Merge remote-tracking branch 'citadel/master' into clickcd_experimental

This commit is contained in:
silicons
2020-07-23 10:36:46 -07:00
43 changed files with 4089 additions and 2706 deletions
+1 -1
View File
@@ -46,7 +46,7 @@
switch(choice)
if("Underwear")
var/new_undies = input(H, "Select your underwear", "Changing") as null|anything in GLOB.underwear_list
if(H.underwear)
if(new_undies)
H.underwear = new_undies
H.saved_underwear = new_undies
var/datum/sprite_accessory/underwear/bottom/B = GLOB.underwear_list[new_undies]