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/mob/living/carbon/monkey/inventory.dm
+5 -5
View File
@@ -5,29 +5,29 @@
return FALSE
switch(slot)
if(SLOT_HANDS)
if(ITEM_SLOT_HANDS)
if(get_empty_held_indexes())
return TRUE
return FALSE
if(SLOT_WEAR_MASK)
if(ITEM_SLOT_MASK)
if(wear_mask)
return FALSE
if( !(I.slot_flags & ITEM_SLOT_MASK) )
return FALSE
return TRUE
if(SLOT_NECK)
if(ITEM_SLOT_NECK)
if(wear_neck)
return FALSE
if( !(I.slot_flags & ITEM_SLOT_NECK) )
return FALSE
return TRUE
if(SLOT_HEAD)
if(ITEM_SLOT_HEAD)
if(head)
return FALSE
if( !(I.slot_flags & ITEM_SLOT_HEAD) )
return FALSE
return TRUE
if(SLOT_BACK)
if(ITEM_SLOT_BACK)
if(back)
return FALSE
if( !(I.slot_flags & ITEM_SLOT_BACK) )
code/modules/mob/living/carbon/monkey/monkey.dm
+1 -1
View File
@@ -184,5 +184,5 @@ GLOBAL_LIST_INIT(strippable_monkey_items, create_strippable_list(list(
. = ..()
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,ITEM_SLOT_HEAD)
INVOKE_ASYNC(helmet, /obj/item.proc/attack_self, src) // todo encapsulate toggle
code/modules/mob/living/carbon/monkey/punpun.dm
+2 -2
View File
@@ -29,9 +29,9 @@
if(ancestor_chain > 1)
generate_fake_scars(rand(ancestor_chain, ancestor_chain * 4))
if(relic_hat)
equip_to_slot_or_del(new relic_hat, SLOT_HEAD)
equip_to_slot_or_del(new relic_hat, ITEM_SLOT_HEAD)
if(relic_mask)
equip_to_slot_or_del(new relic_mask, SLOT_WEAR_MASK)
equip_to_slot_or_del(new relic_mask, ITEM_SLOT_MASK)
/mob/living/carbon/monkey/punpun/BiologicalLife(seconds, times_fired)
if(!(. = ..()))