* Initial Commit
* Not quite all was staged, apparently.
* Multiline no longer necessary
* For my convenience...
* Forgot an important little tidbit in routes.tsx
* This updated, apparently.
* And now hell breaks loose
* First batch
* Second Batch
* Third batch (Unit Tests)
* Improvised shotgun ammo is gone; Vibebots are refactored
* UpdatePath sweeps in our fulp_modules/_maps folder
* I can't bring myself to do it.
* Map stuff
* Didn't mean to leave this uncommented
* I carpet-bombed them with Find-Replace. Let's see what linters think
* I sure do hope this is comprehensive and doesn't break other things
* This may take a while
* Next Round
* Hopefully the last batch before getting on with actual fixes
* Telescreens
* :/
* Stragglers
* Helio Emergency Shuttle; NearStation adjustments.
* Only one more commit for greenchecks... Shuttle code be dammed.
* Pff, the file was missing
* Same treatment as the other map files.
* Missed a comma :P
* BZ chambers for Xenobiology
* Odd. Most of these got done earlier. Not sure why this one wasn't.
* Mapping sweep. I didn't adjust C_tags in Theia. Another time.
* The balloon alerts overlap
* I hate TGU I hate TGU
* I meant to say "I hate TG" on the last one. Freudian slip.
* Fix Fix
* Nanite research cost rebalance
* TGU-Update: Step 0
* Yeah I figured it'd do this.
* I accidentally undid this
* Failed to catch this one
* I don't trust hundredths not to break or be broken somewhere.
* Little air alarm tweaks
* Ports #1228
* Stuff I missed
* Silly
* TGU so nice we're going to make it thrice
* Yarn
* Should be all? Fixes cult stun too.
* Thermomachine layers
* Free square spellcheck to rerun tests and see if it's consistent
* All credit goes to QLA for reminding me to actually do this
* Update to e40becd742
* github folder
* tgu
* ok..
* they killed the fucking grab proc im not fixing this
* fixes some map shit
* huh
* Merge remote-tracking branch 'tgstation/master' into tgu24
* this is weird af
* idk what went on with this merge but ig its fixed
* fixes windoors
* this time for realsies passes
* i promise now it does
* fixes tgui + add boulder
* tgu
* utter bullshit
* fixes more bugs
* a
* barsign bullshit
* Update barsigns.dm
* bitrunner update
* infiltrator bullshit
* ports 2 gamebreaking bug fixes
* mentorwho is now in a block
* Sec mech bay for fulp maps
* merge conflict
* oh man im pushing this to map depot
---------
Co-authored-by: SgtHunk <68669754+SgtHunk@users.noreply.github.com>
* deletes our yarn and moves fulp edit to a proper fulp edit
* tgu
* retgu
* reasonable fixes to maps
* fixes to pubby & selene
* test commit
* Update tgstation.dme
* FUCK YOU SELENE
* Revert "Merge branch 'tgui-thing' of https://github.com/JohnFulpWillard/fulpstation into tgui-thing"
This reverts commit a0de10e581, reversing
changes made to 69fa3aecfd.
* Fixes the rest of fulp map issues
* Fulp edits
* Update PubbyStation.dmm
* Update Heliostation.dmm
* Last fixes
* fix selene double APC
* removes a telecomms hub from bridge
* adds ranged oven to all maps
* Ordnance data disk (from a previous TGU)
* consoles too
* revert readme & prison ovens
* lol.
* bit of changes
* deletes stuff
* some map path updates
* more changes
* deletes unit test that was gonna be deleted in tg
* see if this fixes anything
* The REAL TGU
Pepsi's TGU is completely empty and has been sitting around doing nothing for a while.
I wanted to get my PDA stuff in and it's been a while since I did one, so I'm doing a TGU.
* Ports over PDA fix
* fix dme
* oops
* Fixes wonderland anomalies
* Update mobspawner.dm
* Update Heliostation.dmm
* Let's try again
* i forgot to stage these
* Green checks. Hopefully.
* Z-edit it is
* That should do it (also kills Raid Edwards)
* Whoopsie daisy.
* Beef station
* Saves pubbystation
* Map fixes
* Ticket machines and sorting helpers
* wow awesome
* pubby
* Most linters
* Selene part one
* Helio part one
* Helio part 2
* Pubby Part One
* Pubby Part 2
* Pubby Part 3
* Selene Part Two
* Selene Part Three
* Door name finale
* Bonus AI sat fixes
* Infil and BS rulesets
* Some fixes
* Selene fix test
* Selene shuttle fix
* Please work helio
* Update Heliostation.dmm
* Update PubbyStation.dmm
* debugging
* Debugging again
* Extra debugging
* Revert "Debugging again"
This reverts commit bb22d37fc9.
* restore
* fernando
* restore helio
* Selene test
* fernando2
* nericopouci zusggetion
* LOL FUCK YOU UPSTREAM I WIN IN THE END
* Updates TGU + re-adds unit test + Heliostation
* Cargo shuttle fixes
* pubby + re-adds fulp tgui
* Selene Prison
* more tgu fixes
fixes emergency shuttles, any problem I saw with pubby, and our json's having wrong area paths
* maybe fixes the rest of pubby
* Fixes some minor problems with prison shuttle
* prison shuttle fixes
* pubby fixes
* more fixes to Heliostation
* more fixes to pubby
* maybe the last pubby fix needed
* Fixes science console not having a crate location
* ports my code over so checks can not fail
* Pubby fixes
Fixes missing APCs, Air alarms, lights, and fixes AT roundstart problems
* Removes TEG, replaces with TEG boards
* Fixes problems with Heliostation
* fixes a minor screwup
* increases helio cargo shuttle by 1 tile
* test commit
* Revert "test commit"
This reverts commit dad04936d3.
* adds an extra crash to see what the problem is
* dont crash, actually
* makes proper shuttle subtypes
* another test
* Revert "another test"
This reverts commit e902c090df.
* Update monsterhunter_event.dm
* hardcodes helio
* i give up
* Update Heliostation.dmm
* add supply mapping log
* adds more mapping logs
* adds another log
* MORE logging
* swapping for another test
* Update maps.dm
* Revert "Update maps.dm"
This reverts commit 5b4433766b.
* Revert "swapping for another test"
This reverts commit f9389f54a5.
* swaps around logging
* more in-depth logging
* removes dwidth from supply port
* increases size of helio dock
* logging
* Update map_template.dm
* Update map_template.dm
* loooogs
* g
* s
* w
* Update reader.dm
* Update reader.dm
* acces helpes selene
* sry
* adds our maps to ci
* Update build.js
* Update build.js
* Have templates.dm check for child
* Revert
* We call parent instead
* Might be important idk
* woops
* restore edited file
* idk if we need this
* Revert "idk if we need this"
This reverts commit c35c532b5a.
* Revert "restore edited file"
This reverts commit 38c6bc3e35.
* Revert "woops"
This reverts commit 12c979a32b.
* Revert "Might be important idk"
This reverts commit 206f18171f.
* revert debug stuff
* test
* Revert "test"
This reverts commit 7b82ec123d.
* more fixes
* test
* Update SeleneStation.dmm
* Revert "test"
This reverts commit 26a13f61f5.
* Update SeleneStation.dmm
* my bd
* Moving shuttles to tg files
* test
* Revert "test"
This reverts commit 7912f8ac23.
* Revert "Moving shuttles to tg files"
This reverts commit d220c1a46a.
* new idea
* Revert "new idea"
This reverts commit a7d1f1a4c2.
* Revert "Revert "Moving shuttles to tg files""
This reverts commit 0b427cc070.
* possible fix?
* Docking ports
* Update SeleneStation.dmm
* Dockers
* Mining
* Arrivals
* Prison conveyor & selene cargo linters
* SHOULD BE GOOD PROBABLY?
* Update SeleneStation.dmm
* Lets Selene's supply shuttle land
* Update SeleneStation.dmm
* Saves heliostation
* Saves Selenestation
* new ordnance
* Extra fixes
* Update Heliostation.dmm
* adds heliostation permabrig shuttle
* Adds cameras
* helio fix + ports garbage day fix
* FISHING
* erm i guess
* rerun tests
* Update README.md
* Update janitor.dm
* Beef
* saves heliostation
Co-authored-by: JohnFulpWillard <53777086+JohnFulpWillard@users.noreply.github.com>
Co-authored-by: SMOSMOSMOSMOSMO <95004236+SmoSmoSmoSmok@users.noreply.github.com>
* TGU yea yeah
* hopefully kills all lattices in walls
* another go
* more lattices
* pubby fix
* maybe the last lattices fix
* makes checks run again
* saves selene station ! 😃
* little bfenem :)
* new tgu + fulp fixes
* map fixes
* i rember 😄
* fix selene map merge conflicts
* removes fulp edits from job.dm
* crew monitor and basemap
* revert
* MODULAR BLOODSUCKER HUDS FINALLY
* 2 more fulp edits knocked out
* re-adds chain of command but modular
* moves bloodsucker define to new bloodsucker defines file
* chain of command fix
* ok good enough
* Update mentor_clientprocs.dm
* Beefman port module
* Bodypart edit
* Examine changes for Beefman
* Species edit for Beefman
* Global list edit for Beefman
* Savefile edit for Beefman
* Preferences edit for Beefman
* Boye
* Forgot one edit...
First issue: Certain crafting recipes (for example, Hooch) require a bottle, 100u hooch and a paper bag. If the 100u of hooch is in the bottle, because the crafting recipe has the bottle before the hooch in the requirements list, the craft will runtime as the bottle is "consumed" along with all its reagents.
To remedy this, I've created a simple sorter proc that runs when the global recipe list is inited. Before each recipe is added to the global recipe list, it now sorts the crafting requirements so that reagents are always processed first.
It's not exactly pretty, but it solves having to either refactor crafting code (please God no) or to go through every recipe datum and manually reorder the req list or create a unit test to ensure all recipe reqs are in the appropriate order.
Second issue: When crafting consumes a container, it qdels it and thus qdels all the items inside of it.
I've added two snowflake checks to empty the contents of reagent_containers and storage items before they are qdel'd. No more accidentally deleting items through crafting.
Removes the antennae part of the original moth wing sprites and adds them back as a mutant bodypart.
Seeing as they were then separated I made it a preference so that players can choose which antennae sprite they would like to have, instead of being restricted solely to the ones built into the wing sprite.
About The Pull Request
Ports tgstation/TerraGov-Marine-Corps#2977, overrides click proc to return focus back to chat bar using winsets also ports tgstation/TerraGov-Marine-Corps#1904 which has two sets of defaults for hotkey and classic mode
fixes#47672fixes#47659
much credit to @Rohesie and the TGMC team for a bunch of these improvements
Why It's Good For The Game
lets the non-hotkey players walk and talk again
Changelog
cl
add: Custom keybinds will now check what style (classic / hotkey) you prefer when resetting if you use classic mode make sure to reset your keybinds to default!
add: multiple keybind support
tweak: non-hotkey mode keeps focus on chat
fix: pressing 4 as cyborg now properly cycles
fix: AI location hotkeys now work again
/cl
* custom keybindings
* Update _lists.dm
* Update robot.dm
* modify weights and clean up some vars
* Update say.dm
* Apply suggestions from code review
Co-Authored-By: Emmett Gaines <ninjanomnom@gmail.com>
* some review changes
* formatting
* include focus hack, remove me_wrapper, give default keybinds to new characters, misc fixes
* revert hack and more reviews
* remove another focus hack
this was causing issues with the keydown proc returning early
* Adds sorting to most input() lists.
* Sorted some global lists, added more input sorting
* Should now use correct sort everywhere.
* compiles
* Last fixes.
* Selectively randomisable characters
* it's a list now
* this doesn't work
* it's totally fucking fucked mate big time
* it works
* so sick of this goddamn pull request and yes i know this is a retarded way to do this it didn't work the other way
* anturk forestalls the inevitable suicide
'associative lists are more performant'
* final changes anturk requested
'remove all the "in randomise" and it's ready'
* Brain damage works on organ damage procs, some defib reworks
* Heart and Lung damaging effects and failure, liver damage and failure moved to its organ again
* Cleans up reused global
* Organ damage procs on living and living/carbon
* Changes brain damage procs again
* SR heals all organs on revive, no decay for cybernetic implants, stomach damage and fail effects.
* Damage and failure effects for the appendix, ears, and some touchups on the stomach
* Committing changes so I don't lose them
* Organs now cease decaying in the proper containers
* Organ Fridges
* Reverts map changes
* Adds coronary bypass, lobectomy, trying to deal with organ_stat runtime
* Actually fixes merge conflict
* Smartfridge tweaks
* Think I figured out map merger
* Evidently not
* Still runtiming with glass shards even after I remove the map changes?
* Fixes runtime error with brain_item
* Runtime fix on living/carbon/life
* Cleaning up old PR code
* Brain damage fix, moves defines to actually be in _DEFINES, under DNA since that's where organ slots were
* Wrong math operation used
* Brains in MMIs no longer decay
* Removes redundant variable, and defibs no longer work on heart attacks caused by failing hearts
* Removes misleading comment
* init freezes organs in case organ crates are added, morgue corpses are frozen, removes adjustLiverLoss
* Removes random spaces, scanners check brain damage severity now
* Swaps numbers for defines, fixes brain surgery, rebalances coronary bypass bleed since that was insane last I tested it
* List change
* Runs off of an index instead of using cut
* Brains can be put into organ fridges
* Fixes minor type, hotfix for cloning problem
* Removes pointless check
* Demon hearts no longer decay
* Nightmare hearts no longer decay
* Removes istype() check on process, sets can_decompose instead
* Condenses organ damage report
* Removes organ failure messages
* Less organ damage spam, implements organ threshold messages instead
* Brain damage messages go to owner, not source
* Self-examine shows damaged organs
* Minor code cleanup, adds autodoc comments to the new procs
* Inverts standard organ vars to prevent random organs decaying, adds a few more autodoc comments.
* Merged the booleans into a set of flags
* Healthy living improves organ healing rates
* dunno why this didn't update
* my actions have consequences
* Sets ORGAN_SYNTHETIC for overlooked robotics organs
* Doubles heart decay time
* 3 minute heart decay
* Lobectomy/Coronary_Bypass heal more
* removes hivemind spells from the changes
* caps fixed, small other fixes and mushpunch
* honey, i fixed the bugs!
* STUPID YORII DUMB GIRL STINK LEAVE
* boolean is such a fun word
* zoinks
* F_XED
* fixes part 2
* TRUEs and FALSEs
* don't drink and code boys unless you're goofball or like maybe kor
* for entirely different reasons i mean
* at what point is goofball too drunk to troll but not drunk enough to shitcode
* cool your jets, travis.
* what a TRAVIS-TY
* mush added to yet another blacklist!
* Configuration datum refactor
* More WIP
* New easier on the eyes format
* More WIP
* Finished config.txt
* Fucktons more WIP
* The end of conversion draws near...
* Add all this shit
* Done converting entries finally
* Hunting down compile errors
* More WIP
* MORE CONVERSIONS
* More WIP
* More WIP
* Oh shit only 90 errors this time!
* IT COMPILES!!!
* Fixes world start runtimes
* Add the system for managed global variables
* Travis ban old globals
* So you CAN inline proccall, that's neat
* Fix that
* master.dm
* Remove the hack procs
* Move InitGlobals to the proper spot
* configuration.dm
* Fix the missing pre-slash
* clockcult.dm
* This is probably for the best
* Doy
* Fix shit
* Rest of the DEFINES tree
* Fix
* Use global. for access
* Update find_references_in_globals
Always hated that proc
Whoever made it must've bee a r e a l idiot...
* __HELPERS tree
* Move global initialization to master.
Fix the declaration
* database.dm
* Dat newline
* I said DECLARATIVE order!
* Here's something you can chew on @Iamgoofball
* game_modes.dm
* Fix this
* genetics.dm
* flavor_misc.dm
* More stuff
* Do it mso's way. Keep the controllers as global
* Make master actually see it
* Fix
* Finish _globalvars/lists
* Finish the rest of the _globalvars tree
* This is weird
* Migrate the controllers
* SLOTH -> GLOB
* Lighting globals
* round_start_time -> ticker
* PAI card list -> pai SS
* record_id_num -> static
* Diseases list -> SSdisease
* More disease globals to the SS
* More disease stuff
* Emote list
* Better and better
* Bluh
* So much stuff
* Ahh
* Wires
* dview
* station_areas
* Teleportlocs
* blood_splatter_icons
* Stuff and such
* More stuff
* RAD IO
* More stuff and such
* Blob shit
* Changeling stuff
* Add "Balance" to changelogs
* Balance for changelog compiler + Auto Tagging
* Update the PR template
* hivemind_bank
* Bip
* sacrificed
* Good shit
* Better define
* More cult shit
* Devil shit
* Gang shit
* > borers
Fix shit
* Rename the define
* Nuke
* Objectives
* Sandbox
* Multiverse sword
* Announce systems
* Stuff and such
* TC con
* Airlock
* doppllllerrrrrr
* holopads
* Shut up byond you inconsistent fuck
* Sneaky fuck
* Burp
* Bip
* Fixnshit
* Port without regard
* askdlfjs;
* asdfjasoidojfi
* Protected globals and more
* SO MANY
* ajsimkvahsaoisd
* akfdsiaopwimfeoiwafaw
* gsdfigjosidjfgiosdg
* AHHHHHHHHHHHHHHHHHHHHHHH!!!!!
* facerolll
* ASDFASDFASDF
* Removes the unused parts of dmm_suite
* WIP
* Fix quote
* asdfjauwfnkjs
* afwlunhskjfda
* asfjlaiwuefhaf
* SO CLOSE
* wwwweeeeeewwwww
* agdgmoewranwg
* HOLY MOTHER OF FUCK AND THATS JUST HALF THE JOB?!?
* Fix syntax errors
* 100 errors
* Another 100
* So many...
* Ugh
* More shit
* kilme
* Stuuuuuufffff
* ajrgmrlshio;djfa;sdkl
* jkbhkhjbmjvjmh
* soi soi soi
* butt
* TODAY WE LEARNED THAT GLOBAL AND STATIC ARE THE EXACT SAME FUCKING THING
* lllllllllllllllllllllllllllllllllllllllllll
* afsdijfiawhnflnjhnwsdfs
* yugykihlugk,kj
* time to go
* STUFFF!!!
* AAAAAAAAAAAAAAAAAHHHHHHHHHHHHHHHHHHHHHHHHHHH!!!!!!!!!!!!!!!!!!!!!!!
* ngoaijdjlfkamsdlkf
* Break time
* aufjsdklfalsjfi
* CONTROL KAY AND PRAY
* IT COMPILEELEELELAKLJFKLDAFJLKFDJLADKJHFLJKAJGAHIEJALDFJ!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
* Goteem
* Fix testing mode
* This does not belong in this PR
* Convert it to a controller
* Eh, fuck this option
* Revert controllerization Ill do it some other time
* Fix
* Working controllerization
* FOR THE LOVE OF CHRIST PROTECT THE LOGS
* Protect admins and deadmins
* Use the inbuilt proc