cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-21 19:17:50 +01:00
Code Issues Packages Projects Releases Wiki Activity

Migrates /obj/item/clothing to the New Attack Chain (#31421)

Browse Source 
* the beginning of my torment

* This was a very small piece of torment

* God agghhghhhh the suffering

* pain and suffering and destruction

* Update bot_construction.dm

* Update heretic_necks.dm

* Update heretic_armor.dm

* Apply suggestions from code review

Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
Signed-off-by: CRUNCH <143041327+CRUNCH-Borg@users.noreply.github.com>

* Apply suggestion from @DGamerL

Signed-off-by: DGamerL <108773801+DGamerL@users.noreply.github.com>

---------

Signed-off-by: CRUNCH <143041327+CRUNCH-Borg@users.noreply.github.com>
Signed-off-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
This commit is contained in:
CRUNCH
2026-02-09 19:36:38 +00:00
committed by GitHub
co-authored by DGamerL
parent 2a7c121485
commit bec388228b
42 changed files with 672 additions and 419 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/items/cigs.dm
-2
View File
@@ -27,7 +27,6 @@ LIGHTERS ARE IN LIGHTERS.DM
body_parts_covered = null
attack_verb = null
container_type = INJECTABLE
new_attack_chain = TRUE
/// Is the cigarette lit?
var/lit = FALSE
/// Do we require special items to be lit?
@@ -642,7 +641,6 @@ LIGHTERS ARE IN LIGHTERS.DM
icon_state = "holo_cigar"
lefthand_file = 'icons/mob/inhands/smoking_lefthand.dmi'
righthand_file = 'icons/mob/inhands/smoking_righthand.dmi'
new_attack_chain = TRUE
sprite_sheets = list(
"Vox" = 'icons/mob/clothing/species/vox/mask.dmi',
"Unathi" = 'icons/mob/clothing/species/unathi/mask.dmi',
code/game/objects/items/devices/whistle.dm
+6 -2
View File
@@ -50,9 +50,13 @@
"Grey" = 'icons/mob/clothing/species/grey/mask.dmi'
)
/obj/item/clothing/mask/whistle/attack_self__legacy__attackchain(mob/user)
/obj/item/clothing/mask/whistle/activate_self(mob/user)
if(..())
return ITEM_INTERACT_COMPLETE
if(!COOLDOWN_FINISHED(src, whistle_cooldown))
return
return ITEM_INTERACT_COMPLETE
playsound(src, pick('sound/items/whistle1.ogg', 'sound/items/whistle2.ogg', 'sound/items/whistle3.ogg'), 25)
COOLDOWN_START(src, whistle_cooldown, 4 SECONDS)
return ITEM_INTERACT_COMPLETE
code/game/objects/items/weapons/twohanded.dm
+18 -12
View File
@@ -731,20 +731,26 @@
do_sparks(rand(1,6), 1, loc)
next_spark_time = world.time + 0.8 SECONDS
/obj/item/clothing/gloves/color/black/pyro_claws/attackby__legacy__attackchain(obj/item/I, mob/user, params)
if(istype(I, /obj/item/assembly/signaler/anomaly/pyro))
if(core)
to_chat(user, SPAN_NOTICE("[src] already has a [I]!"))
return
if(!user.drop_item())
to_chat(user, SPAN_WARNING("[I] is stuck to your hand!"))
return
to_chat(user, SPAN_NOTICE("You insert [I] into [src], and [src] starts to warm up."))
I.forceMove(src)
core = I
else
/obj/item/clothing/gloves/color/black/pyro_claws/wirecutter_act(mob/living/user, obj/item/I)
return
/obj/item/clothing/gloves/color/black/pyro_claws/item_interaction(mob/living/user, obj/item/used, list/modifiers)
if(!istype(used, /obj/item/assembly/signaler/anomaly/pyro))
return ..()
if(core)
to_chat(user, SPAN_NOTICE("[src] already has a [used]!"))
return ITEM_INTERACT_COMPLETE
if(!user.drop_item())
to_chat(user, SPAN_WARNING("[used] is stuck to your hand!"))
return ITEM_INTERACT_COMPLETE
to_chat(user, SPAN_NOTICE("You insert [used] into [src], and [src] starts to warm up."))
used.forceMove(src)
core = used
return ITEM_INTERACT_COMPLETE
/obj/item/clothing/gloves/color/black/pyro_claws/proc/reboot()
on_cooldown = FALSE
set_nodrop(FALSE, loc)