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/modules/customitems/item_defines.dm
+16 -11
View File
@@ -708,7 +708,7 @@
var/state = "Soldier Up"
icon_monitor = null
/obj/item/clothing/head/helmet/fluff/merchant_sallet/attack_self__legacy__attackchain(mob/user)
/obj/item/clothing/head/helmet/fluff/merchant_sallet/activate_self(mob/user)
if(!user.incapacitated() && (world.time > cooldown + toggle_cooldown) && Adjacent(user))
var/list/options = list()
options["Soldier Up"] = list(
@@ -741,7 +741,9 @@
to_chat(user, "You adjust the helmet.")
playsound(src.loc, "[toggle_sound]", 100, FALSE, 4)
user.update_inv_head()
return 1
return ITEM_INTERACT_COMPLETE
return ..()
/// V-Force_Bomber: E.L.O.
/obj/item/clothing/head/fluff/elo
@@ -778,7 +780,10 @@
actions_types = list(/datum/action/item_action/openclose)
adjust_flavour = "unbutton"
/obj/item/clothing/suit/jacket/miljacket/patch/attack_self__legacy__attackchain(mob/user)
/obj/item/clothing/suit/jacket/miljacket/patch/activate_self(mob/user)
if(..())
return ITEM_INTERACT_COMPLETE
var/list/options = list()
options["purple"] = "shazjacket_purple"
options["purple light"] = "shazjacket_purple_light"
@@ -811,9 +816,7 @@
to_chat(user, "You turn your coat inside out and now it's [choice]!")
name = "custom [choice] military jacket"
user.update_inv_wear_suit()
return 1
. = ..()
return ITEM_INTERACT_COMPLETE
/// ComputerlessCitizen: Screech
/obj/item/clothing/suit/fluff/dusty_jacket
@@ -1428,7 +1431,10 @@
icon_monitor = null
icon_state = "classic_witch"
/obj/item/clothing/head/wizard/fake/fluff/dreamy/attack_self__legacy__attackchain(mob/user)
/obj/item/clothing/head/wizard/fake/fluff/dreamy/activate_self(mob/user)
if(..())
return ITEM_INTERACT_COMPLETE
var/list/options = list()
options["Classic"] = "classic_witch"
options["Good"] = "good_witch"
@@ -1448,8 +1454,7 @@
if(choice && !user.stat && in_range(user, src))
icon_state = options[choice]
to_chat(user, "Your strange witch hat has now shapeshifted into it's [choice] form!")
return 1
..()
return ITEM_INTERACT_COMPLETE
/// phantasmicdream : Zeke Varloss
/obj/item/fluff/zekemirror
@@ -1668,8 +1673,8 @@
/obj/item/clothing/gloves/ring/fluff/update_icon_state()
return
/obj/item/clothing/gloves/ring/fluff/attackby__legacy__attackchain(obj/item/I as obj, mob/user as mob, params)
return
/obj/item/clothing/gloves/ring/fluff/item_interaction(mob/living/user, obj/item/used, list/modifiers)
return NONE
/// Benjaminfallout: Pretzel Brassheart
/obj/item/clothing/gloves/ring/fluff/benjaminfallout