Removes Fat Sprites (#13430)

* Removes Fat Sprites

* fat vs chubby

* edge case
This commit is contained in:
Fox McCloud
2020-05-23 03:10:39 -06:00
committed by GitHub
parent 707258f78c
commit 798cf7a8be
45 changed files with 46 additions and 246 deletions
@@ -847,9 +847,6 @@ GLOBAL_LIST_INIT(special_role_times, list( //minimum age (in days) for accounts
return 1
/datum/preferences/proc/ShowDisabilityState(mob/user, flag, label)
var/datum/species/S = GLOB.all_species[species]
if(flag == DISABILITY_FLAG_FAT && !(CAN_BE_FAT in S.species_traits))
return "<li><i>[species] cannot be fat.</i></li>"
return "<li><b>[label]:</b> <a href=\"?_src_=prefs;task=input;preference=disabilities;disability=[flag]\">[disabilities & flag ? "Yes" : "No"]</a></li>"
/datum/preferences/proc/SetDisabilities(mob/user)
@@ -1116,9 +1113,8 @@ GLOBAL_LIST_INIT(special_role_times, list( //minimum age (in days) for accounts
SetDisabilities(user)
if("input")
var/dflag=text2num(href_list["disability"])
if(dflag >= 0)
if(!(dflag==DISABILITY_FLAG_FAT && !(CAN_BE_FAT in S.species_traits))) //If the disability isn't fatness, toggle it. If it IS fatness, check to see if the species can be fat before going ahead.
disabilities ^= text2num(href_list["disability"]) //MAGIC
if(dflag >= 0) // Toggle it.
disabilities ^= text2num(href_list["disability"]) //MAGIC
SetDisabilities(user)
else
SetDisabilities(user)
@@ -2221,7 +2217,7 @@ GLOBAL_LIST_INIT(special_role_times, list( //minimum age (in days) for accounts
character.change_eye_color(e_colour)
if(disabilities & DISABILITY_FLAG_FAT && (CAN_BE_FAT in character.dna.species.species_traits))
if(disabilities & DISABILITY_FLAG_FAT)
character.dna.SetSEState(GLOB.fatblock, TRUE, TRUE)
character.overeatduration = 600
character.dna.default_blocks.Add(GLOB.fatblock)
@@ -130,7 +130,6 @@
item_state = "santa"
slowdown = 0
flags = STOPSPRESSUREDMAGE
flags_size = ONESIZEFITSALL
allowed = list(/obj/item) //for stuffing extra special presents
//Space pirate outfit
-3
View File
@@ -20,7 +20,6 @@
icon_state = "armor"
item_state = "armor"
blood_overlay_type = "armor"
flags_size = ONESIZEFITSALL
dog_fashion = /datum/dog_fashion/back
/obj/item/clothing/suit/armor/vest/jacket
@@ -36,7 +35,6 @@
icon_state = "armor-combat"
item_state = "bulletproof"
blood_overlay_type = "armor"
flags_size = ONESIZEFITSALL
/obj/item/clothing/suit/armor/vest/security
name = "security armor"
@@ -255,7 +253,6 @@
icon_state = "detective-armor"
item_state = "armor"
blood_overlay_type = "armor"
flags_size = ONESIZEFITSALL
allowed = list(/obj/item/tank/emergency_oxygen,/obj/item/reagent_containers/spray/pepper,/obj/item/flashlight,/obj/item/gun,/obj/item/ammo_box,/obj/item/ammo_casing,/obj/item/melee/baton,/obj/item/restraints/handcuffs,/obj/item/storage/fancy/cigarettes,/obj/item/lighter,/obj/item/detective_scanner,/obj/item/taperecorder)
resistance_flags = FLAMMABLE
dog_fashion = null
-1
View File
@@ -27,7 +27,6 @@
gas_transfer_coefficient = 0.01
permeability_coefficient = 0.01
flags = THICKMATERIAL
flags_size = ONESIZEFITSALL
body_parts_covered = UPPER_TORSO|LOWER_TORSO|LEGS|FEET|ARMS|HANDS
slowdown = 1
allowed = list(/obj/item/tank/emergency_oxygen,/obj/item/pen,/obj/item/flashlight/pen)
-3
View File
@@ -52,7 +52,6 @@
item_state = "bio_suit"
body_parts_covered = UPPER_TORSO|LOWER_TORSO|LEGS|ARMS
flags_inv = HIDEJUMPSUIT
flags_size = ONESIZEFITSALL
allowed = list(/obj/item/disk, /obj/item/stamp, /obj/item/reagent_containers/food/drinks/flask, /obj/item/melee, /obj/item/storage/lockbox/medal, /obj/item/flash, /obj/item/storage/box/matches, /obj/item/lighter, /obj/item/clothing/mask/cigarette, /obj/item/storage/fancy/cigarettes, /obj/item/tank/emergency_oxygen)
sprite_sheets = list(
@@ -184,7 +183,6 @@
armor = list("melee" = 25, "bullet" = 10, "laser" = 25, "energy" = 10, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 0, "acid" = 45)
cold_protection = UPPER_TORSO|LOWER_TORSO|LEGS|ARMS
heat_protection = UPPER_TORSO|LOWER_TORSO|LEGS|ARMS
flags_size = ONESIZEFITSALL
sprite_sheets = list(
"Vox" = 'icons/mob/species/vox/suit.dmi'
@@ -221,7 +219,6 @@
armor = list(melee = 25, bullet = 10, laser = 25, energy = 10, bomb = 0, bio = 0, rad = 0, fire = 0, acid = 45)
cold_protection = UPPER_TORSO|LOWER_TORSO|LEGS|ARMS
heat_protection = UPPER_TORSO|LOWER_TORSO|LEGS|ARMS
flags_size = ONESIZEFITSALL
sprite_sheets = list(
"Vox" = 'icons/mob/species/vox/suit.dmi'
@@ -541,7 +541,6 @@
item_state = "straight_jacket"
body_parts_covered = UPPER_TORSO|LOWER_TORSO|LEGS|ARMS|HANDS
flags_inv = HIDEGLOVES|HIDESHOES|HIDEJUMPSUIT|HIDETAIL
flags_size = ONESIZEFITSALL
strip_delay = 60
breakouttime = 3000
@@ -690,7 +689,6 @@
item_state = "xenos_helm"
body_parts_covered = UPPER_TORSO|LOWER_TORSO|LEGS|ARMS|HANDS
flags_inv = HIDEGLOVES|HIDESHOES|HIDEJUMPSUIT
flags_size = ONESIZEFITSALL
//swimsuit
/obj/item/clothing/under/swimsuit/
@@ -733,7 +731,6 @@
w_class = WEIGHT_CLASS_BULKY
gas_transfer_coefficient = 0.01
permeability_coefficient = 0.01
flags_size = ONESIZEFITSALL
body_parts_covered = UPPER_TORSO|LOWER_TORSO|LEGS|FEET|ARMS|HANDS
allowed = list(/obj/item/tank/emergency_oxygen,/obj/item/pen,/obj/item/flashlight/pen)
armor = list(melee = 0, bullet = 0, laser = 0, energy = 0, bomb = 0, bio = 100, rad = 20, fire = 50, acid = 50)
@@ -780,7 +777,6 @@
max_heat_protection_temperature = ARMOR_MAX_TEMP_PROTECT
strip_delay = 60
put_on_delay = 40
flags_size = ONESIZEFITSALL
armor = list(melee = 25, bullet = 15, laser = 25, energy = 10, bomb = 25, bio = 0, rad = 0, fire = 50, acid = 50)
//End of inheritance from Security armour.
-19
View File
@@ -16,7 +16,6 @@
icon_state = "black"
item_state = "bl_suit"
item_color = "black"
flags_size = ONESIZEFITSALL
resistance_flags = NONE
/obj/item/clothing/under/color/blackf
@@ -31,18 +30,15 @@
icon_state = "blue"
item_state = "b_suit"
item_color = "blue"
flags_size = ONESIZEFITSALL
/obj/item/clothing/under/color/blue/dodgeball
flags = NODROP
flags_size = ONESIZEFITSALL
/obj/item/clothing/under/color/green
name = "green jumpsuit"
icon_state = "green"
item_state = "g_suit"
item_color = "green"
flags_size = ONESIZEFITSALL
/obj/item/clothing/under/color/grey
name = "grey jumpsuit"
@@ -50,11 +46,9 @@
icon_state = "grey"
item_state = "gy_suit"
item_color = "grey"
flags_size = ONESIZEFITSALL
/obj/item/clothing/under/color/grey/greytide
flags = NODROP
flags_size = ONESIZEFITSALL
/obj/item/clothing/under/color/grey/glorf
name = "ancient jumpsuit"
@@ -70,7 +64,6 @@
icon_state = "orange"
item_state = "o_suit"
item_color = "orange"
flags_size = ONESIZEFITSALL
/obj/item/clothing/under/color/orange/prison
name = "orange jumpsuit"
@@ -80,7 +73,6 @@
item_color = "orange"
has_sensor = 2
sensor_mode = 3
flags_size = ONESIZEFITSALL
/obj/item/clothing/under/color/pink
name = "pink jumpsuit"
@@ -88,32 +80,27 @@
icon_state = "pink"
item_state = "p_suit"
item_color = "pink"
flags_size = ONESIZEFITSALL
/obj/item/clothing/under/color/red
name = "red jumpsuit"
icon_state = "red"
item_state = "r_suit"
item_color = "red"
flags_size = ONESIZEFITSALL
/obj/item/clothing/under/color/red/dodgeball
flags = NODROP
flags_size = ONESIZEFITSALL
/obj/item/clothing/under/color/white
name = "white jumpsuit"
icon_state = "white"
item_state = "w_suit"
item_color = "white"
flags_size = ONESIZEFITSALL
/obj/item/clothing/under/color/yellow
name = "yellow jumpsuit"
icon_state = "yellow"
item_state = "y_suit"
item_color = "yellow"
flags_size = ONESIZEFITSALL
/obj/item/clothing/under/psyche
name = "psychedelic jumpsuit"
@@ -134,7 +121,6 @@
name = "aqua jumpsuit"
icon_state = "aqua"
item_color = "aqua"
flags_size = ONESIZEFITSALL
/obj/item/clothing/under/color/purple
name = "purple jumpsuit"
@@ -161,7 +147,6 @@
name = "light brown jumpsuit"
icon_state = "lightbrown"
item_color = "lightbrown"
flags_size = ONESIZEFITSALL
/obj/item/clothing/under/color/brown
name = "brown jumpsuit"
@@ -177,7 +162,6 @@
name = "dark blue jumpsuit"
icon_state = "darkblue"
item_color = "darkblue"
flags_size = ONESIZEFITSALL
/obj/item/clothing/under/color/lightred
name = "light red jumpsuit"
@@ -188,7 +172,6 @@
name = "dark red jumpsuit"
icon_state = "darkred"
item_color = "darkred"
flags_size = ONESIZEFITSALL
/obj/item/clothing/under/color/red/jersey
name = "red team jersey"
@@ -196,7 +179,6 @@
icon_state = "redjersey"
item_state = "r_suit"
item_color = "redjersey"
flags_size = ONESIZEFITSALL
/obj/item/clothing/under/color/blue/jersey
name = "blue team jersey"
@@ -204,4 +186,3 @@
icon_state = "bluejersey"
item_state = "b_suit"
item_color = "bluejersey"
flags_size = ONESIZEFITSALL
@@ -6,7 +6,6 @@
icon_state = "ba_suit"
item_state = "ba_suit"
item_color = "ba_suit"
flags_size = ONESIZEFITSALL
/obj/item/clothing/under/rank/captain //Alright, technically not a 'civilian' but its better then giving a .dm file for a single define.
desc = "It's a blue jumpsuit with some gold markings denoting the rank of \"Captain\"."
@@ -14,7 +13,6 @@
icon_state = "captain"
item_state = "caparmor"
item_color = "captain"
flags_size = ONESIZEFITSALL
/obj/item/clothing/under/rank/cargo
name = "quartermaster's jumpsuit"
@@ -22,7 +20,6 @@
icon_state = "qm"
item_state = "lb_suit"
item_color = "qm"
flags_size = ONESIZEFITSALL
/obj/item/clothing/under/rank/cargo/skirt
name = "quartermaster's jumpskirt"
@@ -30,7 +27,6 @@
icon_state = "qmf"
item_color = "qmf"
body_parts_covered = UPPER_TORSO|LOWER_TORSO|ARMS
flags_size = null
/obj/item/clothing/under/rank/cargotech
name = "cargo technician's jumpsuit"
@@ -38,14 +34,12 @@
icon_state = "cargotech"
item_state = "lb_suit"
item_color = "cargo"
flags_size = ONESIZEFITSALL
/obj/item/clothing/under/rank/cargotech/skirt
name = "cargo technician's jumpskirt"
desc = "Skirrrrrts! They're comfy and easy to wear!"
icon_state = "cargof"
item_color = "cargof"
flags_size = null
/obj/item/clothing/under/rank/chaplain
desc = "It's a black jumpsuit, often worn by religious folk."
@@ -53,14 +47,12 @@
icon_state = "chaplain"
item_state = "bl_suit"
item_color = "chapblack"
flags_size = ONESIZEFITSALL
/obj/item/clothing/under/rank/chef
desc = "It's an apron which is given only to the most <b>hardcore</b> chefs in space."
name = "chef's uniform"
icon_state = "chef"
item_color = "chef"
flags_size = ONESIZEFITSALL
/obj/item/clothing/under/rank/clown
name = "clown suit"
@@ -68,7 +60,6 @@
icon_state = "clown"
item_state = "clown"
item_color = "clown"
flags_size = ONESIZEFITSALL
/obj/item/clothing/under/rank/clown/Initialize()
. = ..()
@@ -97,7 +88,6 @@
icon_state = "hop"
item_state = "b_suit"
item_color = "hop"
flags_size = ONESIZEFITSALL
/obj/item/clothing/under/rank/head_of_personnel_whimsy
desc = "A blue jacket and red tie, with matching red cuffs! Snazzy. Wearing this makes you feel more important than your job title does."
@@ -114,7 +104,6 @@
item_state = "g_suit"
item_color = "hydroponics"
permeability_coefficient = 0.50
flags_size = ONESIZEFITSALL
/obj/item/clothing/under/rank/internalaffairs
desc = "The plain, professional attire of an Internal Affairs Agent. The collar is <i>immaculately</i> starched."
@@ -122,7 +111,6 @@
icon_state = "internalaffairs"
item_state = "internalaffairs"
item_color = "internalaffairs"
flags_size = ONESIZEFITSALL
/obj/item/clothing/under/rank/ntrep
desc = "A well-ironed dress shirt and matching set of black pants."
@@ -130,7 +118,6 @@
icon_state = "internalaffairs"
item_state = "internalaffairs"
item_color = "internalaffairs"
flags_size = ONESIZEFITSALL
/obj/item/clothing/under/rank/ntrep/skirt
desc = "A silky smooth black and gold representative uniform with blue markings."
@@ -138,7 +125,6 @@
icon_state = "ntrepf"
item_state = "ntrepf"
item_color = "ntrepf"
flags_size = ONESIZEFITSALL
/obj/item/clothing/under/rank/janitor
desc = "It's the official uniform of the station's janitor. It has minor protection from biohazards."
@@ -146,13 +132,11 @@
icon_state = "janitor"
item_color = "janitor"
armor = list("melee" = 0, "bullet" = 0, "laser" = 0,"energy" = 0, "bomb" = 0, "bio" = 10, "rad" = 0, "fire" = 0, "acid" = 0)
flags_size = ONESIZEFITSALL
/obj/item/clothing/under/lawyer
desc = "Slick threads."
name = "Lawyer suit"
flags_size = ONESIZEFITSALL
/obj/item/clothing/under/lawyer/black
icon_state = "lawyer_black"
@@ -201,7 +185,6 @@
icon_state = "red_suit"
item_state = "red_suit"
item_color = "red_suit"
flags_size = ONESIZEFITSALL
/obj/item/clothing/under/mime
name = "mime's outfit"
@@ -209,7 +192,6 @@
icon_state = "mime"
item_state = "mime"
item_color = "mime"
flags_size = ONESIZEFITSALL
/obj/item/clothing/under/mime/nodrop
flags = NODROP
@@ -220,7 +202,6 @@
icon_state = "miner"
item_state = "miner"
item_color = "miner"
flags_size = ONESIZEFITSALL
/obj/item/clothing/under/rank/miner/lavaland
desc = "A green uniform for operating in hazardous environments."
@@ -6,7 +6,6 @@
item_state = "chief"
item_color = "chief"
armor = list("melee" = 0, "bullet" = 0, "laser" = 0,"energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 10, "fire" = 80, "acid" = 40)
flags_size = ONESIZEFITSALL
resistance_flags = NONE
/obj/item/clothing/under/rank/chief_engineer/skirt
@@ -14,7 +13,6 @@
name = "chief engineer's jumpskirt"
icon_state = "chieff"
item_color = "chieff"
flags_size = null
body_parts_covered = UPPER_TORSO|LOWER_TORSO|ARMS
/obj/item/clothing/under/rank/atmospheric_technician
@@ -23,7 +21,6 @@
icon_state = "atmos"
item_state = "atmos_suit"
item_color = "atmos"
flags_size = ONESIZEFITSALL
resistance_flags = NONE
/obj/item/clothing/under/rank/atmospheric_technician/skirt
@@ -31,7 +28,6 @@
name = "atmospheric technician's jumpskirt"
icon_state = "atmosf"
item_color = "atmosf"
flags_size = null
body_parts_covered = UPPER_TORSO|LOWER_TORSO|ARMS
/obj/item/clothing/under/rank/engineer
@@ -41,7 +37,6 @@
item_state = "engi_suit"
item_color = "engine"
armor = list("melee" = 0, "bullet" = 0, "laser" = 0,"energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 10, "fire" = 60, "acid" = 20)
flags_size = ONESIZEFITSALL
resistance_flags = NONE
@@ -50,7 +45,6 @@
name = "engineer's jumpskirt"
icon_state = "enginef"
item_color = "enginef"
flags_size = null
body_parts_covered = UPPER_TORSO|LOWER_TORSO|ARMS
/obj/item/clothing/under/rank/roboticist
@@ -59,7 +53,6 @@
icon_state = "robotics"
item_state = "robotics"
item_color = "robotics"
flags_size = ONESIZEFITSALL
resistance_flags = NONE
/obj/item/clothing/under/rank/roboticist/skirt
@@ -67,7 +60,6 @@
name = "roboticist's jumpskirt"
icon_state = "roboticsf"
item_color = "roboticsf"
flags_size = null
/obj/item/clothing/under/rank/mechanic
desc = "It's a pair of overalls worn by mechanics."
@@ -8,7 +8,6 @@
item_state = "g_suit"
item_color = "director"
armor = list("melee" = 0, "bullet" = 0, "laser" = 0,"energy" = 0, "bomb" = 10, "bio" = 10, "rad" = 0, "fire" = 0, "acid" = 35)
flags_size = ONESIZEFITSALL
/obj/item/clothing/under/rank/scientist
desc = "It's made of a special fiber that provides minor protection against biohazards. It has markings that denote the wearer as a scientist."
@@ -18,14 +17,12 @@
item_color = "toxinswhite"
permeability_coefficient = 0.50
armor = list("melee" = 0, "bullet" = 0, "laser" = 0,"energy" = 0, "bomb" = 10, "bio" = 0, "rad" = 0, "fire" = 0, "acid" = 0)
flags_size = ONESIZEFITSALL
/obj/item/clothing/under/rank/scientist/skirt
name = "scientist's jumpskirt"
icon_state = "sciencewhitef"
item_color = "sciencewhitef"
body_parts_covered = UPPER_TORSO|LOWER_TORSO|ARMS
flags_size = null
/obj/item/clothing/under/rank/chemist
desc = "It's made of a special fiber that gives special protection against biohazards. It has a chemist rank stripe on it."
@@ -35,14 +32,12 @@
item_color = "chemistrywhite"
permeability_coefficient = 0.50
armor = list("melee" = 0, "bullet" = 0, "laser" = 0,"energy" = 0, "bomb" = 0, "bio" = 10, "rad" = 0, "fire" = 50, "acid" = 65)
flags_size = ONESIZEFITSALL
/obj/item/clothing/under/rank/chemist/skirt
name = "chemist's jumpskirt"
icon_state = "chemistrywhitef"
item_color = "chemistrywhitef"
body_parts_covered = UPPER_TORSO|LOWER_TORSO|ARMS
flags_size = null
/*
* Medical
@@ -55,7 +50,6 @@
item_color = "cmo"
permeability_coefficient = 0.50
armor = list("melee" = 0, "bullet" = 0, "laser" = 0,"energy" = 0, "bomb" = 0, "bio" = 10, "rad" = 0, "fire" = 0, "acid" = 0)
flags_size = ONESIZEFITSALL
/obj/item/clothing/under/rank/chief_medical_officer/skirt
desc = "It's a jumpskirt worn by those with the experience to be \"Chief Medical Officer\". It provides minor biological protection."
@@ -63,7 +57,6 @@
icon_state = "cmof"
item_color = "cmof"
body_parts_covered = UPPER_TORSO|LOWER_TORSO|ARMS
flags_size = null
/obj/item/clothing/under/rank/geneticist
desc = "It's made of a special fiber that gives special protection against biohazards. It has a genetics rank stripe on it."
@@ -73,14 +66,12 @@
item_color = "geneticswhite"
permeability_coefficient = 0.50
armor = list("melee" = 0, "bullet" = 0, "laser" = 0,"energy" = 0, "bomb" = 0, "bio" = 10, "rad" = 0, "fire" = 0, "acid" = 0)
flags_size = ONESIZEFITSALL
/obj/item/clothing/under/rank/geneticist/skirt
name = "geneticist's jumpskirt"
icon_state = "geneticswhitef"
item_color = "geneticswhitef"
body_parts_covered = UPPER_TORSO|LOWER_TORSO|ARMS
flags_size = null
/obj/item/clothing/under/rank/virologist
desc = "It's made of a special fiber that gives special protection against biohazards. It has a virologist rank stripe on it."
@@ -90,14 +81,12 @@
item_color = "virologywhite"
permeability_coefficient = 0.50
armor = list("melee" = 0, "bullet" = 0, "laser" = 0,"energy" = 0, "bomb" = 0, "bio" = 10, "rad" = 0, "fire" = 0, "acid" = 0)
flags_size = ONESIZEFITSALL
/obj/item/clothing/under/rank/virologist/skirt
name = "virologist's jumpskirt"
icon_state = "virologywhitef"
item_color = "virologywhitef"
body_parts_covered = UPPER_TORSO|LOWER_TORSO|ARMS
flags_size = null
/obj/item/clothing/under/rank/nursesuit
desc = "It's a jumpsuit commonly worn by nursing staff in the medical department."
@@ -107,7 +96,6 @@
item_color = "nursesuit"
permeability_coefficient = 0.50
armor = list("melee" = 0, "bullet" = 0, "laser" = 0,"energy" = 0, "bomb" = 0, "bio" = 10, "rad" = 0, "fire" = 0, "acid" = 0)
flags_size = ONESIZEFITSALL
/obj/item/clothing/under/rank/nurse
desc = "A dress commonly worn by the nursing staff in the medical department."
@@ -117,7 +105,6 @@
item_color = "nurse"
permeability_coefficient = 0.50
armor = list("melee" = 0, "bullet" = 0, "laser" = 0,"energy" = 0, "bomb" = 0, "bio" = 10, "rad" = 0, "fire" = 0, "acid" = 0)
flags_size = ONESIZEFITSALL
/obj/item/clothing/under/rank/orderly
desc = "A white suit to be worn by orderly people who love orderly things."
@@ -127,7 +114,6 @@
item_color = "orderly"
permeability_coefficient = 0.50
armor = list("melee" = 0, "bullet" = 0, "laser" = 0,"energy" = 0, "bomb" = 0, "bio" = 10, "rad" = 0, "fire" = 0, "acid" = 0)
flags_size = ONESIZEFITSALL
/obj/item/clothing/under/rank/medical
desc = "It's made of a special fiber that provides minor protection against biohazards. It has a cross on the chest denoting that the wearer is trained medical personnel."
@@ -137,42 +123,36 @@
item_color = "medical"
permeability_coefficient = 0.50
armor = list("melee" = 0, "bullet" = 0, "laser" = 0,"energy" = 0, "bomb" = 0, "bio" = 10, "rad" = 0, "fire" = 0, "acid" = 0)
flags_size = ONESIZEFITSALL
/obj/item/clothing/under/rank/medical/skirt
name = "medical doctor's jumpskirt"
icon_state = "medicalf"
item_color = "medicalf"
body_parts_covered = UPPER_TORSO|LOWER_TORSO|ARMS
flags_size = null
/obj/item/clothing/under/rank/medical/blue
name = "medical scrubs"
desc = "It's made of a special fiber that provides minor protection against biohazards. This one is in baby blue."
icon_state = "scrubsblue"
item_color = "scrubsblue"
flags_size = ONESIZEFITSALL
/obj/item/clothing/under/rank/medical/green
name = "medical scrubs"
desc = "It's made of a special fiber that provides minor protection against biohazards. This one is in dark green."
icon_state = "scrubsgreen"
item_color = "scrubsgreen"
flags_size = ONESIZEFITSALL
/obj/item/clothing/under/rank/medical/purple
name = "medical scrubs"
desc = "It's made of a special fiber that provides minor protection against biohazards. This one is in deep purple."
icon_state = "scrubspurple"
item_color = "scrubspurple"
flags_size = ONESIZEFITSALL
/obj/item/clothing/under/rank/medical/mortician
name = "coroner's scrubs"
desc = "It's made of a special fiber that provides minor protection against biohazards. This one is as dark as an emo's poetry."
icon_state = "scrubsblack"
item_color = "scrubsblack"
flags_size = ONESIZEFITSALL
//paramedic
/obj/item/clothing/under/rank/medical/paramedic
@@ -183,7 +163,6 @@
item_color = "paramedic"
permeability_coefficient = 0.50
armor = list("melee" = 0, "bullet" = 0, "laser" = 0,"energy" = 0, "bomb" = 0, "bio" = 10, "rad" = 10, "fire" = 0, "acid" = 0)
flags_size = ONESIZEFITSALL
/obj/item/clothing/under/rank/psych
desc = "A basic white jumpsuit. It has turqouise markings that denote the wearer as a psychiatrist."
@@ -191,7 +170,6 @@
icon_state = "psych"
item_state = "w_suit"
item_color = "psych"
flags_size = ONESIZEFITSALL
/obj/item/clothing/under/rank/psych/turtleneck
desc = "A turqouise turtleneck and a pair of dark blue slacks, belonging to a psychologist."
@@ -199,7 +177,6 @@
icon_state = "psychturtle"
item_state = "b_suit"
item_color = "psychturtle"
flags_size = ONESIZEFITSALL
/*
@@ -213,7 +190,6 @@
item_color = "genetics_new"
permeability_coefficient = 0.50
armor = list("melee" = 0, "bullet" = 0, "laser" = 0,"energy" = 0, "bomb" = 0, "bio" = 10, "rad" = 0, "fire" = 0, "acid" = 0)
flags_size = ONESIZEFITSALL
/obj/item/clothing/under/rank/chemist_new
desc = "It's made of a special fiber which provides minor protection against biohazards."
@@ -223,7 +199,6 @@
item_color = "chemist_new"
permeability_coefficient = 0.50
armor = list("melee" = 0, "bullet" = 0, "laser" = 0,"energy" = 0, "bomb" = 0, "bio" = 10, "rad" = 0, "fire" = 50, "acid" = 65)
flags_size = ONESIZEFITSALL
/obj/item/clothing/under/rank/scientist_new
desc = "Made of a special fiber that gives special protection against biohazards and small explosions."
@@ -233,7 +208,6 @@
item_color = "scientist_new"
permeability_coefficient = 0.50
armor = list("melee" = 0, "bullet" = 0, "laser" = 0,"energy" = 0, "bomb" = 10, "bio" = 0, "rad" = 0, "fire" = 0, "acid" = 0)
flags_size = ONESIZEFITSALL
/obj/item/clothing/under/rank/virologist_new
desc = "Made of a special fiber that gives increased protection against biohazards."
@@ -243,4 +217,3 @@
item_color = "virologist_new"
permeability_coefficient = 0.50
armor = list("melee" = 0, "bullet" = 0, "laser" = 0,"energy" = 0, "bomb" = 0, "bio" = 10, "rad" = 0, "fire" = 0, "acid" = 0)
flags_size = ONESIZEFITSALL
@@ -16,7 +16,6 @@
item_state = "r_suit"
item_color = "warden"
armor = list("melee" = 10, "bullet" = 0, "laser" = 0,"energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 30, "acid" = 30)
flags_size = ONESIZEFITSALL
strip_delay = 50
/obj/item/clothing/under/rank/warden/skirt
@@ -25,7 +24,6 @@
icon_state = "wardenf"
item_state = "r_suit"
item_color = "wardenf"
flags_size = null
/obj/item/clothing/under/rank/security
name = "security officer's jumpsuit"
@@ -34,7 +32,6 @@
item_state = "r_suit"
item_color = "secred"
armor = list("melee" = 10, "bullet" = 0, "laser" = 0,"energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 30, "acid" = 30)
flags_size = ONESIZEFITSALL
strip_delay = 50
/obj/item/clothing/under/rank/security/skirt
@@ -43,7 +40,6 @@
icon_state = "secredf"
item_state = "r_suit"
item_color = "secredf"
flags_size = null
/obj/item/clothing/under/rank/dispatch
name = "dispatcher's uniform"
@@ -52,7 +48,6 @@
item_state = "dispatch"
item_color = "dispatch"
armor = list("melee" = 10, "bullet" = 0, "laser" = 0,"energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 30, "acid" = 30)
flags_size = ONESIZEFITSALL
/obj/item/clothing/under/rank/security2
name = "security officer's uniform"
@@ -61,7 +56,6 @@
item_state = "r_suit"
item_color = "redshirt2"
armor = list("melee" = 10, "bullet" = 0, "laser" = 0,"energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 30, "acid" = 30)
flags_size = ONESIZEFITSALL
/obj/item/clothing/under/rank/security/corp
icon_state = "sec_corporate"
@@ -83,7 +77,6 @@
item_state = "det"
item_color = "detective"
armor = list("melee" = 10, "bullet" = 0, "laser" = 0,"energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 30, "acid" = 30)
flags_size = ONESIZEFITSALL
strip_delay = 50
sprite_sheets = list(
@@ -100,7 +93,6 @@
item_state = "r_suit"
item_color = "hosred"
armor = list("melee" = 10, "bullet" = 0, "laser" = 0,"energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 50, "acid" = 50)
flags_size = ONESIZEFITSALL
strip_delay = 60
/obj/item/clothing/under/rank/head_of_security/skirt
@@ -109,7 +101,6 @@
icon_state = "hosredf"
item_state = "r_suit"
item_color = "hosredf"
flags_size = null
/obj/item/clothing/under/rank/head_of_security/corp
icon_state = "hos_corporate"
@@ -123,7 +114,6 @@
icon_state = "jensen"
item_state = "jensen"
item_color = "jensen"
flags_size = ONESIZEFITSALL
//Paradise Station
@@ -180,7 +170,6 @@
item_color = "brig_phys"
permeability_coefficient = 0.50
armor = list(melee = 10, bullet = 0, laser = 0, energy = 0, bomb = 0, bio = 10, rad = 0, fire = 30, acid = 30)
flags_size = ONESIZEFITSALL
/obj/item/clothing/under/rank/security/brigphys/skirt
desc = "A skirted Brig Physician uniform. It has both security and medical protection."
@@ -189,7 +178,6 @@
item_state = "brig_physf"
item_color = "brig_physf"
permeability_coefficient = 0.50
flags_size = ONESIZEFITSALL
//Pod Pilot
/obj/item/clothing/under/rank/security/pod_pilot
@@ -102,7 +102,6 @@
item_state = "navy_gold"
item_color = "navy_gold"
displays_id = 0
flags_size = ONESIZEFITSALL
/obj/item/clothing/under/rank/centcom/captain
desc = "Gold trim on space-black cloth, this uniform displays the rank of \"Captain\" and bears \"N.A.S. Trurl \" on the left shoulder. Worn exclusively by officers of the Nanotrasen Navy. It's got exotic materials for protection."
@@ -111,7 +110,6 @@
item_state = "navy_gold"
item_color = "navy_gold"
displays_id = 0
flags_size = ONESIZEFITSALL
/obj/item/clothing/under/rank/centcom/blueshield
desc = "Gold trim on space-black cloth, this uniform bears \"Close Protection\" on the left shoulder."
@@ -120,7 +118,6 @@
item_state = "g_suit"
item_color = "officer"
displays_id = 0
flags_size = ONESIZEFITSALL
/obj/item/clothing/under/rank/centcom/representative
desc = "Gold trim on space-black cloth, this uniform bears \"N.S.S. Cyberiad\" on the left shoulder."
@@ -129,7 +126,6 @@
item_state = "g_suit"
item_color = "officer"
displays_id = 0
flags_size = ONESIZEFITSALL
/obj/item/clothing/under/rank/centcom/representative/New()
..()
@@ -142,7 +138,6 @@
item_state = "g_suit"
item_color = "officer"
displays_id = 0
flags_size = ONESIZEFITSALL
/obj/item/clothing/under/rank/centcom/magistrate/New()
..()
@@ -272,7 +267,6 @@
icon_state = "red_suit"
item_state = "r_suit"
item_color = "red_suit"
flags_size = ONESIZEFITSALL
/obj/item/clothing/under/suit_jacket/navy
name = "navy suit"
@@ -751,7 +745,6 @@
righthand_file = 'icons/goonstation/mob/inhands/clothing_righthand.dmi'
flags = NODROP
resistance_flags = LAVA_PROOF | FIRE_PROOF | ACID_PROOF
flags_size = ONESIZEFITSALL
has_sensor = 0 // HUNKE
/obj/item/clothing/under/victdress
@@ -809,7 +802,6 @@
icon_state = "hawaiianred"
item_state = "hawaiianred"
item_color = "hawaiianred"
flags_size = ONESIZEFITSALL
/obj/item/clothing/under/pinkhawaiianshirt
name = "pink hawaiian shirt"
@@ -817,7 +809,6 @@
icon_state = "hawaiianpink"
item_state = "hawaiianpink"
item_color = "hawaiianpink"
flags_size = ONESIZEFITSALL
/obj/item/clothing/under/orangehawaiianshirt
name = "orange hawaiian shirt"
@@ -825,7 +816,6 @@
icon_state = "hawaiianorange"
item_state = "hawaiianorange"
item_color = "hawaiianorange"
flags_size = ONESIZEFITSALL
/obj/item/clothing/under/bluehawaiianshirt
name = "blue hawaiian shirt"
@@ -833,7 +823,6 @@
icon_state = "hawaiianblue"
item_state = "hawaiianblue"
item_color = "hawaiianblue"
flags_size = ONESIZEFITSALL
/obj/item/clothing/under/misc/durathread
name = "durathread jumpsuit"
@@ -7,7 +7,6 @@
item_state = "retro_sec"
item_color = "retro_sec"
displays_id = 0
flags_size = ONESIZEFITSALL
/obj/item/clothing/under/retro/medical
desc = "A once biologically resistant medical uniform. The high-vis stripes are faded and unreflective."
@@ -16,7 +15,6 @@
item_state = "retro_med"
item_color = "retro_med"
displays_id = 0
flags_size = ONESIZEFITSALL
/obj/item/clothing/under/retro/engineering
desc = "A faded grimy engineering jumpsuit and overall combo. It's coated with oil, dust, and grit."
@@ -25,7 +23,6 @@
item_state = "retro_eng"
item_color = "retro_eng"
displays_id = 0
flags_size = ONESIZEFITSALL
/obj/item/clothing/under/retro/science
desc = "A faded polo and set of distinct white slacks. What a ridiculous tie."
@@ -34,4 +31,3 @@
item_state = "retro_sci"
item_color = "retro_sci"
displays_id = 0
flags_size = ONESIZEFITSALL
-2
View File
@@ -1080,7 +1080,6 @@
icon_state = "counterfeitguise"
item_state = "counterfeitguise"
item_color = "counterfeitguise"
flags_size = ONESIZEFITSALL
/obj/item/clothing/under/fluff/benjaminfallout // Benjaminfallout: Pretzel Brassheart
icon = 'icons/obj/custom_items.dmi'
@@ -1350,7 +1349,6 @@
icon = 'icons/obj/custom_items.dmi'
icon_state = "chronx_robe"
item_state = "chronx_robe"
flags_size = ONESIZEFITSALL
actions_types = list(/datum/action/item_action/toggle)
adjust_flavour = "untransform"
ignore_suitadjust = 0
@@ -292,11 +292,14 @@
if(nutrition < NUTRITION_LEVEL_HYPOGLYCEMIA)
msg += "[p_they(TRUE)] [p_are()] severely malnourished.\n"
else if(nutrition >= NUTRITION_LEVEL_FAT)
if(FAT in mutations)
msg += "[p_they(TRUE)] [p_are()] morbidly obese.\n"
if(user.nutrition < NUTRITION_LEVEL_HYPOGLYCEMIA)
msg += "[p_they(TRUE)] [p_are()] plump and delicious looking - Like a fat little piggy. A tasty piggy.\n"
else
msg += "[p_they(TRUE)] [p_are()] quite chubby.\n"
else if(nutrition >= NUTRITION_LEVEL_FAT)
msg += "[p_they(TRUE)] [p_are()] quite chubby.\n"
if(!isSynthetic() && blood_volume < BLOOD_VOLUME_SAFE)
msg += "[p_they(TRUE)] [p_have()] pale skin.\n"
@@ -111,33 +111,11 @@
/mob/living/carbon/human/proc/becomeSlim()
to_chat(src, "<span class='notice'>You feel fit again!</span>")
var/obj/item/organ/external/chest/C = get_organ("chest")
if(istype(C))
C.makeSlim(0)
else
to_chat(src, "Err, well, you *would*, but you don't have a torso. Yell at a coder.")
log_debug("[src] at ([x],[y],[z]) doesn't have a torso.")
mutations.Remove(FAT)
update_mutantrace(0)
update_mutations(0)
update_body(0, 1)
update_inv_w_uniform(0)
update_inv_wear_suit()
/mob/living/carbon/human/proc/becomeFat()
to_chat(src, "<span class='alert'>You suddenly feel blubbery!</span>")
var/obj/item/organ/external/chest/C = get_organ("chest")
if(istype(C))
C.makeFat()
else
to_chat(src, "Err, well, you *would*, but you don't have a torso. Yell at a coder.")
log_debug("[src] at ([x],[y],[z]) doesn't have a torso.")
mutations.Add(FAT)
update_mutantrace(0)
update_mutations(0)
update_body(0, 1)
update_inv_w_uniform(0)
update_inv_wear_suit()
//Handles chem traces
/mob/living/carbon/human/proc/handle_trace_chems()
+6 -8
View File
@@ -598,14 +598,12 @@
return 0 //godmode
if(!(NO_HUNGER in dna.species.species_traits))
//The fucking FAT mutation is the greatest shit ever. It makes everyone so hot and bothered.
if(CAN_BE_FAT in dna.species.species_traits)
if(FAT in mutations)
if(overeatduration < 100)
becomeSlim()
else
if(overeatduration > 500)
becomeFat()
if(FAT in mutations)
if(overeatduration < 100)
becomeSlim()
else
if(overeatduration > 500)
becomeFat()
// nutrition decrease
if(nutrition > 0 && stat != DEAD)
@@ -616,13 +616,6 @@
if(!H.has_organ_for_slot(slot))
return FALSE
if(istype(I, /obj/item/clothing/under) || istype(I, /obj/item/clothing/suit))
if(FAT in H.mutations)
if(!(I.flags_size & ONESIZEFITSALL))
if(!disable_warning)
to_chat(H, "<span class='alert'>You're too fat to wear the [I].</span>")
return FALSE
switch(slot)
if(slot_l_hand)
return !H.l_hand && !H.incapacitated()
@@ -21,7 +21,7 @@
default_genes = list(REMOTE_TALK)
species_traits = list(LIPS, IS_WHITELISTED, CAN_BE_FAT, CAN_WINGDINGS)
species_traits = list(LIPS, IS_WHITELISTED, CAN_WINGDINGS)
clothing_flags = HAS_UNDERWEAR | HAS_UNDERSHIRT | HAS_SOCKS
bodyflags = HAS_BODY_MARKINGS
dietflags = DIET_HERB
@@ -5,7 +5,7 @@
deform = 'icons/mob/human_races/r_def_human.dmi'
primitive_form = /datum/species/monkey
language = "Sol Common"
species_traits = list(LIPS, CAN_BE_FAT)
species_traits = list(LIPS)
skinned_type = /obj/item/stack/sheet/animalhide/human
clothing_flags = HAS_UNDERWEAR | HAS_UNDERSHIRT | HAS_SOCKS
bodyflags = HAS_SKIN_TONE | HAS_BODY_MARKINGS
@@ -18,4 +18,4 @@
reagent_tag = PROCESS_ORG
//Has standard darksight of 2.
@@ -24,7 +24,7 @@
primitive_form = /datum/species/monkey/tajaran
species_traits = list(LIPS, CAN_BE_FAT)
species_traits = list(LIPS)
clothing_flags = HAS_UNDERWEAR | HAS_UNDERSHIRT | HAS_SOCKS
bodyflags = HAS_TAIL | HAS_HEAD_ACCESSORY | HAS_MARKINGS | HAS_SKIN_COLOR | TAIL_WAGGING
dietflags = DIET_OMNI
@@ -1,8 +1,8 @@
/*
Global associative list for caching humanoid icons.
Index format m or f, followed by a string of 0 and 1 to represent bodyparts followed by husk fat hulk skeleton 1 or 0.
Index format m or f, followed by a string of 0 and 1 to represent bodyparts followed by husk hulk skeleton 1 or 0.
TODO: Proper documentation
icon_key is [species.race_key][g][husk][fat][hulk][skeleton][s_tone]
icon_key is [species.race_key][g][husk][hulk][skeleton][s_tone]
*/
GLOBAL_LIST_EMPTY(human_icon_cache)
@@ -449,10 +449,6 @@ GLOBAL_LIST_EMPTY(damage_icon_parts)
/mob/living/carbon/human/update_mutations(var/update_icons=1)
remove_overlay(MUTATIONS_LAYER)
var/fat
if(FAT in mutations)
fat = "fat"
var/mutable_appearance/standing = mutable_appearance('icons/effects/genetics.dmi', layer = -MUTATIONS_LAYER)
var/add_image = 0
var/g = "m"
@@ -463,7 +459,7 @@ GLOBAL_LIST_EMPTY(damage_icon_parts)
if(!gene.block)
continue
if(gene.is_active(src))
var/underlay = gene.OnDrawUnderlays(src, g, fat)
var/underlay = gene.OnDrawUnderlays(src, g)
if(underlay)
standing.underlays += underlay
add_image = 1
@@ -473,9 +469,9 @@ GLOBAL_LIST_EMPTY(damage_icon_parts)
standing.overlays += "lasereyes_s"
add_image = 1
if((COLDRES in mutations) && (HEATRES in mutations))
standing.underlays -= "cold[fat]_s"
standing.underlays -= "fire[fat]_s"
standing.underlays += "coldfire[fat]_s"
standing.underlays -= "cold_s"
standing.underlays -= "fire_s"
standing.underlays += "coldfire_s"
if(add_image)
overlays_standing[MUTATIONS_LAYER] = standing
@@ -557,13 +553,6 @@ GLOBAL_LIST_EMPTY(damage_icon_parts)
t_color = icon_state
var/mutable_appearance/standing = mutable_appearance('icons/mob/uniform.dmi', "[t_color]_s", layer = -UNIFORM_LAYER)
if(FAT in mutations)
if(w_uniform.flags_size & ONESIZEFITSALL)
standing.icon = 'icons/mob/uniform_fat.dmi'
else
to_chat(src, "<span class='warning'>You burst out of \the [w_uniform]!</span>")
unEquip(w_uniform)
return
if(w_uniform.icon_override)
standing.icon = w_uniform.icon_override
@@ -873,13 +862,6 @@ GLOBAL_LIST_EMPTY(damage_icon_parts)
standing = mutable_appearance(wear_suit.icon_override, "[wear_suit.icon_state]", layer = -SUIT_LAYER)
else if(wear_suit.sprite_sheets && wear_suit.sprite_sheets[dna.species.name])
standing = mutable_appearance(wear_suit.sprite_sheets[dna.species.name], "[wear_suit.icon_state]", layer = -SUIT_LAYER)
else if(FAT in mutations)
if(wear_suit.flags_size & ONESIZEFITSALL)
standing = mutable_appearance('icons/mob/suit_fat.dmi', "[wear_suit.icon_state]", layer = -SUIT_LAYER)
else
to_chat(src, "<span class='warning'>You burst out of \the [wear_suit]!</span>")
unEquip(wear_suit)
return
else
standing = mutable_appearance('icons/mob/suit.dmi', "[wear_suit.icon_state]", layer = -SUIT_LAYER)
@@ -1313,7 +1295,6 @@ GLOBAL_LIST_EMPTY(damage_icon_parts)
/mob/living/carbon/human/proc/generate_icon_render_key()
var/husk = (HUSK in mutations)
var/fat = (FAT in mutations)
var/hulk = (HULK in mutations)
var/skeleton = (SKELETON in mutations)
@@ -1346,4 +1327,4 @@ GLOBAL_LIST_EMPTY(damage_icon_parts)
if(part.s_tone)
. += "[part.s_tone]"
. = "[.][!!husk][!!fat][!!hulk][!!skeleton]"
. = "[.][!!husk][!!hulk][!!skeleton]"
-2
View File
@@ -414,8 +414,6 @@ GLOBAL_LIST_INIT(slot_equipment_priority, list( \
if(slot_w_uniform)
if( !(slot_flags & SLOT_ICLOTHING) )
return 0
if((FAT in H.mutations) && !(flags_size & ONESIZEFITSALL))
return 0
if(H.w_uniform)
if(!(H.w_uniform.flags & NODROP))
return 2
@@ -237,10 +237,7 @@
else
icobase = 'icons/mob/human_races/r_human.dmi'
var/fat=""
if(disabilities & DISABILITY_FLAG_FAT && (CAN_BE_FAT in current_species.species_traits))
fat="_fat"
preview_icon = new /icon(icobase, "torso_[g][fat]")
preview_icon = new /icon(icobase, "torso_[g]")
preview_icon.Blend(new /icon(icobase, "groin_[g]"), ICON_OVERLAY)
var/head = "head"
if(alt_head && current_species.bodyflags & HAS_ALT_HEADS)
@@ -404,8 +401,6 @@
var/icon/clothes_s = null
var/uniform_dmi='icons/mob/uniform.dmi'
if(disabilities&DISABILITY_FLAG_FAT)
uniform_dmi='icons/mob/uniform_fat.dmi'
if(job_support_low & JOB_CIVILIAN)//This gives the preview icon clothes depending on which job(if any) is set to 'high'
clothes_s = new /icon(uniform_dmi, "grey_s")
clothes_s.Blend(new /icon('icons/mob/feet.dmi', "black"), ICON_UNDERLAY)
@@ -305,10 +305,14 @@
icon = 'icons/obj/power.dmi'
icon_state = "wire1"
flags = NOBLUDGEON
var/drawing_power = FALSE
/obj/item/apc_powercord/afterattack(atom/target, mob/user, proximity_flag, click_parameters)
if(!istype(target, /obj/machinery/power/apc) || !ishuman(user) || !proximity_flag)
return ..()
if(drawing_power)
to_chat(user, "<span class='warning'>You're already charging.</span>")
return
user.changeNext_move(CLICK_CD_MELEE)
var/obj/machinery/power/apc/A = target
var/mob/living/carbon/human/H = user
@@ -329,6 +333,7 @@
/obj/item/apc_powercord/proc/powerdraw_loop(obj/machinery/power/apc/A, mob/living/carbon/human/H)
H.visible_message("<span class='notice'>[H] inserts a power connector into \the [A].</span>", "<span class='notice'>You begin to draw power from \the [A].</span>")
drawing_power = TRUE
while(do_after(H, 10, target = A))
if(loc != H)
to_chat(H, "<span class='warning'>You must keep your connector out while charging!</span>")
@@ -350,6 +355,7 @@
to_chat(H, "<span class='notice'>You are now fully charged.</span>")
break
H.visible_message("<span class='notice'>[H] unplugs from \the [A].</span>", "<span class='notice'>You unplug from \the [A].</span>")
drawing_power = FALSE
/obj/item/organ/internal/cyberimp/arm/telebaton
name = "telebaton implant"
+1 -8
View File
@@ -62,7 +62,7 @@ GLOBAL_LIST_EMPTY(limb_icon_cache)
get_icon()
. = ..()
/obj/item/organ/external/proc/get_icon(skeletal, fat)
/obj/item/organ/external/proc/get_icon(skeletal)
// Kasparrov, you monster
if(force_icon)
mob_icon = new /icon(force_icon, "[icon_name]")
@@ -181,13 +181,6 @@ GLOBAL_LIST_EMPTY(limb_icon_cache)
icon_file = icobase
return list(icon_file, new_icon_state)
/obj/item/organ/external/chest/get_icon_state(skeletal)
var/result = ..()
if(fat && !skeletal && !is_robotic() && (CAN_BE_FAT in dna.species.species_traits))
result[2] += "_fat"
return result
// new damage icon system
// adjusted to set damage_state to brute/burn code only (without r_name0 as before)
/obj/item/organ/external/update_icon()
@@ -15,27 +15,8 @@
gendered_icon = 1
parent_organ = null
encased = "ribcage"
var/fat = FALSE
convertable_children = list(/obj/item/organ/external/groin)
/obj/item/organ/external/chest/proc/makeFat(update_body_icon = 1)
fat = TRUE
if(owner)
owner.update_body(update_body_icon)
else
// get_icon updates the sprite icon, update_icon updates the injuries overlay.
// Madness.
get_icon()
/obj/item/organ/external/chest/proc/makeSlim(update_body_icon = 1)
fat = FALSE
if(owner)
owner.update_body(update_body_icon)
else
// get_icon updates the sprite icon, update_icon updates the injuries overlay.
// Madness.
get_icon()
/obj/item/organ/external/groin
name = "lower body"
limb_name = "groin"