mirror of
https://github.com/CHOMPStation2/CHOMPStation2.git
synced 2025-12-17 13:43:21 +00:00
Minor optimizations of update_clothing, removal of the ONESIZEFITSALL flag
This commit is contained in:
@@ -23,7 +23,7 @@
|
|||||||
desc = "A set of armored robes worn by the followers of Nar-Sie"
|
desc = "A set of armored robes worn by the followers of Nar-Sie"
|
||||||
icon_state = "cultrobes"
|
icon_state = "cultrobes"
|
||||||
item_state = "cultrobes"
|
item_state = "cultrobes"
|
||||||
flags = FPRINT | TABLEPASS | ONESIZEFITSALL
|
flags = FPRINT | TABLEPASS
|
||||||
body_parts_covered = UPPER_TORSO|LOWER_TORSO|LEGS|ARMS
|
body_parts_covered = UPPER_TORSO|LOWER_TORSO|LEGS|ARMS
|
||||||
allowed = list(/obj/item/weapon/tome,/obj/item/weapon/melee/cultblade)
|
allowed = list(/obj/item/weapon/tome,/obj/item/weapon/melee/cultblade)
|
||||||
armor = list(melee = 50, bullet = 30, laser = 50,energy = 20, bomb = 25, bio = 10, rad = 0)
|
armor = list(melee = 50, bullet = 30, laser = 50,energy = 20, bomb = 25, bio = 10, rad = 0)
|
||||||
@@ -43,7 +43,7 @@
|
|||||||
desc = "A set of armored robes worn by the followers of Nar-Sie"
|
desc = "A set of armored robes worn by the followers of Nar-Sie"
|
||||||
icon_state = "magusred"
|
icon_state = "magusred"
|
||||||
item_state = "magusred"
|
item_state = "magusred"
|
||||||
flags = FPRINT | TABLEPASS | ONESIZEFITSALL
|
flags = FPRINT | TABLEPASS
|
||||||
body_parts_covered = UPPER_TORSO|LOWER_TORSO|LEGS|ARMS
|
body_parts_covered = UPPER_TORSO|LOWER_TORSO|LEGS|ARMS
|
||||||
allowed = list(/obj/item/weapon/tome,/obj/item/weapon/melee/cultblade)
|
allowed = list(/obj/item/weapon/tome,/obj/item/weapon/melee/cultblade)
|
||||||
armor = list(melee = 50, bullet = 30, laser = 50,energy = 20, bomb = 25, bio = 10, rad = 0)
|
armor = list(melee = 50, bullet = 30, laser = 50,energy = 20, bomb = 25, bio = 10, rad = 0)
|
||||||
|
|||||||
@@ -7,7 +7,7 @@
|
|||||||
protective_temperature = T0C + 50
|
protective_temperature = T0C + 50
|
||||||
heat_transfer_coefficient = 0.30
|
heat_transfer_coefficient = 0.30
|
||||||
permeability_coefficient = 0.90
|
permeability_coefficient = 0.90
|
||||||
flags = FPRINT | TABLEPASS | ONESIZEFITSALL
|
flags = FPRINT | TABLEPASS
|
||||||
var/has_sensor = 1//For the crew computer 2 = unable to change mode
|
var/has_sensor = 1//For the crew computer 2 = unable to change mode
|
||||||
var/sensor_mode = 0
|
var/sensor_mode = 0
|
||||||
/*
|
/*
|
||||||
|
|||||||
@@ -27,7 +27,7 @@
|
|||||||
icon_state = "santa"
|
icon_state = "santa"
|
||||||
item_state = "santa"
|
item_state = "santa"
|
||||||
slowdown = 0
|
slowdown = 0
|
||||||
flags = FPRINT | TABLEPASS | ONESIZEFITSALL | SUITSPACE
|
flags = FPRINT | TABLEPASS | SUITSPACE
|
||||||
allowed = list(/obj/item) //for stuffing exta special presents
|
allowed = list(/obj/item) //for stuffing exta special presents
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@@ -2,6 +2,6 @@
|
|||||||
icon = 'suits.dmi'
|
icon = 'suits.dmi'
|
||||||
name = "suit"
|
name = "suit"
|
||||||
var/fire_resist = T0C+100
|
var/fire_resist = T0C+100
|
||||||
flags = FPRINT | TABLEPASS | ONESIZEFITSALL
|
flags = FPRINT | TABLEPASS
|
||||||
var/list/allowed = list(/obj/item/weapon/tank/emergency_oxygen)
|
var/list/allowed = list(/obj/item/weapon/tank/emergency_oxygen)
|
||||||
armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 0, rad = 0)
|
armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 0, rad = 0)
|
||||||
|
|||||||
@@ -10,7 +10,7 @@
|
|||||||
desc = "An armored vest that protects against some damage."
|
desc = "An armored vest that protects against some damage."
|
||||||
icon_state = "armor"
|
icon_state = "armor"
|
||||||
item_state = "armor"
|
item_state = "armor"
|
||||||
flags = FPRINT | TABLEPASS | ONESIZEFITSALL
|
flags = FPRINT | TABLEPASS
|
||||||
armor = list(melee = 50, bullet = 15, laser = 50, energy = 10, bomb = 25, bio = 0, rad = 0)
|
armor = list(melee = 50, bullet = 15, laser = 50, energy = 10, bomb = 25, bio = 0, rad = 0)
|
||||||
|
|
||||||
/obj/item/clothing/suit/armor/vest/warden
|
/obj/item/clothing/suit/armor/vest/warden
|
||||||
@@ -51,7 +51,7 @@
|
|||||||
icon_state = "gearharness"
|
icon_state = "gearharness"
|
||||||
item_state = "gearharness"
|
item_state = "gearharness"
|
||||||
body_parts_covered = UPPER_TORSO|LOWER_TORSO
|
body_parts_covered = UPPER_TORSO|LOWER_TORSO
|
||||||
flags = FPRINT | TABLEPASS | ONESIZEFITSALL
|
flags = FPRINT | TABLEPASS
|
||||||
allowed = list(/obj/item/weapon/gun/energy,/obj/item/weapon/pepperspray,/obj/item/weapon/gun/projectile,/obj/item/ammo_magazine,/obj/item/ammo_casing,/obj/item/weapon/melee/baton,/obj/item/weapon/handcuffs,/obj/item/taperoll/police)
|
allowed = list(/obj/item/weapon/gun/energy,/obj/item/weapon/pepperspray,/obj/item/weapon/gun/projectile,/obj/item/ammo_magazine,/obj/item/ammo_casing,/obj/item/weapon/melee/baton,/obj/item/weapon/handcuffs,/obj/item/taperoll/police)
|
||||||
flags_inv = 0
|
flags_inv = 0
|
||||||
|
|
||||||
@@ -62,7 +62,7 @@
|
|||||||
icon_state = "reactiveoff"
|
icon_state = "reactiveoff"
|
||||||
item_state = "reactiveoff"
|
item_state = "reactiveoff"
|
||||||
slowdown = 1
|
slowdown = 1
|
||||||
flags = FPRINT | TABLEPASS | ONESIZEFITSALL
|
flags = FPRINT | TABLEPASS
|
||||||
armor = list(melee = 0, bullet = 0, laser = 0, energy = 0, bomb = 0, bio = 0, rad = 0)
|
armor = list(melee = 0, bullet = 0, laser = 0, energy = 0, bomb = 0, bio = 0, rad = 0)
|
||||||
|
|
||||||
/obj/item/clothing/suit/storage/armourrigvest
|
/obj/item/clothing/suit/storage/armourrigvest
|
||||||
@@ -71,7 +71,7 @@
|
|||||||
icon_state = "armourrigvest"
|
icon_state = "armourrigvest"
|
||||||
item_state = "armourrigvest"
|
item_state = "armourrigvest"
|
||||||
body_parts_covered = UPPER_TORSO|LOWER_TORSO
|
body_parts_covered = UPPER_TORSO|LOWER_TORSO
|
||||||
flags = FPRINT | TABLEPASS | ONESIZEFITSALL
|
flags = FPRINT | TABLEPASS
|
||||||
allowed = list(/obj/item/weapon/gun/energy,/obj/item/weapon/pepperspray,/obj/item/weapon/gun/projectile,/obj/item/ammo_magazine,/obj/item/ammo_casing,/obj/item/weapon/melee/baton,/obj/item/weapon/handcuffs,/obj/item/taperoll/police)
|
allowed = list(/obj/item/weapon/gun/energy,/obj/item/weapon/pepperspray,/obj/item/weapon/gun/projectile,/obj/item/ammo_magazine,/obj/item/ammo_casing,/obj/item/weapon/melee/baton,/obj/item/weapon/handcuffs,/obj/item/taperoll/police)
|
||||||
armor = list(melee = 50, bullet = 15, laser = 50, energy = 10, bomb = 25, bio = 0, rad = 0)
|
armor = list(melee = 50, bullet = 15, laser = 50, energy = 10, bomb = 25, bio = 0, rad = 0)
|
||||||
|
|
||||||
|
|||||||
@@ -21,7 +21,7 @@
|
|||||||
desc = "An armored vest with a detective's badge on it."
|
desc = "An armored vest with a detective's badge on it."
|
||||||
icon_state = "detective-armor"
|
icon_state = "detective-armor"
|
||||||
item_state = "armor"
|
item_state = "armor"
|
||||||
flags = FPRINT | TABLEPASS | ONESIZEFITSALL
|
flags = FPRINT | TABLEPASS
|
||||||
body_parts_covered = UPPER_TORSO|LOWER_TORSO
|
body_parts_covered = UPPER_TORSO|LOWER_TORSO
|
||||||
allowed = list(/obj/item/weapon/gun/energy,/obj/item/weapon/gun/projectile,/obj/item/ammo_magazine,/obj/item/ammo_casing,/obj/item/weapon/melee/baton,/obj/item/weapon/handcuffs,/obj/item/taperoll/police)
|
allowed = list(/obj/item/weapon/gun/energy,/obj/item/weapon/gun/projectile,/obj/item/ammo_magazine,/obj/item/ammo_casing,/obj/item/weapon/melee/baton,/obj/item/weapon/handcuffs,/obj/item/taperoll/police)
|
||||||
armor = list(melee = 50, bullet = 15, laser = 50, energy = 10, bomb = 25, bio = 0, rad = 0)
|
armor = list(melee = 50, bullet = 15, laser = 50, energy = 10, bomb = 25, bio = 0, rad = 0)
|
||||||
|
|||||||
@@ -74,7 +74,7 @@
|
|||||||
icon_state = "invisible"
|
icon_state = "invisible"
|
||||||
item_state = "invisible"
|
item_state = "invisible"
|
||||||
body_parts_covered = UPPER_TORSO|LOWER_TORSO
|
body_parts_covered = UPPER_TORSO|LOWER_TORSO
|
||||||
flags = FPRINT | TABLEPASS | ONESIZEFITSALL
|
flags = FPRINT | TABLEPASS
|
||||||
allowed = list(/obj/item/weapon/gun/energy,/obj/item/weapon/pepperspray,/obj/item/weapon/gun/projectile,/obj/item/ammo_magazine,/obj/item/ammo_casing,/obj/item/weapon/melee/baton,/obj/item/weapon/handcuffs,/obj/item/taperoll/police)
|
allowed = list(/obj/item/weapon/gun/energy,/obj/item/weapon/pepperspray,/obj/item/weapon/gun/projectile,/obj/item/ammo_magazine,/obj/item/ammo_casing,/obj/item/weapon/melee/baton,/obj/item/weapon/handcuffs,/obj/item/taperoll/police)
|
||||||
armor = list(melee = 50, bullet = 15, laser = 50, energy = 10, bomb = 25, bio = 0, rad = 0)
|
armor = list(melee = 50, bullet = 15, laser = 50, energy = 10, bomb = 25, bio = 0, rad = 0)
|
||||||
flags_inv = 0
|
flags_inv = 0
|
||||||
|
|||||||
@@ -60,6 +60,6 @@
|
|||||||
desc = "This robe commands authority."
|
desc = "This robe commands authority."
|
||||||
icon_state = "judge"
|
icon_state = "judge"
|
||||||
item_state = "judge"
|
item_state = "judge"
|
||||||
flags = FPRINT | TABLEPASS | ONESIZEFITSALL
|
flags = FPRINT | TABLEPASS
|
||||||
body_parts_covered = UPPER_TORSO|LOWER_TORSO|LEGS|ARMS
|
body_parts_covered = UPPER_TORSO|LOWER_TORSO|LEGS|ARMS
|
||||||
allowed = list(/obj/item/weapon/cigpacket,/obj/item/weapon/money)
|
allowed = list(/obj/item/weapon/cigpacket,/obj/item/weapon/money)
|
||||||
|
|||||||
@@ -228,11 +228,6 @@
|
|||||||
Metroid.UpdateFeed()
|
Metroid.UpdateFeed()
|
||||||
return
|
return
|
||||||
|
|
||||||
/*if(istype(tmob, /mob/living/carbon/human) && tmob.mutations & FAT)
|
|
||||||
if(prob(40) && !(mutations & FAT))
|
|
||||||
src << "\red <B>You fail to push [tmob]'s fat ass out of the way.</B>"
|
|
||||||
now_pushing = 0
|
|
||||||
return*/
|
|
||||||
if(tmob.r_hand && istype(tmob.r_hand, /obj/item/weapon/shield/riot))
|
if(tmob.r_hand && istype(tmob.r_hand, /obj/item/weapon/shield/riot))
|
||||||
if(prob(99))
|
if(prob(99))
|
||||||
now_pushing = 0
|
now_pushing = 0
|
||||||
@@ -297,8 +292,6 @@
|
|||||||
if(shoes)
|
if(shoes)
|
||||||
tally += shoes.slowdown
|
tally += shoes.slowdown
|
||||||
|
|
||||||
/*if(mutations & FAT)
|
|
||||||
tally += 1.5*/
|
|
||||||
if(bodytemperature < 283.222)
|
if(bodytemperature < 283.222)
|
||||||
tally += (283.222 - bodytemperature) / 10 * 1.75
|
tally += (283.222 - bodytemperature) / 10 * 1.75
|
||||||
if (stuttering < 10)
|
if (stuttering < 10)
|
||||||
@@ -587,9 +580,6 @@
|
|||||||
return
|
return
|
||||||
if (!( istype(W, /obj/item/clothing/suit) ))
|
if (!( istype(W, /obj/item/clothing/suit) ))
|
||||||
return
|
return
|
||||||
/*if (mutations & FAT && !(W.flags & ONESIZEFITSALL))
|
|
||||||
src << "\red You're too fat to wear the [W.name]!"
|
|
||||||
return*/
|
|
||||||
u_equip(W)
|
u_equip(W)
|
||||||
wear_suit = W
|
wear_suit = W
|
||||||
W.equipped(src, text)
|
W.equipped(src, text)
|
||||||
@@ -695,9 +685,6 @@
|
|||||||
return
|
return
|
||||||
if (!( istype(W, /obj/item/clothing/under) ))
|
if (!( istype(W, /obj/item/clothing/under) ))
|
||||||
return
|
return
|
||||||
/*if (mutations & FAT && !(W.flags & ONESIZEFITSALL))
|
|
||||||
src << "\red You're too fat to wear the [W.name]!"
|
|
||||||
return*/
|
|
||||||
u_equip(W)
|
u_equip(W)
|
||||||
w_uniform = W
|
w_uniform = W
|
||||||
W.equipped(src, text)
|
W.equipped(src, text)
|
||||||
@@ -861,19 +848,14 @@
|
|||||||
|
|
||||||
overlays = null
|
overlays = null
|
||||||
|
|
||||||
// lol
|
|
||||||
var/fat = ""
|
|
||||||
if (mutations & FAT)
|
|
||||||
fat = "fat"
|
|
||||||
|
|
||||||
if (mutations & HULK)
|
if (mutations & HULK)
|
||||||
overlays += image("icon" = 'genetics.dmi', "icon_state" = "hulk[fat]_[gender][!lying ? "_s" : "_l"]")
|
overlays += image("icon" = 'genetics.dmi', "icon_state" = "hulk_[gender][!lying ? "_s" : "_l"]")
|
||||||
|
|
||||||
if (mutations & COLD_RESISTANCE)
|
if (mutations & COLD_RESISTANCE)
|
||||||
overlays += image("icon" = 'genetics.dmi', "icon_state" = "fire[fat][!lying ? "_s" : "_l"]")
|
overlays += image("icon" = 'genetics.dmi', "icon_state" = "fire[!lying ? "_s" : "_l"]")
|
||||||
|
|
||||||
if (mutations & TK)
|
if (mutations & TK)
|
||||||
overlays += image("icon" = 'genetics.dmi', "icon_state" = "telekinesishead[fat][!lying ? "_s" : "_l"]")
|
overlays += image("icon" = 'genetics.dmi', "icon_state" = "telekinesishead[!lying ? "_s" : "_l"]")
|
||||||
|
|
||||||
if (mutations & LASER)
|
if (mutations & LASER)
|
||||||
overlays += image("icon" = 'genetics.dmi', "icon_state" = "lasereyes[!lying ? "_s" : "_l"]")
|
overlays += image("icon" = 'genetics.dmi', "icon_state" = "lasereyes[!lying ? "_s" : "_l"]")
|
||||||
@@ -881,7 +863,7 @@
|
|||||||
if (mutantrace)
|
if (mutantrace)
|
||||||
switch(mutantrace)
|
switch(mutantrace)
|
||||||
if("golem","metroid")
|
if("golem","metroid")
|
||||||
overlays += image("icon" = 'genetics.dmi', "icon_state" = "[mutantrace][fat][!lying ? "_s" : "_l"]")
|
overlays += image("icon" = 'genetics.dmi', "icon_state" = "[mutantrace][!lying ? "_s" : "_l"]")
|
||||||
if(face_standing)
|
if(face_standing)
|
||||||
del(face_standing)
|
del(face_standing)
|
||||||
if(face_lying)
|
if(face_lying)
|
||||||
@@ -891,7 +873,7 @@
|
|||||||
if(lying_icon)
|
if(lying_icon)
|
||||||
del(lying_icon)
|
del(lying_icon)
|
||||||
if("lizard")
|
if("lizard")
|
||||||
overlays += image("icon" = 'genetics.dmi', "icon_state" = "[mutantrace][fat]_[gender][!lying ? "_s" : "_l"]")
|
overlays += image("icon" = 'genetics.dmi', "icon_state" = "[mutantrace]_[gender][!lying ? "_s" : "_l"]")
|
||||||
if(face_standing)
|
if(face_standing)
|
||||||
del(face_standing)
|
del(face_standing)
|
||||||
if(face_lying)
|
if(face_lying)
|
||||||
@@ -902,7 +884,7 @@
|
|||||||
del(lying_icon)
|
del(lying_icon)
|
||||||
if("plant")
|
if("plant")
|
||||||
if(stat != 2) //if not dead, that is
|
if(stat != 2) //if not dead, that is
|
||||||
overlays += image("icon" = 'genetics.dmi', "icon_state" = "[mutantrace][fat]_[gender][!lying ? "_s" : "_l"]")
|
overlays += image("icon" = 'genetics.dmi', "icon_state" = "[mutantrace]_[gender][!lying ? "_s" : "_l"]")
|
||||||
else
|
else
|
||||||
overlays += image("icon" = 'genetics.dmi', "icon_state" = "[mutantrace]_d")
|
overlays += image("icon" = 'genetics.dmi', "icon_state" = "[mutantrace]_d")
|
||||||
if(face_standing)
|
if(face_standing)
|
||||||
@@ -925,20 +907,6 @@
|
|||||||
else
|
else
|
||||||
lying = 1
|
lying = 1
|
||||||
|
|
||||||
// Automatically drop anything in store / id / belt if you're not wearing a uniform.
|
|
||||||
if (!w_uniform)
|
|
||||||
for (var/obj/item/thing in list(r_store, l_store, wear_id, belt))
|
|
||||||
if (thing)
|
|
||||||
u_equip(thing)
|
|
||||||
if (client)
|
|
||||||
client.screen -= thing
|
|
||||||
|
|
||||||
if (thing)
|
|
||||||
thing.loc = loc
|
|
||||||
thing.dropped(src)
|
|
||||||
thing.layer = initial(thing.layer)
|
|
||||||
|
|
||||||
|
|
||||||
//if (zone_sel)
|
//if (zone_sel)
|
||||||
// zone_sel.overlays = null
|
// zone_sel.overlays = null
|
||||||
// zone_sel.overlays += body_standing
|
// zone_sel.overlays += body_standing
|
||||||
@@ -961,30 +929,28 @@
|
|||||||
|
|
||||||
// Uniform
|
// Uniform
|
||||||
if(w_uniform)
|
if(w_uniform)
|
||||||
/*if (mutations & FAT && !(w_uniform.flags & ONESIZEFITSALL))
|
|
||||||
src << "\red You burst out of the [w_uniform.name]!"
|
|
||||||
var/obj/item/clothing/c = w_uniform
|
|
||||||
u_equip(c)
|
|
||||||
if(client)
|
|
||||||
client.screen -= c
|
|
||||||
if(c)
|
|
||||||
c:loc = loc
|
|
||||||
c:dropped(src)
|
|
||||||
c:layer = initial(c:layer)*/
|
|
||||||
if(w_uniform)//I should really not need these
|
|
||||||
w_uniform.screen_loc = ui_iclothing
|
w_uniform.screen_loc = ui_iclothing
|
||||||
|
|
||||||
if(istype(w_uniform, /obj/item/clothing/under))
|
if(istype(w_uniform, /obj/item/clothing/under))
|
||||||
var/t1 = w_uniform.color
|
var/t1 = w_uniform.color
|
||||||
if (!t1)
|
if (!t1)
|
||||||
t1 = icon_state
|
t1 = icon_state
|
||||||
if (mutations & FAT)
|
|
||||||
overlays += image("icon" = 'uniform_fat.dmi', "icon_state" = "[t1][!lying ? "_s" : "_l"]", "layer" = MOB_LAYER)
|
|
||||||
else
|
|
||||||
overlays += image("icon" = 'uniform.dmi', "icon_state" = text("[][]",t1, (!(lying) ? "_s" : "_l")), "layer" = MOB_LAYER)
|
overlays += image("icon" = 'uniform.dmi', "icon_state" = text("[][]",t1, (!(lying) ? "_s" : "_l")), "layer" = MOB_LAYER)
|
||||||
if (w_uniform.blood_DNA)
|
if (w_uniform.blood_DNA)
|
||||||
var/icon/stain_icon = icon('blood.dmi', "uniformblood[!lying ? "" : "2"]")
|
var/icon/stain_icon = icon('blood.dmi', "uniformblood[!lying ? "" : "2"]")
|
||||||
overlays += image("icon" = stain_icon, "layer" = MOB_LAYER)
|
overlays += image("icon" = stain_icon, "layer" = MOB_LAYER)
|
||||||
|
|
||||||
|
else // Automatically drop anything in store / id / belt if you're not wearing a uniform.
|
||||||
|
for (var/obj/item/thing in list(r_store, l_store, wear_id, belt))
|
||||||
|
if (thing)
|
||||||
|
u_equip(thing)
|
||||||
|
if (client)
|
||||||
|
client.screen -= thing
|
||||||
|
if (thing)
|
||||||
|
thing.loc = loc
|
||||||
|
thing.dropped(src)
|
||||||
|
thing.layer = initial(thing.layer)
|
||||||
|
|
||||||
if (wear_id)
|
if (wear_id)
|
||||||
if(wear_id.over_jumpsuit)
|
if(wear_id.over_jumpsuit)
|
||||||
overlays += image("icon" = 'mob.dmi', "icon_state" = "id[!lying ? null : "2"]", "layer" = MOB_LAYER)
|
overlays += image("icon" = 'mob.dmi', "icon_state" = "id[!lying ? null : "2"]", "layer" = MOB_LAYER)
|
||||||
@@ -1025,10 +991,12 @@
|
|||||||
else if(ro.destroyed)
|
else if(ro.destroyed)
|
||||||
stain_icon.Blend(new /icon('limb_mask.dmi', "left_[lying?"l":"s"]"), ICON_MULTIPLY)
|
stain_icon.Blend(new /icon('limb_mask.dmi', "left_[lying?"l":"s"]"), ICON_MULTIPLY)
|
||||||
overlays += image("icon" = stain_icon, "layer" = MOB_LAYER)
|
overlays += image("icon" = stain_icon, "layer" = MOB_LAYER)
|
||||||
|
|
||||||
// Glasses
|
// Glasses
|
||||||
if (glasses)
|
if (glasses)
|
||||||
var/t1 = glasses.icon_state
|
var/t1 = glasses.icon_state
|
||||||
overlays += image("icon" = 'eyes.dmi', "icon_state" = text("[][]", t1, (!( lying ) ? null : "2")), "layer" = MOB_LAYER)
|
overlays += image("icon" = 'eyes.dmi', "icon_state" = text("[][]", t1, (!( lying ) ? null : "2")), "layer" = MOB_LAYER)
|
||||||
|
|
||||||
// Ears
|
// Ears
|
||||||
if (l_ear)
|
if (l_ear)
|
||||||
var/t1 = l_ear.icon_state
|
var/t1 = l_ear.icon_state
|
||||||
@@ -1036,6 +1004,7 @@
|
|||||||
if (r_ear)
|
if (r_ear)
|
||||||
var/t1 = r_ear.icon_state
|
var/t1 = r_ear.icon_state
|
||||||
overlays += image("icon" = 'ears.dmi', "icon_state" = text("[][]", t1, (!( lying ) ? null : "2")), "layer" = MOB_LAYER)
|
overlays += image("icon" = 'ears.dmi', "icon_state" = text("[][]", t1, (!( lying ) ? null : "2")), "layer" = MOB_LAYER)
|
||||||
|
|
||||||
// Shoes
|
// Shoes
|
||||||
lo = organs["l_foot"]
|
lo = organs["l_foot"]
|
||||||
ro = organs["r_foot"]
|
ro = organs["r_foot"]
|
||||||
@@ -1054,6 +1023,7 @@
|
|||||||
else if(ro.destroyed)
|
else if(ro.destroyed)
|
||||||
stain_icon.Blend(new /icon('limb_mask.dmi', "left_[lying?"l":"s"]"), ICON_MULTIPLY)
|
stain_icon.Blend(new /icon('limb_mask.dmi', "left_[lying?"l":"s"]"), ICON_MULTIPLY)
|
||||||
overlays += image("icon" = stain_icon, "layer" = MOB_LAYER) // Radio
|
overlays += image("icon" = stain_icon, "layer" = MOB_LAYER) // Radio
|
||||||
|
|
||||||
/* if (w_radio)
|
/* if (w_radio)
|
||||||
overlays += image("icon" = 'ears.dmi', "icon_state" = "headset[!lying ? "" : "2"]", "layer" = MOB_LAYER) */
|
overlays += image("icon" = 'ears.dmi', "icon_state" = "headset[!lying ? "" : "2"]", "layer" = MOB_LAYER) */
|
||||||
|
|
||||||
@@ -1087,19 +1057,10 @@
|
|||||||
|
|
||||||
|
|
||||||
if (wear_suit)
|
if (wear_suit)
|
||||||
/*if (mutations & FAT && !(wear_suit.flags & ONESIZEFITSALL))
|
|
||||||
src << "\red You burst out of the [wear_suit.name]!"
|
|
||||||
var/obj/item/clothing/c = wear_suit
|
|
||||||
u_equip(c)
|
|
||||||
if(client)
|
|
||||||
client.screen -= c
|
|
||||||
if(c)
|
|
||||||
c:loc = loc
|
|
||||||
c:dropped(src)
|
|
||||||
c:layer = initial(c:layer)*/
|
|
||||||
if (istype(wear_suit, /obj/item/clothing/suit))
|
if (istype(wear_suit, /obj/item/clothing/suit))
|
||||||
var/t1 = wear_suit.icon_state
|
var/t1 = wear_suit.icon_state
|
||||||
overlays += image("icon" = 'suit.dmi', "icon_state" = text("[][]", t1, (!( lying ) ? null : "2")), "layer" = MOB_LAYER)
|
overlays += image("icon" = 'suit.dmi', "icon_state" = text("[][]", t1, (!( lying ) ? null : "2")), "layer" = MOB_LAYER)
|
||||||
|
|
||||||
if (wear_suit)
|
if (wear_suit)
|
||||||
if (wear_suit.blood_DNA)
|
if (wear_suit.blood_DNA)
|
||||||
var/icon/stain_icon = null
|
var/icon/stain_icon = null
|
||||||
@@ -1111,6 +1072,7 @@
|
|||||||
stain_icon = icon('blood.dmi', "suitblood[!lying ? "" : "2"]")
|
stain_icon = icon('blood.dmi', "suitblood[!lying ? "" : "2"]")
|
||||||
overlays += image("icon" = stain_icon, "layer" = MOB_LAYER)
|
overlays += image("icon" = stain_icon, "layer" = MOB_LAYER)
|
||||||
wear_suit.screen_loc = ui_oclothing
|
wear_suit.screen_loc = ui_oclothing
|
||||||
|
|
||||||
if (istype(wear_suit, /obj/item/clothing/suit/straight_jacket))
|
if (istype(wear_suit, /obj/item/clothing/suit/straight_jacket))
|
||||||
if (handcuffed)
|
if (handcuffed)
|
||||||
handcuffed.loc = loc
|
handcuffed.loc = loc
|
||||||
@@ -1376,7 +1338,6 @@
|
|||||||
lying_icon = new /icon('human.dmi', "torso_[g]_l")
|
lying_icon = new /icon('human.dmi', "torso_[g]_l")
|
||||||
|
|
||||||
var/husk = (mutations & HUSK)
|
var/husk = (mutations & HUSK)
|
||||||
var/obese = (mutations & FAT)
|
|
||||||
|
|
||||||
stand_icon.Blend(new /icon('human.dmi', "chest_[g]_s"), ICON_OVERLAY)
|
stand_icon.Blend(new /icon('human.dmi', "chest_[g]_s"), ICON_OVERLAY)
|
||||||
lying_icon.Blend(new /icon('human.dmi', "chest_[g]_l"), ICON_OVERLAY)
|
lying_icon.Blend(new /icon('human.dmi', "chest_[g]_l"), ICON_OVERLAY)
|
||||||
@@ -1417,9 +1378,6 @@
|
|||||||
|
|
||||||
stand_icon.Blend(husk_s, ICON_OVERLAY)
|
stand_icon.Blend(husk_s, ICON_OVERLAY)
|
||||||
lying_icon.Blend(husk_l, ICON_OVERLAY)
|
lying_icon.Blend(husk_l, ICON_OVERLAY)
|
||||||
else if(obese)
|
|
||||||
stand_icon.Blend(new /icon('human.dmi', "fatbody_s"), ICON_OVERLAY)
|
|
||||||
lying_icon.Blend(new /icon('human.dmi', "fatbody_l"), ICON_OVERLAY)
|
|
||||||
|
|
||||||
// Skin tone
|
// Skin tone
|
||||||
if (s_tone >= 0)
|
if (s_tone >= 0)
|
||||||
|
|||||||
@@ -1098,10 +1098,10 @@
|
|||||||
else
|
else
|
||||||
seer = 0
|
seer = 0
|
||||||
see_invisible = 0
|
see_invisible = 0
|
||||||
|
|
||||||
else if (istype(wear_mask, /obj/item/clothing/mask/gas/voice/space_ninja))
|
else if (istype(wear_mask, /obj/item/clothing/mask/gas/voice/space_ninja))
|
||||||
switch(wear_mask:mode)
|
switch(wear_mask:mode)
|
||||||
if(0)
|
if(0)
|
||||||
if(client)
|
|
||||||
var/target_list[] = list()
|
var/target_list[] = list()
|
||||||
for(var/mob/living/target in oview(src))
|
for(var/mob/living/target in oview(src))
|
||||||
if( target.mind&&(target.mind.special_role||issilicon(target)) )//They need to have a mind.
|
if( target.mind&&(target.mind.special_role||issilicon(target)) )//They need to have a mind.
|
||||||
@@ -1122,6 +1122,7 @@
|
|||||||
sight |= SEE_TURFS
|
sight |= SEE_TURFS
|
||||||
if(!druggy)
|
if(!druggy)
|
||||||
see_invisible = 0
|
see_invisible = 0
|
||||||
|
|
||||||
else if(istype(glasses, /obj/item/clothing/glasses/meson))
|
else if(istype(glasses, /obj/item/clothing/glasses/meson))
|
||||||
sight |= SEE_TURFS
|
sight |= SEE_TURFS
|
||||||
if(!druggy)
|
if(!druggy)
|
||||||
@@ -1131,10 +1132,12 @@
|
|||||||
see_in_dark = 5
|
see_in_dark = 5
|
||||||
if(!druggy)
|
if(!druggy)
|
||||||
see_invisible = 0
|
see_invisible = 0
|
||||||
|
|
||||||
else if(istype(glasses, /obj/item/clothing/glasses/thermal))
|
else if(istype(glasses, /obj/item/clothing/glasses/thermal))
|
||||||
sight |= SEE_MOBS
|
sight |= SEE_MOBS
|
||||||
if(!druggy)
|
if(!druggy)
|
||||||
see_invisible = 2
|
see_invisible = 2
|
||||||
|
|
||||||
else if(istype(glasses, /obj/item/clothing/glasses/material))
|
else if(istype(glasses, /obj/item/clothing/glasses/material))
|
||||||
sight |= SEE_OBJS
|
sight |= SEE_OBJS
|
||||||
if (!druggy)
|
if (!druggy)
|
||||||
@@ -1165,11 +1168,6 @@
|
|||||||
see_invisible = 0
|
see_invisible = 0
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
else if(istype(head, /obj/item/clothing/head/helmet/welding)) // wat. This is never fucking called.
|
else if(istype(head, /obj/item/clothing/head/helmet/welding)) // wat. This is never fucking called.
|
||||||
if(!head:up && tinted_weldhelh)
|
if(!head:up && tinted_weldhelh)
|
||||||
see_in_dark = 1
|
see_in_dark = 1
|
||||||
@@ -1183,21 +1181,18 @@
|
|||||||
// Special on-map HUDs like the medical HUD
|
// Special on-map HUDs like the medical HUD
|
||||||
// ----------------------------------------
|
// ----------------------------------------
|
||||||
if(istype(glasses, /obj/item/clothing/glasses/hud/health))
|
if(istype(glasses, /obj/item/clothing/glasses/hud/health))
|
||||||
if(client)
|
|
||||||
glasses:process_hud(src)
|
glasses:process_hud(src)
|
||||||
if (!druggy)
|
if (!druggy)
|
||||||
see_invisible = 0
|
see_invisible = 0
|
||||||
|
|
||||||
if(istype(glasses, /obj/item/clothing/glasses/hud/security))
|
else if(istype(glasses, /obj/item/clothing/glasses/hud/security))
|
||||||
if(client)
|
|
||||||
glasses:process_hud(src)
|
glasses:process_hud(src)
|
||||||
if (!druggy)
|
if (!druggy)
|
||||||
see_invisible = 0
|
see_invisible = 0
|
||||||
|
|
||||||
if(istype(glasses, /obj/item/clothing/glasses/sunglasses))
|
else if(istype(glasses, /obj/item/clothing/glasses/sunglasses))
|
||||||
see_in_dark = 1
|
see_in_dark = 1
|
||||||
if(istype(glasses, /obj/item/clothing/glasses/sunglasses/sechud))
|
if(istype(glasses, /obj/item/clothing/glasses/sunglasses/sechud))
|
||||||
if(client)
|
|
||||||
if(glasses:hud)
|
if(glasses:hud)
|
||||||
glasses:hud:process_hud(src)
|
glasses:hud:process_hud(src)
|
||||||
if (!druggy)
|
if (!druggy)
|
||||||
|
|||||||
@@ -132,7 +132,7 @@ var/MAX_EXPLOSION_RANGE = 14
|
|||||||
|
|
||||||
#define OPENCONTAINER 4096 // is an open container for chemistry purposes
|
#define OPENCONTAINER 4096 // is an open container for chemistry purposes
|
||||||
|
|
||||||
#define ONESIZEFITSALL 8192 // can be worn by fatties (or children? ugh)
|
// #define ONESIZEFITSALL 8192 // can be worn by fatties (or children? ugh)
|
||||||
|
|
||||||
#define NOREACT 16384 //Reagents dont' react inside this container.
|
#define NOREACT 16384 //Reagents dont' react inside this container.
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user