* fixed issue with containers
* whoops
* fixed runtimes on hood, typo in medical designs
* made beaker description update with var edits
* Revert "fixed issue with containers"
This reverts commit e1c2a8165a.
* sorting out PRs
* Revert "fixed runtimes on hood, typo in medical designs"
This reverts commit 46ab4ff2e7.
* fixes spelling mistake
* better description of the neutrient pump
Co-authored-by: JimKil3 <47290811+JimKil3@users.noreply.github.com>
* he is a better writer than me
Co-authored-by: JimKil3 <47290811+JimKil3@users.noreply.github.com>
---------
Co-authored-by: JimKil3 <47290811+JimKil3@users.noreply.github.com>
* NT Recruiter arcade
* TGUI and other tweaks
* No longer called curriculum
* Name now matches with species
* almost there
* TGUI, MORE tweaks
* removing useless stuff
* breaking some lines
* Lets gooo
* More sounds effects and screen adjustments
* missing sound here
* More sounds and records
* Moooore records
* TGUI title, volume tweaks and sprites added
* Added the rest of the records
* Invaliid planet and other small tweaks
* New reward amount
* More tips
* added design and more tweaks to volumes
* tweaks to values and records
* Better comment
* More tweaks to sounds
* Apply suggestions from code review
Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
* DGamerL review
* job typo
* typo and cybersun is actually bad
* golem bad
* We now check for matching names
* Tweaks to the TGUI buttons
* begin shift
* tgui conflict
* Apply suggestions from code review
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
* data list indentation
* tgui rebuild
* Apply suggestions from code review
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
* tgui rebuild
* tgui rebuild
* tgui rebuild
* Moving to naother file
* moving to another place part 2
* ops
* tgui rebuild
* sprite conflict pt1
* adding sprite back
* tgui rebuild
* its conflict time
* tgui rebuild and sprite conflicts
* tgui rebuild
* New CEO child name
* Better do it later
---------
Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
* crutches!
* comment update
* henri review
* comment tweak
* in-hands updated
* i can spell
* two handed component
* unfuck this file
* oh lord map changes
* make the placing a little more reasonable...
* changes to cyberiad
* god this was a headache
* prevent decon if locked
* henri review
* dont feel like coming up with something, someone else can do later if they want
* sean review
Co-authored-by: S34N <12197162+S34NW@users.noreply.github.com>
* henri review
---------
Co-authored-by: S34N <12197162+S34NW@users.noreply.github.com>
* Aaaaaaaaaaaa
* IT WORKS
* Okay now make it a martial art
* Final shit
* Forgor this
* Protolathe moment
* The sprite
* Typo fixes
* Burza review
* Contra review
* Contra review
* Contra + Henri review
* Update code/modules/surgery/organs/augments_arms.dm
Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
* Me when I push untested code
* Contra review pt 1
* Contra review
* I forgor
* I forgot v2
* Henri review
---------
Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
* biting off more than I can chew, but I feel like hurting myself
* more shit
* progress continues, moral stays sameish
* bite of 2587
* mod_theme down, but probably broken
* 385 errors, 16 warnings, zero tgui interactions
* 292 19
* final strech to buggy mess, break time
* it compiles. It almost fucking certainly doesnt work, but it compiles
* fudhsciffubgsbgpgb actions not working as should for modules
* fuck it we'll just open the pr as we work on it
* icons work now
* tgui stuff
* more progress
* JUDGEMENT
* IT LIVES. TGUI LIVES. Special thanks to Sirryan and my brother.
* jetpacks, gps, and go do what exo-suits yourself
* almost ready
* sorry to whoever has to review this
* should work™️
* should be good now
* pushing changes so I can do reviews next
* Apply suggestions from code review
Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
* lore™️ Adds illegals level to modsuit parts from syndicate.
* early returns
* and these illegals
* no uplink reference idiot
* mod inhands are a good idea
* this is needed for inhands nerd
* Bomb detector working, modsutis cover ears. skin things
* overslotting removal, cyborg charging, ert loadout for gamma
* duplicated signal
* modsuit themes, removes broken mister / bad base type module, 2 cores in robotics.
* tether module, orb module, holster stuff
* built in no slip, cheaper 87
* removes modules already installed, engineer ert get jetpack, equip into modsuit storage
* comments spaces and duplicate flags
* Some adjustments and thoughts on armor, heads get guns because they are cool like that / looting command members armor
* Apply suggestions from code review
Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com>
* Apply suggestions from code review
Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com>
* Compile TGUI, slowdown adjustment, Modsuit to MODsuit
* sonar, do after, more equipment, acid handling
* overlay bugs / ERT / DS suits autodeploy
* middle click action buttons
* traders, sec modsuit energy nerf
* surplus weighting
* Kinesis module.
* Pathfinder module, kinesis balance, blueprint for pathfinder and kinesis
* more power / unused module removed
* name, ds fix, pre equipped to cc suit
* depot / grammer
* ok should be good™️
* overslot, dupe gun, missing suit storage
* stealth nerf, new kit
* gun stuff / ds theme
* bio armor is gone
* let me push changes please thank you
* makes shocks work right
* copies over some changes TG made to module prices after porting
* Merge remote-tracking branch 'upstream/master' into Because-I-hate-myself-and-someone-has-to-try-it-
* sirryans changes
Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com>
* Update code/modules/telesci/gps.dm
Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com>
* Update code/modules/telesci/gps.dm
Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com>
* Control define, ERT / DS have gloves / boots again.
* Apply suggestions from code review
Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com>
* More changes
* god I hate tgui. Why do all the bundles live underground, instead of in my basement?
* she updates my master till I testmerge
* modsuits can recharge again
* fixes a lot of shit
* Ready for TM probably
* sure fuck it whatever that makes sense I guess
* the pinpointer works better™️
* Another storage module bug fix
* hair and medical stuff
* fuck fuck fuck
* fixes sonar
* Bag exploit fixes / plasma runtimes / ear nerf
* dna lock improvement / cryostorage
* whoops
* Ball form second cooldown wasn't helping, no more infinite cores
* she springs my lock till I ***SNAP***
* plasmaman no longer die
* fixes modsuit emp issues
* atmos no longer fucking dies
* Fixes, module printing, and a restriction on newly constructed modsuits
* Inventory code my hated
* WOOO PREFERENCE CODE WOOOOO
* icons my hated
* fix for mods / spaceproof shit
* holy shit whhhyyyyy
* backpack first
* Update mod_theme.dm
* prevent infinite gun arms / infinite modsuit cores / syndicate modules
* fixes tm error
* scream loudly if species sprites break. They shouldn't, but, you know.
* deconflicted with luck
* converts to refit for species
* fix pathfinder
* fixes modsuits being funky power wise
* lockboxes :gatto: , as well as DN-MP shield lock, and slight nerf to atmos modsuit
* nerfs the atmos modsuit
* magboots for ds / CC modsuit
* downside of autosave: typing in wrong window saves bad stuff
* Gamma ERT have internal cameras again.
* spellcheck when
* ah fuck
* yes delete the null that works
* whoops
* fixes error / description
* un vulps your cannon
* fixes tails disapeering on base modsuits
* space to underscore
* tgui fix / tajaran
* springlock buff, cryopod fix
* u helps
* WHO PUTS A GUN IN ITEMS
* tgui moment
* mining modsuit nerf / hidden holster module
* PAIN
* UNATHI TIDE STATION WIDE
* I love special code
* slightly dense
* shark jumpscare
* fixes ghost item, fixes springlock being bad
* YIPPEEEE IT WORKED
* she decons my flict
* pain
* ebbas days are numbered :^)
* hidden
* r-r-r-ebuild
* fixes more bugs
* qwerty, you are dense
* fixes gps
* fix mulebot crate
* level fix
* adds back icon
* moving storage, fix bug, modules activate / deactivate message
* yeah
* yeah
* yeah™️
* steels requests
* windoors no longer make pathfinder module explode
* chat spam
* oil slicks + modsuits
* whoops
* bag check
* ofc
* Update code/modules/mod/mod_control.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>
* Update code/datums/uplink_items/uplink_nuclear.dm
Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
* Update code/modules/mod/mod_control.dm
Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
* Update code/modules/mod/modules/module_pathfinder.dm
Co-authored-by: S34N <12197162+S34NW@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: S34N <12197162+S34NW@users.noreply.github.com>
* Reworks and nerfs WTs
* Removes some duplicate comments
* Makes WT ammo box's normal sized items because I forgot to at first
* Adds a var to WT mags to check if they are being loaded to prevent people from queueing up multiple reload processes at once
* Sanity checks work properly now
* Implements changes requested, empty magazines now available from RND, ammo crate contains 5 full magazines, mag size set back to 20, magazines made normal sized items and fit in assault belt
* Update code/__HELPERS/mob_helpers.dm
Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
* Update code/__HELPERS/mob_helpers.dm
Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
* Magazines fit in security webbings
* I forgot a comma
* Apply suggestions from code review
Co-authored-by: S34N <12197162+S34NW@users.noreply.github.com>
* Applying various reviewer suggestions
* Applies various suggestions
* removes moving_do_after now that its a param
* Apply suggestions from code review
Co-authored-by: SteelSlayer <42044220+SteelSlayer@users.noreply.github.com>
* solves the merge conflict hopefully
* step one of trying to fix conflict again
* step two hopefully fixes conflict
* Delete ammo.dmi
* Merge branch 'master' into wt-rework
* Apply suggestions from code review
Co-authored-by: S34N <12197162+S34NW@users.noreply.github.com>
* Applying various reviewer suggestions
* Revert "Applying various reviewer suggestions"
This reverts commit 7081e9aa2b.
* Revert "Apply suggestions from code review"
This reverts commit 96dab4f8b8.
* Revert "Merge branch 'master' into wt-rework"
This reverts commit 6906a67654.
* Merge branch 'master' into wt-rework
* please god work
* Update code/modules/projectiles/ammunition.dm
* Update code/modules/projectiles/ammunition/magazines.dm
---------
Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
Co-authored-by: S34N <12197162+S34NW@users.noreply.github.com>
Co-authored-by: SteelSlayer <42044220+SteelSlayer@users.noreply.github.com>
Co-authored-by: Farie82 <farie82@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>
* 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>
* start of mess
* reflect/parries works
* more pog-ress
* temp icons, .33 to 0.4
* more work, sound, rnd, fixes me breaking shields
* removes this since open pr fixes
* better codee
* attack log
* Final changes / sprites by ramon
* fixes issue
* shoot ramon for the white pixel :^)
* But what if it was a purple glass shard
* Fixes the throw parry
* sorry for so many commits, lower callback
* Apply suggestions from code review
Co-authored-by: Sirryan2002 <80364400+Sirryan2002@users.noreply.github.com>
* Early return, no need to typecast
Co-authored-by: Sirryan2002 <80364400+Sirryan2002@users.noreply.github.com>
* video camera tweaks and added to protolathe
* sprites
* you must wield it to use now
* Edan52 review and use of if(wielded)
* Back to one hand
* conflict
* sprites
* hahaha
* mistake fixed
* visible message, librarian camera and tweak to desc
* little tweak to desc
* Steelslayer review
* 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)
* Adds the u-ION silencer to rnd, replacing ecrossbow. Ecrossbow up to syndicate 5
* grammer / typeblock
* 15 is not more than 15
* how did I miss this, I swear I put in 3
* path + crafting
* Update code/modules/crafting/guncrafting.dm
Co-authored-by: Farie82 <farie82@users.noreply.github.com>
Co-authored-by: Farie82 <farie82@users.noreply.github.com>
