cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-07-18 02:24:11 +01:00
Code Issues Packages Projects Releases Wiki Activity

TG: Fixed r500 (faces displaying above glasses and such) Cause: face layer was set

Browse Source 
to MOB_LAYER.
Fixed r501 (underwear not showing) Cause: bad indentation

A possible fix for some very odd bugs caused by restarting the MC related to the
usr variable being passed into the MC. *shrug* Very hard to test.

Removed the need for the world to be in Debug2 mode to edit ticklag as the verb
is hidden behind another proc now anyway, and it's become more of an annoyance
than a thing to stop people accidentally clicking it.
Revision: r3695
Author: 	 elly1...@rocketmail.com
This commit is contained in:
Erthilo
2012-06-03 14:15:27 +01:00
parent 03c64bb064
commit ce019d526d
4 changed files with 43 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/mob/living/carbon/human/human.dm
+19 -27
View File
@@ -1379,25 +1379,19 @@
return 0
/mob/living/carbon/human/proc/update_body()
if(stand_icon)
del(stand_icon)
if(lying_icon)
del(lying_icon)
if (mutantrace)
return
if(stand_icon) del(stand_icon)
if(lying_icon) del(lying_icon)
if(mutantrace) return
var/g = "m"
if (gender == MALE)
g = "m"
else if (gender == FEMALE)
g = "f"
if(gender == FEMALE) g = "f"
var/husk = (HUSK in src.mutations)
// var/obese = (FAT in src.mutations)
//Base mob icon
stand_icon = new /icon('human.dmi', "torso_[g]_s")
lying_icon = new /icon('human.dmi', "torso_[g]_l")
var/husk = (HUSK in mutations)
stand_icon.Blend(new /icon('human.dmi', "chest_[g]_s"), ICON_OVERLAY)
lying_icon.Blend(new /icon('human.dmi', "chest_[g]_l"), ICON_OVERLAY)
@@ -1438,8 +1432,8 @@
stand_icon.Blend(husk_s, ICON_OVERLAY)
lying_icon.Blend(husk_l, ICON_OVERLAY)
// Skin tone
if (s_tone >= 0)
//Skin tone
if(s_tone >= 0)
stand_icon.Blend(rgb(s_tone, s_tone, s_tone), ICON_ADD)
lying_icon.Blend(rgb(s_tone, s_tone, s_tone), ICON_ADD)
else
@@ -1449,11 +1443,14 @@
stand_icon.Blend(rgb(100,100,100))
lying_icon.Blend(rgb(100,100,100))
if (underwear < 6 && underwear > 0)
//Underwear
if(underwear < 6 && underwear > 0)
// if(!obese)
stand_icon.Blend(new /icon('human.dmi', "underwear[underwear]_[g]_s"), ICON_OVERLAY)
lying_icon.Blend(new /icon('human.dmi', "underwear[underwear]_[g]_l"), ICON_OVERLAY)
/mob/living/carbon/human/proc/update_face()
if(organs)
var/datum/organ/external/head = organs["head"]
@@ -1463,17 +1460,12 @@
del(face_lying)
return
if(!facial_hair_style || !hair_style) return//Seems people like to lose their icons, this should stop the runtimes for now
del(face_standing)
del(face_lying)
if (mutantrace)
return
if(face_standing) del(face_standing)
if(face_lying) del(face_lying)
if(mutantrace) return
var/g = "m"
if (gender == MALE)
g = "m"
else if (gender == FEMALE)
g = "f"
if (gender == FEMALE) g = "f"
var/icon/eyes_s = new/icon("icon" = 'human_face.dmi', "icon_state" = "eyes_s")
var/icon/eyes_l = new/icon("icon" = 'human_face.dmi', "icon_state" = "eyes_l")
@@ -1510,9 +1502,9 @@
face_standing = new /image()
face_lying = new /image()
face_standing.icon = eyes_s
face_standing.layer = MOB_LAYER
face_standing.layer = FACE_LAYER
face_lying.icon = eyes_l
face_lying.layer = MOB_LAYER
face_lying.layer = FACE_LAYER
del(mouth_l)
del(mouth_s)
code/modules/mob/new_player/preferences_setup.dm
+2 -5
View File
@@ -204,10 +204,7 @@ datum/preferences
del(preview_icon)
var/g = "m"
if (gender == MALE)
g = "m"
else if (gender == FEMALE)
g = "f"
if (gender == FEMALE) g = "f"
if(species == "Tajaran")
preview_icon = new /icon('tajaran.dmi', "body_[g]_s", "dir" = preview_dir)
@@ -271,4 +268,4 @@ datum/preferences
if(H.name == f_style)
facial_hair_style = H
else
del(H)
del(H)