8f654dfcc7
Adds Kidan Ship Ruin ( #32081 )
...
* Kidan Warriors
* Linters
* Kidan mob AI adjustments and stat adjustments. Kidan Princess Megafauna
* Bug spray vulnerability
* Ragnarok props and kidan spear update
* The ship
* Fixes and adjustments
* Map update
* Linters
2026-06-24 21:49:27 +00:00
7a5658a90a
Improves Baseball Bat Deflect Mechanics ( #31918 )
...
* Improves Baseball Bat Deflect Mechanics
* Adjustments
* Update code/game/objects/items/weapons/weaponry.dm
Co-authored-by: JimKil3 <47290811+JimKil3@users.noreply.github.com >
Signed-off-by: PollardTheDragon <144391971+PollardTheDragon@users.noreply.github.com >
* Update code/game/objects/items/weapons/weaponry.dm
Co-authored-by: JimKil3 <47290811+JimKil3@users.noreply.github.com >
Signed-off-by: PollardTheDragon <144391971+PollardTheDragon@users.noreply.github.com >
* Reorders if chain
---------
Signed-off-by: PollardTheDragon <144391971+PollardTheDragon@users.noreply.github.com >
Co-authored-by: JimKil3 <47290811+JimKil3@users.noreply.github.com >
2026-05-07 02:21:59 +00:00
394c3b0108
Stealth and Steel: The Space Ninja ( #31497 )
...
* Space Ninja Antag Datum
* Small fixes
* Ninja outfit, ekatana, actions
* Ninja scanner and spans
* Ninja uplink implant
* Ninja bombs
* Ninja bomb flare grants
* Ninja modsuit, objective payouts
* Fixes objectives
* Ninja stealth fix, modsuit sprites and final implementations
* Lints
* Ninja scanner sprites
* Ninja Suit and Energy Shuriken Sprites
* Fixes config, Adjusts stim ability, adds shuriken printer and e-shurikens, uplink stuff
* Fixes a duplicate icon
* Attack chain
* Energy katana item sprite
* Ninja net gun
* Brazil
* Spawning ninjas, ninja on traitor panel, ninja spawn sound
* Linter
* Objective stuff
* Fixes n grey suits
* Objectives
* Trim intro sound
* Event, spawn point
* Ninja Outfits, Vox Check, Bug Fixes, Mirror at ninja spawn
* Address code review
* Oops
* Uncomments an important thingy
* Update: Gave space ninjas access to maints and an agent ID card. Updated net description.
* Update scanner examine
* Removes excess file
* Makes ninja scanner fit in belts and ninja suits. Gives them NV goggles
* Fixes modsuit sprite issue
* Energy shuriken fixes
* Scanner fix
* Printer fix
* Fixes some runtimes
* Fixes capture teleport
* Clothes rename
* Buffs energy katana, adds soft no-drop to ekatana, buffs ninja modsuit, fixes equip bug
* Adds research levels to ninja gear
* Fixes ninja capture issue
* Remaps ninja dojo
* Better cuff removal
* Forgor
* Fixes action availability
* Updates walls at dojo
* Improves ninja modsuit
* Windoors can now be opened with the katana
* Adds advanced pinpointer to ninja uplink
* Fixed energy nets sticking
* Fixes slime people ninjas
* Adds reroll to ninja capture if target is DNR. Prevents off Z-level targets
* Oop
* Adds reactor sabotage objective.
* Fixes ninja cuffs
* Removes Carp scroll from uplink. Adds Krav Implant to uplink
2026-03-25 23:11:10 +00:00
da1ebd039d
Adds Materials to Every Autolathe and Protolathe Item (except for ammo boxes, IK mags, and Dart Boxes) ( #31445 )
...
* Holy fuck there's so much shit I'm not even done
* oh god there's so many
* it is done
* Update autolathe_designs.dm
* Update circuitboard.dm
2026-01-30 21:25:40 +00:00
eeb980f191
Adds Reycleable Materials to a Bunch of Objects ( #31320 )
...
* recycle
* moar
* Update glass_containers.dm
* Update spray.dm
* cost adjustment because sheets are 2000, not 1000
* Update hydroitemdefines.dm
* Update hydroitemdefines.dm
2025-12-25 21:03:22 +00:00
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
280ab5c19f
Stops homerun bat from storing homerun charge after drop ( #30478 )
2025-09-18 06:00:34 +00:00
4ffa9870cd
Migrates the baseball bat to the new attack chain, and makes it use tg cooldowns ( #30387 )
...
* migrates the baseball bat to the new attack chain, and makes it use tg cooldowns
* meant to revert that
* moves a var
* Update weaponry.dm
2025-09-14 19:52:30 +00:00
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
5b368c3f8f
Renames some pre_attack arguments ( #30324 )
...
* Renames some pre_attack arguments
* fix
2025-09-04 07:11:59 +00:00
b2e6789f5a
Migrates bedsheets, bedsheet bins, beachballs, baseballs, basketballs, and banhammers to the new attack chain ( #30170 )
...
* bedsheet
* click tweak
2025-08-22 14:30:29 +00:00
1504ed98be
massive burndown ( #29894 )
2025-07-27 20:52:39 +00:00
a6e8f69c55
[PORT] Adds TG "busy" cogbar animation for players ( #27932 )
...
* looks like it works
* move to PREFTOGGLE_3 and add sneaky do_after
* linter
* param doc and some cleanup
* autodoc and comment signal
* fix wrong type in link_processing
* fix wrong var in preferences
* cover do_mob and do_after_once
* fix toggles total
* replace indent with space
* offset and helpers procs
* fix conditional statement
* Apply suggestions from code review
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com >
Signed-off-by: Mira <42539014+MiraHell@users.noreply.github.com >
* Update code/__HELPERS/mob_helpers.dm
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com >
Signed-off-by: Mira <42539014+MiraHell@users.noreply.github.com >
* use SECONDS
* Update code/game/objects/items/weapons/weaponry.dm
Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com >
Signed-off-by: Mira <42539014+MiraHell@users.noreply.github.com >
---------
Signed-off-by: Mira <42539014+MiraHell@users.noreply.github.com >
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com >
Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com >
2025-03-06 16:04:51 +00:00
0eafad8475
Refactor /mob/unEquip. ( #27720 )
...
* Refactor /mob/unEquip.
* fix things found in testing
* more fixes from testing
* fix removal of hooded suits
* fix flayers inability to deploy swarmprod
* fix changeling blade activation
* unnecessary parens
* pass default unequip args to proc overrides
* fix belts being able to forceMove into full hands
2025-01-10 01:58:35 +00:00
525c68d617
Attack chain, initial setup. (pull *immediately* for *any* TM issues) ( #26834 )
...
* refactor: Attack chain, initial setup.
* migrate curtain to make dreamchecker happy
* update thurible
* don't call attacked_by separately for legacy attack chain
* remove duplicate proc
* condense similar code, put allowances for legacy code in new procs
* update docs, include diagram source
* add comment on how to update diagram
* fix admonition
* mindflayer updates
* remove commented out code
* clarify all steps
* after_attack should be overridable
* whoops
* retrofit recent changes
* duh, can't restrict this yet because of tool_acts
* i hate ore bags with the fire of a thousand suns
* return correct value for object attack logic
* Various cleanups.
We don't want to attempt to pull stuff out of `/obj/item/attackby`,
because those pieces are part of the related objects' migrations, not
`/obj/item` itself. Attempting to do this causes knockon effects where
things expected to call e.g. `/obj/item/storage/attackby` in the call
chain were not ferried over to the new item interaction code, because
the related objects hadn't actually been migrated over yet.
I've used refactoring /obj/vehicle as the example for migrating
`attackby` methods instead.
* simplify some argument names
* fuck it
* make it do the thing
* Rename CI module call
* Prove that CI works
* improve test output
* aaand fix it again
* fix curtain tool interactions
* fix compile error
* fix compile error
* Better docs, introduce migration plan tool.
2024-12-02 23:36:36 +00:00
a08dd177ba
Baseball resets deflectmode on dropping ( #27229 )
...
* reset deflectmode on item dropped
* louder message that you can't attack
2024-11-14 17:16:33 +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
b38c4bbd4c
A few description grammar fixes ( #27134 )
...
* Double spaces
* more space and misspelling
* Fixing punctuations
* Not now
* double dots
* Apply suggestions from code review
Signed-off-by: Henri215 <77684085+Henri215@users.noreply.github.com >
---------
Signed-off-by: Henri215 <77684085+Henri215@users.noreply.github.com >
2024-11-10 13:38:28 +00:00
777910d6d2
replace magic numbers related to emp and explosion severity with defines ( #26495 )
...
replace even more magic emp and ex numbers
2024-08-18 03:11:22 +00:00
4cf6595d12
Makes all playsounds use bools for vary ( #26183 )
...
* Makes all playsounds use `TRUE` for vary
* Same but for `FALSE`
2024-07-08 23:54:38 +00:00
c7887bffde
Sord missing icon fix ( #24829 )
2024-03-27 05:42:55 +00:00
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
36b202bd26
Standardize on exclaiming about committing suicide. ( #24433 )
...
* Standardize on exclaiming about committing suicide.
* Update code/game/objects/items/weapons/kitchen.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 >
* I think this is the last of the unexciting suicides.
---------
Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com >
2024-03-10 18:18:36 +00:00
3288816b0c
claymore fix ( #24221 )
2024-02-19 14:48:59 +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
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
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
4c976a6e01
Splits up item_inhands.dmi ( #22584 )
...
* AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
* Fixes jackhammer and glass shard
* Fixes toy Chainsaw
* Update code/game/objects/items/toys.dm
Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com >
* Update code/game/objects/items/weapons/weaponry.dm
Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com >
* Update code/modules/antagonists/vampire/vampire_powers/hemomancer_powers.dm
Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com >
* Fixes edagger hopefully
* Henri review
* Oops
* First this gone, and now the pain
* Should all be fixed now
---------
Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com >
2023-10-01 11:47:25 +01:00
702893d02b
Deletes the space worm ( #22251 )
...
* But every brave man wants to be wealthy
* even though it would mean losing thisgreattreasure
2023-09-06 22:19:58 +01:00
327add6348
Converts two-handedness/wielding to a component ( #21619 )
...
* initial checkin
* Add everything but maps
* update paths
* Patches some minor bugs across twohanded things
* remove a stowaway
* Update code/__DEFINES/dcs/signals.dm
Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com >
* Contra review
* Fix kc
* hopefully fix file perms
* Fix file perms
* revert line-endings
* uh?
* Trying once again to fix file formats
* henri review 1
* henri review 2
* update from master
* Removes override that breaks modsuits
* re-add reference
---------
Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com >
2023-09-01 22:06:59 +01:00
a19e2fb130
fix the bat ( #21617 )
...
Add RANDOM_BLOCKER flag so the bat will deflect stuff
2023-07-10 11:10:53 +01:00
173bfb92f5
Removes bio resist from the code ( #21108 )
...
* BIO armor is kill
* some more stuff that uses bio resist
* I did a scuffed merge conflict solve but it works
2023-06-03 09:50:22 +01: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
421777b317
Reworks block chance into Parrying. ( #19334 )
...
* parry component
* converts block chance to parry components
* armour pen, katana fix, pickup fix
* melee parry fix
* removes perfect parries, tweaks armour pen calc
* SIGNAL_HANDLER
* fix
* resist fix
* reduces parry time out time, increases cooldown
* Apply suggestions from code review
Co-authored-by: Farie82 <farie82@users.noreply.github.com >
* fix
* cooldown rebalance
Co-authored-by: Farie82 <farie82@users.noreply.github.com >
2022-11-12 08:49:44 +01:00
7d9213e0c2
Ports TG cursed katana to replace our cursed katana. ( #18757 )
...
* Ports TG cursed katana to replace our cursed katana.
* OH, IT'S JUST A SIMPLE NUMBERS GAME!
* More changes / additions / removals
* unneeded comments
* more things
* Apply suggestions from code review
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com >
* Update code/__HELPERS/lists.dm
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com >
* Update code/modules/mining/lavaland/necropolis_chests.dm
Co-authored-by: Sirryan2002 <80364400+Sirryan2002@users.noreply.github.com >
* should have commited this too
Co-authored-by: Sirryan2002 <80364400+Sirryan2002@users.noreply.github.com >
* Update code/game/gamemodes/wizard/spellbook.dm
Co-authored-by: Charlie <69320440+hal9000PR@users.noreply.github.com >
* removes status, death signal, turf rename, return true
* sprites my hated
* Hal / steel requested changes
* built in
* quest 1/2
* Extra spacing / github instantly resolved status_effects and did not let me change it.
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com >
Co-authored-by: Sirryan2002 <80364400+Sirryan2002@users.noreply.github.com >
Co-authored-by: Charlie <69320440+hal9000PR@users.noreply.github.com >
2022-09-07 13:36:29 +01:00
d805668ccb
Makes the Katana Bulky ( #18338 )
...
* Makes the Katana Bulky
* Makes katana bulky
Co-authored-by: adrermail@gmail.com <adrermail@gmail.com >
2022-07-13 21:18:30 +01:00
6a91840962
Code Readability - Weapons ( #18171 )
...
* weapons
* weapons
* prefer explicit time
Co-authored-by: Charlie <69320440+hal9000PR@users.noreply.github.com >
* Don't have code on same line as control statement
Co-authored-by: Charlie <69320440+hal9000PR@users.noreply.github.com >
2022-07-10 13:59:33 +01:00
0766c6d236
Fixed thrownby hard del ( #17686 )
2022-05-16 22:48:42 +09:00
1c3c2c22ad
Name Capitalisation Tweaks (Weapons) ( #16906 )
...
* Weapon names
* Assault rile
* More #coding_chat tweaks
Realistically changing the typepath here is out of the scope of this PR, but it's such a small change and I'm editing the item already so... probably not worth making an entire separate PR for.
* Missed these
2021-11-04 19:47:31 +01:00
559fa37756
add defines for damage flags
2021-08-20 21:09:21 +02:00
97996dd4de
Just a singular letter letter addition ( #16556 )
2021-08-16 22:39:45 +01:00
0b375de42c
Removes the the vast majority of 'The the' from the the code ( #15597 )
...
* The the
* Some more
* Review 1
* A couple more
2021-06-20 10:20:32 -04:00
4a944658ad
[TGUI] Upgrades Bots ( #14871 )
...
* secbots, ED209s, cleanbots
* Apply suggestions from AA code review
Co-authored-by: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com >
* fluid buttons, Restore Safties
* pai rebuild
* deletes all spacing from data list
* katana needs_permit
* lava/storm/boneaxe needs_permit
* check s_store
Co-authored-by: Kyep <Kyep@users.noreply.github.com >
Co-authored-by: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com >
2020-11-27 09:56:02 +00:00
7b78232276
Reworks Baseball Bat ( #14186 )
...
* Adjusts baseball bat
Co-authored-by: Kyep <Kyep@users.noreply.github.com >
2020-09-16 10:16:21 -04:00
b9e44c869e
Baton knockdown animation, refactor & doc
2020-08-03 22:38:16 +02:00
210f8badf4
Makes all global variables handled by the GLOB controller ( #13152 )
...
* Handlers converted, now to fix 3532 compile errors
* 3532 compile fixes later, got runtimes on startup
* Well the server loads now atleast
* Take 2
* Oops
2020-03-20 21:56:37 -06:00
04ba5c1cc9
File standardisation ( #13131 )
...
* Adds the check components
* Adds in trailing newlines
* Converts all CRLF to LF
* Post merge EOF
* Post merge line endings
* Final commit
2020-03-17 18:08:51 -04:00
20c4cf0a08
for-if-I-stand-I-stand-by-his-will-alone
2019-10-03 19:52:03 -04:00
af92373d33
though-this-world-may-be-broken
2019-09-15 05:53:43 -04:00
1bfb442d40
Merge remote-tracking branch 'upstream/master' into universal-damage
2019-09-14 21:15:31 -04:00
PollardTheDragon