* IT WORKS UP UNTIL THIS POINT
* Consolidates SLOT_FLAG and SLOT_HUD into one
* Remove cover_both_ears
* SLOT_HUD to ITEM_SLOT
* Remove clothing_trait changes for the time being
* Remove accidental copy-paste
* Re-add no-slip var
* More failure to copy-paste correctly
* Leftover flag
* Combine left and right slot flags where possible
* UNGOOF MY DEFINES, PHAND IS NOT A THING
* Minor spacing changes
* Some more fixes from merge
* Seperates ITEM SLOT AMOUNT into two defines
* ON SECOND THOUGHT LETS NOT DO THAT.
* Addresses Contra's review
* Thank you GREP
* Rename ITEM_SLOT_FEET to ITEM_SLOT_SHOES
* Added a comment to the bitmasks in clothing defines
* Rename ITEM_SLOT_TIE to ITEM_SLOT_ACCESSORY
* These are for a seperate PR.
* Magboot fixes
* Requested changes
* Re-add accidental removal
* Wrong flags
* Update code/__DEFINES/clothing_defines.dm
Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com>
Signed-off-by: Chap <erwin@lombok.demon.nl>
* Requested changes
* Merge fixes
* Fix double headset
* Fixes multiple accessories
---------
Signed-off-by: Chap <erwin@lombok.demon.nl>
Co-authored-by: Adrer <adrermail@gmail.com>
Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com>
* Remove confusing hand overlay
Co-Authored-By: Serge K Lebedev <hello@sergelebe.dev>
* Fix clickable areas of equipped items
Co-Authored-By: Serge K Lebedev <hello@sergelebe.dev>
---------
Co-authored-by: Serge K Lebedev <hello@sergelebe.dev>
* Globals work
* Double access works
* All other things
* Revert "All other things"
This reverts commit 6574442eb6.
* More changes that compile and work
* IT WORKS AAAAAA
* Changes even more .len to length()
* Apply suggestions from code review
* Update code/datums/mind.dm
* Update code/__HELPERS/sorts/InsertSort.dm
Co-authored-by: Deniz <66401072+Oyu07@users.noreply.github.com>
* Update code/__HELPERS/sanitize_values.dm
Co-authored-by: Deniz <66401072+Oyu07@users.noreply.github.com>
---------
Co-authored-by: FunnyMan3595 (Charlie Nolan) <funnyman@google.com>
Co-authored-by: Deniz <66401072+Oyu07@users.noreply.github.com>
* Many botany QoL changes.
* Give observers a plant analyzer.
* Hooks should be executable.
* Completely new botany mutation mechanics.
* Minor fixes, changed vendor contents.
* Add charcoal to NutriMax extended inventory.
* Lint.
* Reset somatoray beam effects in a few more places.
* Mapped in seed sorting trays and mutrient.
* Slimmed down the seed sorting tray.
* Update unsorted seeds with analyzer, ghost-analyzer, and HUD support.
* Make english_list null-safe (and slightly faster).
* Fixed a mutation focus bug, added plant anayzer attackby to unsorted seeds.
* Made self-sufficient trays display their nutrient as Earthsblood.
* Improved descriptions and on-use texts.
* Added 5 dropers and 3 seed sorting trays to NutriMax.
* Mark stuff as notices, special case for duplicate doping.
* New way to get kudzu, QoL changes.
* Yield somatoray adds a message to the yield stat.
* Unsorted seeds produce a message when you try to put them in a tray or
machine.
* Potassium iodide and pentetic acid will now neutralize the tray's
mutagen.
* Using a plant bag on a seed extractor will now process plants into
seeds if there are no seeds in it.
* Bonk.
* Don't try to extract no seeds.
* Butterfingers.
* Bonk more.
* Add seed sorting trays to perma.
* Upgraded Seed Extractor GUI.
* Do not drop that which you do not extract.
* Don't bug out when removing the last seed.
* You want a tgui rebuild? Have a tgui rebuild.
* Drop trait-adding threshold by 10.
Before:
Needs modified mutation level >50.
With the x2 from 9+ seeds, this happens at base mutation level 25.
With maximum mutation level of 35 (L4Z+mutagen+somatoray), chance was
20%.
Required either L4Z (yield set to 1), or a somatoray (external help) for
any chance.
After:
Needs modified mutation level >40.
With the x2 from 9+ seeds, this happens at base mutation level 20.
With maximum mutation level of 35 (L4Z+mutagen+somatoray), chance is
30%.
Can get 10% chance with mutation level 25 (Mut+mutagen).
* Renamed mutagen level -> mutagen tank
* Left-align seed extractor, more efficient icon sending.
* New sprite thanks to McRamon.
* tgui rebuild
---------
Co-authored-by: FunnyMan3595 (Charlie Nolan) <funnyman@google.com>
* part 1
* these also
* fuckin nuke it
* more
* more stuff
* more crap
* wow
* holy fucking shit, it works
* thats a start
* oops
* fubing bundle
* hahah brrrrr
* I LITERALLY ADDED IT BACK, FUCK OFF GIT
* yeah more changes
* hide abstract
* blamo
* thats enough for today
* old code begone
* goodbye can_strip
* nearly there
* finally
* fuckin finally
* review
* tgui
* unbreak shit
* fix OD
* okay, that should fix the last thing
* remove hover on nodrop, fix early interacting
* everything is on fire
* silent trait check
* how did it even become CRLF
* minor formatting
* fix icon updating and adds silent insertion to global trait list
* adds the new parameter to documentation - whoops!
* pain
* contra review
* contra review again, reduces amount of checks for user in the loops
---------
Co-authored-by: cybercapitalism <98280110+cybercapitalism@users.noreply.github.com>
* add the new stuff
* guh
* add the brunt of it
* action button stuff
* adds a lot of other stuff
* careful find and replace
* it loads
* so many huds
* ehh yeah this kinda works
* fixes this runtime
* hacks in some DMI stuff, we'll fix it later
* Adds better mouse pointer for dragging buttons
* gets dragging into place working again, updates DMI
* moves define
* remove extra hud defines, now it compiles
* CHECK GREP
* owww
* rename action defines
* ticks
* are we good
* let's try that again
* renames mob vars
* renames
* fixes some hud issues with huds getting the wrong variable
* fixes some alignment issues
* Adds mouse-wheel scroll support
* left -> right
* I am the entire circus
* first self-review pass
* Another review pass -- just realized I need to fix keybinds
* more testing
* update icons
* oops
* Fix spell icons not appearing properly
* fixes some outstanding issues
- Action button backgrounds now work properly
- Fixes some runtimes on dropping
- Fixes some misplaced icons
* hmm
* weh
* again?
* nah?
* maybe this?
* asdf
* should finally fix CI
* add client check
* move the ?
* add missing override causing runtimes
* shift-clicking now doesn't trigger the button
* better docs
* Please merge 23876 first thanks
* whoops / fix
* she snakes on my case till I
* Apply suggestions from code review
Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
* deconflicts, ready for TM
* Update code/_onclick/click.dm
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
* lewcs good to them
* icon move and changes
* almost forgot to save this
* Update augments_arms.dm
* Inverted it, it seems.
* fixes lockers
* razorwire failsafes
* fuck
* razorwire one hand
* removes 2hand implant stuff
* Apply suggestions from code review
Co-authored-by: S34N <12197162+S34NW@users.noreply.github.com>
* s34ns changes
* Vampires can gain blood for a minute from people who succumb
* Revert "Vampires can gain blood for a minute from people who succumb"
This reverts commit 50a3cf87fe.
---------
Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
Co-authored-by: S34N <12197162+S34NW@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
* 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
* 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>
