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

2021-01-06 23:55:24 -08:00
parent 555c384d73 51f8739ad8
commit 186bb483b1
1096 changed files with 56771 additions and 24089 deletions
@@ -271,6 +271,11 @@
 	icon = "the_lightbulb"
 	desc = "A cafe popular among moths and moffs. Once shut down for a week after the bartender used mothballs to protect her spare uniforms."

+/datum/barsign/goose
+	name = "The Loose Goose"
+	icon = "goose"
+	desc = "Drink till you puke and/or break the laws of reality!"
+
 /datum/barsign/cybersylph
 	name = "Cyber Sylph's"
 	icon = "cybersylph"
@@ -243,7 +243,7 @@ LINEN BINS

 /obj/item/bedsheet/random/Initialize()
 	..()
-	var/type = pick(typesof(/obj/item/bedsheet) - list(/obj/item/bedsheet/random, /obj/item/bedsheet/chameleon))
+	var/type = pick(typesof(/obj/item/bedsheet) - (list(/obj/item/bedsheet/random, /obj/item/bedsheet/chameleon) + typesof(/obj/item/bedsheet/unlockable)))
 	new type(loc)
 	return INITIALIZE_HINT_QDEL

@@ -257,9 +257,32 @@ LINEN BINS
 	chameleon_action = new(src)
 	chameleon_action.chameleon_type = /obj/item/bedsheet
 	chameleon_action.chameleon_name = "Bedsheet"
-	chameleon_action.chameleon_blacklist = typecacheof(list(/obj/item/bedsheet/chameleon, /obj/item/bedsheet/random), only_root_path = TRUE)
+	chameleon_action.chameleon_blacklist = typecacheof(list(/obj/item/bedsheet/chameleon, /obj/item/bedsheet/random, /obj/item/bedsheet/unlockable), only_root_path = FALSE)
 	chameleon_action.initialize_disguises()

+//unlockable bedsheets
+/obj/item/bedsheet/unlockable
+	name = "unlockable bedsheet"
+	desc = "this shouldn't be here!"
+
+//janitor: clean 100 messes with mop as janitor
+/obj/item/bedsheet/unlockable/janitor
+	name = "janitor bedsheet"
+	desc = "A white bedsheet, with a warning sign on the front."
+	icon_state = "sheetjanitor"
+
+//cook: use microwave 100 times properly (contents must make one good item) as cook
+/obj/item/bedsheet/unlockable/cook
+	name = "cook bedsheet"
+	desc = "A grey bedsheet, with a microwave on the front."
+	icon_state = "sheetcook"
+
+//miner: redeem 100,000 mining points
+/obj/item/bedsheet/unlockable/miner
+	name = "miner bedsheet"
+	desc = "A red and black bedsheet. It seems to be made with goliath hide."
+	icon_state = "sheetminer"
+
 //bedsheet bin
 /obj/structure/bedsheetbin
 	name = "linen bin"
@@ -73,4 +73,4 @@
 /obj/structure/chess/blackking
 	name = "\improper Black King"
 	desc = "A black king chess piece. It can move one tile in any direction."
-	icon_state = "black_king"
+	icon_state = "black_king"
@@ -446,8 +446,11 @@
 			var/mob/living/L = O
 			if(!issilicon(L))
 				L.DefaultCombatKnockdown(40)
-			O.forceMove(T)
-			close()
+			if(istype(src, /obj/structure/closet/supplypod/extractionpod))
+				O.forceMove(src)
+			else
+				O.forceMove(T)
+				close()
 	else
 		O.forceMove(T)
 	return 1
@@ -108,4 +108,4 @@
 	icon_state = "radbodybag"
 	mob_storage_capacity = 1
 	foldedbag_path = /obj/item/bodybag/containment
-	rad_flags = RAD_PROTECT_CONTENTS | RAD_NO_CONTAMINATE
+	rad_flags = RAD_PROTECT_CONTENTS | RAD_NO_CONTAMINATE
@@ -30,6 +30,8 @@
 	new /obj/item/construction/rcd/loaded/upgraded(src)
 	new /obj/item/clothing/suit/hooded/wintercoat/ce(src)
 	new /obj/item/clothing/head/beret/ce/white(src)
+	new /obj/item/storage/bag/construction(src)
+	new /obj/item/storage/bag/material(src)

 /obj/structure/closet/secure_closet/engineering_electrical
 	name = "electrical supplies locker"
@@ -78,6 +80,8 @@
 	new /obj/item/clothing/glasses/meson/engine(src)
 	new /obj/item/storage/box/emptysandbags(src)
 	new /obj/item/cartridge/engineering(src)
+	new /obj/item/storage/bag/construction(src)
+	new /obj/item/storage/bag/material(src)

 /obj/structure/closet/secure_closet/atmospherics
 	name = "\proper atmospheric technician's locker"
@@ -99,6 +103,8 @@
 	new /obj/item/clothing/glasses/meson/engine/tray(src)
 	new /obj/item/extinguisher/advanced(src)
 	new /obj/item/cartridge/atmos(src)
+	new /obj/item/storage/bag/construction(src)
+	new /obj/item/storage/bag/material(src)

 /*
 * Empty lockers
@@ -10,4 +10,4 @@
 	new /obj/item/radio/headset/headset_srv(src)
 	new /obj/item/cultivator(src)
 	new /obj/item/hatchet(src)
-	new /obj/item/storage/box/disks_plantgene(src)
+	new /obj/item/storage/box/disks_plantgene(src)
@@ -47,6 +47,25 @@
 	new /obj/item/clothing/glasses/hud/health(src)
 	return

+/obj/structure/closet/secure_closet/paramedic
+    name = "paramedic's locker"
+    req_access = list(ACCESS_MEDICAL)
+    icon_state = "paramed_secure"
+
+/obj/structure/closet/secure_closet/paramedic/PopulateContents()
+    ..()
+    new /obj/item/clothing/suit/toggle/labcoat/paramedic(src)
+    new /obj/item/clothing/under/rank/medical/paramedic(src)
+    new /obj/item/clothing/under/rank/medical/paramedic/skirt(src)
+    new /obj/item/radio/headset/headset_med(src)
+    new /obj/item/defibrillator/loaded(src)
+    new /obj/item/clothing/gloves/color/latex/nitrile(src)
+    new /obj/item/storage/belt/medical(src)
+    new /obj/item/clothing/glasses/hud/health(src)
+    new /obj/item/pinpointer/crew(src)
+    new /obj/item/sensor_device(src)
+    return
+
 /obj/structure/closet/secure_closet/CMO
 	name = "\proper chief medical officer's locker"
 	req_access = list(ACCESS_CMO)
@@ -15,4 +15,4 @@
 	new	/obj/item/reagent_containers/food/drinks/soda_cans/canned_laughter(src)
 	new /obj/item/pneumatic_cannon/pie(src)
 	new /obj/item/reagent_containers/food/snacks/pie/cream(src)
-	new /obj/item/storage/crayons(src)
+	new /obj/item/storage/crayons(src)
@@ -553,4 +553,4 @@
 /obj/structure/displaycase/forsale/kitchen
 	desc = "A display case with an ID-card swiper. Use your ID to purchase the contents. Meant for the bartender and chef."
 	req_one_access = list(ACCESS_KITCHEN, ACCESS_BAR)
-*/
+*/
@@ -38,4 +38,4 @@
 			user.show_message("<span class='notice'>You weave \the [W.name] into a workable fabric.</span>", MSG_VISUAL)
 	return TRUE

-#undef FABRIC_PER_SHEET
+#undef FABRIC_PER_SHEET
@@ -18,4 +18,4 @@ This memorial has been designed for him and any future coders to perish.
 	icon = 'icons/obj/tomb.dmi'
 	icon_state = "memorial"
 	density = TRUE
-	anchored = TRUE
+	anchored = TRUE
@@ -94,7 +94,7 @@
 	name = "magic mirror"
 	desc = "Turn and face the strange... face."
 	icon_state = "magic_mirror"
-	var/list/races_blacklist = list("skeleton", "agent", "angel", "military_synth", "memezombies", "clockwork golem servant", "android", "synth", "mush", "zombie", "memezombie")
+	var/list/races_blacklist = list("skeleton", "agent", "military_synth", "memezombies", "clockwork golem servant", "android", "synth", "mush", "zombie", "memezombie")
 	var/list/choosable_races = list()

 /obj/structure/mirror/magic/New()
@@ -26,4 +26,4 @@
 /obj/structure/mopbucket/update_overlays()
 	. = ..()
 	if(reagents.total_volume > 0)
-		. += "mopbucket_water"
+		. += "mopbucket_water"
@@ -72,4 +72,4 @@
 /obj/structure/spawner/mining/wumborian
 	name = "wumborian fugu den"
 	desc = "A den housing a nest of wumborian fugus, how do they all even fit in there?"
-	mob_types = list(/mob/living/simple_animal/hostile/asteroid/fugu)
+	mob_types = list(/mob/living/simple_animal/hostile/asteroid/fugu)