6b9c333636
Adds Security Fines ( #31857 )
...
* Adds Fines
* Forgot one
* Enhanced Clarity
* Fixes issue with linked account
* If no crime stated, states in the fine message
* Updates fine scanner sprite
* Updates fine scanner behavior
* Adds comment to records
* Apply suggestions from code review
Co-authored-by: JimKil3 <47290811+JimKil3@users.noreply.github.com >
Signed-off-by: PollardTheDragon <144391971+PollardTheDragon@users.noreply.github.com >
* Removes capitalization
---------
Signed-off-by: PollardTheDragon <144391971+PollardTheDragon@users.noreply.github.com >
Co-authored-by: JimKil3 <47290811+JimKil3@users.noreply.github.com >
2026-05-17 09:45:07 +00:00
kyunkyunkyun and GitHub
b0463d3c83
Convert most spans to defines ( #31080 )
...
* spanish?
* aaaagain
* keep maptext
* Update robot_items.dm
* Update span_defines.dm
* compiles
* Update silicon_mob.dm
* compile
2025-12-13 23:55:48 +00:00
kyunkyunkyun and GitHub
8821ab9a66
Updates a couple of /obj/item variables ( #29829 )
...
* compiles checkpoint
* fix some
* updatepaths
* fix
* rrr
* linters
* fiexs
* icon fixes
* plasmemes
* fix
* fix
* fix bit more
* fix
* well
* cleanup
* fix glasses layer
* conflict
* fuck gun code
* fixes
* fix
* fixes to energy guns
* review
* conflict
* support that 1 unathi pixel
* fix
2025-09-14 15:23:56 +00:00
Contrabang and GitHub
1504ed98be
massive burndown ( #29894 )
2025-07-27 20:52:39 +00:00
warriorstar-orion and GitHub
475d5d4fa5
fix bad judo belt unequip state ( #27908 )
2025-01-10 02:07:53 +00:00
d90a70ecda
[REFACTOR] Consolidates SLOT_FLAG and SLOT_HUD into one ITEM_SLOT flag ( #26743 )
...
* 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 >
2024-11-13 13:02:29 +00:00
9465b565b8
refactor/ci: enforce mapload in Initialize args ( #26878 )
...
* refactor/ci: enforce mapload in Initialize args
* add new missing mapload arg
* add yet another missing mapload arg
* Update code/modules/power/engines/singularity/particle_accelerator/particle.dm
Signed-off-by: DGamerL <108773801+DGamerL@users.noreply.github.com >
---------
Signed-off-by: DGamerL <108773801+DGamerL@users.noreply.github.com >
Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com >
2024-10-23 19:07:46 +00:00
9225cd5817
Security belts tweak ( #26754 )
...
* Tweaking sec belts
* Update code/game/objects/items/weapons/storage/belt.dm
Signed-off-by: Sean <12197162+S34NW@users.noreply.github.com >
---------
Signed-off-by: Sean <12197162+S34NW@users.noreply.github.com >
Co-authored-by: Sean <12197162+S34NW@users.noreply.github.com >
2024-10-10 09:57:12 +00:00
kyunkyunkyun and GitHub
95f2c7e575
fixing judo ( #26755 )
2024-10-02 15:21:21 +00:00
DGamerL and GitHub
098b13bb33
Removes the empty type of /snacks ( #26010 )
...
* Aaaaa it works
* Add updatepaths
* Add unsaved files
* MATTTTT
* Fixes casino
* Fix
---------
Signed-off-by: DGamerL <108773801+DGamerL@users.noreply.github.com >
2024-07-29 14:46:04 +00:00
matttheficus and GitHub
9d1e1ba40e
Judo Storage Slots + Changes to Combos ( #25659 )
...
* this might be a lot i dunno
* forgor status for armbar
* armbar tweak
* DGamerL Review
* merge issue fixed
2024-06-23 10:53:00 +00:00
8b2852e824
GOLDEN BLAST: a new judo combo ( #25457 )
...
* FACE THE WRATH OF THE GOLDEN BOLT
* lew review
* 120 stam damage standardization
* makes it cooler
* GOLDEN BLAST is now louder
* Update code/modules/martial_arts/combos/judo/goldenblast.dm
Signed-off-by: DGamerL <108773801+DGamerL@users.noreply.github.com >
---------
Signed-off-by: DGamerL <108773801+DGamerL@users.noreply.github.com >
Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com >
2024-05-17 13:12:26 +00:00
805d6acb71
Sleight of Hand, a Bartender Ability ( #23234 )
...
* the start
* Update code/modules/projectiles/guns/projectile/revolver.dm
Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com >
* Update code/modules/projectiles/guns/projectile/revolver.dm
Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com >
* Update code/modules/projectiles/guns/projectile/revolver.dm
Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com >
* Update code/modules/projectiles/guns/projectile/revolver.dm
Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com >
* pain
* ITS STILL A WIP
* dones
* Apply suggestions from code review
Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com >
* oh god, this was just a draft, it should be part of the PR
* we dont need this anymore either
* sirrayan request
* Update code/modules/projectiles/guns/projectile/revolver.dm
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com >
* DGL's review
* more of DLG's review
* removes bar judo
---------
Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com >
Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com >
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com >
2024-03-01 13:10:53 +00:00
Contrabang and GitHub
324560e753
fixes judo footer ( #24325 )
2024-02-27 17:24:55 -05:00
SchrodingersWolf and GitHub
e6addfc6ac
Belts and some select belt slot items no longer require a jumpsuit to wear ( #23038 )
...
* Why wear clothes when you can wear belts?
* Converted the ignore_under var into a flag
2023-11-04 16:37:01 -04:00
Contrabang and GitHub
f3f9bd442a
Changes slot number defines from lowercase to all uppercase ( #22297 )
...
* 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
2023-10-03 18:27:51 +01:00
2672d02eb3
[s] Martial arts granted by equipped items no longer persist through cloning. ( #22684 )
...
* Martial arts no longer persist through cloning
* Remove unnessecary var declarations
* Combo counter
---------
Co-authored-by: Adrer <adrermail@gmail.com >
2023-10-03 08:47:19 +02:00
ac385bdf5d
Stops you from grabbing someone if you are horizontal ( #22563 )
...
* Gotcha! Oh wait-
* Update code/modules/mob/living/living_defense.dm
Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com >
* Works for now, oculd use a cleanup later
* Nice it works
* Contra review
---------
Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com >
2023-10-01 16:20:18 +01:00
Contrabang and GitHub
65ab4a5d89
Refactors station areas to be /area/station subtypes ( #21681 )
...
* areas
* progress...
* death hatred and murder
* get current master maps
* hoooly shit i can load up the maps
* it compiles now
* map changes
* fixes some unintended stuff
* make the .dme right
* fix mixed space+tab indents
* more space-tab fixes
* CI, please show me more than 1 CI fail at a time
* UPDATE PATHS!!!
* none of the stations had it anyways, but fixed
* mint wasnt actually deleted, my bad
* epic random CI fail for no reason
* i beg you, CI
* dont delete anything
* okay THAT should work now
* okay get master maps and rerun
* okay THEN run update paths
* actually done now
* oops
2023-09-06 17:37:50 +01:00
GDN and GitHub
08eb183875
Gives the bartender their own version of judo ( #21886 )
2023-09-01 23:20:47 +01:00
9186b7d421
Adds Corporate Judo, an optional alternative to the stun baton (deconflicted edition) ( #21229 )
...
* Adds Judo, Judo belt, and increased harm damage
* Judo users can no longer use batons (any type)
* Adds Discombobulate combo
* adds Eye-poke combo
* copy-paste related error fixes
* adds throw (knockdown) combo
* adds Armbar and Fatailty Combos
* assorted changes (spelling, args, unneeded checks)
* minor changes to belt item
* updated desc, fixes belt item pathing
* adds 3 belts to secvend
* Adds sprites courtsey AVeryReulctantSpider
* Assorted code cleanup (thx Henri)
* minor grammatical issues
* Adds Judo, Judo belt, and increased harm damage
* Judo users can no longer use batons (any type)
* Adds Discombobulate combo
* adds Eye-poke combo
* copy-paste related error fixes
* adds throw (knockdown) combo
* adds Armbar and Fatailty Combos
* assorted changes (spelling, args, unneeded checks)
* minor changes to belt item
* updated desc, fixes belt item pathing
* adds 3 belts to secvend
* Adds sprites courtsey AVeryReulctantSpider
* Assorted code cleanup (thx Henri)
* minor grammatical issues
* junk commit to re-open PR
* pronoun consistancy
* Lewc review #1
* de-jankification, buffs eye poke
* Reduces harm intent damage from 10 to 7
* descriptions
* lewc name change
* weight class is now bulky
* wheel throw fix, discombob buff (slight)
* Throw buff (Grab > disarm)
* partial lewcc review
* assorted reviews (HIIYAA edition)
* Eyepoke, discombobulate can be done on the ground
* hal second pass review
---------
Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com >
2023-07-30 18:08:16 +01:00
