* Fixing some minor typos for cyborg upgrade flavour text
Throws in some missing apostrophes, capitalisation, and the letter "s."
* Briefcase Full of Cash buff
Increases the amount of cash in the Syndicate Briefcase Full of Cash from 600 Cr to 1000 Cr
* Reverts double-feature PR
* Reverts a broken revert
* Reverting again because Ebba told me to
* And reverting yet again
* Update hypospray.dm
* Update hypospray.dm
* weeeee
* Update code/modules/reagents/reagent_containers/hypospray.dm
Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
Signed-off-by: CRUNCH <143041327+Fordoxia@users.noreply.github.com>
* a
* Update traits.dm
---------
Signed-off-by: CRUNCH <143041327+Fordoxia@users.noreply.github.com>
Co-authored-by: Fordoxia <fordoxia@googlemail.com>
Co-authored-by: DGamerL <108773801+DGamerL@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
* makes noslips work
* trait part
* THE REST
* it didnt conflict too much actually
* this was intended, whoops lol
* no more processing
* consistency
* lewc review
* Apply suggestions from code review
---------
Co-authored-by: S34N <12197162+S34NW@users.noreply.github.com>
* Rebuilt PR #22537 to fix DMI Conflict
* Removed Coverage Limitation on Vox Jumpsuit
* Revised Descriptions for Vox Clothes to fit lore
* Grammar Fixes
* Adjusted Loadout Descriptions to match
* Onboard, not Aboard.
* 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
* RATATATATATA
* We use TRUE, not 1
* making it cost 12
* making progress
* FINALLY
* Lewcc review
* Whoops this too
* Lewcc review
* Might work, might not, but conflict time
* Henri review
* Add SScamera
* Refactor camera
* Refactor how camera chunks add/remove cams
* Use CAMERA_VIEW_DISTANCE to determine max view dist of cam
* Fix movable cameras and optimise them
* Optimise update()
* Ensure aiEyes get removed properly when deleted
* Final optimisations and refactoring
* Fix cameras being EMPed
* Shits fixed
* AA review
* Fix merge mistake
* Add comment about early return
* Seans review
* the it the
Co-authored-by: S34N <12197162+S34NW@users.noreply.github.com>
* Update code/game/machinery/camera/camera.dm
Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com>
* Ensure the robit has a camera before updating it
---------
Co-authored-by: S34N <12197162+S34NW@users.noreply.github.com>
Co-authored-by: Charlie <69320440+hal9000PR@users.noreply.github.com>
Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com>
* Medical and RnD DMI files split
* Cargo DMI split
* Security DMI split
* Engineering DMI split
* Captain DMI split
* Civilian/service DMI split
This one hurt
* Forgot about this one
* Color DMI split
* Purges everything that was delted up until this point
... with a blindfold and a shotgun
* Dress and suit DMI split
* Pants and shorts DMI split
and merges pants and shorts files... shorts are pants, right?
* Donator/fluff jumpsuit clothing organisational relocation
* e
oops
* So this is used, repath bad
* Random commit
* Costumes DMI split and jumpsuits purge
* Some fixes
* pennywise
* Centcom DMI split
* SolGov DMI split
* Retro DMI split
* Syndicate DMI split
* Misc DMI split
* centcom officer
* Kills off uniform.dmi completely
* last fixes
* lastest fixes
* vox navy gold conflict
* civilian barber
* Tourist observers work now
* Hopefully working non-human humanoid clothing
* This being in suit.dmi is one of the reasons I made this PR
* This shouldn't be here
* Late night coding
* Pun Pun regains his drip
* Last fixes
* security/OFFICER
* Most important - clown fix
* working subtypes good
* Fixes chameleon jumpsuit
* Proper QM pathes
* Fixes jumpsuit rolling with the power of poor quality code
* Cargo tech character setup fix
* else instead
why didn't I do this in the first place
* PURP
* Fixes broken character setup job clothing
* CC suit fix
* Psychedelic jumpsuit proper path
* You must wear the jumpsuit to adjust it
* 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
* a new coat of paint
* no shooting teammates on spawn for 100 damage
* datumization part 1, makes DS more OP, spacing fix
* hnng still broken but better
* breaks stuff less 99%
* mostly tgui
* oops, removes left over things from testing
* seperate tgui
* undo changes to ERT file and ERT manager
* build TGUI, front end is working
* minor fix, still broken
* this hurts me
* few small changes
* please dont fail
* mind code runs, but it doesnt work
* logging good, tgui built, will finish later
* mind code hurts, tgui should deconflict
* part one of giving up on TGUI
* 3 days of debugging, 2 lines of errors fixed
* no more unneccessary spawners
* Revert "no more unneccessary spawners"
* wow it works
* tgui, deconflict please
* a little clean up
* little more cleanup
* Sirryan addressed pt1
* Oops should commit this before the next commit
* DS isnt an option in one click antag, nuke it
* oops forgot this one small bit
* wow, simple code works
* oops, forgot to address, doesnt fix headset
* ds headset was broken long ago
* removes testing implants
* addresses requests
* get addressed code, you will be good
* few code improvements
* address moxian
* Makes deathsquad naming consistent
* this comment is true again
* a little precaution to stop AFKs
* no nuke code? no problem
* bing bam boom, more addressing
* no more runtimes I think
* clarified a few things
* gloves now show again following #18190
* Update code/game/objects/items/weapons/explosives.dm
Co-authored-by: Charlie <69320440+hal9000PR@users.noreply.github.com>
* okay I'm a bit stupid
* deathsquad jumpsuit desc update
* CI my beloved, have a fix
* deathsquad gets their proper icon
* Revert "deathsquad gets their proper icon"
This reverts commit a52519305b.
Co-authored-by: Charlie <69320440+hal9000PR@users.noreply.github.com>
PopeDaveThe3th