* initial addition
* adds wall/airlock obliteration
this definitely needs to be tuned a bit numbers-wise
* adds TRAIT_SUPERMATTER_IMMUNE & gloves
* adds more checks for the supermatter immune trait
* removes SM tongs logic from the halberd
Realistically, you would never actually have the halberd and tongs
* makes slivers bulky
* dusting downed people
also removing a useless assigned variable i missed
* adds the (incomplete) loadout
* halberd buff
* adds robes + sprites
* oops
* halberd icons
* knockdown
* stuff
* timer shortening
* species sprites part 2
* animation for dusting walls
* Apply suggestions from code review
Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
* early return
* parry numbers!
* Update code/modules/power/engines/supermatter/supermatter.dm
Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
* dgamer review
* dgamer review + no more pulling
* reverts early return thingamajig
* Update code/modules/power/engines/supermatter/supermatter.dm
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
* removes `get_turf`
* hal review pt 1
* hal review pt. 2
* Update code/game/objects/items/theft_items.dm
Co-authored-by: Charlie <69320440+hal9000PR@users.noreply.github.com>
* `carve_sliver` proc
* unfucks icons
* Apply suggestions from code review
Co-authored-by: Charlie <69320440+hal9000PR@users.noreply.github.com>
---------
Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
Co-authored-by: Charlie <69320440+hal9000PR@users.noreply.github.com>
* holy shit, datumized revs!
* changes to shuttle blocking system
* boom, more shit
* bonk more commits
* convert most in boolean checks to hasantagdatum
* oops, its supposed to be like this
* updates this comment (im making too many commits)
* more changes
* aaaaa moooore changes
* nukes some stuff, makes stuff GC better
* rev victory conditions are checked always on death
* more rev stuff
* oops fucking forgot to push
* i swear to god
* lewcc review
* i forgot this one small bit
* lewc review
* reviews
* comment
* s34n review
* areas
* progress...
* death hatred and murder
* get current master maps
* hoooly shit i can load up the maps
* it compiles now
* map changes
* fixes some unintended stuff
* make the .dme right
* fix mixed space+tab indents
* more space-tab fixes
* CI, please show me more than 1 CI fail at a time
* UPDATE PATHS!!!
* none of the stations had it anyways, but fixed
* mint wasnt actually deleted, my bad
* epic random CI fail for no reason
* i beg you, CI
* dont delete anything
* okay THAT should work now
* okay get master maps and rerun
* okay THEN run update paths
* actually done now
* oops
* 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>
* Removes swiftness, add speed potions back as oil potions
* no shorting, icon update on mob
* early and forgotten returns
* ramon oil colours
* Update code/modules/research/xenobiology/xenobiology.dm
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
* no more slipery vehicles, now slippery tables
* just because it compiled the first time doesn't mean the second list will compile idiot
* icons my hated
* bottle4
* cleaner up
* qwerty my man what you doin: s34n 2023
---------
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
* RATATATATATA
* We use TRUE, not 1
* making it cost 12
* making progress
* FINALLY
* Lewcc review
* Whoops this too
* Lewcc review
* Might work, might not, but conflict time
* Henri review
* she supers my matter till I delam
* incorrect delamination alarm
* now soulstones glow to make them not get lost
* Helper proc, also fixes supermatter visual bugging out on high mole pressure
* moved
* initial delta alarm stuff
* TODOS
* make it do this
* safeties
* stop on explode, proper loop, volume corrections
* ping be gone
* better end timing, worse code implementation
* sirryan fix
* farie
* 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>
* fucking cult
* WERE STILL WORKING ON ITTTT
* d
* Revert "d"
This reverts commit 8a4bf06f5c.
* MOREEEE
* update
* Revert "update"
This reverts commit 65d85eae87.
* only chap can do it now lmao
* WHOOPS
* OK NOW
* Update runes.dm
* Apply suggestions from code review
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
* PLEASE TESTMERGE AAA
* fixes some stuff, improves it
* fixes the code from merge conflict
* Update code/game/gamemodes/wizard/soulstone.dm
Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com>
* fixes a bug with shit not dying due to brains
* Adds some GC stuff, Sirr's code reviews.
* finishes the last changes and reviews
* missed 1
---------
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com>
* Makes N2O not a trace gas
* Back end for nitrous readout on air alarm
* Makes nitrous appear on atmosphere scanners
* adds N2O bar to air alarm UI
* adds nitrous to PDA scanner
* TGUI Rebuild
* The least confident I've been in a change in awhile
* I FORGOT THE RETURN
WHY WAS THIS WORKING IN TESTING AAA
* the or 1 works now????
* Farie's request
Co-authored-by: Farie82 <farie82@users.noreply.github.com>
---------
Co-authored-by: Farie82 <farie82@users.noreply.github.com>
* Some verbs queue up now
* Damn you 515
* Screw you Topic
* Update client_procs.dm
* Fixes for unit testing
* Update MC.dm
* verb
* Update callback.dm
* Tweaks
* Linters might not have liked that,
* More tweaks, and fix
* Update verb_manager.dm
* technically functional
* technically functional
* more logically coded, credit to Contra and Mira
* yes this is more logical
* Sean and Fox reviews
* webeditor heresy
