cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-07-17 18:14:25 +01:00
Code Issues Packages Projects Releases Wiki Activity

Underwear Datums (#1794)

Browse Source 
* One more step to bringing our preferences/setup stuff in line with Bay.

* Whoopsy

* Jon is a moron, more at 11.
This commit is contained in:
EmperorJon
2016-05-29 17:29:36 +01:00
committed by Yoshax
parent 288ae3d274
commit 5a545854a4
17 changed files with 644 additions and 166 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/mob/living/carbon/human/human_defines.dm
+1 -4
View File
@@ -33,10 +33,7 @@
var/b_type = "A+" //Player's bloodtype
var/synthetic //If they are a synthetic (aka synthetic torso)
var/underwear_top = 1 //Which underwear the player wants
var/underwear_bottom = 1
var/undershirt = 0 //Which undershirt the player wants.
var/socks = 0 //Which socks the player wants.
var/list/all_underwear = list()
var/backbag = 2 //Which backpack type the player has chosen. Nothing, Satchel or Backpack.
var/pdachoice = 1 //Which PDA type the player has chosen. Default, Slim, or Old.
code/modules/mob/living/carbon/human/update_icons.dm
+4 -10
View File
@@ -319,16 +319,10 @@ var/global/list/damage_icon_parts = list()
stand_icon.Blend(base_icon,ICON_OVERLAY)
//Underwear
if(underwear_top && species.appearance_flags & HAS_UNDERWEAR)
stand_icon.Blend(new /icon('icons/mob/human.dmi', underwear_top), ICON_OVERLAY)
if(underwear_bottom && species.appearance_flags & HAS_UNDERWEAR)
stand_icon.Blend(new /icon('icons/mob/human.dmi', underwear_bottom), ICON_OVERLAY)
if(undershirt && species.appearance_flags & HAS_UNDERWEAR)
stand_icon.Blend(new /icon('icons/mob/human.dmi', undershirt), ICON_OVERLAY)
if(socks && species.appearance_flags & HAS_UNDERWEAR)
stand_icon.Blend(new /icon('icons/mob/human.dmi', socks), ICON_OVERLAY)
if(species.appearance_flags & HAS_UNDERWEAR)
for(var/category in all_underwear)
var/datum/category_item/underwear/UW = all_underwear[category]
UW.apply_to_icon(stand_icon)
if(update_icons)
update_icons()
code/modules/mob/new_player/preferences_setup.dm
+5 -5
View File
@@ -15,11 +15,6 @@
b_skin = rand (0,255)
if(current_species.appearance_flags & HAS_EYE_COLOR)
randomize_eyes_color()
if(current_species.appearance_flags & HAS_UNDERWEAR)
underwear_top = underwear_top_t[pick(underwear_top_t)]
underwear_bottom = underwear_bottom_t[pick(underwear_bottom_t)]
undershirt = undershirt_t[pick(undershirt_t)]
socks = socks_t[pick(socks_t)]
if(current_species.appearance_flags & HAS_HAIR_COLOR)
randomize_hair_color("hair")
randomize_hair_color("facial")
@@ -27,6 +22,11 @@
r_skin = rand (0,255)
g_skin = rand (0,255)
b_skin = rand (0,255)
if(current_species.appearance_flags & HAS_UNDERWEAR)
all_underwear.Cut()
for(var/datum/category_group/underwear/WRC in global_underwear.categories)
var/datum/category_item/underwear/WRI = pick(WRC.items)
all_underwear[WRC.name] = WRI.name
backbag = rand(1,4)