ec90b441ad
Moves weapons sprites out of items.dmi ( #24634 )
...
* Moves weapons sprites out of items.dmi
* lets revert this
* oversight from energy melee PR
2024-03-19 17:08:35 +00:00
b703a52294
Alters Command access to include weapons permits + Telebatons are now weapons ( #24621 )
...
* beepsy nooo
* Update code/game/objects/items/weapons/batons.dm
Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com >
* Update code/game/objects/items/weapons/batons.dm
Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com >
---------
Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com >
2024-03-16 16:14:43 +00:00
ecc109915a
Stamina damage no longer bypass some checks ( #23447 )
...
* adjusting stamina damage no longer bypass some checks
* no illness changes
* i surrender on this, let it be
2024-02-04 21:15:20 +00:00
6a109ade7f
Moves a few sprites out of items.dmi ( #23301 )
...
* fuck you items.dmi
* banhammer
2023-11-24 15:39:20 +00:00
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
10c1c82c09
We using traits in this house ( #22548 )
2023-09-28 19:32:57 -04:00
30dacc03e3
Adds crutches ( #21959 )
...
* 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
2023-09-11 12:50:05 -05:00
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
feb480e39c
if baton would stun cyborgs, it would stun bots too ( #21062 )
...
* if baton would stun cyborgs, it would stun bots too
* added visible message when stunning bots
* cleanup
2023-06-02 17:41:56 +01:00
a7bd9d6bde
Whitespace fixes, final part (hopefully) ( #20361 )
2023-02-13 11:49:28 -06:00
9ba005de9f
Add themselves as a pronoun helper, fixes some usages of it ( #20184 )
...
* Add themselves helper
* Testing and replacing
* Fixes some non-standard usages
2023-01-20 19:28:48 -05:00
066bd06e8d
Whitespace cleanup part 3. ( #19897 )
...
* Whitespace cleanup part 3.
* clean up mecha a lot, other review fixes
2022-12-27 11:00:39 -05:00
21fc24a31c
Ports Yogstation's version of CQC, adds it back to traitor uplink. ( #19310 )
...
* Changes most instances of brute to stamina, combos
* Adds CQC back into uplink
* Updates chokeholds so it takes time to knock out
* Adds cqc back to tot uplink, gives nukies discount
* Tweaks base grabs and disarms
* Tweaks combos some
* I am a mild idiot
* Charlie's suggestions
* I don't like these numbers, nerf head kick
* Removes blocking and countering
* More kicking tweaks
* Update code/datums/uplink_item.dm
commit charlie's changes pt. 2
Co-authored-by: Charlie <69320440+hal9000PR@users.noreply.github.com >
* stop kicking yourself
Co-authored-by: Charlie <69320440+hal9000PR@users.noreply.github.com >
2022-10-22 21:42:17 +01:00
dffdf8c7c1
Adds icon_states to telescopic batons ( #19074 )
...
* mapping batons
* lets have them off
2022-09-16 18:14:37 +01:00
1d552ab0e4
Armour Refactor ( #18547 )
...
* initial commit
* bullet fix + 100% armour pen
* equivalent armour values
* percentage armour pen
* updates bombing
* adds more defines
* i like armour too much
* review pass 1
* review pass 2
* updates with lavaland elites
* armour penetration value tweaks
* wt550 AP round change
2022-08-01 20:23:49 +01:00
1d0e3dde0f
Updates a considerable amount of legacy weapon sprites to modern TG/Bay versions ( #18118 )
...
* test
* holdup
* more guns
* EVEN MORE CHANGES
* fuck
* eugh
* actual shit editor, love DM
* i think I just need inhands now
* final review, test pr
* ooops
* holy shit
* new maka
* foamforce new makarov
* this is going to be hell to review. is it?
* AHHHHH
* small melee fixes
* GOD DAMN STAFF
* as above
* i thought i fixed you, also grip added to wt550 inhand
* acutally deconflicts with the new camera pr, removes the new animated missle(rip)
* some fixes
* a bit more sprite cleaning
* i am suffering
* reverts 9mm
* seemingly forgot a few
* i think we're good now
2022-07-07 17:12:28 +01:00
3980f2dd77
stun and telebaton rework ( #18127 )
...
* stun and telebaton rework
* batons now do stamina
* makes it work
* indicator
* tweaks
* farie review
* moxian review
* sod it
2022-07-06 20:46:52 +02:00
0f7a8707ef
[Ready] Refactors stuns and status effects. ( #17579 )
...
* Fixes reviver runtime
* Confusion status effect
* Dizzy status effect
* Drowsiness status effect
* decaying -> transient
* Drunkenness status effect
* why use timer when SSfastprocessing work good
* stuns (mostly)
* weaken and immobalise
* stun/weaken times
* update_flags redundancies.
* Slowed()
* Silence + fixes transient decay
* Jittery
* sleeping
* Paralyze -> weaken
* Cult sluring
* paralyse
* Stammer
* slurring + projectile cleanups
* losebreath
* Hallucination
* forgor this
* eyeblurry
* eye blind
* Druggy
* affected didn't like my spacing
* review pass
* second review pass
* some cleanups
* documentation and signal framework
* confusion fix
* Fixes spec_stun
* rejuv fix
* removes a TODO
* conflicted myself
* fixes
* self review
* review
* removes TODOs
* adminfreeze
* TM fixes
* hallucination fix + others
* tones down alchol and runtime fixes
* confusion overlay suggestion
* more fixes
* runtime fix
* losebreath fix
* clamp => directional bounded sum
* steel review
* oops
Co-authored-by: SteelSlayer <42044220+SteelSlayer@users.noreply.github.com >
* reduces the dizziness cycle rate
* borg hotfix
* sanctified decursening
Co-authored-by: mochi <1496804+dearmochi@users.noreply.github.com >
Co-authored-by: SteelSlayer <42044220+SteelSlayer@users.noreply.github.com >
2022-05-24 16:35:26 +01:00
ee22c8d4ee
Refactors Item Blood Overlays ( #16826 )
...
* Refactors Item Blood Overlays
* update
* remove blood color changing
2021-10-01 21:57:54 +01:00
51c2c8840d
Telescopic baton/scythe blood overlay fix
2021-09-25 00:11:56 +01:00
02b9445b9b
Refactors DNA Mutations; Refactors Mutations to use Traits ( #15483 )
...
* Refactors Mutations
* traits
* more work
* styling fix
* yet even more work
* oh hush
* almost there
* it continues yet further
* and that's genetics done
* and that's it folks
* last bit and golem fixup
* oof
* oops
* tweaks and fixes
* styling
2021-02-21 21:25:19 +00:00
d2e034d80d
Fixes Captain being contractor target, contractor batons not stunning silicon ( #15096 )
2020-12-12 16:25:25 +00:00
5edee29a50
[READY] Syndicate Contractors ( #14605 )
...
* Syndicate Contractors initial PR
* Finalize initial version
DNP
Finalize initial version
* Baton now costs 6 Rep, show dead extraction penalty, fix scroll
* Reduce total TC, add zippo, balloon, icon tweaks
* Address moxian, AA and Farie
* Fix mode.txt
* oops
* Address Farie 2
* Tweak baton to work around stam crits, address SteelSlayer
* Address TM issues, TP menu
* Fix wrongly merged DME
* Tick contractor DM files again
* Remove step_y
* TC rewards always higher than preceding difficulty's reward
* Address Farie
* Remove extraction_turf from handle_target_return
* fix doc
* Merge part2
* Address AA again
2020-12-09 12:03:23 -05:00
5720b0b8b2
Clean up code and make telebaton verbs static
2020-08-06 21:54:56 +02:00
b9e44c869e
Baton knockdown animation, refactor & doc
2020-08-03 22:38:16 +02:00
Henri215