* 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>
* makes noslips work
* trait part
* THE REST
* it didnt conflict too much actually
* this was intended, whoops lol
* no more processing
* consistency
* lewc review
* Apply suggestions from code review
---------
Co-authored-by: S34N <12197162+S34NW@users.noreply.github.com>
* Converts isHoly into a trait
* Moves holy from body to mind
* Uncurses the source of curses
* Updates source to roundstart trait
* Contrabang fixes
* Forgot one
* Add trait mind helper
* Request changed Dgamerr/Contra
* Fixes issue
* Nullchecks minds
* proof-of-concept implementation
* clear being_hijacked on death
* it glows in the dark
* oops
* machinery interactions and some fixes
* consistency, correctness, fixes
* stop usage of the \the text macro
* list inits in Initialize
* fix control flow spacing
* review compliance
* event code and some tweaks
* upgradable spell abilities and some tweaks
* how did that happen
* cycle cameras spell
* stat upgrades (no sprites for now)
* tweaking
* sounds
* jecties code
* more tweaks and fixes
* some review stuff
* alt-click user param and charger icon fix
* Remove unused default amounts in objectives
* Comply with sirryan review (part 1)
* Move isapc definition
* Add autodoc comments to all pulse_demon vars
* Give random number in name on init
* Fix merge conflicts
* Remove pulse demon from traitors on Destroy
* Fix mulebot relaymove override
* Fix airlock TGUI actions
* Fix loop over mobs in cablehop
* Attempt to fix overload runtime
* Half-fix gun cooldown issue
* Fix chat related issues
* Attempt to fix overload runtime (take 2)
* Make ion projectiles collide
* Tweak pulse demon speed
* Make demon survive loc being deleted
* Send message when saved by self-sustaining
* Fix vv_edit_var for charge
* Stop people disabling hijacked bots
* Make demon lose more health when not on wires
* Increase costs of stat upgrades
* Allow demon to change its drain speed
* Stop demon obliterating xenos
* Comply with review (partial)
* Fix issues pointed out in reviews
* Allow demon to drain charge of reachable items
* Adjust volume of demon sounds
* Improve cell interactions
* Bump up event weight (for testmerge)
* Give pulse demon a highlight section on orbit menu
* Give demon an experimental soft-counter to insuls
* Reduce volume of most common sounds (again)
* Update demon cable overlay when required
* Stop AI using its tracking ability on pulse demons
* Add wizard spawner for pulse demon
* Tweak EMP behaviour and numbers
* Clear references in Destroy
* Make appear on end of round credits even when dead
* Prevent pulse demon from detonating cyborgs
* Generalise insulated structure check
* Clean up remaining review requests
* Add new sprites
* some addressed reviews
* Typepath changes, GC fixes
* I blame charlie
* good enough
* die or something
* Update code/game/gamemodes/miniantags/pulsedemon/pulsedemon.dm
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
* Update code/game/gamemodes/miniantags/pulsedemon/pulsedemon_interactions.dm
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
* Update code/game/gamemodes/miniantags/pulsedemon/pulsedemon_interactions.dm
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
* even more changes
* final tweaks
* what
* Update code/game/gamemodes/miniantags/pulsedemon/pulsedemon_interactions.dm
Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
* Update code/game/gamemodes/miniantags/pulsedemon/pulsedemon_abilities.dm
Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
* Update code/game/gamemodes/miniantags/pulsedemon/pulsedemon.dm
Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
* Update code/game/gamemodes/miniantags/pulsedemon/pulsedemon.dm
Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
* bam
* Update code/game/gamemodes/miniantags/pulsedemon/pulsedemon.dm
Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
* Update code/game/gamemodes/miniantags/pulsedemon/pulsedemon.dm
Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
* Update code/game/gamemodes/miniantags/pulsedemon/pulsedemon.dm
Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
* Update code/game/gamemodes/miniantags/pulsedemon/pulsedemon.dm
Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
* Update code/game/gamemodes/miniantags/pulsedemon/pulsedemon.dm
Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
* to_chatn't
* deconflicted
---------
Co-authored-by: unknownuser782 <126365777+unknownuser782@users.noreply.github.com>
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
* let the wall of errors begin
* alright that's enough for today
* more pain
* only 7 errors
* arena :)
* smaller arena
* slight cleanups
* okay we ask charlie for help tomorrow
* leap works
* okay we ball
* idk I'm just adding this for now
* WE HAVE A CIRCLEEE
* Charge back + timer!
* first steps of the buff
* more cleaning up
* Buff is progressing nicely, almost done
* OKAY WE BALL
* Whoops last things
* whoopsie forgot this
* 20 Stamina damage
* 150 blood now
* WE GOT ANIMATE IN THIS HOUSE
* we be impact immune now
* IT DOESN'T LOOK LIKE SHIT (and goes through walls)
* ok ship it
* Consistency
* I'm buying charlie a bottle of asda rum
* Okay, ready for review
* Henri + Hal reviews
* More reviews + I am stupid
* Charlie review
* Ohhhh so that's why it didn't work
* Yeet this
* Charlie review
* Comment
* Charlie review kinda
* Hal review
* DESECRATED DUEL WOHOOO
* Oops I changed this
* That's one thing done
* Lewc review
* Lewc review part 2
* Update code/__HELPERS/trait_helpers.dm
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
* Lewc review + ICON WOOO
* Aaaaaaa
* TGUI FIXED
* Henri review
* Charlie review
* Charlie review
* Henri review
* Jimkil review
* Update code/__HELPERS/game.dm
Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
* Charlie review
---------
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
* 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>
* 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
