]>
git.smokeofanarchy.ru Git - space-station-14.git/log
Entvari [Sun, 20 Apr 2025 21:38:30 +0000 (22:38 +0100)]
Wizard Headset (#35732)
* wizardcomms
* wizheadset
* Addressed requested changes and axed wizard channel due to redundancy.
* oops overlooked this, dont tell anyone
* another mistake fixed
* removed wiz encryption key due to redundancy
* accidentally left some punctuation in a now unrelated meta.json
PJBot [Sun, 20 Apr 2025 21:35:26 +0000 (21:35 +0000)]
Automatic changelog update
Jackson Langley [Sun, 20 Apr 2025 21:34:19 +0000 (16:34 -0500)]
Require traitors to maroon their objective no matter what (#35825)
* jesus
* okay.
* OOPS
* ok
* ok
Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>
* ok
* Update Resources/Prototypes/Objectives/paradoxClone.yml
Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>
* Update Resources/Prototypes/Objectives/base_objectives.yml
Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>
* m
* ok
* ok
---------
Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>
PJBot [Sun, 20 Apr 2025 21:28:42 +0000 (21:28 +0000)]
Automatic changelog update
uhbg [Sun, 20 Apr 2025 21:27:35 +0000 (17:27 -0400)]
The Bartender can now make Eggnog (#34065)
* Preliminary eggnog changes (egg in shaker crashes?)
* Fixed eggnog reagent name and description
* added - to flavor
* deleted a space
* Added eggnog glass sprite
* changed fill levels to match rsi
* Added two more fill levels to eggnog
* Removed fizziness, changed physical description, and fixed rsi
---------
Co-authored-by: uhbg <29674581+uhbg@users.noreply.github.com>
Co-authored-by: Nemanja <98561806+EmoGarbage404@users.noreply.github.com>
Princess Cheeseballs [Sun, 20 Apr 2025 21:27:12 +0000 (14:27 -0700)]
Puddle Code Slipping Cleanup (#35845)
* Init Commit
* windows yelling at me to update commit
* working commit, need prediciton and more dehardcoding
* Project 0 warnings
* Working Commit (Near Final)
* ryder got confused commit
* I love Merge Conflicts :)
* Working commit, no prediction
* Forgot the yaml changes
* Comments and typos
* Apparently while the reduced launch mult of lube was initialized it was never used so I revered back to default
* Fixed an incorrect divisor
* bit of cleanup
* Prediciton fixed, and puddles now affect all entities
* FORGOT TO RENAME A VERY IMPORTANT VARIABLE OOPS
* Really big I forgor moment
* Even bigger I forgor moment
* four more merge conflicts to fix four more oopsies
* fixed actual divide by zero moment and also im very dumb
* Even bigger I forgor moment
* four more merge conflicts to fix four more oopsies
* fixed actual divide by zero moment and also im very dumb
* Fix all test fails
* code cleanup
* Webedit whitespace
* Code cleaup
* whitespace webedit
* whitespace webedit
* whitespace webedit
* whitespace removal
* Comments and cleanup
* Re-Added 20 warnings as per Ork's request
* Cleanups
* Spacing fix
* bugfixes and cleanup
* Small bugfix
* Actually dirty the slipComp for real
* Added Friction field to Reagent Prototype per design discussion
* Sliding system is kill
PJBot [Sun, 20 Apr 2025 21:18:18 +0000 (21:18 +0000)]
Automatic changelog update
Banedon [Sun, 20 Apr 2025 21:17:12 +0000 (23:17 +0200)]
Santa hat with a foldable beard (#36510)
* Added foldable component to santa hat
* Modified sprites, modified YAML. YAML is cursed
* Changed santa hat description to mention the beard fold
* Removed HideLayerClothing since it doesnt work
* Changed the prefix from "beard" to "nobeard" to match with the fold/unfold verb
* Credits for sprite changes
---------
Co-authored-by: Lanedon <matth.galvez@gmail>
PJBot [Sun, 20 Apr 2025 21:16:40 +0000 (21:16 +0000)]
Automatic changelog update
UBlueberry [Sun, 20 Apr 2025 21:15:34 +0000 (17:15 -0400)]
Adds beanies to the WinterDrobe! (#32946)
* sprites
* messing with the ymls
* new sprites
* that's a lotta yaml
* make the sprites gooder
* color adjustment
* to the winterdrobe with you
* layering fix
PJBot [Sun, 20 Apr 2025 21:10:07 +0000 (21:10 +0000)]
Automatic changelog update
Booblesnoot42 [Sun, 20 Apr 2025 21:09:00 +0000 (17:09 -0400)]
Resprite main altars (#35685)
* resprite main altars
* updated meta.json
PJBot [Sun, 20 Apr 2025 21:02:56 +0000 (21:02 +0000)]
Automatic changelog update
Ed [Sun, 20 Apr 2025 21:01:50 +0000 (00:01 +0300)]
Markings overhaul (#35938)
* markings displacement setup
* ok i got it!
* fix map updating
* remove trackingLayers
* markings clean up and modernizize
* marking disabling displacements
* markings restriction
* dehihienize
* dehihiniezize 2
* aa
* nice
PJBot [Sun, 20 Apr 2025 20:56:49 +0000 (20:56 +0000)]
Automatic changelog update
RedBookcase [Sun, 20 Apr 2025 20:55:42 +0000 (13:55 -0700)]
Pirate Gear Tweaks. (#35986)
* Tweaked pirate gear to be in-line with similar items.
* Added attribution for flashlight sprites, made hardsuits Major Contraband
* Added empty versions of the pirate revolver and flintlock.
* Test fail fix hopefully?
* Test fail fix hopefully V2.0
* Test fail fix hopefully V3.0
* Test fail fix hopefully V4.0
---------
Co-authored-by: RedBookcase <Usualmoves@gmail.com>
Prole [Sun, 20 Apr 2025 20:36:22 +0000 (13:36 -0700)]
The Beverage Jug Can Now Look Open (#36070)
* GenJug-Changes
Signed-off-by: Prole <172158352+Prole0@users.noreply.github.com>
* Guh
Signed-off-by: Prole <172158352+Prole0@users.noreply.github.com>
* Support For the Rest
Signed-off-by: Prole <172158352+Prole0@users.noreply.github.com>
* New Sprites
Signed-off-by: Prole <172158352+Prole0@users.noreply.github.com>
* Newest Sprites
Signed-off-by: Prole <172158352+Prole0@users.noreply.github.com>
---------
Signed-off-by: Prole <172158352+Prole0@users.noreply.github.com>
lzk [Sun, 20 Apr 2025 20:30:37 +0000 (22:30 +0200)]
change MV cable outline (#36751)
* change MV cable outline
* zamn
YoungThug [Sun, 20 Apr 2025 20:30:04 +0000 (13:30 -0700)]
Wizard Figure Voiceline Fix #36771 (#36779)
DA WIZARDgit add -A
Tayrtahn [Sun, 20 Apr 2025 19:20:57 +0000 (15:20 -0400)]
Restore `LimitedChargesComponent.MaxCharges` default value to 3 (#36778)
PJBot [Sun, 20 Apr 2025 19:09:47 +0000 (19:09 +0000)]
Automatic changelog update
Tayrtahn [Sun, 20 Apr 2025 19:08:41 +0000 (15:08 -0400)]
Add marker components for admin shenanigans (#36776)
Tayrtahn [Sun, 20 Apr 2025 15:00:33 +0000 (11:00 -0400)]
Use non-generic TryComp in `StationSpawningSystem` (#36769)
Use non-generic TryComp in StationSpawningSystem
PJBot [Sun, 20 Apr 2025 14:09:09 +0000 (14:09 +0000)]
Automatic changelog update
K-Dynamic [Sun, 20 Apr 2025 14:08:02 +0000 (02:08 +1200)]
Nonlethal throwables crate (#35808)
PJBot [Sun, 20 Apr 2025 14:07:21 +0000 (14:07 +0000)]
Automatic changelog update
Hyper B [Sun, 20 Apr 2025 14:06:14 +0000 (19:06 +0500)]
Fire protection for ERT engineering hardsuit (#34949)
Kyle Tyo [Sun, 20 Apr 2025 13:56:39 +0000 (09:56 -0400)]
Unused dependency cleanup. (#36760)
* take 2! fight!!!
* final touches
* reeeeeee
PJBot [Sun, 20 Apr 2025 13:56:30 +0000 (13:56 +0000)]
Automatic changelog update
ScarKy0 [Sun, 20 Apr 2025 13:55:23 +0000 (15:55 +0200)]
Decrease amount of mail, increase profits (#36767)
init
Kyle Tyo [Sun, 20 Apr 2025 12:57:53 +0000 (08:57 -0400)]
Replace GetEntitiesInTile with EntityLookupSystem equivalent (#36756)
* commit GET!!
* minor cleanup
PJBot [Sun, 20 Apr 2025 12:20:18 +0000 (12:20 +0000)]
Automatic changelog update
Hyper B [Sun, 20 Apr 2025 12:19:11 +0000 (17:19 +0500)]
Departmental shelves whitelist expansion (Attempt №3) (#34292)
* Expand-Shelves-Whitelist
Made departmental shelves hold a wider variety of items.
* Accidentally included "Packet" twice
PJBot [Sun, 20 Apr 2025 12:04:52 +0000 (12:04 +0000)]
Automatic changelog update
TakoDragon [Sun, 20 Apr 2025 12:03:46 +0000 (14:03 +0200)]
Salvage Airlock (#36375)
* Salvage
* atmos a
* more muted colours
* Mapping Related to AI
* Fixed small naming inconsistency
* Revert "Fixed small naming inconsistency"
This reverts commit
985e1fd46a09e521c11dc345f470228e7907fbb9 .
* Revert "Mapping Related to AI"
This reverts commit
5d5ae4feb819396c5c2a7413399ab5ce34f8683b .
* Revert "atmos a"
This reverts commit
529831e2584df27fa102ee1c970948fa3b6bab56 .
* indent
---------
Co-authored-by: Milon <milonpl.git@proton.me>
Pgriha [Sun, 20 Apr 2025 12:03:37 +0000 (15:03 +0300)]
Heterochromia for Moth (#36061)
* 1
* Fix local
* formatting
---------
Co-authored-by: Milon <milonpl.git@proton.me>
PJBot [Sun, 20 Apr 2025 12:02:14 +0000 (12:02 +0000)]
Automatic changelog update
Alice4267 [Sun, 20 Apr 2025 12:01:08 +0000 (15:01 +0300)]
Fix glass duplication with beakers (#34441)
Update chemistry.yml
Fixing glass dupe.
PJBot [Sun, 20 Apr 2025 11:54:49 +0000 (11:54 +0000)]
Automatic changelog update
PJBot [Sun, 20 Apr 2025 11:53:43 +0000 (11:53 +0000)]
Automatic changelog update
RedBookcase [Sun, 20 Apr 2025 11:53:37 +0000 (04:53 -0700)]
Makes more items recyclable. (#35800)
* Makes more items recyclable.
* Added newlines
* Fixed material issues which were NOT MY FAULT
---------
Co-authored-by: RedBookcase <Usualmoves@gmail.com>
PJBot [Sun, 20 Apr 2025 11:52:33 +0000 (11:52 +0000)]
Automatic changelog update
Pgriha [Sun, 20 Apr 2025 11:52:31 +0000 (14:52 +0300)]
Fix head markings under some helmets (#36074)
* 1
* 2
Nox [Sun, 20 Apr 2025 11:51:27 +0000 (04:51 -0700)]
Descriptions for .35 auto (#36085)
* Initial commit.
* added SMG descriptions
* Update Resources/Prototypes/Entities/Objects/Weapons/Guns/SMGs/smgs.yml
Co-authored-by: ArtisticRoomba <145879011+ArtisticRoomba@users.noreply.github.com>
* Updated descriptions to incorporate Roomba's feedback.
* Slightly changed Viper description
* Minor formatting change
* Updated Atreides description
* Fixed a minor convention mistake in magazines
* Slightly changed the Viper's description to not reveal its manufacturer.
* Updated Drozd description.
* Rerun test
* Updated descriptions in accordance with Roomba's suggestions!
* Updated Viper description!
* Shit I forgot to remove the cartridge length, did it now!
* More smart changes by Roomba
* Tests gaslighting me
* Update Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/pistol.yml
Co-authored-by: ArtisticRoomba <145879011+ArtisticRoomba@users.noreply.github.com>
* Updated WT550 description
---------
Co-authored-by: ArtisticRoomba <145879011+ArtisticRoomba@users.noreply.github.com>
Nox [Sun, 20 Apr 2025 11:33:31 +0000 (04:33 -0700)]
Fix some SMG magazines fitting 35 rounds (#34782)
All SMG magazines are now 30 round, rather than half being 35 round.
PJBot [Sun, 20 Apr 2025 09:33:09 +0000 (09:33 +0000)]
Automatic changelog update
Helm [Sun, 20 Apr 2025 09:32:02 +0000 (15:32 +0600)]
Fix soup (#34633)
Co-authored-by: Helm4142 <Helm4142@users.noreply.github.com>
Spessmann [Sun, 20 Apr 2025 08:54:01 +0000 (01:54 -0700)]
Small ruin fixes (#36763)
PJBot [Sun, 20 Apr 2025 07:01:40 +0000 (07:01 +0000)]
Automatic changelog update
Cass [Sun, 20 Apr 2025 07:00:33 +0000 (02:00 -0500)]
Plurality pin addition (now not on master branch) (#36744)
PJBot [Sun, 20 Apr 2025 06:02:34 +0000 (06:02 +0000)]
Automatic changelog update
ArtisticRoomba [Sun, 20 Apr 2025 06:01:28 +0000 (23:01 -0700)]
kill filing cabinet heisentests (#36757)
PJBot [Sun, 20 Apr 2025 05:59:48 +0000 (05:59 +0000)]
Automatic changelog update
chromiumboy [Sun, 20 Apr 2025 05:58:41 +0000 (00:58 -0500)]
Bugfix to sync emergency broadcast cooldowns on holopad UIs (#34115)
* Initial commit
* Bug fix
* Included check for gaining power
* Addressed reviews
PJBot [Sun, 20 Apr 2025 05:58:08 +0000 (05:58 +0000)]
Automatic changelog update
Alzore [Sun, 20 Apr 2025 05:57:01 +0000 (00:57 -0500)]
Aquatic tail and back fin markings for lizards (#33219)
* shark tail and back fin for lizards
* credit me
TytosB [Sun, 20 Apr 2025 05:51:13 +0000 (00:51 -0500)]
loop lairlock lattice fix (#36758)
* sinful
* funeralofdeadbutterflies
* butterfly
* lattice fix
TytosB [Sun, 20 Apr 2025 05:22:04 +0000 (00:22 -0500)]
New salv ruin- butterfly funeral (#36755)
TytosB [Sun, 20 Apr 2025 04:32:19 +0000 (23:32 -0500)]
Salvage ruins- the deadly sins (#36754)
Spessmann [Sun, 20 Apr 2025 04:27:20 +0000 (21:27 -0700)]
Add More Ruins (#36752)
Tayrtahn [Sun, 20 Apr 2025 04:16:59 +0000 (00:16 -0400)]
Convert `NameIdentifier` to use `NameModifierSystem` (#36736)
Convert NameIdentifier to use NameModifierSystem
Kyle Tyo [Sun, 20 Apr 2025 04:14:58 +0000 (00:14 -0400)]
replace obsolete IsGrid calls with HasComp<MapGridComponent> (#36729)
* replace obsolete IsGrid calls with HasComp<MapGridComponent>
* remove IMapManager dependency
* well would you look at that
* just look at it
Emisse [Sun, 20 Apr 2025 03:03:34 +0000 (21:03 -0600)]
Terrarium ruin (#36739)
PJBot [Sun, 20 Apr 2025 02:42:30 +0000 (02:42 +0000)]
Automatic changelog update
ArtisticRoomba [Sun, 20 Apr 2025 02:41:24 +0000 (19:41 -0700)]
Fix spray nozzle not cleaning reagents properly (#35950)
* init, god help us all
* further refining
* final round of bugfixes
* whoopsies
* To file scoped namespace
* first review
* oopsie
* oopsie woopsie
* pie is on my face
* persistence
* datafieldn't
* make PreviousTileRef nullable
* change component to file scoped namespace
* Minor tweaks:
- We clamp the reaction amount to a minimum value because when working with percentages and dividing, we approach numbers like 0.01 and never actually properly delete the entity (because we check for zero). This allows us to react with a minimum amount and cleans things up nicely.
- Minor clarification to comments.
- Rebalancing of the spray nozzle projectile.
* the scug lies!!!!
* undo file scoped namespace in system
* kid named warning
---------
Co-authored-by: ScarKy0 <106310278+ScarKy0@users.noreply.github.com>
shibe [Sun, 20 Apr 2025 02:26:10 +0000 (22:26 -0400)]
Add one word to the dragon summon announcement (#36749)
terror!!!!
Nemanja [Sun, 20 Apr 2025 01:00:49 +0000 (21:00 -0400)]
Fix artifact spawns parenting to players (#36745)
Nemanja [Sun, 20 Apr 2025 01:00:23 +0000 (21:00 -0400)]
Fix ore silo clients showing up when out of range (#36741)
github-actions[bot] [Sun, 20 Apr 2025 00:41:15 +0000 (20:41 -0400)]
Update Credits (#36748)
Co-authored-by: PJBot <pieterjan.briers+bot@gmail.com>
PJBot [Sun, 20 Apr 2025 00:18:47 +0000 (00:18 +0000)]
Automatic changelog update
SeamLesss [Sun, 20 Apr 2025 00:17:38 +0000 (17:17 -0700)]
Scarf Resprite (#35446)
* guh???
* Merge branch 'master' of https://github.com/SeamLesss/space-station-14
* all of em
* better scarfs
TytosB [Sat, 19 Apr 2025 21:19:08 +0000 (16:19 -0500)]
fixgridatmos
Velcroboy [Sat, 19 Apr 2025 21:07:49 +0000 (16:07 -0500)]
Smuggler follow up (#36456)
* Fix Overfilling satchels
* Add notes
* Clearer
* remove line :/
* Reduce by 1 cigars/booze
* fix typo
---------
Co-authored-by: Velcroboy <velcroboy333@hotmail.com>
TytosB [Sat, 19 Apr 2025 20:42:59 +0000 (15:42 -0500)]
terrarium
PJBot [Sat, 19 Apr 2025 20:35:01 +0000 (20:35 +0000)]
Automatic changelog update
ScarKy0 [Sat, 19 Apr 2025 20:33:54 +0000 (22:33 +0200)]
Give salvage borgs a tool module. (#33336)
Init
PJBot [Sat, 19 Apr 2025 20:33:24 +0000 (20:33 +0000)]
Automatic changelog update
MilenVolf [Sat, 19 Apr 2025 20:32:17 +0000 (23:32 +0300)]
[#30096 Fix] Dumping a RefillableSolution into a DumpableSolution now requires `CanComplexInteract` (#33350)
* dumping containers now require having at least one hand
* Cleanup
* Better
* Apply suggested changes
* Cleanup
---------
Co-authored-by: Luiz Costa <luiz@mavromati.com>
PJBot [Sat, 19 Apr 2025 20:21:41 +0000 (20:21 +0000)]
Automatic changelog update
c4llv07e [Sat, 19 Apr 2025 20:20:32 +0000 (23:20 +0300)]
Better PowerCharge menu wrapping (retry) (#34036)
* fixed
* Move wattage to the power button
---------
Co-authored-by: VideoKompany <135313844+VlaDOS1408@users.noreply.github.com>
Emisse [Sat, 19 Apr 2025 18:56:46 +0000 (12:56 -0600)]
Plasma ore silos and department eco (#36715)
Emisse [Sat, 19 Apr 2025 18:56:21 +0000 (12:56 -0600)]
Elkridge - Silo (#36716)
Emisse [Sat, 19 Apr 2025 18:56:11 +0000 (12:56 -0600)]
Fland Silo (#36724)
Emisse [Sat, 19 Apr 2025 18:31:39 +0000 (12:31 -0600)]
Packed Silo (#36722)
Emisse [Sat, 19 Apr 2025 18:31:28 +0000 (12:31 -0600)]
Omega Silo (#36718)
Emisse [Sat, 19 Apr 2025 18:31:12 +0000 (12:31 -0600)]
Oasis Silo (#36720)
Emisse [Sat, 19 Apr 2025 18:21:39 +0000 (12:21 -0600)]
Convex Silo (#36734)
Emisse [Sat, 19 Apr 2025 18:21:28 +0000 (12:21 -0600)]
Loop Silo (#36733)
Emisse [Sat, 19 Apr 2025 18:21:15 +0000 (12:21 -0600)]
Marathon Silo (#36732)
Emisse [Sat, 19 Apr 2025 18:21:01 +0000 (12:21 -0600)]
Box Silo (#36723)
Emisse [Sat, 19 Apr 2025 18:19:05 +0000 (12:19 -0600)]
Bagel Silo (#36721)
ScarKy0 [Sat, 19 Apr 2025 18:00:31 +0000 (20:00 +0200)]
Fix silo rotation (#36737)
Update silo.yml
ScarKy0 [Sat, 19 Apr 2025 17:28:25 +0000 (19:28 +0200)]
init
ScarKy0 [Sat, 19 Apr 2025 17:18:22 +0000 (19:18 +0200)]
init
ScarKy0 [Sat, 19 Apr 2025 17:11:17 +0000 (19:11 +0200)]
init
slarticodefast [Sat, 19 Apr 2025 17:11:08 +0000 (19:11 +0200)]
cleanup RingerSystem (#36731)
cleanup ringersystem
PJBot [Sat, 19 Apr 2025 17:08:30 +0000 (17:08 +0000)]
Automatic changelog update
Fildrance [Sat, 19 Apr 2025 17:07:23 +0000 (20:07 +0300)]
fixing spessman getting teleported inside artifact (#36719)
* fixing spessman getting teleported inside artifact
* refactor: move XAEPortal comp to server
* refactor: replace Spawn and coord logic with with TrySpawnNextTo
---------
Co-authored-by: pa.pecherskij <pa.pecherskij@interfax.ru>
Kyle Tyo [Sat, 19 Apr 2025 16:11:34 +0000 (12:11 -0400)]
Minor dependency and variable cleanup. (#36730)
removal of misc unused or extra dependency definitions.
PJBot [Sat, 19 Apr 2025 15:32:44 +0000 (15:32 +0000)]
Automatic changelog update