cyberpresidentvanellope/fulpstation
1
0
Fork 0
mirror of https://github.com/fulpstation/fulpstation.git synced 2025-12-10 10:01:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixes undershirts to play nice with female uniforms.

Browse Source 
Generalizes and renames some things with female uniforms now that they're used for undershirts too
This commit is contained in:
Incoming
2014-10-11 13:09:52 -04:00
parent b1d1a207d9
commit 6a157216f9
4 changed files with 19 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
code/_globalvars/lists/flavor_misc.dm
View File

@@ -17,7 +17,7 @@ var/global/list/undershirt_f = list() //stores only undershirt name
//Backpacks
var/global/list/backbaglist = list("Nothing", "Backpack", "Satchel")
//Female Uniforms
var/global/list/female_uniform_icons = list()
var/global/list/female_clothing_icons = list()
//radical shit
var/list/hit_appends = list("-OOF", "-ACK", "-UGH", "-HRNK", "-HURGH", "-GLORF")

10
code/modules/clothing/clothing.dm
View File

@@ -216,12 +216,12 @@ BLIND // can't see anything
if(hastie)
user << "\A [hastie] is attached to it."
atom/proc/generate_uniform(index,t_color)
var/icon/female_uniform_icon = icon("icon"='icons/mob/uniform.dmi', "icon_state"="[t_color]_s")
atom/proc/generate_female_clothing(index,t_color,icon)
var/icon/female_clothing_icon = icon("icon"=icon, "icon_state"="[t_color]_s")
var/icon/female_s = icon("icon"='icons/mob/uniform.dmi', "icon_state"="female_s")
female_uniform_icon.Blend(female_s, ICON_MULTIPLY)
female_uniform_icon = fcopy_rsc(female_uniform_icon)
female_uniform_icons[index] = female_uniform_icon
female_clothing_icon.Blend(female_s, ICON_MULTIPLY)
female_clothing_icon = fcopy_rsc(female_clothing_icon)
female_clothing_icons[index] = female_clothing_icon
/obj/item/clothing/under/verb/toggle()
set name = "Toggle Suit Sensors"

5
code/modules/mob/living/carbon/human/species.dm
View File

@@ -185,7 +185,10 @@
if(H.undershirt)
var/datum/sprite_accessory/undershirt/U2 = undershirt_list[H.undershirt]
if(U2)
standing += image("icon"=U2.icon, "icon_state"="[U2.icon_state]_s", "layer"=-BODY_LAYER)
if(H.dna && H.dna.species.sexes && H.gender == FEMALE)
standing += H.wear_female_version(U2.icon_state, U2.icon, BODY_LAYER)
else
standing += image("icon"=U2.icon, "icon_state"="[U2.icon_state]_s", "layer"=-BODY_LAYER)
if(standing.len)
H.overlays_standing[BODY_LAYER] = standing

14
code/modules/mob/living/carbon/human/update_icons.dm
View File

@@ -281,11 +281,7 @@ Please contact me on #coderbus IRC. ~Carnie x
if(dna && dna.species.sexes)
var/G = (gender == FEMALE) ? "f" : "m"
if(G == "f" && U.fitted == 1)
var/index = "[t_color]_s"
var/icon/female_uniform_icon = female_uniform_icons[index]
if(!female_uniform_icon ) //Create standing/laying icons if they don't exist
generate_uniform(index,t_color)
standing = image("icon"=female_uniform_icons["[t_color]_s"], "layer"=-UNIFORM_LAYER)
standing = wear_female_version(t_color, 'icons/mob/uniform.dmi', UNIFORM_LAYER)
overlays_standing[UNIFORM_LAYER] = standing
if(w_uniform.blood_DNA)
@@ -583,6 +579,14 @@ Please contact me on #coderbus IRC. ~Carnie x
apply_overlay(L_HAND_LAYER)
/mob/living/carbon/human/proc/wear_female_version(t_color, icon, layer)
var/index = "[t_color]_s"
var/icon/female_clothing_icon = female_clothing_icons[index]
if(!female_clothing_icon) //Create standing/laying icons if they don't exist
generate_female_clothing(index,t_color,icon)
var/standing = image("icon"=female_clothing_icons["[t_color]_s"], "layer"=-layer)
return(standing)
//Human Overlays Indexes/////////
#undef SPECIES_LAYER