The Lizard's Gas (Station) Update (#64304)

san7890 · Koshenko · commit ddf64b31eb93 · 2022-08-29T17:54:55.000-07:00
diff --git a/_maps/RandomRuins/SpaceRuins/gasthelizards.dmm b/_maps/RandomRuins/SpaceRuins/gasthelizards.dmm
diff --git a/_maps/RandomRuins/SpaceRuins/thelizardsgas.dmm b/_maps/RandomRuins/SpaceRuins/thelizardsgas.dmm
diff --git a/code/datums/ruins/space.dm b/code/datums/ruins/space.dm
@@ -123,11 +123,11 @@
 	name = "Empty Shell"
 	description = "Cosy, rural property available for young professional couple. Only twelve parsecs from the nearest hyperspace lane!"
 
-/datum/map_template/ruin/space/gas_the_lizards
-	id = "gas-the-lizards"
-	suffix = "gasthelizards.dmm"
-	name = "Disposal Facility 17"
-	description = "Gas efficiency at 95.6%, fluid elimination at 96.2%. Will require renewed supplies of 'carpet' before the end of the quarter."
+/datum/map_template/ruin/space/the_lizards_gas
+	id = "the-lizards-gas"
+	suffix = "thelizardsgas.dmm"
+	name = "The Lizard's Gas"
+	description = "A refueling station stocked with enough plasma for any space-worthy vessel. Well, maybe if it weren't 50 years ago."
 
 /datum/map_template/ruin/space/intact_empty_ship
 	id = "intact-empty-ship"
diff --git a/code/game/area/areas/ruins/space.dm b/code/game/area/areas/ruins/space.dm
@@ -161,10 +161,10 @@
 	icon_state = "green"
 
 
-//Ruin of gas the lizard
+//Ruin of The Lizard's Gas (Station)
 
-/area/ruin/space/has_grav/gasthelizard
-	name = "Gas the lizard"
+/area/ruin/space/has_grav/thelizardsgas
+	name = "\improper The Lizard's Gas"
 
 
 //Ruin of Deep Storage
diff --git a/code/game/objects/effects/contraband.dm b/code/game/objects/effects/contraband.dm
@@ -453,6 +453,16 @@
 	desc = "DONK CO. BRAND MICROWAVABLE FOOD: MADE BY STARVING COLLEGE STUDENTS, FOR STARVING COLLEGE STUDENTS."
 	icon_state = "donk_co"
 
+/obj/structure/sign/poster/contraband/lizards_gas_payment
+	name = "Please Pay"
+	desc = "A crudely-made poster asking the reader to please pay for any items they may wish to leave the station with."
+	icon_state = "gas_payment"
+
+/obj/structure/sign/poster/contraband/lizards_gas_power
+	name = "Conserve Power"
+	desc = "A crudely-made poster asking the reader to turn off the power before they leave. Hopefully, it's turned on for their re-opening."
+	icon_state = "gas_power"
+
 /obj/structure/sign/poster/contraband/donk_co/examine_more(mob/user)
 	var/list/msg = list(span_notice("<i>You browse some of the poster's information...</i>"))
 	msg += "\t[span_info("DONK CO. BRAND DONK POCKETS: IRRESISTABLY DONK!")]"
diff --git a/code/game/objects/effects/spawners/random/contraband.dm b/code/game/objects/effects/spawners/random/contraband.dm
@@ -71,3 +71,24 @@
 		/obj/effect/spawner/random/entertainment/lighter = 5,
 		/obj/effect/spawner/random/food_or_drink/booze = 5,
 	)
+
+/obj/effect/spawner/random/contraband/cannabis
+	name = "Random Cannabis Spawner" //blasphemously overpowered, use extremely sparingly (if at all)
+	icon = 'goon/icons/obj/hydroponics.dmi'
+	icon_state = "cannabis_spawner"
+	loot = list(
+		/obj/item/food/grown/cannabis = 25,
+		/obj/item/food/grown/cannabis/white = 25,
+		/obj/item/food/grown/cannabis/death = 24,
+		/obj/item/food/grown/cannabis/rainbow = 25,
+		/obj/item/food/grown/cannabis/ultimate = 1, //very rare on purpose
+	)
+
+/obj/effect/spawner/random/contraband/cannabis/lizardsgas
+	loot = list(
+		/obj/item/food/grown/cannabis = 24,
+		/obj/item/food/grown/cannabis/white = 15,
+		/obj/item/food/grown/cannabis/death = 45, //i mean, it's been there for a while?
+		/obj/item/food/grown/cannabis/rainbow = 15,
+		/obj/item/food/grown/cannabis/ultimate = 1,
+	)
diff --git a/code/game/objects/effects/spawners/random/food_or_drink.dm b/code/game/objects/effects/spawners/random/food_or_drink.dm
@@ -202,6 +202,19 @@
 		/obj/item/food/candy/bronx = 1
 	)
 
+/obj/effect/spawner/random/food_or_drink/snack/lizard
+	name = "lizard snack spawner"
+	loot = list(
+		/obj/item/food/brain_pate = 5,
+		/obj/item/food/bread/root = 1,
+		/obj/item/food/breadslice/root = 5,
+		/obj/item/food/kebab/candied_mushrooms = 5,
+		/obj/item/food/steeped_mushrooms = 5,
+		/obj/item/food/larvae = 5,
+		/obj/item/food/emperor_roll = 5,
+		/obj/item/food/honey_roll = 5,
+	)
+
 /obj/effect/spawner/random/food_or_drink/condiment
 	name = "condiment spawner"
 	icon_state = "condiment"
diff --git a/code/game/objects/effects/spawners/random/structure.dm b/code/game/objects/effects/spawners/random/structure.dm
@@ -196,3 +196,19 @@
 		/obj/structure/billboard/nanotrasen = 35,
 		/obj/structure/billboard/nanotrasen/defaced = 15,
 	)
+
+/obj/effect/spawner/random/structure/billboard/lizardsgas //for the space ruin, The Lizard's Gas. I don't see much use for the sprites below anywhere else since they're unifunctional.
+	name = "\improper The Lizards Gas billboard spawner"
+	loot = list(
+		/obj/structure/billboard/lizards_gas = 75,
+		/obj/structure/billboard/lizards_gas/defaced = 25,
+	)
+
+/obj/effect/spawner/random/structure/billboard/roadsigns //also pretty much only unifunctionally useful for gas stations
+	name = "\improper Gas Station billboard spawner"
+	loot = list(
+		/obj/structure/billboard/roadsign/two = 25,
+		/obj/structure/billboard/roadsign/twothousand = 25,
+		/obj/structure/billboard/roadsign/twomillion = 25,
+		/obj/structure/billboard/roadsign/error = 25,
+	)
diff --git a/code/game/objects/structures/billboard.dm b/code/game/objects/structures/billboard.dm
@@ -33,3 +33,33 @@
 	name = "\improper Azik Interstellar billboard"
 	desc = "A billboard advertising Azik Interstellar and their newest model: the Autocrat Solar Sailer. Azik Interstellar: Tiziran Refinement for Galactic Necessities."
 	icon_state = "billboard_azik"
+
+/obj/structure/billboard/lizards_gas
+	name = "\improper The Lizard's Gas billboard"
+	desc = "A billboard labelling the gas station known as 'The Lizard's Gas'. It's been lost to time, and this is the only known gas station of its type. It's hard to see why it flopped based on the quality of the billboard."
+	icon_state = "billboard_lizards_gas"
+
+/obj/structure/billboard/lizards_gas/defaced
+	desc = "A billboard labelling the gas station known as 'The Lizard's Gas'. The soulfully drawn billboard has been graffitied, with a kind stranger painting over the vitriolic graffiti."
+	icon_state = "billboard_lizards_gas_defaced"
+
+/obj/structure/billboard/roadsign
+	name = "\improper Roadsign billboard"
+	desc = "A billboard notifying the reader how many miles are left until the gas station. This one seems to be blank, however."
+	icon_state = "billboard_roadsign_blank"
+
+/obj/structure/billboard/roadsign/two
+	desc = "A billboard notifying the reader how many miles are left until the next gas station. It's hard to see a purpose for this sign at all."
+	icon_state = "billboard_roadsign_two"
+
+/obj/structure/billboard/roadsign/twothousand
+	desc = "A billboard notifying the reader how many miles are left until the next gas station. You'll probably want to stock up on food and gas if you see something like this."
+	icon_state = "billboard_roadsign_twothousand"
+
+/obj/structure/billboard/roadsign/twomillion
+	desc = "A billboard notifying the reader how many miles are left until the next gas station. If you're capable of multi-million-mile travel, this shouldn't be a sweat! If you aren't..."
+	icon_state = "billboard_roadsign_twomillion"
+
+/obj/structure/billboard/roadsign/error
+	desc = "A billboard notifying the reader how many miles are left until the next gas station. This is a static sign, so you have to wonder what sort of person would both print this and then hang it up."
+	icon_state = "billboard_roadsign_error"
diff --git a/code/game/objects/structures/crates_lockers/closets/secure/freezer.dm b/code/game/objects/structures/crates_lockers/closets/secure/freezer.dm
@@ -30,6 +30,13 @@
 	jones = TRUE
 	flags_1 &= ~PREVENT_CONTENTS_EXPLOSION_1
 
+/obj/structure/closet/secure_closet/freezer/empty
+	name = "empty freezer"
+
+/obj/structure/closet/secure_closet/freezer/empty/open
+	req_access = null
+	locked = FALSE
+
 /obj/structure/closet/secure_closet/freezer/kitchen
 	name = "kitchen cabinet"
 	req_access = list(ACCESS_KITCHEN)
diff --git a/code/modules/paperwork/paper_premade.dm b/code/modules/paperwork/paper_premade.dm
@@ -116,3 +116,22 @@
 	name = "URGENT!"
 	info = "A hastily written note has been scribbled here... <br><br> Please use the ore redemption machine in the cargo office for smelting. PLEASE! <br><br>--The Research Staff"
 
+/////////// Space Ruins
+
+/obj/item/paper/fluff/spaceruins/lizardsgas/memorandum
+	name = "A Memorandum"
+	info = {"To all employees:
+	<br> Hey there, it's me, Josh. You know who I am, I hired you! Anyways, you're probably wondering why this gas station is themed after lizards. I just think they're pretty neat! I wish I was a lizard.
+	<br>
+	<br> Anywho, it's also called "The Lizard's Gas" for another reason... <i> weeeeeeeeeeeeeeeeeeeeeeeeeeed. </i> Yeah, I got a buddy who's a fucking wizard with growing weed.
+	<br>
+	<br> Anyways, I thought that when I bought this fuckin' joint (ha ha get it weed), that I should probably sell, y'know, <i> gas? </i> Get it? Gas. Like weed. God, I love weed so much.
+	<br>
+	<br> Back to my point, feel free to sling some of this weed on the side. I don't know what jurisdiction we're in, but it's fine. I know it's fine. I probably wouldn't care. Weed.
+	<br>
+	<br> Yep, all of my weed is in this box. Enjoy! I'm going to go home and hit a gram of my THC (that's like, concentrated weed) Pen (for weed). I'll be back, and those hemp ropes I tied should stay...
+	<br>
+	<br> Make sure you turn that SMES off before you leave! It needs to be on for everything to function, but there's only so much charge left and I can't afford a new one!
+	<br>
+	<br> Best of luck!
+	<br> Josh."}
diff --git a/config/spaceruinblacklist.txt b/config/spaceruinblacklist.txt
@@ -29,7 +29,7 @@
 #_maps/RandomRuins/SpaceRuins/derelict8.dmm
 #_maps/RandomRuins/SpaceRuins/djstation.dmm
 #_maps/RandomRuins/SpaceRuins/emptyshell.dmm
-#_maps/RandomRuins/SpaceRuins/gasthelizards.dmm
+#_maps/RandomRuins/SpaceRuins/thelizardsgas.dmm
 #_maps/RandomRuins/SpaceRuins/gondolaasteroid.dmm
 #_maps/RandomRuins/SpaceRuins/hilbertshoteltestingsite.dmm
 #_maps/RandomRuins/SpaceRuins/intactemptyship.dmm
diff --git a/goon/icons/obj/hydroponics.dmi b/goon/icons/obj/hydroponics.dmi
diff --git a/icons/obj/billboard.dmi b/icons/obj/billboard.dmi
diff --git a/icons/obj/contraband.dmi b/icons/obj/contraband.dmi
