From d3407f1711a51d2bcd03de4e6b9e3ed6b6c3f293 Mon Sep 17 00:00:00 2001 From: Poojawa Date: Sat, 17 Mar 2018 20:03:21 -0500 Subject: [PATCH] a few other little runtimes --- code/modules/client/preferences.dm | 3 +++ code/modules/jobs/job_types/civilian.dm | 2 +- .../objects/structures/crates_lockers/closets/wardrobe.dm | 6 +++++- 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/code/modules/client/preferences.dm b/code/modules/client/preferences.dm index 4235f3e37e..fa19edc832 100644 --- a/code/modules/client/preferences.dm +++ b/code/modules/client/preferences.dm @@ -1478,6 +1478,9 @@ GLOBAL_LIST_EMPTY(preferences_datums) if (!isnull(desiredfps)) clientfps = desiredfps parent.fps = desiredfps + else + clientfps = 0 + parent.fps = 0 if("ui") var/pickedui = input(user, "Choose your UI style.", "Character Preference") as null|anything in list("Midnight", "Plasmafire", "Retro", "Slimecore", "Operative", "Clockwork") if(pickedui) diff --git a/code/modules/jobs/job_types/civilian.dm b/code/modules/jobs/job_types/civilian.dm index a10c15e53f..b2e4d63b2b 100644 --- a/code/modules/jobs/job_types/civilian.dm +++ b/code/modules/jobs/job_types/civilian.dm @@ -140,7 +140,7 @@ Curator l_hand = /obj/item/storage/bag/books r_pocket = /obj/item/key/displaycase l_pocket = /obj/item/device/laser_pointer - accessory = /obj/item/clothing/accessory/pocketprotector/full + //CITADEL EDIT removes runtimes from this pocket protector backpack_contents = list( /obj/item/melee/curator_whip = 1, /obj/item/soapstone = 1, diff --git a/modular_citadel/code/game/objects/structures/crates_lockers/closets/wardrobe.dm b/modular_citadel/code/game/objects/structures/crates_lockers/closets/wardrobe.dm index 6e5c160408..ba4fa3787b 100644 --- a/modular_citadel/code/game/objects/structures/crates_lockers/closets/wardrobe.dm +++ b/modular_citadel/code/game/objects/structures/crates_lockers/closets/wardrobe.dm @@ -30,4 +30,8 @@ if(prob(30)) new /obj/item/clothing/suit/hooded/wintercoat(src) new /obj/item/clothing/shoes/winterboots(src) - return \ No newline at end of file + return + +/obj/structure/closet/wardrobe/curator/PopulateContents() + ..() + new /obj/item/clothing/accessory/pocketprotector/full(src) \ No newline at end of file