shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Upload files

Browse Source
This commit is contained in:
SandPoot
2022-02-25 16:58:09 -03:00
parent 87d30e1a4f
commit 5029af901b
206 changed files with 782 additions and 818 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/clothing/suits/miscellaneous.dm
+3 -3
View File
@@ -206,7 +206,7 @@
/obj/item/clothing/suit/cardborg/equipped(mob/living/user, slot)
..()
if(slot == SLOT_WEAR_SUIT)
if(slot == ITEM_SLOT_OCLOTHING)
disguise(user)
/obj/item/clothing/suit/cardborg/dropped(mob/living/user)
@@ -1012,7 +1012,7 @@
/obj/item/clothing/suit/hooded/wintercoat/ratvar/equipped(mob/living/user,slot)
..()
if (slot != SLOT_WEAR_SUIT || !real)
if (slot != ITEM_SLOT_OCLOTHING || !real)
return
if (is_servant_of_ratvar(user))
return
@@ -1034,7 +1034,7 @@
/obj/item/clothing/suit/hooded/wintercoat/narsie/equipped(mob/living/user,slot)
..()
if (slot != SLOT_WEAR_SUIT || !real)
if (slot != ITEM_SLOT_OCLOTHING || !real)
return
if (iscultist(user))
return
code/modules/clothing/suits/reactive_armour.dm
+2 -2
View File
@@ -51,7 +51,7 @@
icon_state = "reactiveoff"
item_state = "reactiveoff"
add_fingerprint(user)
if(user.get_item_by_slot(SLOT_WEAR_SUIT) == src)
if(user.get_item_by_slot(ITEM_SLOT_OCLOTHING) == src)
user.update_inv_wear_suit()
/obj/item/clothing/suit/armor/reactive/emp_act(severity)
@@ -177,7 +177,7 @@
/obj/item/clothing/suit/armor/reactive/tesla/equipped(mob/user, slot)
..()
if(slot_flags & slotdefine2slotbit(slot)) //Was equipped to a valid slot for this item?
if(slot_flags & slot) //Was equipped to a valid slot for this item?
ADD_TRAIT(user, TRAIT_TESLA_SHOCKIMMUNE, "reactive_tesla_armor")
/obj/item/clothing/suit/armor/reactive/tesla/block_action(mob/living/owner, atom/object, damage, attack_text, attack_type, armour_penetration, mob/attacker, def_zone, final_block_chance, list/block_return)
code/modules/clothing/suits/toggles.dm
+6 -6
View File
@@ -31,11 +31,11 @@
ToggleHood()
/obj/item/clothing/suit/hooded/item_action_slot_check(slot, mob/user, datum/action/A)
if(slot == SLOT_WEAR_SUIT || slot == SLOT_NECK)
if(slot == ITEM_SLOT_OCLOTHING || slot == ITEM_SLOT_NECK)
return 1
/obj/item/clothing/suit/hooded/equipped(mob/user, slot)
if(slot != SLOT_WEAR_SUIT && slot != SLOT_NECK)
if(slot != ITEM_SLOT_OCLOTHING && slot != ITEM_SLOT_NECK)
RemoveHood()
..()
@@ -80,7 +80,7 @@
if(H.head)
to_chat(H, "<span class='warning'>You're already wearing something on your head!</span>")
return
else if(H.equip_to_slot_if_possible(hood,SLOT_HEAD,0,0,1))
else if(H.equip_to_slot_if_possible(hood,ITEM_SLOT_HEAD,0,0,1))
suittoggled = TRUE
update_icon()
H.update_inv_wear_suit()
@@ -102,7 +102,7 @@
/obj/item/clothing/head/hooded/equipped(mob/user, slot)
..()
if(slot != SLOT_HEAD)
if(slot != ITEM_SLOT_HEAD)
if(suit)
suit.RemoveHood()
else
@@ -177,7 +177,7 @@
/obj/item/clothing/suit/space/hardsuit/equipped(mob/user, slot)
if(!helmettype)
return
if(slot != SLOT_WEAR_SUIT)
if(slot != ITEM_SLOT_OCLOTHING)
RemoveHelmet()
..()
@@ -222,7 +222,7 @@
if(message)
to_chat(H, "<span class='warning'>You're already wearing something on your head!</span>")
return
else if(H.equip_to_slot_if_possible(helmet,SLOT_HEAD,0,0,1))
else if(H.equip_to_slot_if_possible(helmet,ITEM_SLOT_HEAD,0,0,1))
if(message)
to_chat(H, "<span class='notice'>You engage the helmet on the hardsuit.</span>")
suittoggled = TRUE
code/modules/clothing/suits/wiz_robe.dm
+1 -1
View File
@@ -167,7 +167,7 @@
actions_types = list(/datum/action/item_action/stickmen)
/obj/item/clothing/suit/wizrobe/paper/item_action_slot_check(slot, mob/user, datum/action/A)
if(A.type == /datum/action/item_action/stickmen && slot != SLOT_WEAR_SUIT)
if(A.type == /datum/action/item_action/stickmen && slot != ITEM_SLOT_OCLOTHING)
return FALSE
return ..()