* first runthrough lol
* okay make this shit actually work
* nerfs slime people
* fixes
* more changes
* fix
* bim bim bam bam
* ok back in the head becuz i dont give a shit
* Sirryan review
* Sirryan review
* Fixes CI
* Stealthy CI fail
---------
Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com>
* no longer super sick time to port station traits in a 4 hour rush as you have lost control of your life
* some changes /fixes
* Apply suggestions from code review
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com>
* more changes
* oh right, the murders (uplink price tweaks)
* Update code/controllers/subsystem/SSjobs.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>
* compiles
* doesnt work but works better
* tgui dogs still sleep but I want to sleep
* it should finally compile now. Probably.
* Update tgui.bundle.js
* Sorry IAN, transfer components is shoddy as hell
* removes minor uneeded /tgui
* also extra line whoops
* final stuff
* reverting changes I made earlier is hard ok
* Weight change, uplink reference
* oh right, the hey fucko
* Update code/_globalvars/traits.dm
Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
* Update tgui.bundle.js
* pushes
* pulls it
* Apply suggestions from code review
Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com>
* more changes, ion rifle blocked on cyb revolution
* dipshit remove the debug / tgui pritier and such
* tgui
* updates tgui again as nanomap was merged
* Apply suggestions from code review
Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com>
* comment / tgui
* every day I worry all day
* Full TGUI rebuild + prettier
* ah fuck
* leave a customer feedback at the link below!
* tgui momenr
* tgui moment
* FUCK I am dumb
* vertical TGUI
* She T's on my GUI till I
* Update tgui.bundle.js
* Apply suggestions from code review
Co-authored-by: Gaxeer <44334376+Gaxeer@users.noreply.github.com>
* Update code/modules/supply/supply_pack.dm
Co-authored-by: Gaxeer <44334376+Gaxeer@users.noreply.github.com>
* IPC can now use robotic hearts / pulse demon hearts and charge
* fixes revert not working for hangover / arrivals
* tgui moment
* hhgreg
* fixes that one bug
* Every day I worry all day
* deconflicted for real this t ime
* Update code/datums/station_traits/postive_traits.dm
Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com>
* ch-ch-ch-changes
* Update SSjobs.dm
* Update code/modules/supply/supply_pack.dm
Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com>
* deconflicted but won't pass CI
* fixes double dipping on traits
* my le consoles, they le no work?
* Great Great Asset, Asset, Great Great Asset, Asset...
* sorry slime mains
* fixes borgs being punished heavier
* actually fixes it, I was dense
* hopefully fixes borg drunk further
* makes it compile?
* actually makes it compile god whyyyy
---------
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
Co-authored-by: Contrabang <91113370+Contrabang@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: Gaxeer <44334376+Gaxeer@users.noreply.github.com>
* Sprites and little refactor
* idk what i am doing
Maybe refactor
* Sort the boxes
* Matches path
* Script and maps
* Okay... that was a strange decision.
* bathroom parts box
* More boxes
* Henri review changes
* Update toy.dmi
* Update code/game/objects/items/weapons/storage/boxes.dm
Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com>
* Update storage.dmi
* Update boxes.dmi
* True conflict solve
I hope
---------
Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com>
* Adds jani HUDs from Baystation!
* wrong place
* tweak to sprite
* contra review and tmeporary tweaks to the sprite
* finishing the sprites
* tweak to icon alpha and nv sprite
* typo
* conflict part 2
* test
* final adjustments
* DgamerL review
* fixing sprites
* changing name
* name part 2
* DGamerL review part 2
* wrong value
* nope
* equipment and janitorial categories
* Apply suggestions from code review
* 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
* fixes xeno headslugging not working
* tweak
Honestly I think the logic behind this is super fucking questionable, so have fun changing this back in like five years me
* Update code/modules/mob/living/simple_animal/hostile/headslug.dm
Co-authored-by: S34N <12197162+S34NW@users.noreply.github.com>
* Update code/modules/mob/living/simple_animal/hostile/headslug.dm
---------
Co-authored-by: S34N <12197162+S34NW@users.noreply.github.com>
* Part 2 - feeding others doesn't work as intended
* Part 3: fixing force feeding
* Fixes patches being wack
* Makes this less ass
* Adds patches to the chemistry bag
* Update code/modules/mob/living/carbon/carbon.dm
* Update code/modules/mob/living/carbon/carbon.dm
* Some missed patches
* Apply suggestions from code review
Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
* Fixes IPC logic
* Henri Review
* Add updatepaths
* Jimkil review
* IPCs now aren't allowed to eat pills and get patch
* Update code/modules/mob/living/carbon/carbon.dm
Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com>
* Update code/modules/reagents/reagent_containers/patch.dm
Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com>
* Update code/modules/mob/living/carbon/carbon.dm
---------
Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com>
* Converts isHoly into a trait
* Moves holy from body to mind
* Uncurses the source of curses
* Updates source to roundstart trait
* Contrabang fixes
* Forgot one
* Add trait mind helper
* Request changed Dgamerr/Contra
* Fixes issue
* Nullchecks minds
* Item dropped while antidrop active no longer nodrop
* Switched to or instead of XOR
* Combines if statements.
---------
Co-authored-by: Adrer <adrermail@gmail.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
* Martial arts no longer persist through cloning
* Remove unnessecary var declarations
* Combo counter
---------
Co-authored-by: Adrer <adrermail@gmail.com>
* let the wall of errors begin
* alright that's enough for today
* more pain
* only 7 errors
* arena :)
* smaller arena
* slight cleanups
* okay we ask charlie for help tomorrow
* leap works
* okay we ball
* idk I'm just adding this for now
* WE HAVE A CIRCLEEE
* Charge back + timer!
* first steps of the buff
* more cleaning up
* Buff is progressing nicely, almost done
* OKAY WE BALL
* Whoops last things
* whoopsie forgot this
* 20 Stamina damage
* 150 blood now
* WE GOT ANIMATE IN THIS HOUSE
* we be impact immune now
* IT DOESN'T LOOK LIKE SHIT (and goes through walls)
* ok ship it
* Consistency
* I'm buying charlie a bottle of asda rum
* Okay, ready for review
* Henri + Hal reviews
* More reviews + I am stupid
* Charlie review
* Ohhhh so that's why it didn't work
* Yeet this
* Charlie review
* Comment
* Charlie review kinda
* Hal review
* DESECRATED DUEL WOHOOO
* Oops I changed this
* That's one thing done
* Lewc review
* Lewc review part 2
* Update code/__HELPERS/trait_helpers.dm
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
* Lewc review + ICON WOOO
* Aaaaaaa
* TGUI FIXED
* Henri review
* Charlie review
* Charlie review
* Henri review
* Jimkil review
* Update code/__HELPERS/game.dm
Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
* Charlie review
---------
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
* Aaaaaaaaaaaa
* IT WORKS
* Okay now make it a martial art
* Final shit
* Forgor this
* Protolathe moment
* The sprite
* Typo fixes
* Burza review
* Contra review
* Contra review
* Contra + Henri review
* Update code/modules/surgery/organs/augments_arms.dm
Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
* Me when I push untested code
* Contra review pt 1
* Contra review
* I forgor
* I forgot v2
* Henri review
---------
Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
