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

Merge branch 'master' into upstream-merge-37486

Browse Source
This commit is contained in:
LetterJay
2018-05-21 11:59:57 -05:00
committed by GitHub
parent 931a950adb 6489ef5511
commit 359d31238d
228 changed files with 1640 additions and 1643 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/mob/living/carbon/monkey/inventory.dm
+9 -12
View File
@@ -1,34 +1,31 @@
/mob/living/carbon/monkey/can_equip(obj/item/I, slot, disable_warning = 0)
switch(slot)
if(slot_hands)
if(SLOT_HANDS)
if(get_empty_held_indexes())
return TRUE
return FALSE
if(slot_wear_mask)
if(SLOT_WEAR_MASK)
if(wear_mask)
return FALSE
if( !(I.slot_flags & SLOT_MASK) )
if( !(I.slot_flags & ITEM_SLOT_MASK) )
return FALSE
return TRUE
if(slot_neck)
if(SLOT_NECK)
if(wear_neck)
return FALSE
if( !(I.slot_flags & SLOT_NECK) )
if( !(I.slot_flags & ITEM_SLOT_NECK) )
return FALSE
return TRUE
if(slot_head)
if(SLOT_HEAD)
if(head)
return FALSE
if( !(I.slot_flags & SLOT_HEAD) )
if( !(I.slot_flags & ITEM_SLOT_HEAD) )
return FALSE
return TRUE
if(slot_back)
if(SLOT_BACK)
if(back)
return FALSE
if( !(I.slot_flags & SLOT_BACK) )
if( !(I.slot_flags & ITEM_SLOT_BACK) )
return FALSE
return TRUE
return FALSE //Unsupported slot
code/modules/mob/living/carbon/monkey/monkey.dm
+1 -1
View File
@@ -168,5 +168,5 @@
. = ..()
if(prob(10))
var/obj/item/clothing/head/helmet/justice/escape/helmet = new(src)
equip_to_slot_or_del(helmet,slot_head)
equip_to_slot_or_del(helmet,SLOT_HEAD)
helmet.attack_self(src) // todo encapsulate toggle
code/modules/mob/living/carbon/monkey/punpun.dm
+2 -2
View File
@@ -27,9 +27,9 @@
//bodyparts are actually created before we try to equip things to
//those slots
if(relic_hat)
equip_to_slot_or_del(new relic_hat, slot_head)
equip_to_slot_or_del(new relic_hat, SLOT_HEAD)
if(relic_mask)
equip_to_slot_or_del(new relic_mask, slot_wear_mask)
equip_to_slot_or_del(new relic_mask, SLOT_WEAR_MASK)
/mob/living/carbon/monkey/punpun/Life()
if(!stat && SSticker.current_state == GAME_STATE_FINISHED && !memory_saved)