* Diverse Traders Types
* Trader Type control, announcements, species spawning
* Trader Outfits
* Posh Moth - Posh Cane
* Landmarks, Trader ID Name Change
* Trader Shuttle Adjustment - Landmarks for Item Pools
* Outfit Survival Kit changes
* Added another refill for the hand labeler due to more cargo
* Trader Shuttle locker fix
* Item Stocks, Item Stock Assignments, Box Kits, Love Bottle
* Mech access, No double mechs, Small box fix
* Removed Solgov Gunkit from General Pool
* Spacing
* Moved traders to not be event subtypes, added documentation to vars
* Boxed spacing, removed improper
* Moved postequip, used box variables
* Lore team requested change - Bolt action instead of AK
* Changed landmark
* Moved soviet ammo to minor gear, increased soviet minor gear to 8.
* Obfuscated Cybersun
* Lootpool Adjustments
* Readded Solgov Kit to general pool at low weight
* Commas!
* Spelling
Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
* Comments
Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
* Re-Nulled After_Equip_Job
* Removed extraneous var spaces
* Relocated space in trader introduction message
* Robomoon is now once again Cybersun
* Impropered Enforcer Kit
* No more ERT box for non-NT boxes
* Fixed turbine kit stock part amount
* Subtyped skrell/unathi suit boxes
* Replaced meson cyber eye (nodrop issue) with meson sunglasses/gar mesons
* Reduced weight on arm/esword implant rare items
* Also reduced arm laser weight
* Added a couple items to skipjack large - more 'random', filled in reduced weights
* Path typo fix
Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
* Removed trailing / in path
Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
* Removed Cheap Breacher suit from inventory
* Apply suggestions from code review
Signed-off-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
---------
Signed-off-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
* Globals work
* Double access works
* All other things
* Revert "All other things"
This reverts commit 6574442eb6.
* More changes that compile and work
* IT WORKS AAAAAA
* Changes even more .len to length()
* Apply suggestions from code review
* Update code/datums/mind.dm
* Update code/__HELPERS/sorts/InsertSort.dm
Co-authored-by: Deniz <66401072+Oyu07@users.noreply.github.com>
* Update code/__HELPERS/sanitize_values.dm
Co-authored-by: Deniz <66401072+Oyu07@users.noreply.github.com>
---------
Co-authored-by: FunnyMan3595 (Charlie Nolan) <funnyman@google.com>
Co-authored-by: Deniz <66401072+Oyu07@users.noreply.github.com>
* Removes the first weird helper
* Removes get_turf_or_move
* Slightly alters the sharp weapon proc
* Adds nullcheck to adjustBruteLossByPart
* Changes `is_dead`
* Adds `hasorgans` to the replaced list
* Update code/__HELPERS/unsorted.dm
Co-authored-by: Deniz <66401072+Oyu07@users.noreply.github.com>
* Contra review
---------
Co-authored-by: Deniz <66401072+Oyu07@users.noreply.github.com>
* no longer super sick time to port station traits in a 4 hour rush as you have lost control of your life
* some changes /fixes
* Apply suggestions from code review
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com>
* more changes
* oh right, the murders (uplink price tweaks)
* Update code/controllers/subsystem/SSjobs.dm
Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
* Apply suggestions from code review
Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
* compiles
* doesnt work but works better
* tgui dogs still sleep but I want to sleep
* it should finally compile now. Probably.
* Update tgui.bundle.js
* Sorry IAN, transfer components is shoddy as hell
* removes minor uneeded /tgui
* also extra line whoops
* final stuff
* reverting changes I made earlier is hard ok
* Weight change, uplink reference
* oh right, the hey fucko
* Update code/_globalvars/traits.dm
Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
* Update tgui.bundle.js
* pushes
* pulls it
* Apply suggestions from code review
Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com>
* more changes, ion rifle blocked on cyb revolution
* dipshit remove the debug / tgui pritier and such
* tgui
* updates tgui again as nanomap was merged
* Apply suggestions from code review
Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com>
* comment / tgui
* every day I worry all day
* Full TGUI rebuild + prettier
* ah fuck
* leave a customer feedback at the link below!
* tgui momenr
* tgui moment
* FUCK I am dumb
* vertical TGUI
* She T's on my GUI till I
* Update tgui.bundle.js
* Apply suggestions from code review
Co-authored-by: Gaxeer <44334376+Gaxeer@users.noreply.github.com>
* Update code/modules/supply/supply_pack.dm
Co-authored-by: Gaxeer <44334376+Gaxeer@users.noreply.github.com>
* IPC can now use robotic hearts / pulse demon hearts and charge
* fixes revert not working for hangover / arrivals
* tgui moment
* hhgreg
* fixes that one bug
* Every day I worry all day
* deconflicted for real this t ime
* Update code/datums/station_traits/postive_traits.dm
Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com>
* ch-ch-ch-changes
* Update SSjobs.dm
* Update code/modules/supply/supply_pack.dm
Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com>
* deconflicted but won't pass CI
* fixes double dipping on traits
* my le consoles, they le no work?
* Great Great Asset, Asset, Great Great Asset, Asset...
* sorry slime mains
* fixes borgs being punished heavier
* actually fixes it, I was dense
* hopefully fixes borg drunk further
* makes it compile?
* actually makes it compile god whyyyy
---------
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com>
Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com>
Co-authored-by: SteelSlayer <42044220+SteelSlayer@users.noreply.github.com>
Co-authored-by: Gaxeer <44334376+Gaxeer@users.noreply.github.com>
* Sprites and little refactor
* idk what i am doing
Maybe refactor
* Sort the boxes
* Matches path
* Script and maps
* Okay... that was a strange decision.
* bathroom parts box
* More boxes
* Henri review changes
* Update toy.dmi
* Update code/game/objects/items/weapons/storage/boxes.dm
Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com>
* Update storage.dmi
* Update boxes.dmi
* True conflict solve
I hope
---------
Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com>
* Part 1
* Testing 1
* Revert "Testing 1"
This reverts commit fc06554b28.
* Part 1.1
* Part 2 - UI Style List
* Preferences lists
* Preferences lists - DONE
* More inputs
* MOOOOOORE
* UI style else
* Last ones
* Double name fix
* Pre-selected Search
* Return Pick Darkness
* Return Pick Darkness
* Missing users
* Some review changes
* Revert MULE lists
* I just hate MERGE CONFLICT label
* List window tweaks
* I think there it is
* why i am stopid
* Update tgui.bundle.js
* Part 2 - feeding others doesn't work as intended
* Part 3: fixing force feeding
* Fixes patches being wack
* Makes this less ass
* Adds patches to the chemistry bag
* Update code/modules/mob/living/carbon/carbon.dm
* Update code/modules/mob/living/carbon/carbon.dm
* Some missed patches
* Apply suggestions from code review
Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
* Fixes IPC logic
* Henri Review
* Add updatepaths
* Jimkil review
* IPCs now aren't allowed to eat pills and get patch
* Update code/modules/mob/living/carbon/carbon.dm
Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com>
* Update code/modules/reagents/reagent_containers/patch.dm
Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com>
* Update code/modules/mob/living/carbon/carbon.dm
---------
Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com>
* Rework Syndie Research Base
* Fixing
* Fixing..
* work you cu-
* SPAACE
* Pack of changes:
- Removed Toilets and replaced them with "Dressing" room.
- Added Genetics, because person on discord wished for it.
- Placed Atmos pipes (scrubbers and supply)
* Changes:
- Added Pathing for ed209 (syndicate)
- Removed random_spawners custom spawner made before.
- Added "security" room with allow you to control turrets and see all base cameras.
* Fixing turret control panel
* Fixing turrets.. again
* huh?
* Changes:
- Decreased Beacons amount from 20 to 10 (they give same path, just less stops).
- Added special room to "store" ed209 syndicate, if you want to activate it: View Variables -> patrol = 1.
- Added light switches everywhere.
- Added Air alarms and fire alarms everywhere, and made sure there are fire doors to stop potential fires.
- Added 2 more areas, Genetics and "control room".
* Placed Power Cables.
* Added disposals
Lets fuckign Gooooo
* Changes:
- Made button from drive actually open doors and shoot stuff to toxin range.
- Added emergency PACMAN generator, in case someone join late and whole base will be de-powered.
- Added CCTV to caves, now you can see intruders.
* Added 2 more boxes of plant disc.
* Changes:
- Added new variant of free drobes, now syndicate can get drip for free.
- Added "hidden" safe at vault with contain 10000credits and stethoscope nearby to help, its only for syndicate researcher, if explorer steal it, they should get bounty on them by syndicate.
- Added a lot of vendors refilling units, to make sure that you cannot run out by "accident".
* Changed Toxin Test arena to indestructable walls.
* Bunch of Changes:
- Replaced "grenade casings" (with are foam grenades) with new created "Foam Grenades Box" so its more oblivious what it is.
- Added paper note near PACMAN Generator with contain basic instruction how to use it.
- Added missing fire doors for "drooms".
- Added fire extinguishers EVERYWHERE so syndicate OSHA will be happy.
- Changed "genetics" room, now instead of supporing 4 people, it support now only 2 in exchange for "faster" DNA researching.
- Added "Foam Grenades Box" around base and in storage, so if there any breaches just throw kanu- grenades at them.
- Named and connected disposal to "toxin launcher" so now you can disposal your constractions inside.
- Added 4 buttons for "Chemical" testing room (with is not for explosives) so now you cannot get trapped inside.
- Made special disposal Ride for genetics "monkeys" to turret so they will be killed (its made this way to avoid researchers spacing themselfs allowing them to escape)
- Increased Toxin Storage room, by increasing oxygen and plasma tanks amount by tanks 2 each.
- Moved AIR container to engine, now they are replaced with "tank container" to storage... custom plasma mixes without destroying main plasma containers.
* fixes
* Changed Genetics:
- Now genetics layout got changed, now instead of supporting 4 genetics people it only support 2 in exchange for more efficency in making DNA syringes.
- Now you can dispose bodies for turrets to shoot holes trough... its funny.
* Added Mirrors to dressing room-
And Fixed hallway curve
* Made cryo and sleepers face themselfs
* Added RPD for toxin launcher room
- now if you run out of valves, you can just "spawn" new ones.
* Used merge conflict fixing tool
- and for *some* reason it keep showing merge conflict? (whot)
* Requested changes:
- Replaced NT machine with syndie cigarette machine.
- Removed random blueshield note.
- replaced syndie donk machines to secured variant.
* Changes full build consoles to unbuild.
* Fixes:
- Fixed storage, somehow one rack with mats got exaporated.
- Added tachyon-doppler array for tracking explosion size.
- Removed duplicated buttons from toxin mixing room.
- Removed console and placed in storage.
- Storage now have items with offsets so they are more visible in stack pile.
- Removed Air alarm from toxing testing arena, considering it dont have pipes.
* Add RPD in toxing mixing
* batch of fixes (?)
- Changed Art vendor and critter care to free variant.
- Fixed spelling on paper to requested one.
- Now syndicate researchers spawn with 100 credits in their backpack for claw machine, if you run out, ask your coworkers to borrow more cash on game.
* batch of changes:
- Did most requested changes by S34N (except defib one)
- Added APC to hallway, so now hallway use power too.
- Made new subtype of syndicate APC's with offset depending on direction.
* fix stripes issue
* Removed random stripes and syndie having cash
* undo all of it
* flags
* back
* head/mask
* left
* right
* Cuffs
* other name changes
* ID and PDA
* idk about calling them SLOT_HUD now
* glasses, gloves, and shoes, oh my!
* the rest
* comment
* remote
* more additions
* tgui + ssu
* map edits
* Shut your mug
More changes, huds, mugs and icons.
* mug time
* aaaa
* fixes cere edits
* should fix it
* Update tgui/packages/tgui/interfaces/common/CrewManifest.js
Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com>
* Update code/game/machinery/suit_storage_unit.dm
Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com>
* Revert "Update tgui/packages/tgui/interfaces/common/CrewManifest.js"
This reverts commit 5de07cba58.
* mugs all the way down
Fixes locker headset oversight, adds icon for supply management console, new QM mug sprite
* more map changes
* wow this worked?
* Misplaced comma
Removes a misplaced comma.
Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
* Mr QM's Wild Ride
Resolves a number of review comments, including preventing the QM slot being altered by the B/E event, adds a flash to the locker and reverts removal of basic cargo access from the HOP.
* Forgot a var name change, I'm gonna cry edition.
Renames name to board_name for supply ID computer.
Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
* genesis 1:3
Alters light_color of supply management console to brown_orange from light_color_red
* Update code/modules/events/bureaucratic_error.dm
Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
* another misplaced comma
Removes a comms where there should not be one.
* saving private ryan
Removes plasmacutter, adds mining GPS and crew monitor to QM locker contents.
* redone map changes
* oop
* the last of it
* merge time
---------
Co-authored-by: GDN <Roanrichards1@Gmail.com>
Co-authored-by: GDN <96800819+GDNgit@users.noreply.github.com>
Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com>
Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
* The Great Toolening
* oops all belts (incoming self conflict lul)
* defines shouldnt lie
* mini crowbar TODOs
* beeeeeeeeeg crowbar
* oops it needs a design
* purple kit + vendor fix
* add mini crowbar dmi
* oops forgot this
* i am an idiot sandwhich
* im bad at code
* scratch that, i cant read my VSC
* wrench undo + readd to boxes
* nukies too
* man i cant code
* power tools should logically follow
* formatting
* maybe im free?
* forgot inhands
* Update toolbox.dm
* bluespace belt buff (unironic)
* undo for now
* fixes bluespace/tot belts + adds w_class override
* adds small crowbar to e-toolboxes and tot tools
* power tool fix
* Rnd build path
Co-authored-by: Adrer <erwin@lombok.demon.nl>
* design fix
* merge conflict + small fix
* small name fixes
---------
Co-authored-by: Adrer <erwin@lombok.demon.nl>
* 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>
* 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>
* recorder pt 1
* part 2
* consistency
* nuke that verb
* ruined comment
* fixes update_icon pt1
* update_icon_state()
* fix, address sirryan and moxian
* oops that should be 600 to function properly
* aaaa spacing
* Sirryan Review
* HAL review
* Hal review
* Get pants that match or else you gonna look silly yo
* Posters
* Fix other hud elements
* Rereviewed
* Update shotglass.dm
* Fix for new merged PRs
* Typo
* Coming across other stuff
* Update theblob.dm
* No takebacksies
* smh i forget to leave a comment
* Updated for the detgun and cards
* Should have rerun langserver again
* No longer plastic, more in scope
* Damn you bluespace
* Reverting turret logic, out of scope at this point
* Tweak that part
* Went over energy guns again, and fixed UI White's sprite sheet
* Welding masks, glasses, and JUSTICE
* Update portable_atmospherics.dm
* Cleaning up, clearing things up
* Review and suggestions
* Update valve.dm
* More tweaks
* Missing character
* Not distinct lightmasks, so they can be overlays
* Update generator.dm
* Add parameter so holodeck doesn't try to make a perfect copy
* Update unsorted.dm
* Spiders
* Better fix for spiders, fix vamps too
* Ghosts
* Update telekinesis.dm
* Cleaning up old procs
* It's set up to not copy datums... Unless they're in a list
* Donuts, duct tape, and detgun. D3VR coming to Early Access
* Update procs that interact with doors so they call update_state instead
* Forgot one spot, and actually might as well just force lock
* Cleaning up other things... Sigh, and kitty ears
* oops
* Getting used to how it works
* blinds
* Going back to the suit obscuring thing, so it doesn't update all the time
* Missed that from merging master
* I made this PR and forgot about it
* Fix runtimes in cards
* Make things a bit more unified
* Update update_icons.dm
* yarn, really?
* Update library_equipment.dm
* Update shieldgen.dm
* Every time Charlie merges something, I go back and see if I can improve things further
* what's this? more?
* Update misc_special.dm
* wow, paper
* Review
* More reviews
* To be sure, seems like being broken messed something sometimes
* Brought airlocks closer to how TG works to iron out some stuff
* Pizza and morgue
* Doesn't seem to hurt, tried with holodeck
* Revert "Doesn't seem to hurt, tried with holodeck"
This reverts commit 158529302b.
* Icon conflict
* Fix organ damage
* Don't ask how. Why. It's like that on prod too.
* Cutting down on things and updating from TG.
* More flexible. Just in case the thing you stuck it on didn't destroy.
* Hydro was one the things I touched earlier on, better rework it
* Reviews
* Cleaning up further, also bri'ish
* Undo a change I did, and switch over to a more recent implementation
* Update biogenerator.dm
* Rolling back to old airlocks, but with new duct taped note
* Functionally the same. I'd just rather not have the smoothing happen there
* Went over APCs again
* Fix welding helmet names in species files
* Update airlock.dm
* Update persistent_overlay.dm
* Oh, topic
* a new coat of paint
* no shooting teammates on spawn for 100 damage
* datumization part 1, makes DS more OP, spacing fix
* hnng still broken but better
* breaks stuff less 99%
* mostly tgui
* oops, removes left over things from testing
* seperate tgui
* undo changes to ERT file and ERT manager
* build TGUI, front end is working
* minor fix, still broken
* this hurts me
* few small changes
* please dont fail
* mind code runs, but it doesnt work
* logging good, tgui built, will finish later
* mind code hurts, tgui should deconflict
* part one of giving up on TGUI
* 3 days of debugging, 2 lines of errors fixed
* no more unneccessary spawners
* Revert "no more unneccessary spawners"
* wow it works
* tgui, deconflict please
* a little clean up
* little more cleanup
* Sirryan addressed pt1
* Oops should commit this before the next commit
* DS isnt an option in one click antag, nuke it
* oops forgot this one small bit
* wow, simple code works
* oops, forgot to address, doesnt fix headset
* ds headset was broken long ago
* removes testing implants
* addresses requests
* get addressed code, you will be good
* few code improvements
* address moxian
* Makes deathsquad naming consistent
* this comment is true again
* a little precaution to stop AFKs
* no nuke code? no problem
* bing bam boom, more addressing
* no more runtimes I think
* clarified a few things
* gloves now show again following #18190
* Update code/game/objects/items/weapons/explosives.dm
Co-authored-by: Charlie <69320440+hal9000PR@users.noreply.github.com>
* okay I'm a bit stupid
* deathsquad jumpsuit desc update
* CI my beloved, have a fix
* deathsquad gets their proper icon
* Revert "deathsquad gets their proper icon"
This reverts commit a52519305b.
Co-authored-by: Charlie <69320440+hal9000PR@users.noreply.github.com>
* Weapon names
* Assault rile
* More #coding_chat tweaks
Realistically changing the typepath here is out of the scope of this PR, but it's such a small change and I'm editing the item already so... probably not worth making an entire separate PR for.
* Missed these
Adrer