From 600586c72bc83ff7f65ff1cc47dbc065a06c5d23 Mon Sep 17 00:00:00 2001 From: ShizCalev Date: Thu, 9 Aug 2018 17:04:25 -0400 Subject: [PATCH] Fixes var set lists on maps (#39615) --- .../LavaRuins/lavaland_surface_pizzaparty.dmm | 18 ++-------- _maps/RandomRuins/SpaceRuins/miracle.dmm | 4 +-- _maps/RandomZLevels/spacebattle.dmm | 27 ++++----------- _maps/map_files/MetaStation/MetaStation.dmm | 9 ++--- _maps/map_files/PubbyStation/PubbyStation.dmm | 21 ++++-------- _maps/map_files/generic/CentCom.dmm | 34 +++---------------- _maps/shuttles/whiteship_cere.dmm | 6 +--- code/game/machinery/computer/arcade.dm | 9 +++++ .../game/objects/effects/spawners/lootdrop.dm | 23 ++++++++----- .../awaymissions/mission_code/spacebattle.dm | 9 +++++ .../ruins/lavalandruin_code/pizzaparty.dm | 9 +++++ code/modules/ruins/spaceruin_code/miracle.dm | 4 +++ code/modules/shuttle/white_ship.dm | 6 ++++ code/modules/vending/cigarette.dm | 10 ++++++ code/modules/vending/medical_wall.dm | 6 ++++ tgstation.dme | 2 ++ 16 files changed, 94 insertions(+), 103 deletions(-) create mode 100644 code/modules/ruins/lavalandruin_code/pizzaparty.dm create mode 100644 code/modules/ruins/spaceruin_code/miracle.dm diff --git a/_maps/RandomRuins/LavaRuins/lavaland_surface_pizzaparty.dmm b/_maps/RandomRuins/LavaRuins/lavaland_surface_pizzaparty.dmm index d3ebc38fb79..21f2d380905 100644 --- a/_maps/RandomRuins/LavaRuins/lavaland_surface_pizzaparty.dmm +++ b/_maps/RandomRuins/LavaRuins/lavaland_surface_pizzaparty.dmm @@ -57,11 +57,7 @@ /area/ruin/unpowered) "k" = ( /obj/structure/table/wood, -/obj/effect/spawner/lootdrop{ - loot = list(/obj/item/pizzabox/margherita = 3, /obj/item/pizzabox/meat = 3, /obj/item/pizzabox/mushroom = 3, /obj/item/pizzabox/bomb = 1); - lootdoubles = 0; - name = "pizza spawner" - }, +/obj/effect/spawner/lootdrop/pizzaparty, /obj/effect/decal/cleanable/dirt, /turf/open/floor/wood{ initial_gas_mix = "o2=14;n2=23;TEMP=300" @@ -72,11 +68,7 @@ dir = 4 }, /obj/structure/table/wood, -/obj/effect/spawner/lootdrop{ - loot = list(/obj/item/pizzabox/margherita = 3, /obj/item/pizzabox/meat = 3, /obj/item/pizzabox/mushroom = 3, /obj/item/pizzabox/bomb = 1); - lootdoubles = 0; - name = "pizza spawner" - }, +/obj/effect/spawner/lootdrop/pizzaparty, /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/cobweb/cobweb2, /turf/open/floor/wood{ @@ -161,11 +153,7 @@ /area/ruin/unpowered) "x" = ( /obj/structure/table/wood, -/obj/effect/spawner/lootdrop{ - loot = list(/obj/item/pizzabox/margherita = 3, /obj/item/pizzabox/meat = 3, /obj/item/pizzabox/mushroom = 3, /obj/item/pizzabox/bomb = 1); - lootdoubles = 0; - name = "pizza spawner" - }, +/obj/effect/spawner/lootdrop/pizzaparty, /turf/open/floor/wood{ initial_gas_mix = "o2=14;n2=23;TEMP=300" }, diff --git a/_maps/RandomRuins/SpaceRuins/miracle.dmm b/_maps/RandomRuins/SpaceRuins/miracle.dmm index 031cc37ff26..ba22f462361 100644 --- a/_maps/RandomRuins/SpaceRuins/miracle.dmm +++ b/_maps/RandomRuins/SpaceRuins/miracle.dmm @@ -1,8 +1,6 @@ //MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE "a" = ( -/obj/item/storage/backpack/satchel/flat/secret{ - reward_all_of_these = list(/obj/item/gun/energy/pulse/prize) - }, +/obj/item/storage/backpack/satchel/flat/secret/miracle_ruin, /turf/open/floor/fakespace{ initial_gas_mix = "TEMP=2.7" }, diff --git a/_maps/RandomZLevels/spacebattle.dmm b/_maps/RandomZLevels/spacebattle.dmm index e49140ca62c..7b5edd5a8fe 100644 --- a/_maps/RandomZLevels/spacebattle.dmm +++ b/_maps/RandomZLevels/spacebattle.dmm @@ -58,9 +58,7 @@ /turf/open/floor/mineral/plastitanium, /area/awaymission/spacebattle/syndicate2) "ap" = ( -/mob/living/simple_animal/hostile/syndicate/ranged{ - loot = list(/obj/effect/mob_spawn/human/corpse/syndicatesoldier,/obj/item/gun/ballistic/automatic/c20r,/obj/item/shield/energy) - }, +/mob/living/simple_animal/hostile/syndicate/ranged/spacebattle, /turf/open/floor/mineral/plastitanium, /area/awaymission/spacebattle/syndicate2) "aq" = ( @@ -127,10 +125,7 @@ /turf/open/floor/mineral/plastitanium, /area/awaymission/spacebattle/syndicate3) "aG" = ( -/mob/living/simple_animal/hostile/syndicate/melee{ - deathmessage = "\[src] falls limp as they release their grip from the energy weapons, activating their self-destruct function!"; - loot = list(/obj/effect/mob_spawn/human/corpse/syndicatesoldier) - }, +/mob/living/simple_animal/hostile/syndicate/melee/spacebattle, /turf/open/floor/mineral/plastitanium, /area/awaymission/spacebattle/syndicate2) "aI" = ( @@ -680,9 +675,7 @@ /turf/open/floor/plasteel/bar, /area/awaymission/spacebattle/cruiser) "db" = ( -/mob/living/simple_animal/hostile/syndicate/ranged{ - loot = list(/obj/effect/mob_spawn/human/corpse/syndicatesoldier,/obj/item/gun/ballistic/automatic/c20r,/obj/item/shield/energy) - }, +/mob/living/simple_animal/hostile/syndicate/ranged/spacebattle, /turf/open/floor/mineral/plastitanium, /area/awaymission/spacebattle/syndicate3) "dc" = ( @@ -952,10 +945,7 @@ /turf/open/floor/plating, /area/awaymission/spacebattle/cruiser) "ef" = ( -/mob/living/simple_animal/hostile/syndicate/melee{ - deathmessage = "\[src] falls limp as they release their grip from the energy weapons, activating their self-destruct function!"; - loot = list(/obj/effect/mob_spawn/human/corpse/syndicatesoldier) - }, +/mob/living/simple_animal/hostile/syndicate/melee/spacebattle, /turf/open/floor/mineral/plastitanium, /area/awaymission/spacebattle/syndicate3) "eg" = ( @@ -966,10 +956,7 @@ /turf/open/floor/plating, /area/awaymission/spacebattle/cruiser) "eh" = ( -/mob/living/simple_animal/hostile/syndicate/melee{ - deathmessage = "\[src] falls limp as they release their grip from the energy weapons, activating their self-destruct function!"; - loot = list(/obj/effect/mob_spawn/human/corpse/syndicatesoldier) - }, +/mob/living/simple_animal/hostile/syndicate/melee/spacebattle, /turf/open/floor/mineral/plastitanium, /area/awaymission/spacebattle/syndicate1) "ei" = ( @@ -1057,9 +1044,7 @@ /turf/open/floor/plasteel, /area/awaymission/spacebattle/cruiser) "eA" = ( -/mob/living/simple_animal/hostile/syndicate/ranged{ - loot = list(/obj/effect/mob_spawn/human/corpse/syndicatesoldier,/obj/item/gun/ballistic/automatic/c20r,/obj/item/shield/energy) - }, +/mob/living/simple_animal/hostile/syndicate/ranged/spacebattle, /turf/open/floor/mineral/plastitanium, /area/awaymission/spacebattle/syndicate1) "eC" = ( diff --git a/_maps/map_files/MetaStation/MetaStation.dmm b/_maps/map_files/MetaStation/MetaStation.dmm index a549fdc031e..73b48b5ce2d 100644 --- a/_maps/map_files/MetaStation/MetaStation.dmm +++ b/_maps/map_files/MetaStation/MetaStation.dmm @@ -1997,9 +1997,7 @@ lootcount = 3; name = "3maintenance loot spawner" }, -/obj/effect/spawner/lootdrop/armory_contraband{ - loot = list(/obj/item/gun/ballistic/automatic/pistol = 5, /obj/item/gun/ballistic/shotgun/automatic/combat = 5, /obj/item/gun/ballistic/revolver/mateba, /obj/item/gun/ballistic/automatic/pistol/deagle, /obj/item/storage/box/syndie_kit/throwing_weapons = 3) - }, +/obj/effect/spawner/lootdrop/armory_contraband/metastation, /turf/open/floor/plasteel/vault{ dir = 4 }, @@ -36964,10 +36962,7 @@ /area/crew_quarters/bar) "bAq" = ( /obj/structure/table/wood/poker, -/obj/effect/spawner/lootdrop{ - loot = list(/obj/item/gun/ballistic/revolver/russian = 5, /obj/item/storage/box/syndie_kit/throwing_weapons, /obj/item/toy/cards/deck/syndicate = 2); - name = "gambling valuables spawner" - }, +/obj/effect/spawner/lootdrop/gambling, /turf/open/floor/wood, /area/crew_quarters/bar) "bAr" = ( diff --git a/_maps/map_files/PubbyStation/PubbyStation.dmm b/_maps/map_files/PubbyStation/PubbyStation.dmm index a75e0c52ad0..9a47dd9e5cf 100644 --- a/_maps/map_files/PubbyStation/PubbyStation.dmm +++ b/_maps/map_files/PubbyStation/PubbyStation.dmm @@ -14835,11 +14835,7 @@ /turf/open/floor/plasteel/cafeteria, /area/crew_quarters/cafeteria/lunchroom) "aNb" = ( -/obj/machinery/vending/sustenance{ - contraband = list(/obj/item/kitchen/knife = 6, /obj/item/reagent_containers/food/drinks/coffee = 12); - desc = "A vending machine which vends food."; - product_ads = "Sufficiently healthy." - }, +/obj/machinery/vending/sustenance, /turf/open/floor/plasteel/cafeteria, /area/crew_quarters/cafeteria/lunchroom) "aNc" = ( @@ -31893,9 +31889,8 @@ /obj/machinery/light/small{ dir = 1 }, -/obj/machinery/vending/wallmed{ - pixel_y = 28; - products = list(/obj/item/reagent_containers/syringe = 3, /obj/item/reagent_containers/pill/patch/styptic = 1, /obj/item/reagent_containers/pill/patch/silver_sulf = 1, /obj/item/reagent_containers/medspray/sterilizine = 1) +/obj/machinery/vending/wallmed/pubby{ + pixel_y = 28 }, /obj/machinery/atmospherics/components/unary/vent_pump/on, /obj/effect/landmark/blobstart, @@ -33432,9 +33427,8 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/supply/hidden, -/obj/machinery/vending/wallmed{ - pixel_y = 28; - products = list(/obj/item/reagent_containers/syringe = 3, /obj/item/reagent_containers/pill/patch/styptic = 1, /obj/item/reagent_containers/pill/patch/silver_sulf = 1, /obj/item/reagent_containers/medspray/sterilizine = 1) +/obj/machinery/vending/wallmed/pubby{ + pixel_y = 28 }, /turf/open/floor/plasteel/whiteblue/side{ dir = 1 @@ -34247,9 +34241,8 @@ /turf/open/floor/plasteel/freezer, /area/medical/medbay/central) "bKw" = ( -/obj/machinery/vending/wallmed{ - pixel_y = 28; - products = list(/obj/item/reagent_containers/syringe = 3, /obj/item/reagent_containers/pill/patch/styptic = 1, /obj/item/reagent_containers/pill/patch/silver_sulf = 1, /obj/item/reagent_containers/medspray/sterilizine = 1) +/obj/machinery/vending/wallmed/pubby{ + pixel_y = 28 }, /obj/machinery/atmospherics/components/unary/vent_pump/on{ dir = 4 diff --git a/_maps/map_files/generic/CentCom.dmm b/_maps/map_files/generic/CentCom.dmm index 995a9be39d8..bcec824aee8 100644 --- a/_maps/map_files/generic/CentCom.dmm +++ b/_maps/map_files/generic/CentCom.dmm @@ -1242,15 +1242,7 @@ /obj/structure/window/reinforced{ dir = 8 }, -/obj/machinery/computer/arcade/orion_trail{ - desc = "A test for cadets"; - events = list("Raiders" = 3, "Interstellar Flux" = 1, "Illness" = 3, "Breakdown" = 2, "Malfunction" = 2, "Collision" = 1, "Spaceport" = 2); - icon = 'icons/obj/machines/particle_accelerator.dmi'; - icon_state = "control_boxp"; - name = "Kobayashi Maru control computer"; - prizes = list(/obj/item/paper/fluff/holodeck/trek_diploma = 1); - settlers = list("Kirk","Worf","Gene") - }, +/obj/machinery/computer/arcade/orion_trail/kobayashi, /turf/open/floor/holofloor/plating, /area/holodeck/rec_center/kobayashi) "dP" = ( @@ -1268,30 +1260,14 @@ pixel_x = 16; pixel_y = -5 }, -/obj/machinery/computer/arcade/orion_trail{ - desc = "A test for cadets"; - events = list("Raiders" = 3, "Interstellar Flux" = 1, "Illness" = 3, "Breakdown" = 2, "Malfunction" = 2, "Collision" = 1, "Spaceport" = 2); - icon = 'icons/obj/machines/particle_accelerator.dmi'; - icon_state = "control_boxp"; - name = "Kobayashi Maru control computer"; - prizes = list(/obj/item/paper/fluff/holodeck/trek_diploma = 1); - settlers = list("Kirk","Worf","Gene") - }, +/obj/machinery/computer/arcade/orion_trail/kobayashi, /turf/open/floor/holofloor/plating, /area/holodeck/rec_center/kobayashi) "dQ" = ( /obj/structure/window/reinforced{ dir = 4 }, -/obj/machinery/computer/arcade/orion_trail{ - desc = "A test for cadets"; - events = list("Raiders" = 3, "Interstellar Flux" = 1, "Illness" = 3, "Breakdown" = 2, "Malfunction" = 2, "Collision" = 1, "Spaceport" = 2); - icon = 'icons/obj/machines/particle_accelerator.dmi'; - icon_state = "control_boxp"; - name = "Kobayashi Maru control computer"; - prizes = list(/obj/item/paper/fluff/holodeck/trek_diploma = 1); - settlers = list("Kirk","Worf","Gene") - }, +/obj/machinery/computer/arcade/orion_trail/kobayashi, /turf/open/floor/holofloor/plating, /area/holodeck/rec_center/kobayashi) "dR" = ( @@ -5996,9 +5972,7 @@ }, /area/syndicate_mothership/control) "qM" = ( -/obj/machinery/vending/cigarette{ - products = list(/obj/item/storage/fancy/cigarettes/cigpack_syndicate = 7, /obj/item/storage/fancy/cigarettes/cigpack_uplift = 3, /obj/item/storage/fancy/cigarettes/cigpack_robust = 2, /obj/item/storage/fancy/cigarettes/cigpack_carp = 3, /obj/item/storage/fancy/cigarettes/cigpack_midori = 1, /obj/item/storage/box/matches = 10, /obj/item/lighter/greyscale = 4, /obj/item/storage/fancy/rollingpapers = 5) - }, +/obj/machinery/vending/cigarette/syndicate, /turf/open/floor/plasteel/bar{ dir = 2 }, diff --git a/_maps/shuttles/whiteship_cere.dmm b/_maps/shuttles/whiteship_cere.dmm index f640e014a93..fda62dfeb39 100644 --- a/_maps/shuttles/whiteship_cere.dmm +++ b/_maps/shuttles/whiteship_cere.dmm @@ -120,11 +120,7 @@ /turf/open/floor/mineral/titanium, /area/shuttle/abandoned) "an" = ( -/obj/effect/spawner/lootdrop{ - loot = list(/obj/mecha/working/ripley/mining = 1, /obj/structure/mecha_wreckage/ripley = 5); - lootdoubles = 0; - name = "25% mech 75% wreckage ripley spawner" - }, +/obj/effect/spawner/lootdrop/whiteship_cere_ripley, /turf/open/floor/mech_bay_recharge_floor, /area/shuttle/abandoned) "ao" = ( diff --git a/code/game/machinery/computer/arcade.dm b/code/game/machinery/computer/arcade.dm index c91760f52bc..88f609c7f59 100644 --- a/code/game/machinery/computer/arcade.dm +++ b/code/game/machinery/computer/arcade.dm @@ -367,6 +367,15 @@ var/gameStatus = ORION_STATUS_START var/canContinueEvent = 0 +/obj/machinery/computer/arcade/orion_trail/kobayashi + name = "Kobayashi Maru control computer" + desc = "A test for cadets" + icon = 'icons/obj/machines/particle_accelerator.dmi' + icon_state = "control_boxp" + events = list("Raiders" = 3, "Interstellar Flux" = 1, "Illness" = 3, "Breakdown" = 2, "Malfunction" = 2, "Collision" = 1, "Spaceport" = 2) + prizes = list(/obj/item/paper/fluff/holodeck/trek_diploma = 1) + settlers = list("Kirk","Worf","Gene") + /obj/machinery/computer/arcade/orion_trail/Reset() // Sets up the main trail stops = list("Pluto","Asteroid Belt","Proxima Centauri","Dead Space","Rigel Prime","Tau Ceti Beta","Black Hole","Space Outpost Beta-9","Orion Prime") diff --git a/code/game/objects/effects/spawners/lootdrop.dm b/code/game/objects/effects/spawners/lootdrop.dm index bd4237a9db9..4a77274d23b 100644 --- a/code/game/objects/effects/spawners/lootdrop.dm +++ b/code/game/objects/effects/spawners/lootdrop.dm @@ -41,6 +41,13 @@ /obj/item/gun/ballistic/automatic/pistol/deagle ) +/obj/effect/spawner/lootdrop/armory_contraband/metastation + loot = list(/obj/item/gun/ballistic/automatic/pistol = 5, + /obj/item/gun/ballistic/shotgun/automatic/combat = 5, + /obj/item/gun/ballistic/revolver/mateba, + /obj/item/gun/ballistic/automatic/pistol/deagle, + /obj/item/storage/box/syndie_kit/throwing_weapons = 3) + /obj/effect/spawner/lootdrop/gambling name = "gambling valuables spawner" loot = list( @@ -228,7 +235,7 @@ /obj/item/circuitboard/machine/microwave, /obj/item/circuitboard/machine/chem_dispenser/drinks, /obj/item/circuitboard/machine/chem_dispenser/drinks/beer, - /obj/item/circuitboard/computer/slot_machine + /obj/item/circuitboard/computer/slot_machine ) /obj/effect/spawner/lootdrop/techstorage/rnd @@ -237,14 +244,14 @@ loot = list( /obj/item/circuitboard/computer/aifixer, /obj/item/circuitboard/machine/rdserver, - /obj/item/circuitboard/computer/pandemic, + /obj/item/circuitboard/computer/pandemic, /obj/item/circuitboard/machine/mechfab, /obj/item/circuitboard/machine/circuit_imprinter/department, /obj/item/circuitboard/computer/teleporter, - /obj/item/circuitboard/machine/destructive_analyzer, + /obj/item/circuitboard/machine/destructive_analyzer, /obj/item/circuitboard/computer/rdconsole ) - + /obj/effect/spawner/lootdrop/techstorage/security name = "security circuit board spawner" lootcount = 3 @@ -253,13 +260,13 @@ /obj/item/circuitboard/computer/security, /obj/item/circuitboard/computer/prisoner ) - + /obj/effect/spawner/lootdrop/techstorage/engineering name = "engineering circuit board spawner" lootcount = 3 loot = list( /obj/item/circuitboard/computer/atmos_alert, - /obj/item/circuitboard/computer/stationalert, + /obj/item/circuitboard/computer/stationalert, /obj/item/circuitboard/computer/powermonitor ) @@ -300,7 +307,7 @@ /obj/item/circuitboard/computer/borgupload, /obj/item/circuitboard/aicore ) - + /obj/effect/spawner/lootdrop/techstorage/command name = "secure command circuit board spawner" lootcount = 3 @@ -309,7 +316,7 @@ /obj/item/circuitboard/computer/communications, /obj/item/circuitboard/computer/card ) - + /obj/effect/spawner/lootdrop/techstorage/RnD_secure name = "secure RnD circuit board spawner" lootcount = 3 diff --git a/code/modules/awaymissions/mission_code/spacebattle.dm b/code/modules/awaymissions/mission_code/spacebattle.dm index 5084663f5f1..a477a223b2d 100644 --- a/code/modules/awaymissions/mission_code/spacebattle.dm +++ b/code/modules/awaymissions/mission_code/spacebattle.dm @@ -40,3 +40,12 @@ /area/awaymission/spacebattle/secret name = "Hidden Chamber" icon_state = "awaycontent10" + +/mob/living/simple_animal/hostile/syndicate/ranged/spacebattle + loot = list(/obj/effect/mob_spawn/human/corpse/syndicatesoldier, + /obj/item/gun/ballistic/automatic/c20r, + /obj/item/shield/energy) + +/mob/living/simple_animal/hostile/syndicate/melee/spacebattle + deathmessage = "falls limp as they release their grip from the energy weapons, activating their self-destruct function!" + loot = list(/obj/effect/mob_spawn/human/corpse/syndicatesoldier) diff --git a/code/modules/ruins/lavalandruin_code/pizzaparty.dm b/code/modules/ruins/lavalandruin_code/pizzaparty.dm new file mode 100644 index 00000000000..a7776f4e6a8 --- /dev/null +++ b/code/modules/ruins/lavalandruin_code/pizzaparty.dm @@ -0,0 +1,9 @@ +//lavaland_surface_pizzaparty.dmm + +/obj/effect/spawner/lootdrop/pizzaparty + name = "pizza bomb spawner" + loot = list(/obj/item/pizzabox/margherita = 3, + /obj/item/pizzabox/meat = 3, + /obj/item/pizzabox/mushroom = 3, + /obj/item/pizzabox/bomb = 1) + lootdoubles = FALSE diff --git a/code/modules/ruins/spaceruin_code/miracle.dm b/code/modules/ruins/spaceruin_code/miracle.dm new file mode 100644 index 00000000000..075d43df254 --- /dev/null +++ b/code/modules/ruins/spaceruin_code/miracle.dm @@ -0,0 +1,4 @@ +/////////// miracle ruin + +/obj/item/storage/backpack/satchel/flat/secret/miracle_ruin + reward_all_of_these = list(/obj/item/gun/energy/pulse/prize) diff --git a/code/modules/shuttle/white_ship.dm b/code/modules/shuttle/white_ship.dm index cbee03e4690..bca16c35f13 100644 --- a/code/modules/shuttle/white_ship.dm +++ b/code/modules/shuttle/white_ship.dm @@ -50,3 +50,9 @@ /obj/machinery/computer/camera_advanced/shuttle_docker/whiteship/Destroy() GLOB.jam_on_wardec -= src return ..() + +/obj/effect/spawner/lootdrop/whiteship_cere_ripley + name = "25% mech 75% wreckage ripley spawner" + loot = list(/obj/mecha/working/ripley/mining = 1, + /obj/structure/mecha_wreckage/ripley = 5) + lootdoubles = FALSE diff --git a/code/modules/vending/cigarette.dm b/code/modules/vending/cigarette.dm index 6b9334362df..36434f6b03c 100644 --- a/code/modules/vending/cigarette.dm +++ b/code/modules/vending/cigarette.dm @@ -20,6 +20,16 @@ /obj/item/storage/fancy/cigarettes/cigars/cohiba = 1) refill_canister = /obj/item/vending_refill/cigarette +/obj/machinery/vending/cigarette/syndicate + products = list(/obj/item/storage/fancy/cigarettes/cigpack_syndicate = 7, + /obj/item/storage/fancy/cigarettes/cigpack_uplift = 3, + /obj/item/storage/fancy/cigarettes/cigpack_robust = 2, + /obj/item/storage/fancy/cigarettes/cigpack_carp = 3, + /obj/item/storage/fancy/cigarettes/cigpack_midori = 1, + /obj/item/storage/box/matches = 10, + /obj/item/lighter/greyscale = 4, + /obj/item/storage/fancy/rollingpapers = 5) + /obj/machinery/vending/cigarette/beach //Used in the lavaland_biodome_beach.dmm ruin name = "\improper ShadyCigs Ultra" desc = "Now with extra premium products!" diff --git a/code/modules/vending/medical_wall.dm b/code/modules/vending/medical_wall.dm index ef19ce3b9b3..84c48915898 100644 --- a/code/modules/vending/medical_wall.dm +++ b/code/modules/vending/medical_wall.dm @@ -20,3 +20,9 @@ /obj/item/vending_refill/wallmed machine_name = "NanoMed" icon_state = "refill_medical" + +/obj/machinery/vending/wallmed/pubby + products = list(/obj/item/reagent_containers/syringe = 3, + /obj/item/reagent_containers/pill/patch/styptic = 1, + /obj/item/reagent_containers/pill/patch/silver_sulf = 1, + /obj/item/reagent_containers/medspray/sterilizine = 1) diff --git a/tgstation.dme b/tgstation.dme index 2d3b0851ad7..7184c0b9b8d 100755 --- a/tgstation.dme +++ b/tgstation.dme @@ -2446,6 +2446,7 @@ #include "code\modules\research\xenobiology\crossbreeding\stabilized.dm" #include "code\modules\ruins\lavaland_ruin_code.dm" #include "code\modules\ruins\lavalandruin_code\biodome_clown_planet.dm" +#include "code\modules\ruins\lavalandruin_code\pizzaparty.dm" #include "code\modules\ruins\lavalandruin_code\puzzle.dm" #include "code\modules\ruins\lavalandruin_code\sloth.dm" #include "code\modules\ruins\lavalandruin_code\surface.dm" @@ -2462,6 +2463,7 @@ #include "code\modules\ruins\spaceruin_code\deepstorage.dm" #include "code\modules\ruins\spaceruin_code\DJstation.dm" #include "code\modules\ruins\spaceruin_code\listeningstation.dm" +#include "code\modules\ruins\spaceruin_code\miracle.dm" #include "code\modules\ruins\spaceruin_code\oldstation.dm" #include "code\modules\ruins\spaceruin_code\originalcontent.dm" #include "code\modules\ruins\spaceruin_code\spacehotel.dm"