* Custom USSP roles for admins
* Added the sprites for new USSP
* conflict part 2
* Elder Gods please make this work
* new style for soviet box
* Added Soviet headset
* lets fix this conflict
* Die conflict!
* Sirryan review
* Apply suggestions from code review
Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com>
* Lets solve this conflict
* Die conflict!
---------
Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com>
* Ports the Bluespace Light Replacer from BeeStation
* advanced replacer for janitor ERT
* wrong place
* Preventing it from being used over cameras
* Update code/game/objects/items/devices/lightreplacer.dm
Co-authored-by: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com>
* bluespace replacer only for gamma
---------
Co-authored-by: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com>
* donk pocket rework
* Snowball had a far more sensible way to do this
* lewcc review
* Sirryan review
Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com>
* I fix?
* Revert "I fix?"
This reverts commit 1517d2e21e.
* please work you stupid .dmi
* WORK DAMN YOU
* will this hypothetically work
* re-adds syndie donk kit
* documented these
* just return
* clause guarded
---------
Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com>
* First commit for ERT medic kit rework
* Value adjustment for pill bottles and patch pack
This was intended for the first commit
* removes the empty containers previously created
* Update code/game/objects/items/weapons/storage/firstaid.dm
Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
* Update code/game/objects/items/weapons/storage/firstaid.dm
Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
* Merge conflict resolution
---------
Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
* moves the combat defib out of the first aid kit, tweaks both costs
* no more synthflesh patches
* i just a little stupid
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
* we just a little stupid
* deletes stims, really not needed
webedit lol
---------
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
* dignitary, human, items, spawning
* garment bag update
* dignitary icons
* ntrep cap
* gloves and hat fix
* dignitary icons part 2 and misc code
* minor stuff
* hat fix from updates also drask and grey suit slot
* minor description discrepancy
* cane resprite
* paperwork so boring it kills you
* it's worth a bit more now
* Backup in case you poison yourself
* Virologist gets it, accurate description
* I promise im literate
Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
* No more charcoal, time for gloves
* Turns comments into auto-doc
---------
Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
* Janitorial equipment tweaks and advanced cleaner
* cleaner availability tweaks
* old cleaner for drones
* Mop capacity buff
* advanced cleaner for sol traders
* conflict part 1
* Merge branch 'master' into janitorial_tweaks
* Revert "Merge branch 'master' into janitorial_tweaks"
This reverts commit 47129ea819.
* Revert "Revert "Merge branch 'master' into janitorial_tweaks""
This reverts commit a8c520b069.
* hahahahaha
* hahaha part 2
* hahaha part 3
* cerestation edit
* adv cleaner comes with 500 now and ERT belt
* lube spray upper case and moving it to spray.dm
* change da world
* compile, thanks
* Update cere.dmm
* Update cere.dmm
* ready for test
* use the proper name please
its CERE not ceres.
* stops shuttle from forcibly docking with podbay
* things are now different
Landmark update for job spawns.
More hardsuits in EVA, engi, and atmos.
Disaster counters properly added.
Vault is now more spooky.
Gamma armoury moved to below gulag shuttle.
Sleeping rooms replaced with arcade and swimming pool.
Captains ERP nest deleted.
Tcomms now looks like it was designed by a functional human being.
Mining doesn't need a weird glass box.
Shuffled docking ports at arrivals.
Windows are now reinforced windows.
Mr changs has arrived.
* disposals functions now
* now with 50% more air
* gamma armoury doesn't attempt to become one with gulag shuttle
* disposals net is airless, vault is enclosed in some rock
* standard number of escape pods
* slight fixes
* more bugfixes
* lighting fixes
* divided hallways, added psych office, more cams
* fire alarms, shutters, and fixes
* temporary DME edit to set cere as default map
* fixed shuttle runtime
* this compiles and runs locally, please CI
* fixes hidden double pipe
* more double pipes
* more vents and scrubbers, morgue body delivery
* tweaks to secbot pathing
* various QoL changes
* Medbay expansion, med+arrival maints expansion.
* the definitive air alarm update, and more!
* Departmental emergency EVA suits, signage, tweaks.
* 2 Cryodorms added (oops). Asteroid sound updates.
* Borg cryo, shutters correctly rotated.
* Supply shuttle edit. I like joining the map queue.
* minor fixes, grav gen isolation.
* minor fixes
* Disposal fixes, lighting adjustment
* SabreML feedback changes
* More minor fixes
* More fixes
* NSS Farragus
* (most) floors turn into asteroid sand, not spess
* reverted random file edit, fixed mr teeny
* minor fixes
* big bombs can breach asteroid areas
* Asteroid plating exists, did you know? I do now!
* camera network pass
* walls become sand too on destruction
* lighting pass
* implements feedback, dramatically reduces ores
* yeets ores entirely, sci break room added
* roundstart pads, more solars, bigger departures
* runtimes
* mining resistant rock
* variable names are important
* AoE KA doesnt affect rocks
* actually fix AoE stuff
* now with 1000% more bats
* no sandy cables, a brig exit chute, more head ssu
* mech drills are not pickaxes
* proc rename, perma window, faster sapce bridges
* Brig rework
* robotics changes
* More sci edits
* Rotayshun changes
* dme edit
* Delete cerestation.dm
begone, thot
* temp edit so it loads cere as default
* merge conflicts begone
* decal purge
* map repipe
* removes under-wall pipe adapters
* shuffled maint areas
* dirt purge
* longest bridge rework
* fixes
* PPI feedback
* kitchen does, in fact, need air
* permabrig tweaks
* restores cc changes
* merge part 2
* tag purge
* secret clown HQ got me shook
* SQUASHENING
* solar shuffle
* directional consoles
* remove TM edits due to rotation
* merge conflict part 2
* pod pilot deletion
* cold rock, window tint fixes, etc.
* further red rocks
* further tweaks
* more standardising
* robotics redo
* carpet time
* CI update for cere
* Apply suggestions from code review
Co-authored-by: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com>
* more squash, corridor cam removal, etc.
* light switches
* minor fixes
* temp cere default
* FOODCART!
* fixes
* no airless no more
* space_hall
* compat pass 1
* make it work
* more changes
* slimmening
* air alarm tweak
* TM commit
* ci tests
* final CI changes?
* squash. squeeze, optimise
* wall vent
* disposals fix, more squeezing
* bugfixes
* false walls
* bedroom culling
* edits and fixes
* tweaks
* changes
* det window
* further tweaks
* Revert "TM commit"
This reverts commit 9e8814937f.
* More TM only changes reverted
* fixes smoothing with falsewalls
* denth changes
* the airlockenning
* cicicici
* CICICICI
* further tweaks
* further tweaks
* reverts weird sand behaviour code from ages ago
* oops
* universal adapter my beloathed
* nanomap moment
* webmap
* cere nanomap
* feedback updates
* updates
* airlock tweaks
* vents and tweaks
* solars moment
* triple APC fix
* south of where?
* airlock helpers
* disposal flap purge
* outpost monitor with actual real networks?
* tweakeroni
* fixes
* fixes
* tweaks
* fixes
* medbay improvements
* power and flaps
* changes
* aa changes
* fixes
* more fixeronies
* fixes!
* reversed
* chemicals
* chem tweaks
* fixes
* shuttle fixes
* holopad pass
* editseditsedits
* lightslightslights
* door
* /obj/machinery/computer/security/telescreen/entertainment
* sonic underground
* actual sonic reference
* Apply suggestions from code review
Co-authored-by: Charlie <69320440+hal9000PR@users.noreply.github.com>
* Tsrc
Co-authored-by: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com>
Co-authored-by: Charlie <69320440+hal9000PR@users.noreply.github.com>
* Make portable seed extractor use alt-click instead of a verb
* little bit more feedback never hurts
* Remove duplicate check
* alt-shift-click
* Should probably update the examine too
* revolvers are balanced now, right?
* decreases metal cost per bullet from 5000 to 4000
* converts bullets to a new ammo box
* shut up Marmite (makes the revolver unrecyclable)
* Medical and RnD DMI files split
* Cargo DMI split
* Security DMI split
* Engineering DMI split
* Captain DMI split
* Civilian/service DMI split
This one hurt
* Forgot about this one
* Color DMI split
* Purges everything that was delted up until this point
... with a blindfold and a shotgun
* Dress and suit DMI split
* Pants and shorts DMI split
and merges pants and shorts files... shorts are pants, right?
* Donator/fluff jumpsuit clothing organisational relocation
* e
oops
* So this is used, repath bad
* Random commit
* Costumes DMI split and jumpsuits purge
* Some fixes
* pennywise
* Centcom DMI split
* SolGov DMI split
* Retro DMI split
* Syndicate DMI split
* Misc DMI split
* centcom officer
* Kills off uniform.dmi completely
* last fixes
* lastest fixes
* vox navy gold conflict
* civilian barber
* Tourist observers work now
* Hopefully working non-human humanoid clothing
* This being in suit.dmi is one of the reasons I made this PR
* This shouldn't be here
* Late night coding
* Pun Pun regains his drip
* Last fixes
* security/OFFICER
* Most important - clown fix
* working subtypes good
* Fixes chameleon jumpsuit
* Proper QM pathes
* Fixes jumpsuit rolling with the power of poor quality code
* Cargo tech character setup fix
* else instead
why didn't I do this in the first place
* PURP
* Fixes broken character setup job clothing
* CC suit fix
* Psychedelic jumpsuit proper path
* You must wear the jumpsuit to adjust it
* screwdriver_act my beloved
* convert to returns instead of . / lewcc review
* it will be done
* i'm a little bit stupid, but now time to test
* sometimes I get excited and press the commit
* The great test has been completed
* oh wow oh wow, lewc review
* found one last one
* Steel review
* Lewc review
* quick sirryan review
* removes stupid comments (old coders I blame)
* sirryan review two
* whoops...
* hal review
* the fix to the fix to the fix
* Revert "the fix to the fix to the fix"
FUCK I pushed to the wrong branch
This reverts commit a96fe98781.
