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

Merge pull request #6550 from Citadel-Station-13/upstream-merge-37476

Browse Source 
[MIRROR] Uppercases slot defines.
This commit is contained in:
LetterJay
2018-05-21 11:23:02 -05:00
committed by GitHub
parent 6060df5b92 d9cc361b81
commit 6489ef5511
228 changed files with 1641 additions and 1642 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/research/xenobiology/crossbreeding/burning.dm
+1 -1
View File
@@ -386,7 +386,7 @@ Burning extracts:
item_state = "adamshield"
w_class = WEIGHT_CLASS_HUGE
armor = list("melee" = 50, "bullet" = 50, "laser" = 50, "energy" = 0, "bomb" = 30, "bio" = 0, "rad" = 0, "fire" = 80, "acid" = 70)
slot_flags = SLOT_BACK
slot_flags = ITEM_SLOT_BACK
block_chance = 75
throw_range = 1 //How far do you think you're gonna throw a solid crystalline shield...?
throw_speed = 2
code/modules/research/xenobiology/crossbreeding/regenerative.dm
+8 -8
View File
@@ -89,10 +89,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), 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)
if(equipped > 0)
target.visible_message("<span class='notice'>The milky goo congeals into clothing!</span>")
@@ -104,13 +104,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(SLOT_WEAR_SUIT))
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(SLOT_WEAR_SUIT)
fireproof(C)
if(H.get_item_by_slot(slot_head))
if(H.get_item_by_slot(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(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>")