Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit28

2019-07-15 17:33:41 +02:00
parent ffecca8c11 8c1b7c4f22
commit 1e1f8e627f
478 changed files with 4946 additions and 2469 deletions
@@ -168,8 +168,11 @@
 		vr_human.name = H.name
 		vr_human.real_name = H.real_name
 		vr_human.socks = H.socks
+		vr_human.socks_color = H.socks_color
 		vr_human.undershirt = H.undershirt
+		vr_human.shirt_color = H.shirt_color
 		vr_human.underwear = H.underwear
+		vr_human.undie_color = H.undie_color
 		vr_human.updateappearance(TRUE, TRUE, TRUE)
 		vr_human.give_genitals(TRUE) //CITADEL ADD
 		if(outfit)