From 27b6ebc612816673b53e9cee9d37b8f8f71c654b Mon Sep 17 00:00:00 2001 From: Cw 3040 Date: Mon, 18 Jun 2018 14:52:11 -0400 Subject: [PATCH] Cw's Spaceruins, Maintbar and Kegspawn changes (#7141) * Station Changes -Added Jukebox to: Box (maintbar), Meta (maintbar), Pubby (maintbar), and Omega (maintarcade) -Added keg spawn to Pubby -Removed Legcuffs and Rifle Stock from Box maintbar (people were unhappy with the fact these were sprited identically to handcuffs, will re-add if someone ports Virgo's legcuffs) * Space Ruins Changes -Added KinkMates to SpaceHotel -Swapped riot helmet for AI detecting multitool on TurretedOutpost -Changed the loot for oldAIsat to not have a suspicious toolbox, instead having a toolbelt and combat gloves * Kegspawn Change Changed Spawn Rate of kegs to: -50% mead (5 in 10 instead of 5 in 8) -20% aphro (2 in 10 instead of 1 in 8) -20% strong aphro (2 in 10 instead of 1 in 8) -10% pan galactic gargle blaster (1 in 10 instead of 1 in 8) * Small MetaStation Fixes Fixed bug reported by Nethaufer (Zig)#5868 on discord, there was a wire (and an air supply pipe) accidentally deleted. --- _maps/RandomRuins/SpaceRuins/oldAIsat.dmm | 9 +++++-- _maps/RandomRuins/SpaceRuins/spacehotel.dmm | 26 ++++++++++++++++--- .../SpaceRuins/turretedoutpost.dmm | 22 ++++++++++------ _maps/map_files/BoxStation/BoxStation.dmm | 8 ++---- _maps/map_files/MetaStation/MetaStation.dmm | 8 +++++- _maps/map_files/OmegaStation/OmegaStation.dmm | 1 + _maps/map_files/PubbyStation/PubbyStation.dmm | 8 ++++-- .../game/objects/effects/spawner/spawners.dm | 4 +-- 8 files changed, 61 insertions(+), 25 deletions(-) diff --git a/_maps/RandomRuins/SpaceRuins/oldAIsat.dmm b/_maps/RandomRuins/SpaceRuins/oldAIsat.dmm index 299d1769b0..aa21d08041 100644 --- a/_maps/RandomRuins/SpaceRuins/oldAIsat.dmm +++ b/_maps/RandomRuins/SpaceRuins/oldAIsat.dmm @@ -167,6 +167,7 @@ /area/tcommsat/chamber) "aG" = ( /obj/structure/grille/broken, +/obj/item/clothing/gloves/combat, /turf/open/floor/plasteel/airless, /area/tcommsat/chamber) "aH" = ( @@ -624,7 +625,7 @@ /turf/open/floor/plating, /area/tcommsat/chamber) "cd" = ( -/obj/item/storage/toolbox/syndicate, +/obj/item/storage/belt/utility/full/engi, /turf/open/floor/plasteel/airless, /area/tcommsat/chamber) "ce" = ( @@ -905,6 +906,10 @@ /obj/machinery/teleport/hub, /turf/open/floor/plating, /area/tcommsat/chamber) +"SH" = ( +/obj/item/dildo/random, +/turf/open/floor/plating/airless, +/area/tcommsat/chamber) (1,1,1) = {" aa @@ -2702,7 +2707,7 @@ ac bw bw bw -ac +SH ca cf bw diff --git a/_maps/RandomRuins/SpaceRuins/spacehotel.dmm b/_maps/RandomRuins/SpaceRuins/spacehotel.dmm index 75978850b0..f89a8ba4d2 100644 --- a/_maps/RandomRuins/SpaceRuins/spacehotel.dmm +++ b/_maps/RandomRuins/SpaceRuins/spacehotel.dmm @@ -4355,6 +4355,24 @@ }, /turf/open/floor/plating, /area/ruin/space/has_grav/hotel/power) +"Dv" = ( +/obj/item/vending_refill/kink, +/obj/item/vending_refill/kink, +/obj/item/vending_refill/kink, +/obj/item/vending_refill/kink, +/obj/item/vending_refill/kink, +/obj/item/vending_refill/kink, +/obj/structure/closet, +/turf/open/floor/plasteel/neutral, +/area/ruin/space/has_grav/hotel/custodial) +"Fy" = ( +/obj/machinery/vending/kink, +/turf/open/floor/plasteel/white, +/area/ruin/space/has_grav/hotel/workroom) +"MK" = ( +/obj/effect/spawner/lootdrop/keg, +/turf/open/floor/plating, +/area/ruin/space/has_grav/hotel) (1,1,1) = {" aa @@ -5365,7 +5383,7 @@ ee dH cZ eJ -aw +MK fi fQ fQ @@ -6093,7 +6111,7 @@ kC kn lg jG -ml +Dv mp mw mJ @@ -7252,7 +7270,7 @@ di di ea ep -dV +Fy di eT fp @@ -7532,7 +7550,7 @@ di di di dV -dV +Fy di eW ft diff --git a/_maps/RandomRuins/SpaceRuins/turretedoutpost.dmm b/_maps/RandomRuins/SpaceRuins/turretedoutpost.dmm index 385c1bd6df..a6c2079969 100644 --- a/_maps/RandomRuins/SpaceRuins/turretedoutpost.dmm +++ b/_maps/RandomRuins/SpaceRuins/turretedoutpost.dmm @@ -273,11 +273,6 @@ /obj/machinery/light, /turf/open/floor/plasteel/vault/side, /area/ruin/space/has_grav/turretedoutpost) -"aZ" = ( -/obj/structure/rack, -/obj/item/clothing/head/helmet/riot, -/turf/open/floor/plasteel/vault/side, -/area/ruin/space/has_grav/turretedoutpost) "ba" = ( /obj/structure/table/wood, /obj/item/reagent_containers/food/snacks/breadslice/meat, @@ -286,6 +281,13 @@ }, /turf/open/floor/plasteel, /area/ruin/space/has_grav/turretedoutpost) +"Kw" = ( +/obj/structure/rack, +/obj/item/multitool/ai_detect, +/turf/open/floor/plasteel/vault/side{ + dir = 8 + }, +/area/ruin/space/has_grav/turretedoutpost) "Nu" = ( /obj/machinery/door/airlock/external, /obj/effect/mapping_helpers/airlock/cyclelink_helper{ @@ -293,6 +295,10 @@ }, /turf/open/floor/plating, /area/ruin/space/has_grav/turretedoutpost) +"YF" = ( +/obj/effect/spawner/lootdrop/keg, +/turf/open/floor/plating/airless, +/area/ruin/space/has_grav/turretedoutpost) (1,1,1) = {" aa @@ -384,7 +390,7 @@ al ad ad ay -aF +Kw aL aF ad @@ -467,7 +473,7 @@ az az az az -aZ +aW ad al ab @@ -682,7 +688,7 @@ ad aj ak ad -al +YF ad aK aP diff --git a/_maps/map_files/BoxStation/BoxStation.dmm b/_maps/map_files/BoxStation/BoxStation.dmm index b46e6f1753..f7aefd5575 100644 --- a/_maps/map_files/BoxStation/BoxStation.dmm +++ b/_maps/map_files/BoxStation/BoxStation.dmm @@ -53270,7 +53270,6 @@ /turf/open/floor/wood, /area/maintenance/bar) "fZE" = ( -/obj/item/restraints/legcuffs, /obj/item/restraints/handcuffs/fake, /obj/structure/bed/dogbed, /turf/open/floor/plating, @@ -53666,6 +53665,7 @@ /area/maintenance/bar) "mLY" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden, +/obj/machinery/jukebox, /turf/open/floor/wood{ icon_state = "wood-broken4" }, @@ -53780,10 +53780,6 @@ }, /turf/open/floor/wood, /area/maintenance/bar) -"pxN" = ( -/obj/item/weaponcrafting/stock, -/turf/open/floor/wood, -/area/maintenance/bar) "pHl" = ( /obj/structure/table, /obj/item/storage/box/beakers{ @@ -78068,7 +78064,7 @@ aaa bLv bUs lFY -pxN +kPI fFm kPI lSY diff --git a/_maps/map_files/MetaStation/MetaStation.dmm b/_maps/map_files/MetaStation/MetaStation.dmm index 8a5cc15fbe..477e06d124 100644 --- a/_maps/map_files/MetaStation/MetaStation.dmm +++ b/_maps/map_files/MetaStation/MetaStation.dmm @@ -73558,6 +73558,9 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 6 + }, /turf/open/floor/plasteel/neutral/corner{ dir = 8 }, @@ -74286,10 +74289,10 @@ /turf/open/floor/wood, /area/maintenance/port/aft) "diF" = ( -/obj/structure/chair/stool, /obj/structure/sign/poster/contraband/random{ pixel_y = 32 }, +/obj/machinery/jukebox, /turf/open/floor/wood, /area/maintenance/port/aft) "diG" = ( @@ -76380,6 +76383,9 @@ dir = 8; pixel_x = -24 }, +/obj/structure/cable/yellow{ + icon_state = "1-2" + }, /turf/open/floor/plasteel/neutral/corner{ dir = 1 }, diff --git a/_maps/map_files/OmegaStation/OmegaStation.dmm b/_maps/map_files/OmegaStation/OmegaStation.dmm index 437cd5491e..73acabffe5 100644 --- a/_maps/map_files/OmegaStation/OmegaStation.dmm +++ b/_maps/map_files/OmegaStation/OmegaStation.dmm @@ -25436,6 +25436,7 @@ /turf/open/floor/plating, /area/maintenance/starboard/aft) "bbQ" = ( +/obj/machinery/jukebox, /turf/open/floor/wood{ icon_state = "wood-broken5" }, diff --git a/_maps/map_files/PubbyStation/PubbyStation.dmm b/_maps/map_files/PubbyStation/PubbyStation.dmm index 6ef5df68cc..9bc3ebe791 100644 --- a/_maps/map_files/PubbyStation/PubbyStation.dmm +++ b/_maps/map_files/PubbyStation/PubbyStation.dmm @@ -47308,7 +47308,7 @@ }, /area/science/xenobiology) "cPO" = ( -/obj/item/chair/stool, +/obj/machinery/jukebox, /turf/open/floor/wood{ icon_state = "wood-broken7" }, @@ -49815,6 +49815,10 @@ }, /turf/open/floor/plating/airless, /area/engine/engineering) +"koO" = ( +/obj/effect/spawner/lootdrop/keg, +/turf/open/floor/plating, +/area/maintenance/department/crew_quarters/dorms) "kpK" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 5 @@ -92592,7 +92596,7 @@ aiS aiS aob eaw -ajv +koO ajv cnX aiS diff --git a/modular_citadel/code/game/objects/effects/spawner/spawners.dm b/modular_citadel/code/game/objects/effects/spawner/spawners.dm index 3cc646fd98..b6fbeef4c9 100644 --- a/modular_citadel/code/game/objects/effects/spawner/spawners.dm +++ b/modular_citadel/code/game/objects/effects/spawner/spawners.dm @@ -2,6 +2,6 @@ name = "random keg spawner" lootcount = 1 loot = list(/obj/structure/reagent_dispensers/keg/mead = 5, - /obj/structure/reagent_dispensers/keg/aphro = 1, - /obj/structure/reagent_dispensers/keg/aphro/strong = 1, + /obj/structure/reagent_dispensers/keg/aphro = 2, + /obj/structure/reagent_dispensers/keg/aphro/strong = 2, /obj/structure/reagent_dispensers/keg/gargle = 1) \ No newline at end of file