* 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
* some tweaks for hardmode
* Update colossus.dm
* fail safes / other fixes
* oops pressed compile but had an active thing open
* bubblegum nerfs
* nerfs the self healing on guidance
* crusher bubble care
* and finally, the portal to the second arena, so a rescue might happen. Maybe.
* oh right the legion core related murders
* lets not make modsuit users suffer
* oops
* whoops
* fixes legion loot
* changes requested
* terminal smooth brain
* Update code/modules/mob/living/simple_animal/hostile/megafauna/bubblegum.dm
Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com>
* comment
---------
Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com>
* 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
* step 1
* renaming 1
* how could I forget this
* renaming 2
* renaming 3
* add matching proc, even if unused can remove later
* rename team obj to match
* oops
* okay more stuff
* okay more stuff
* fix this stuff
* okay more stuff
* needs_target = FALSE
* OKAY MORE STUFF
* OOPS AGAIN.
* self-review
* more round_end stuff
* stuff 119
* yeah fix that too
* EVEN MORE CHANGES
* grammar
* fix
* s34n review
* fixes custom teams with no antags not showing objs
* makes objectives work properly with teams
* a
* Ports Rod of Asclepius inhand sprites and moves
staves hand.dmi into a new file
* removing for now
* its conflict time
* lets fix this conflict
* ah shit
* here we go again
* almost done
* HELP, SCOPE KEEPS INCREASING
* if this isn't the last thing, blame my sleepy me
* fucking foam all my homies hate foam
* remove the extra whitespace
* ghhh this needs testing + revert old shit
* first sleeper steps
* okay now to revert some changes
* oops forgot this
* more fixes
* iv bags can't dupe shit anymore too
* removes coniine from the list because why not
* removes life and histamine
* this should pass Cl
* stop runtiming me for unexisting chemicals
* adds ???? instead + god I hope this passes Cl
* attempt #2 to fix Cl
* Cl still fails but no solution now - static lists
* One fucking day Cl will not fail + complete remove
* I am going insane
* I am praying to several gods
* I'm getting desparate
* whoops that's my bad
* whoopsie number 2
* oops space indentation
* one rubber ducky later
* attempt number I am in a psych ward
* CODING CHAT MY BELOVED
* last things
* foam is also not a chemical
* now it shouldn't remake the list every time
* Henri review
* Adds saturated activated charcoal
* Charlie review
* 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>
* 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
* pain
* more progress
* progress continues
* more progress™️
* saving progress while I swap brances
* leg moving working for real, woo
* more saving as power goes out
* eeven more
* fix transfer
* More changes, closer to pr ready
* final stuff for night backup
* almost done™️
* almost done
* Final changes to get ready for posting
* Update code/modules/mob/living/simple_animal/hostile/megafauna/ancient_robot.dm
Co-authored-by: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com>
* new sprite
* Loot added (minus crusher loot)
* Apply suggestions from code review
Co-authored-by: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com>
* Defines, loot, and requested changes, oh my!
* Apply suggestions from code review
Co-authored-by: Sirryan2002 <80364400+Sirryan2002@users.noreply.github.com>
* sound, bluespace charge improvements, more text
* Update code/game/gamemodes/nuclear/pinpointer.dm
Co-authored-by: Sirryan2002 <80364400+Sirryan2002@users.noreply.github.com>
* WOOO CRUSHER ITEM
* don't code when dead tired kids
* Update code/modules/mob/living/simple_animal/hostile/megafauna/ancient_robot.dm
Co-authored-by: Sirryan2002 <80364400+Sirryan2002@users.noreply.github.com>
* Makes crusher loot work, reworks shield for mecha fauna
* Names it, lets it spawn, buffs it, should be ready.
* Adds better sprites.
* pick to rand
* Buff, prevent cheese.
* Merge conflict hook test
* double checking to see if I installed it or not, think I need to manual
* fixes the merge issue
* makes gibtonite not yeet the mechafauna as much.
* fixes hostile/hostile fuckup
* fix most beam issues
* extra qdel insurance but it should be good
* fixes chasm issues, beep on self destruct, extra bluspace charge
* Shrinks the kaboom.
* spelling + beam fix
* Apply suggestions from code review
Co-authored-by: Charlie <69320440+hal9000PR@users.noreply.github.com>
* late_initialize, var names, and styling, oh my!
* attacl
Co-authored-by: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com>
Co-authored-by: Sirryan2002 <80364400+Sirryan2002@users.noreply.github.com>
Co-authored-by: Charlie <69320440+hal9000PR@users.noreply.github.com>
* Switch a bunch of /obj/machinery from /New to /Initialize
This is an easy and uncontroversial batch.
No globs, no late init, and stuff.
* Move more machinery to Initialize
This time the ones dealing with GLOB vars,
as well as some simpler ones i missed previously.
* More tricky New -> Initialize migrations
* The last of machinery Initialize conversion
* fixups
* Newscaster armor fix
* styling
* Comment on armor handling
* Move newscaster armor definition back to datum
* farie82 review
* kill extra .=
Co-authored-by: Farie82 <farie82@users.noreply.github.com>
* farie's review part 2
Co-authored-by: Farie82 <farie82@users.noreply.github.com>
Co-authored-by: Farie82 <farie82@users.noreply.github.com>
* fire lighting and shielding
* blink + lavaland loot
* file move and projectile removal
* get out of MY WALLS
* review
* sprites
* forgot this
* sprite update
* Apply suggestions from code review
Co-authored-by: S34N <12197162+S34NW@users.noreply.github.com>
* some TM changes
Co-authored-by: S34N <12197162+S34NW@users.noreply.github.com>
* Adds the 100% original and serious BSG
* Adds sprites
* prevents divide by zero
* Adds to protolathe, shield from projectiles, prevents hitting through walls
* adds sprites for inhands, pain, and suffering
* Finished the gun sprites.
* Adds admin version, sound effect, visual
* moves chain to base projectile, adds shitty sprite for bsg explosion
* Fixes it, maybe.
* I hate merge conflicts, gun sprites are back
* I need this, it seems.
* re-adds sprites back
* Prevents turrets from working with BSG, adds a variable for it, heavily nerfs the BSG stun to be more of a trip
* Apply grammer and spaceing suggestions from code review
Co-authored-by: dearmochi <shenesis@gmail.com>
* Makes the code clearer, use update icon, fix shaded charge
* Better inhands, tweaked base sprite
* Better explosion effect, mochi suggestion, PR ready
* Accidently removed this
* I did not intend to put this in, I discarded this change
* Update settings.json
* Spelling and return removal
Co-authored-by: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com>
* Removes spawn, makes it a callback
* Lowercase states
Co-authored-by: dearmochi <shenesis@gmail.com>
Co-authored-by: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com>
