* wip
* goodbye two pizzas
* commit to pizza time
* pizzaaaaaaaa
* getting there
* hopefully final
* pizza
* do you like me now CL?
* Update code/modules/food_and_drinks/recipes/recipes_oven.dm
Co-authored-by: Sirryan2002 <80364400+Sirryan2002@users.noreply.github.com>
* fixing suggestions
* Update paradise.dme
* back on track
* removing tablecrafting recipies, switch back to oven recipeis
* remove unused raw pizza sprites
* re-add KalevTait's suggestion
* fix merge conflict
* merge conflict fix i guess???
* i swear if this is still conflicted
* fixing trailing newlines
* moves parent calls
Co-authored-by: Sirryan2002 <80364400+Sirryan2002@users.noreply.github.com>
* turns hover over tooltips into a preference
this allows people to toggle the tooltip boxes that appear when hovering over items
* adds up the bitflags in preferences.dm
oops
* coding late at night be like
fixes the bitflag, a variable location and the define name
* better wording and removes a var
cooler code
* startup, expect like 50 unneeded icons, not bug free™️
* Hope works. Cloak works. Buffs for AI controlled. Faction fix.
* map speed buffs, fixes resummon health decay
* Adds roles. Adds Mirror walk. Nerfs revival, especialy for non antag summoned.
* I am denser than bluespace ore
* x2 antag cooldown, update desc for cloak
* removes 66% burn damage resist from elites
* honestly just knock that down
* herald not speaking right, fuckup with max hp fix
* Thanks hal!
Co-authored-by: Charlie <69320440+hal9000PR@users.noreply.github.com>
* changes, changes, and more changes, oh my!
* Update code/datums/status_effects/buffs.dm
Co-authored-by: Charlie <69320440+hal9000PR@users.noreply.github.com>
* GC stuff
* oh, and just one more thing
* no gibtonite gaming
* Huston we have a FUCKING PROBLEM
* oopsy doopsy
* but just one more thing (again, gc stuff)
* Lets all elites speak their mind
* NO LAVA
* grab ghost, legion charge red.
* dust the dusting from the code
* no mirror cargo shuttle crossing
* need to stop making small changes, x2 broodmother
* herald no longer crashes the MC
* Lower broodmother cooldown, herald down 5 brute and , legionare gets more smoke and thermals, pandora gets chasers
* remove extra brackets, x 2 on aoe squares
* pandora now respects factions
* fixes teleporting to tumor if reactivated by someone else. Herald has light, boost elites make message
* requested changes
* mirroring a wanted change
Co-authored-by: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com>
Co-authored-by: Charlie <69320440+hal9000PR@users.noreply.github.com>
Co-authored-by: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com>
* amogus
* Revert "amogus"
This reverts commit ebaa99c77b.
* Part 1
* rest of the airlocks
holy shit that took a long time
* part 2
* part 3
finale
* conflict resolution
* fixes warnings
* fixes paneloen airlock emissives
* adds back changes from #18145
* #18085 sprites
* SteelSlayer Review
readded process in status_display, idk why I removed it, it broke some functionality
* future proofing firedoors
Talked with the contributor who added emissive appearances to the codebase. As of now they wont block them unless they spawn as closed, but with future PR merges this code will work.
* solar panel PR conflict resolve
* pain
* small fix
* farie82 suggestions
Co-authored-by: Farie82 <farie82@users.noreply.github.com>
* farie82 suggestions part 2
* farie82 suggestions part 3
* finalle
pog champ ers 2000
* farie82 suggestions the sequel
Co-authored-by: Farie82 <farie82@users.noreply.github.com>
* SteelSlayer Suggestions
Co-authored-by: SteelSlayer <42044220+SteelSlayer@users.noreply.github.com>
Co-authored-by: Farie82 <farie82@users.noreply.github.com>
Co-authored-by: SteelSlayer <42044220+SteelSlayer@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
* grammar fixes
cant - can't
removes duplicate the from mobs
the pain in your the -
treads on the lit the lit -
what you can cook with this the -
* should fix the merge conflict
0 to FALSE
* unconflicts
panther will have to be fixed at a later date
* chilly
* frosty
* Now with crawling and buckling!
had to do some jank because meat spikes dont change a perfectly good variable that other angle changing code uses, so insert snowflake code for the meat spike. :C
* Fixes warning
what the hell is a protected variable anyways
* amogus
* Revert "amogus"
This reverts commit ebaa99c77b.
* megafauna PR deconflict
* removes jank
* needless variable def
* 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>
* SSinput Rewrite, Custom Keybindings
* hmm yes, safety
* azerty begone
* address AA and SteelSlayer
* Address the old man
* what
* CI dbconfig too
* Address TM issues
Unicode support
Better numpad support
Fix no perms message
Fix modifier screwing movement
* pre-TM tweak, nitfix
* pre TM change 2
* Display others
* MERGE ME
* unduplicates your rows
* reverts some changes, makes this work for now (not TM safe)
* fixes direction facing, removes hotkey help item
* weird keys
* TM commit revert later
* fixed asay/msay keybind
* adds ALL the emotes
* flip and spin
* makes old people happy
* and fixes admins not being able to msay
* lets borgs stow modules
* saves prefs when someone changes a keybind
* reverts skin changes and manually applies
HEAVEN HELP YOU IF YOU USE THE DM SKIN EDITOR IT BREAKS EVERYTHING
* tidies menu, unduplicates rest
* sql file pls come back
* Update SQL/updates/40-41.sql
* why did you not throw an error?!
* inits keybinds if your prefs somehow fail, i guess
* restores these spaces, i guess
* fixes local testing, i guess
* emote cooldown returns (oops)
* movement lock improvements
* Pageup does Swap Hands
* LOOC
* whisper for living mobs
* oops
* fix dsay
* fix IPC silicon emote hotkeys
* category name
* backspace only clears if input is focused
* Makes TAB and BACKSPACE rebindable
* charlie review
* define move
* yeet
* Lewcc review
* brings back legacy mode
* restores legacy mode
* tell legacy mode what is going on
* Update code/controllers/subsystem/input.dm
* Update code/controllers/subsystem/input.dm
Co-authored-by: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com>
* safeties!
* legacy mode is a pref now
* undo TM changes
* null prefs safeties
* Revert "legacy mode is a pref now"
This reverts commit b45af65139.
* revert this too thanks
Co-authored-by: mochi <shenesis@gmail.com>
Co-authored-by: dearmochi <1496804+dearmochi@users.noreply.github.com>
Co-authored-by: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com>