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

Merge pull request #15528 from SandPoot/time-to-kill-this-broken-system

Browse Source 
[PORT] Removes the non bitflag slot defines
This commit is contained in:
silicons
2022-02-26 18:08:28 -07:00
committed by GitHub
parent 6da623250f f7ea1f377d
commit bf9afd846d
194 changed files with 763 additions and 799 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/research/xenobiology/crossbreeding/_clothing.dm
+3 -3
View File
@@ -19,7 +19,7 @@ Slimecrossing Armor
/obj/item/clothing/mask/nobreath/equipped(mob/living/carbon/human/user, slot)
. = ..()
if(slot == SLOT_WEAR_MASK)
if(slot == ITEM_SLOT_MASK)
ADD_TRAIT(user, TRAIT_NOBREATH, "breathmask_[REF(src)]")
user.failed_last_breath = FALSE
user.clear_alert("not_enough_oxy")
@@ -39,7 +39,7 @@ Slimecrossing Armor
var/glasses_color = "#FFFFFF"
/obj/item/clothing/glasses/prism_glasses/item_action_slot_check(slot)
if(slot == SLOT_GLASSES)
if(slot == ITEM_SLOT_EYES)
return TRUE
/obj/structure/light_prism
@@ -111,7 +111,7 @@ Slimecrossing Armor
/obj/item/clothing/head/peaceflower/equipped(mob/living/carbon/human/user, slot)
. = ..()
if(slot == SLOT_HEAD)
if(slot == ITEM_SLOT_HEAD)
ADD_TRAIT(user, TRAIT_PACIFISM, "peaceflower_[REF(src)]")
/obj/item/clothing/head/peaceflower/dropped(mob/living/carbon/human/user)
code/modules/research/xenobiology/crossbreeding/regenerative.dm
+8 -8
View File
@@ -127,10 +127,10 @@ Regenerative extracts:
/obj/item/slimecross/regenerative/darkpurple/core_effect(mob/living/target, mob/user)
var/equipped = 0
equipped += target.equip_to_slot_or_del(new /obj/item/clothing/shoes/sneakers/purple(null), SLOT_SHOES)
equipped += target.equip_to_slot_or_del(new /obj/item/clothing/under/color/lightpurple(null), SLOT_W_UNIFORM)
equipped += target.equip_to_slot_or_del(new /obj/item/clothing/gloves/color/purple(null), SLOT_GLOVES)
equipped += target.equip_to_slot_or_del(new /obj/item/clothing/head/soft/purple(null), SLOT_HEAD)
equipped += target.equip_to_slot_or_del(new /obj/item/clothing/shoes/sneakers/purple(null), ITEM_SLOT_FEET)
equipped += target.equip_to_slot_or_del(new /obj/item/clothing/under/color/lightpurple(null), ITEM_SLOT_ICLOTHING)
equipped += target.equip_to_slot_or_del(new /obj/item/clothing/gloves/color/purple(null), ITEM_SLOT_GLOVES)
equipped += target.equip_to_slot_or_del(new /obj/item/clothing/head/soft/purple(null), ITEM_SLOT_HEAD)
if(equipped > 0)
target.visible_message("<span class='notice'>The milky goo congeals into clothing!</span>")
@@ -142,13 +142,13 @@ Regenerative extracts:
return
var/mob/living/carbon/human/H = target
var/fireproofed = FALSE
if(H.get_item_by_slot(SLOT_WEAR_SUIT))
if(H.get_item_by_slot(ITEM_SLOT_OCLOTHING))
fireproofed = TRUE
var/obj/item/clothing/C = H.get_item_by_slot(SLOT_WEAR_SUIT)
var/obj/item/clothing/C = H.get_item_by_slot(ITEM_SLOT_OCLOTHING)
fireproof(C)
if(H.get_item_by_slot(SLOT_HEAD))
if(H.get_item_by_slot(ITEM_SLOT_HEAD))
fireproofed = TRUE
var/obj/item/clothing/C = H.get_item_by_slot(SLOT_HEAD)
var/obj/item/clothing/C = H.get_item_by_slot(ITEM_SLOT_HEAD)
fireproof(C)
if(fireproofed)
target.visible_message("<span class='notice'>Some of [target]'s clothing gets coated in the goo, and turns blue!</span>")