cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-22 11:37:40 +01:00
Code Issues Packages Projects Releases Wiki Activity

Minor Flag Refactor

Browse Source
This commit is contained in:
Fox-McCloud
2016-07-03 23:43:12 -04:00
parent c0350a654f
commit b57391aba6
23 changed files with 124 additions and 120 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/mob/living/carbon/human/inventory.dm
+1 -1
View File
@@ -423,7 +423,7 @@
if(istype(I, /obj/item/clothing/under) || istype(I, /obj/item/clothing/suit))
if(FAT in mutations)
//testing("[M] TOO FAT TO WEAR [src]!")
if(!(I.flags & ONESIZEFITSALL))
if(!(I.flags_size & ONESIZEFITSALL))
if(!disable_warning)
to_chat(src, "<span class='alert'>You're too fat to wear the [I].</span>")
return 0
code/modules/mob/living/carbon/human/species/golem.dm
+2 -1
View File
@@ -75,7 +75,8 @@
item_state = "golem"
body_parts_covered = HEAD|UPPER_TORSO|LOWER_TORSO|LEGS|FEET|ARMS|HANDS
flags_inv = HIDEGLOVES|HIDESHOES
flags = ONESIZEFITSALL | ABSTRACT | NODROP | THICKMATERIAL
flags = ABSTRACT | NODROP | THICKMATERIAL
flags_size = ONESIZEFITSALL
armor = list(melee = 55, bullet = 0, laser = 0, energy = 0, bomb = 0, bio = 0, rad = 0)
/obj/item/clothing/shoes/golem
code/modules/mob/living/carbon/human/update_icons.dm
+2 -2
View File
@@ -600,7 +600,7 @@ var/global/list/damage_icon_parts = list()
var/image/standing = image("icon_state" = "[t_color]_s")
if(FAT in mutations)
if(w_uniform.flags&ONESIZEFITSALL)
if(w_uniform.flags_size & ONESIZEFITSALL)
standing.icon = 'icons/mob/uniform_fat.dmi'
else
to_chat(src, "\red You burst out of \the [w_uniform]!")
@@ -907,7 +907,7 @@ var/global/list/damage_icon_parts = list()
else if(wear_suit.sprite_sheets && wear_suit.sprite_sheets[species.name])
standing = image("icon" = wear_suit.sprite_sheets[species.name], "icon_state" = "[wear_suit.icon_state]")
else if(FAT in mutations)
if(wear_suit.flags&ONESIZEFITSALL)
if(wear_suit.flags_size & ONESIZEFITSALL)
standing = image("icon" = 'icons/mob/suit_fat.dmi', "icon_state" = "[wear_suit.icon_state]")
else
to_chat(src, "\red You burst out of \the [wear_suit]!")
code/modules/mob/mob.dm
+1 -1
View File
@@ -402,7 +402,7 @@ var/list/slot_equipment_priority = list( \
if(slot_w_uniform)
if( !(slot_flags & SLOT_ICLOTHING) )
return 0
if((FAT in H.mutations) && !(flags & ONESIZEFITSALL))
if((FAT in H.mutations) && !(flags_size & ONESIZEFITSALL))
return 0
if(H.w_uniform)
if(!(H.w_uniform.flags & NODROP))