* 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
* it begins
* Revert "it begins"
This reverts commit 02f90f4ce9.
* oopsies, restart
* here we go again
* oopsie again
* god i finally figured out TGUI
* henri review
* tgui update
* Update tgui.bundle.js
* tgui
* Update tgui.bundle.js
* 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>
* 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>
* Update traditional CPR to loop automatically
* Implement most of the base stuff
* Bring over most defib changes so far
* Checks and fixes
* cleans up some leftovers, getting it ready for review
* Little bit of IPC flavor
* excludes non oxy-breathers, sorry!
* Better rescue breath handling
* Refactor revivability into a status effect
* Adds a little bit of feedback
* Removes the original variables
* Allows for CPR to activate cavity bombs
* Update code/modules/mob/living/carbon/human/human_mob.dm
Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
* snake case time
* breathid instead
* remove unused proc
---------
Co-authored-by: Henri215 <77684085+Henri215@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
* Update lighter icon state code
This commit adds a new `update_icon_state()` method which updates the
held icon sprite with the appropriate sprite for lit status before
updating the graphic, and drops the use of explicit icon_state
definitions for lit/unlit in favour of consistently named sprites for
lighters.
As no "lit" graphic exists for held zippos, nor sprites for other
custom or base lighters, updating of 'item_state' has been removed which
fixes#21257.
The naming of zippo sprites has been updated to reflect this change and
stay consistent with the base lighter object and sprites.
* Add missing sprites for colored zippos and lit state
This adds copies of the base zippo sprite for spiters to work on when
updating for custom held zippo combinations.
* Adds held sprite references for custom zippos
This change adds in overrides for item_state for zippos that differ from
the base silver model, which include:
* zippo-gold
* zippo-blue
* zippo-black
* zippo-red
* zippo-purple
* Update held item sprite for lighter lit status
* Set parent items file for fluff lighters
* Update zippo sprites with lit and color variations
This commit adds the colorized versions of zippo lighters, as well
as including the lit animation ported over from TG appearances,
with variations applied for Paradise flame colors.
* fixup! Update lighter icon state code
* fixup! Update lighter icon state code
* fixup! Add missing sprites for colored zippos and lit state
* Correct purple held sprite to have blue flame
* Update code/modules/customitems/item_defines.dm
Fixup for ad1b5fb
Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
---------
Co-authored-by: XFirebirdX <xfirebirdx@users.noreply.github.com>
Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
* comments out TEG crate
* buffs turbine power generation curve.
* adds overheat to turbine
* Allows for overheat to dissapate while at low RPM
* Adds bearing heat meter to control console
* Multitool is now required to link turbines
* spacing consistancy
* comment per Sirryan review
* adresses review, replaces reconnect with DC button
* better comments
* properly defines things. debugging is important
* temp must be above 500k for power to be generated
* Adresses latest review
* Define fixes
* TGUI update
* should fix CI. Probably.
* typo fix
* lewcc review
* Deconflicted TGUI
* Heri and Hal reviews
* Deconflict TGUI
* deconflicts TGUI
* Steel review
* Slight formatting
---------
Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com>
* 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
* paramedic grindset
Adds Paramedic headset with associated encryption key. Gives Paramedic mining access+supply comms. Adds Lavaland corpse related recovery equipment to Paramedic locker.
* goodbye soul hello garment bags
Adds a Paramedic garment bag. Cuts back on Paramedic locker clutter by adding crew monitor and crew pinpointer to loadout.
* headset, i barely know her
Paramedic headset moved out of garment bag and into main locker.
* lore???
Turns out I've been spelling Nanotrasen wrong all this time.
* Update code/game/objects/items/devices/radio/headset.dm
Co-authored-by: matttheficus <57759731+matttheficus@users.noreply.github.com>
---------
Co-authored-by: matttheficus <57759731+matttheficus@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>
* ok one second I gotta do something else
* Okay we ball
* Okay we are stealthier now
* Does this work? I have no idea.
* So cloooose
* I don't know what the fuck I am doing
* IT WOOOOOOORKS
* Contra reviews
* oops
* Contra review
* Now it actually works
* Add railing caps
-subtype of railing corners
* Batch of changes:
- Fixed cap sprite
- Added 2 more instances of caps (left and right)
- Added caps to rods crafting menu
- Changed cost of corner from 3 to 2
- Added cost to cap, it cost 2 rods
* Woops:
- Apparently railings corners and such borrow code from normal railing so they always drop 3 rods.
* Change railings to list
* removed density/climbable
- they inhert it from railing
