* Added hardsuit lockers for logistics officer
* Removed the Rhino suit from the normal entity table, since it is its own thing now.
* [pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
* Updated maps' LockerQuarterMasterFilled to LockerQuarterMasterFilledHardsuit
* Forgot submarine.
* Put parent before id
---------
Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
* Update shoukou.yml
Tweaked surgery room;
Tweaked detective room to include its own bedroom to fit an evidence locker;
Tweaked the library to include a display case;
Fixed prison intercom;
Fixed departmental lock boxes.
* Update shoukou.yml
Removed invalid configurators
* Update shoukou.yml
* Update shoukou.yml
* Update shoukou.yml
* Update shoukou.yml
no invalids
* Shoukou AI
* Fixs grid atmos
* The AI sat gets reworked and then I remove the spawn so no job :(
It's still gonna come *eventually* though, this is just setup
* April cursed all my maps to have invalids
and the curse is manifesting, i've been trolled.
* Fixes this angular and linear damping I know nothing about
* Shoukou runaround
Destroys invalids, makes a library, moves epistemics, redefines the chapel, obliterates all bathrooms (you now have to piss in maint botany or the bridge bathroom) and moves two of the dorms to the area by cryo.
* Fixes a few more blunders by yours truly, maybe it'll run this time
* uncomment grappling gun
* Remove rest of Geras files (#30912)
remove remaining geras stuff
* tweak(AgeRequirement): Make the requiredAge more sensible (#30913)
* chrore(ageRequirement): fix grammar. atleast -> at least (#30914)
* Minor sprite fix to inhand med hardsuits and HoS turtleneck jumpsuit (#30918)
* Fixes inhand hardsuit cross color from https://github.com/space-wizards/space-station-14/issues/26516#issue-2213917971
* Fixed HoS Turtle not covering all butt pixels
---------
Co-authored-by: Zachary Yona <magicalusf@gmail.com>
* Add execution component to all energy sword weapons (#30909)
Co-authored-by: plykiya <plykiya@protonmail.com>
* Automatic changelog update
* chore(grammar): correct some mistakes (#30916)
* Add diamond mining drills, buff regular mining drills (#30814)
* why do I have to change so much just to add drills
* diamon
* Automatic changelog update
* give trash a reusable entity table (#30921)
* Contraband marking & examining (#28688)
* System & loc strings
* pass over syndie contraband
* fixes
* grand theft pass
* contrabandexamine -> contraband
* examine text generation update
* all composition parents necessary
* bring back minor contra so it has a less confusing message
* minor
* weapon pass
* jumpsuit pass
* feet pass
* AUUUUUUUUUGHHHHHHHHHHHHHHHHHH
* head
* AUUUUGH
* ear
* belt
* back
* fix
* bro
* rename for more clarity
* do da review
* add cvar for contraband examine
---------
Co-authored-by: EmoGarbage404 <retron404@gmail.com>
Co-authored-by: Nemanja <98561806+EmoGarbage404@users.noreply.github.com>
* Automatic changelog update
* Automatic changelog update
* Removes variant cube migration (#30934)
add
* First Review Pass Contraband Fixes (#30930)
* First pass contra fix
* bam
* More
* Security crates are now marked as security restricted
* Syndicate raid suit is contra
* damn I forgot gatfruit
* Add conducting gloves to the maintenance loot table (#30904)
* add
* lower weight
* Fix DoDrop to DropNextTo in container cases (#30911)
* Fix DoDrop to DropNextTo in container cases
DoDrop is too heavy to calculation. In any other case we should use alternatives, for example DropNextTo helper method
* codestyle change
* Fix Reagent Fire Stacks (#30766)
* Fix Reagent Fire Stacks
* Comments on code
* little nicer wording?
* Lines 88 and 89, updated 'narsie' and 'ratvar' to 'Nar'Sie' and Ratva… (#30954)
Lines 88 and 89, updated 'narsie' and 'ratvar' to 'Nar'Sie' and Ratvar, per issue #30719.
* Automatic changelog update
* Fix permission check for whitelists in player panel (#30948)
* Automatic changelog update
* Grey mantle in winterdrobe (#29774)
* add the mantle
* fix a few things
* fix merge conflict stuff, remove from winterdrobe and lathe.
* Add mantle to loadouts (20 hour requirement)
* Automatic changelog update
* Sliceable doAfter (#30824)
* init
* wtf git
* Automatic changelog update
* Add capfruit, a gatfruit mutation. (#30850)
* add base
* add fake suffix and flavor fix
* address some reviews
* parent it
* fix test fail
* add FoodSequence support and address small review
* Automatic changelog update
* Fixes the grey mantle (#30971)
add the thing i missed
* Add keybinds for rotating and flipping objects (#30540)
* add keybinds for rotating and flipping objects
* no popup for verbs
* Automatic changelog update
* tweak(Shuttle_honki): Remove DeviceQuantumSpinInverter from honki shuttle. (#30618)
* Make the Borgs Names Appear When they Make an Announcement (#30107)
* Make the Borgs Names Appear When they Make an Announcement
* bwomp
* re-order
* Use Name instead of metadata
* goiup
* Automatic changelog update
* disable contraband examine
* rename our SliceFoodEvent
* Throngler Plushie Sprite (#30969)
Throngonkler Plush sprite
* Fix bug with rotating shelves (#30978)
* Main
* Update shelfs.yml
* Little bug fix
* No weather on concrete tiles (#30952)
* concrete weather
* miss
* development build ghostrole lottery changes (#30980)
debug ghostrole lottery changes
* Automatic changelog update
* Add a saline syringe to the combat medical kit (#29954)
saline
* Automatic changelog update
* fix the admin verbs trying to kill players by filling their lungs with plasma (#30991)
fix the admin tools trying to kill players by filling their lungs with plasma
* Custom Taco & Kebabs - FoodSequence 2 (#30905)
* control layer ordering
* sprite update
* taco!
* taco naming gen
* fix separator naming
* some proto fixes
* default naming separation
* fix taco naming
* rat update
* hamsterburger
* organs taco
* remove from spawners
* fixes
* fix separators and lemons
* Update food-sequence.ftl
* randomization offset
* fix
* kebabs refactor
* fix
* skewer weapon
* Update food_single.yml
* Update migration.yml
* suppermatter
* hamlet centered
* hamsburger
* Update dead-0.png
* 20 -> 4 burger layers max
* Update burger.yml
* canReact: false
* capfruit update
* Update burger.yml
* Update burger.yml
* Update produce.yml
* some fixes
* Update Resources/Textures/Objects/Consumable/Food/taco.rsi/meta.json
Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>
* Update Content.Shared/Nutrition/Components/FoodSequenceStartPointComponent.cs
Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>
* Update Content.Shared/Nutrition/Components/FoodSequenceStartPointComponent.cs
Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>
* chicken
* Update food-sequence.ftl
* documentation
* fixes
* Update meat.yml
* Update meat.yml
---------
Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>
* Automatic changelog update
* Fix popups not working properly with an eye offset (#30990)
* Adds a random smokable spawner (#30870)
* Textures to make lamps mappable to East/West.
* Adds a random smokable spawner
* remove double derma
* Increase chance for just basic cig
* Update to enitity tables
* Tweak values
* Remove space
---------
Co-authored-by: Jeff <velcroboy333@hotmail.com>
* Fix lizards being unable to eat custom burgers (#31005)
* Fix lizards being unable to eat custom burgers
* ensure tag comp
* Automatic changelog update
* Sedin (#27110)
* Sedin
* almost forgot this.
* what
* Did a few fixes, tried to readd popup
* Fix popup, ready for merge
* minor change
* Generalize seed removal/destruction system, add popups in general.
* fix
* fix (again)
* deadcode is no more
* Sedin buff (nerfing the recipe soon)
* godont
* webedit moment
ok listen I had to nuke my setup because my computer was being Dumb As Shit so let me do this ONE webedit
* CRIKEY
* Revert "CRIKEY"
This reverts commit 1c6959ffd9ba8bb1e97ccf2eb0b37b3ff4ec82ee.
I was not supposed to commit that >:/
* Alright, it should be good now but I havent tested it
* ready for merge/review
* prob -> probability
* Requested changes nodoc
* Review nodoc
* documento
* thumb up emoji
* Automatic changelog update
* Adds a Dinky Star Sticker for security officers (#29767)
* Sec-Star-TASTIC
* fix license
* now counts as trash
* Sticks to people + wearable
* no more sticky
* no more sticky
* mystery-space
* Update Loadout Yaml
* Automatic changelog update
* tweak(hospital): Reduce diamond stack from 30 to 1 (#31027)
* tweak(experiment): Reduce diamond stack from 30 to 1 (#31025)
* replace mapped diamond stacks with single
* Figurine voicelines (#30865)
* initial commit
* tweaks to the new voice lines
capitalizations of I's and the Y on hos 3 voice lines
also changed the captain figuring voice line 2 to something completely different
* capitalized one letter
man i really suck at capitalization
* more capitalization
i never thought this pr would need so many changes
* changed one comma to a dot
* Update Resources/Locale/en-US/datasets/figurines.ftl
Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>
---------
Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>
* Automatic changelog update
* Adding shock collar and electropack (#30529)
* Adding shock collar with the new ShockOnTrigger
* Cleaning and updating the shock collar
* Add StripDelay datafield to ClothingComponent
* Adding SelfUnremovableClothingComponent
* ShockCollar Update
* Correction of the shock collar
* Correction of the shock collar 2
* Renaming the DamageSpecifier DataField to Damage
* Fixing the damage field in ShockCollar
* Cleaning the ShockCollar
* Renaming ShockCollar to ClothingNeckShockCollar
* Adding ClothingNeckShockCollar as a stealTarget to a thief
* Fixing a typo of the sprite path in ClothingNeckShockCollar
* Cleaning the ShockOnTriggerComponent
* Revision of SelfUnremovableClothing
* Adding a ClothingBackpackElectropack
* Sprite fix
* Code review
* Shock Collar sprite update
* add commit hash
---------
Co-authored-by: Nemanja <98561806+EmoGarbage404@users.noreply.github.com>
* Automatic changelog update
* Greatly improve the usability of the Gas Analyzer. (#30763)
* greatly improve how the gas analyzer behaves
* don't close the analyzer when the object goes out of range
* cleanup
* always switch to the device tab when a new device is analyzed
* modern api part one
* modern api part 2
* modern api part three
* file scope namespace
* Automatic changelog update
* Fix false and true in player-panel.ftl (#31043)
Fix false and true in player-panel
Add a new True string
* Contra Review Passs - Round 2 (#30942)
* Contra pass round two
* command too
* Stamps
* oopsied a bracket
* Namespace cleanup around Mind Roles (#30965)
* namespaces
* Comment does not need a semicolon
---------
Co-authored-by: Vasilis <vascreeper@yahoo.com>
* Contraband Review Pass - The Threequel (#30970)
Contraband pass number three
* Golden toilet (#31049)
* golden toilet
* Destructible
* sprite
* fix
* copyright
* Automatic changelog update
* Salvage Spawners (#31020)
* treasure entities and spawners
* no more smiles
* remove nyano shock collar code
* Event scheduler setting tweaks (#31018)
tweaks
* Automatic changelog update
* remove meteor swarms rule for a moment
* Revamped Meteor Swarm (#28974)
* meteor code and balanced values
* Meteor Swarms
* Update meteors.yml
* Update meteors.yml
* HOO! (fix overkill bug and buff space dust)
* undo BloodstreamComponent.cs changes
* DamageDistribution -> DamageTypes
* part 2.
* Missing meteor presets (#29044)
* add meteors into missing game presets
* changes for real
* implement code
* this too
* Meteors now leave behind a bit of ore (#30419)
* Meteors that leave behind asteroid ore
* bigger offset
* Bit more generic
* Better defaults
* hrm?
* I HATE CUSTOM SERIALIZERS
* More comments
* renamed a variable
---------
Co-authored-by: plykiya <plykiya@protonmail.com>
* refactor event schedulers to use explicit game rules (#29320)
* works, still has testing values, im sure I did stupid shit.
* shitvent crapfactor
* snap extra word out of existence
* shit I died of old
* remove useless inaccurate design comments
* Oopsie, handle requirement params in RandomRuleSystem too
* I'm a slash slinging hasher
* Address reviews, add admin alerts I forgor
* EntityMan saves the day
* address reviews 1
* eh, I actually don't care about the cargo gifts thing.
* started
* Do reviews
* you actually meant 1.2 lmao
* dependency inheritance is a fickle bitch
* I have no idea.
* Threads are for sheets not computers.
* fix traitor rule test
* fix round type tattling
* break things
* It worky
* Toolshed makes we want to drink depresso.
* Finished?
* remove debug values
* timings
* use defaults
* alphabetize
* bobby drop tables
* Float required fr fr
* continue
* more continence
* uno mas
* obsolution
* cleanup and documentations
* Yell at self
* use the right value defaults
* housekeeping
* Event scheduler setting tweaks (#31018)
tweaks
* Automatic changelog update
* remove(NukeopsRuleComponent): Remove a trap from the component file (#31029)
ah
* Fix bug with holding objects (#31009)
Main
* Automatic changelog update
* Replace obsolete map functions in IconSmoothSystem (#30958)
* first part
* second part
* Automatic changelog update
* Fix reagents with ReagentData being duplicated (#30983)
Initial commit
* :trollface:
* :trollface:
* actually untroll
* a
* 50 burger
* add back old meteor code
* fix
* use some live config options in dev
* remove old shock collar icon
* make ammo more consistent and work more
* clean up lathes diff to upstream
* a
* move rubber bullets to deltav folder
* a
* untroll
* more untrolls
* more untrolls
* untroll
* :trollface:
* a
* b
* remove it for real
* add missing lathe recipes
* replace cvars with component field
* remove taco from roboisseur
* migrate cardboard box with smg mags
* remove kebabs
* a
---------
Co-authored-by: deltanedas <@deltanedas:kde.org>
Co-authored-by: Killerqu00 <47712032+Killerqu00@users.noreply.github.com>
Co-authored-by: Brandon Hu <103440971+Brandon-Huu@users.noreply.github.com>
Co-authored-by: Zachary Yona <58833995+Magicalus@users.noreply.github.com>
Co-authored-by: Zachary Yona <magicalusf@gmail.com>
Co-authored-by: Plykiya <58439124+Plykiya@users.noreply.github.com>
Co-authored-by: plykiya <plykiya@protonmail.com>
Co-authored-by: PJBot <pieterjan.briers+bot@gmail.com>
Co-authored-by: Alzore <140123969+Blackern5000@users.noreply.github.com>
Co-authored-by: Nemanja <98561806+EmoGarbage404@users.noreply.github.com>
Co-authored-by: Kara <lunarautomaton6@gmail.com>
Co-authored-by: EmoGarbage404 <retron404@gmail.com>
Co-authored-by: Ubaser <134914314+UbaserB@users.noreply.github.com>
Co-authored-by: Token <esil.bektay@yandex.com>
Co-authored-by: Cojoke <83733158+Cojoke-dot@users.noreply.github.com>
Co-authored-by: LeoSantich <108027402+LeoSantich@users.noreply.github.com>
Co-authored-by: nikthechampiongr <32041239+nikthechampiongr@users.noreply.github.com>
Co-authored-by: pigeonpeas <147350443+pigeonpeas@users.noreply.github.com>
Co-authored-by: Ed <96445749+TheShuEd@users.noreply.github.com>
Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>
Co-authored-by: PoorMansDreams <150595537+PoorMansDreams@users.noreply.github.com>
Co-authored-by: IgorAnt028 <118114530+IgorAnt028@users.noreply.github.com>
Co-authored-by: NotSoDamn <75203942+NotSoDana@users.noreply.github.com>
Co-authored-by: Errant <35878406+Errant-4@users.noreply.github.com>
Co-authored-by: DrSmugleaf <10968691+DrSmugleaf@users.noreply.github.com>
Co-authored-by: Velcroboy <107660393+IamVelcroboy@users.noreply.github.com>
Co-authored-by: Jeff <velcroboy333@hotmail.com>
Co-authored-by: themias <89101928+themias@users.noreply.github.com>
Co-authored-by: Eris <eris@erisws.com>
Co-authored-by: FATFSAAM2 <saamboroujerdi@gmail.com>
Co-authored-by: to4no_fix <156101927+chavonadelal@users.noreply.github.com>
Co-authored-by: Mervill <mervills.email@gmail.com>
Co-authored-by: Vasilis <vascreeper@yahoo.com>
Co-authored-by: Nim <128169402+Nimfar11@users.noreply.github.com>
Co-authored-by: IProduceWidgets <107586145+IProduceWidgets@users.noreply.github.com>
Co-authored-by: SlamBamActionman <83650252+SlamBamActionman@users.noreply.github.com>
* Prosecutor and det switch positions
Doesn't fix other jarring map issues like the sec door on shoko but addresses the astro grass, the det office and the prosecutor, and the clerk maints being locked to justice because I forgor.
* Trolled by prosecutor spawn + AI sat rework
Reworks the AI sat to not be shit.
Also adds a prosecutor spawn because I got trolled
* Adei forgets to run fixgridatmos so he does that in this commit
Title. Now I can fix invalids
* TROLLED BY INVALIDS!!
* Shoukou Hotfix
Fixes the wall eating the CMO's dresser, does some shit with tiles, fleshes out the bridge bar and dock more.
* Unfucks the Clerk's access by replacing the door
Keeping in with that PR timemaster did and was accepted
* Brings Justice to Shoukou Station
* adds a space in the map prototype yml
* Adei leaves a spot between "Chief" and "Justice" like a fucking dingus
* Map Error Fixes
reroutes pipes by the robo lab, adds maint door by reporter's office so it's still accessible, 1984s heads spawning in their rooms. adds scrubber in the vault so ratcliff the mouse doesn't choke on their own breath and die. adds tiny fans on the command dock, labels clerk fax and allows clerk to breathe air. takes away the warden's cannabis butter and replaces it with a sec encryption server.
Security, medical, head of personnel, logistics, epistemics and engineer's head department has been provided with a medal they can bestow upon their crew for doin.... well, I guess better than others, whether or not its literly just doing their job in the first place.
Robotics has been provided with some changes, removed protolathe and the resources that were next to it but given bit better to look in the surgery room of it. (For now)
Epistemics and Medical has been provided with starting basic resources.
Engineering received spare fuel to the generators so they dont have to pray that salvage mines plasma someday.
Salvager's equipment has been doubled to cover all 4 miners and moved to the inside.
Provided meteor shield cover to certain parts of the magnet incase a miner forgets to bring the magnet back and only one meteor hits for some reason.
Provided meteor shield cover above the "legally speaking" secret room
Given an entry on the left side of epistemics to provide faster access to robotics.
Increased the amount of solar panels on both sides but made more broken while at it.
Bit late, I know.
Added disposals infront of bridge
Added jukebox
Added shipyard dock in command
Changed disposal placement infront of kitchen/bar to less inconvenient spot.
* Made more things blessable
* Removed junk
* Remove whatever that was
* Make bowls blessable
* New mixablesolution component, converted everything to work with it
* Fix minor mishaps
* Fix extra spaces in bottle yml
* Fix last extra space, fix bottle havign the wrong solution name
* Remvoe unneeded event(I think), fix alcohol bottles not being mixable
* I missed cans
Basicly just does small fixes that were told to me.
Warden's wall monitor is now located on the table because previously it was on a wall that wasnt even accesable
Salvage was readjusted due to no shuttle and given conveyors to help moving the cargo inside
Prisoner wall lockers now contain jumpsuit and jumpskirt for any new prisoners
* Expands Shoukou's medical
Everything from the right of medical,
From the right of medical up to the bridge needs to be checked because I moved ALL OF IT.
* Update shoukou.yml
* Update shoukou.yml
Again
This time at the least, I noticed that the lights were changed so at the least the map was updated properly before i touched it.
Changes cloning to metem.
Redo captain's quarters to include all his gear.
Added a noticeboard to kitchen.
* Shoukou small patch
Deletes plasma miner
Deletes command cryo
Replaces cryo in prison with cryo with prisoners included edition
Ensures techmaints are under robotics and cryo
Fixes shutters in robotics
Provides medical with a singular cryo
* gets rid of invalid
* Update shoukou.yml
---------
Co-authored-by: Velcroboy <107660393+IamVelcroboy@users.noreply.github.com>
* Shoukou's cryo update.
Head of security's locker was replaced with HoS's locker with hardsuit to fit in a new furniture that has the clothing for them.
Head of personal's plant was removed for a dresser with his clothing.
Captain's hardsuit is now located in their locker, locker was placed where the hardsuit locker was and the dresser was placed where the locker was previously.
CMO had same treatment as HoS. Same goes for Mystagogue, chief engineer,warden and logistics officer
Added cryo to command/prison/arrivals
Added more screens
Named APCs. God there is alot of them.
Added Tropico to detective's office. (Aparently thief objective)
* DIE INVALID
* Shoukou maintenance update.... again.
Fixes camera in cryo
Added a techmaint floor under Armoury level 2 door.
Adds mirror to cloning.
Adds maintenance behind robotics, giving access to atmos if someone wanted to break in.
Adds a TV in bar.
* Update shoukou.yml
* Second patch.
* Just going to see how this will go.
* Revertin the previous commit.
---------
Co-authored-by: Debug <49997488+DebugOk@users.noreply.github.com>
* Shoukou update, the reckoning.
Lets see if this will work.
* Deletes INVALID
I swear to god.
* A quick update.
---------
Co-authored-by: Velcroboy <107660393+IamVelcroboy@users.noreply.github.com>
* Shoukou readjustments.
Changed volumetric gas pump to a normal gas pump on co2 recycler to prevent it from clogging up.
Changed piping in TEG for it to be more comfortable
Changed position of the freezer in atmos to cool down oxygen over air due to the heated oxygen from the recycler.
Spaced the cooling chamber in TEG better.
Added nitrogen canister to TEG.
Added a power monitoring next to CE's room
Replaced sofa in the middle of the map with plastic chairs
Made robotics bit more private with shutters on windows.
Got rid of EVA room near logistics to added maintance and expanded salvage's room
Redid robotix a bit by givin it more space and shufflin some machines around, also given curtains for private murder.
Fixes issue #487
Redone the entire bottom of medical, expanding it to include cryo.
Added cameras to: Robotics, detective's office, TEG, atmos's office, engineering's front, dojo, arrivals, corpsman's office, salvage's break room, loading bay in cargo, evacuation.
Medical's substation has been moved.
Exchanged one chem maker for a chemical vendor to let people choose what they want to use.
Exchanged training bomb CRATE with 2 training bombs due to how they would glitch into eachother as soon as you open the crate.
Added 3 riot helmets to the riot gears in light armoury.
Added ATV to cargo.
Removed selling square and computer in cargo
Added docking to salvage's walkway.
* Another adjustments to adjustments.
Gave salvage's outside a conveyor and gave them some light.
Readjusted pipes in cryo.
Moved air alarm in cloning to a better position
Added a singular air vent to evacuation.
Added conveyor's to cargo's loading bay.
Gave nanomed plus back into medical because I forgot
Gave a *proper* cargo shuttle console instead of a computer.
* Updates three maps
Musician airlocks, clown/mime lockers, custodian lockers in service rooms, sec/law maintenance hatches, space cleaner dispensers, other minor changes.
* Update edge.yml
* A small adjustment for shoukou.
Fixes mantis's room bein accesible by all epistemics.
Changes the location of the firewall closet.
(I would give this PR a day incase someone finds another thing to check unless someone is in a rush)
* Update shoukou.yml
named the lawyer fax
Signed-off-by: Colin-Tel <113523727+Colin-Tel@users.noreply.github.com>
---------
Signed-off-by: Colin-Tel <113523727+Colin-Tel@users.noreply.github.com>
Co-authored-by: Colin-Tel <113523727+Colin-Tel@users.noreply.github.com>
Velcroboy
Vanessa
BriBrooo
Quanteey
Radezolid
Unkn0wn_Gh0st
Adeinitas
deltanedas
Adrian16199
Verm
Debug
Colin-Tel