diff --git a/code/controllers/autotransfer.dm b/code/controllers/autotransfer.dm index afd1435ffaf..bdb5c6d39c8 100644 --- a/code/controllers/autotransfer.dm +++ b/code/controllers/autotransfer.dm @@ -3,8 +3,12 @@ var/datum/controller/transfer_controller/transfer_controller datum/controller/transfer_controller var/timerbuffer = 0 //buffer for time check var/currenttick = 0 + var/shift_hard_end = 0 //VOREStation Edit + var/shift_last_vote = 0 //VOREStation Edit datum/controller/transfer_controller/New() timerbuffer = config.vote_autotransfer_initial + shift_hard_end = config.vote_autotransfer_initial + (config.vote_autotransfer_interval * 1) //VOREStation Edit //Change this "1" to how many extend votes you want there to be. + shift_last_vote = shift_hard_end - config.vote_autotransfer_interval //VOREStation Edit processing_objects += src datum/controller/transfer_controller/Destroy() @@ -12,6 +16,13 @@ datum/controller/transfer_controller/Destroy() datum/controller/transfer_controller/proc/process() currenttick = currenttick + 1 - if (round_duration_in_ticks >= timerbuffer - 1 MINUTE) + if (round_duration_in_ticks >= shift_last_vote - 2 MINUTES) //VOREStation Edit START + shift_last_vote = 999999999999 //Setting to a stupidly high number since it'll be not used again. + world << "Warning: This upcoming extend vote will be your LAST extend vote. Wrap up your scenes in the next 60 minutes if the vote succeeds." //VOREStation Edit + if (round_duration_in_ticks >= shift_hard_end - 1 MINUTE) + init_shift_change(null, 1) + shift_hard_end = timerbuffer + config.vote_autotransfer_interval //If shuttle somehow gets recalled, let's force it to call again next time a vote would occur. + timerbuffer = timerbuffer + config.vote_autotransfer_interval //Just to make sure a vote doesn't occur immediately afterwords. + else if (round_duration_in_ticks >= timerbuffer - 1 MINUTE) //VOREStation Edit END vote.autotransfer() timerbuffer = timerbuffer + config.vote_autotransfer_interval diff --git a/code/datums/supplypacks/hydroponics_vr.dm b/code/datums/supplypacks/hydroponics_vr.dm index 08b721dba90..25daad249c0 100644 --- a/code/datums/supplypacks/hydroponics_vr.dm +++ b/code/datums/supplypacks/hydroponics_vr.dm @@ -3,4 +3,32 @@ cost = 200 //You're getting 22 birds. Of course it's going to be a lot! containertype = /obj/structure/largecrate/birds containername = "Bird crate" - access = access_hydroponics \ No newline at end of file + access = access_hydroponics + +/datum/supply_packs/hydro/sobaka + name = "Sobaka crate" + contains = list (/obj/item/weapon/storage/box/monkeycubes/sobakacubes) + cost = 20 + containertype = /obj/structure/closet/crate/freezer + containername = "Sobaka crate" + +/datum/supply_packs/hydro/saru + name = "Saru crate" + contains = list (/obj/item/weapon/storage/box/monkeycubes/sarucubes) + cost = 20 + containertype = /obj/structure/closet/crate/freezer + containername = "Saru crate" + +/datum/supply_packs/hydro/sparra + name = "Sparra crate" + contains = list (/obj/item/weapon/storage/box/monkeycubes/sparracubes) + cost = 20 + containertype = /obj/structure/closet/crate/freezer + containername = "Sparra crate" + +/datum/supply_packs/hydro/wolpin + name = "Wolpin crate" + contains = list (/obj/item/weapon/storage/box/monkeycubes/wolpincubes) + cost = 20 + containertype = /obj/structure/closet/crate/freezer + containername = "Wolpin crate" diff --git a/code/datums/supplypacks/science_vr.dm b/code/datums/supplypacks/science_vr.dm index e5a1adc8903..b05d4ef0688 100644 --- a/code/datums/supplypacks/science_vr.dm +++ b/code/datums/supplypacks/science_vr.dm @@ -59,9 +59,11 @@ access = access_xenobiology contraband = 1 +/* Removed until Otie code is unfucked. /datum/supply_packs/sci/otie name = "V.A.R.M.A.corp adoptable reject (Dangerous!)" cost = 100 containertype = /obj/structure/largecrate/animal/otie containername = "V.A.R.M.A.corp adoptable reject (Dangerous!)" - access = access_xenobiology \ No newline at end of file + access = access_xenobiology +*/ \ No newline at end of file diff --git a/code/datums/supplypacks/security_vr.dm b/code/datums/supplypacks/security_vr.dm index e0ebe3440a3..5e969b942b2 100644 --- a/code/datums/supplypacks/security_vr.dm +++ b/code/datums/supplypacks/security_vr.dm @@ -1,8 +1,10 @@ +/* Removed until Otie code is unfucked. /datum/supply_packs/security/guardbeast name = "V.A.R.M.A.corp autoNOMous security solution" - cost = 199 + cost = 150 containertype = /obj/structure/largecrate/animal/guardbeast containername = "V.A.R.M.A.corp autoNOMous security solution crate" access = list( access_security, access_xenobiology) +*/ \ No newline at end of file diff --git a/code/game/objects/random/random_vr.dm b/code/game/objects/random/random_vr.dm index 3fecb12d817..b6cbbf73e2e 100644 --- a/code/game/objects/random/random_vr.dm +++ b/code/game/objects/random/random_vr.dm @@ -183,7 +183,7 @@ /obj/random/outside_mob/item_to_spawn() // Special version for mobs to have the same faction. var/mob = pick( prob(50);/mob/living/simple_animal/retaliate/gaslamp, - prob(50);/mob/living/simple_animal/otie/feral, +// prob(50);/mob/living/simple_animal/otie/feral, // Removed until Otie code is unfucked. prob(20);/mob/living/simple_animal/hostile/dino/virgo3b, prob(1);/mob/living/simple_animal/hostile/dragon/virgo3b) if (istype(mob, /mob/living)) // This is just to prevent runtime errors in case some dev is a dumbass and puts invalid items into this. diff --git a/code/game/objects/structures/crates_lockers/largecrate_vr.dm b/code/game/objects/structures/crates_lockers/largecrate_vr.dm index c22698ce458..964022061ab 100644 --- a/code/game/objects/structures/crates_lockers/largecrate_vr.dm +++ b/code/game/objects/structures/crates_lockers/largecrate_vr.dm @@ -53,7 +53,6 @@ /mob/living/simple_animal/hostile/bear;0.5, /mob/living/simple_animal/hostile/bear/brown;0.5, /mob/living/simple_animal/hostile/carp, - /mob/living/simple_animal/otie/friendly, /mob/living/simple_animal/hostile/mimic) ..() @@ -73,6 +72,7 @@ /mob/living/simple_animal/hostile/alien/queen) ..() +/* // Removed until Otie code is unfucked. /obj/structure/largecrate/animal/guardbeast name = "V.A.R.M.A.corp autoNOMous security solution" desc = "The V.A.R.M.A.corp bioengineering division flagship product on trained optimal snowflake guard dogs." @@ -93,4 +93,5 @@ playsound(src, 'sound/items/poster_ripped.ogg', 50, 1) icon_state = "otiecrate" taped = 0 - ..() \ No newline at end of file + ..() +*/ \ No newline at end of file diff --git a/code/modules/mob/living/simple_animal/vore/otie.dm b/code/modules/mob/living/simple_animal/vore/otie.dm index bdf43fb3637..d9083acd57e 100644 --- a/code/modules/mob/living/simple_animal/vore/otie.dm +++ b/code/modules/mob/living/simple_animal/vore/otie.dm @@ -1,3 +1,5 @@ +// ToDo: Make this code not a fucking snowflaky horrible broken mess. Do not use until it's actually fixed. It's miserably bad right now. + /mob/living/simple_animal/otie //Spawn this one only if you're looking for a bad time. Not friendly. name = "otie" desc = "The classic bioengineered longdog." diff --git a/code/modules/multiz/movement.dm b/code/modules/multiz/movement.dm index 602ff9232bd..ff4da22fa03 100644 --- a/code/modules/multiz/movement.dm +++ b/code/modules/multiz/movement.dm @@ -193,6 +193,8 @@ // Check if this atom prevents things standing on it from falling. Return TRUE to allow the fall. /obj/proc/CanFallThru(atom/movable/mover as mob|obj, turf/target as turf) + if(!isturf(mover.loc)) // VORESTATION EDIT. We clearly didn't have enough backup checks. + return FALSE //If this ain't working Ima be pissed. return TRUE // Things that prevent objects standing on them from falling into turf below diff --git a/code/modules/reagents/reagent_containers/food/snacks_vr.dm b/code/modules/reagents/reagent_containers/food/snacks_vr.dm index f95331c86ba..721b9742c91 100644 --- a/code/modules/reagents/reagent_containers/food/snacks_vr.dm +++ b/code/modules/reagents/reagent_containers/food/snacks_vr.dm @@ -189,3 +189,35 @@ ..() reagents.add_reagent("protein", 4) bitesize = 2 + +/obj/item/weapon/reagent_containers/food/snacks/monkeycube/sobakacube + name = "sobaka cube" + monkey_type = "Sobaka" + +/obj/item/weapon/reagent_containers/food/snacks/monkeycube/wrapped/sobakacube + name = "sobaka cube" + monkey_type = "Sobaka" + +/obj/item/weapon/reagent_containers/food/snacks/monkeycube/sarucube + name = "saru cube" + monkey_type = "Saru" + +/obj/item/weapon/reagent_containers/food/snacks/monkeycube/wrapped/sarucube + name = "saru cube" + monkey_type = "Saru" + +/obj/item/weapon/reagent_containers/food/snacks/monkeycube/sparracube + name = "sparra cube" + monkey_type = "Sparra" + +/obj/item/weapon/reagent_containers/food/snacks/monkeycube/wrapped/sparracube + name = "sparra cube" + monkey_type = "Sparra" + +/obj/item/weapon/reagent_containers/food/snacks/monkeycube/wolpincube + name = "wolpin cube" + monkey_type = "Wolpin" + +/obj/item/weapon/reagent_containers/food/snacks/monkeycube/wrapped/wolpincube + name = "wolpin cube" + monkey_type = "Wolpin" diff --git a/code/modules/vore/fluffstuff/custom_boxes_vr.dm b/code/modules/vore/fluffstuff/custom_boxes_vr.dm index c3c99fedd8b..6d55cc5bf4d 100644 --- a/code/modules/vore/fluffstuff/custom_boxes_vr.dm +++ b/code/modules/vore/fluffstuff/custom_boxes_vr.dm @@ -242,3 +242,40 @@ Swimsuits, for general use, to avoid arriving to work with your swimsuit. /obj/item/weapon/storage/box/fluff/swimsuit/medical name = "Medical Swimsuit capsule" has_items = list(/obj/item/clothing/under/swimsuit/fluff/medical) + +//Monkey boxes for the new primals we have +/obj/item/weapon/storage/box/monkeycubes/sobakacubes + name = "sobaka cube box" + desc = "Drymate brand sobaka cubes. Just add water!" + +/obj/item/weapon/storage/box/monkeycubes/sobakacubes/New() + ..() + for(var/i = 1 to 4) + new /obj/item/weapon/reagent_containers/food/snacks/monkeycube/wrapped/sobakacube(src) + +/obj/item/weapon/storage/box/monkeycubes/sarucubes + name = "saru cube box" + desc = "Drymate brand saru cubes. Just add water!" + +/obj/item/weapon/storage/box/monkeycubes/sarucubes/New() + ..() + for(var/i = 1 to 4) + new /obj/item/weapon/reagent_containers/food/snacks/monkeycube/wrapped/sarucube(src) + +/obj/item/weapon/storage/box/monkeycubes/sparracubes + name = "sparra cube box" + desc = "Drymate brand sparra cubes. Just add water!" + +/obj/item/weapon/storage/box/monkeycubes/sparracubes/New() + ..() + for(var/i = 1 to 4) + new /obj/item/weapon/reagent_containers/food/snacks/monkeycube/wrapped/sparracube(src) + +/obj/item/weapon/storage/box/monkeycubes/wolpincubes + name = "wolpin cube box" + desc = "Drymate brand wolpin cubes. Just add water!" + +/obj/item/weapon/storage/box/monkeycubes/wolpincubes/New() + ..() + for(var/i = 1 to 4) + new /obj/item/weapon/reagent_containers/food/snacks/monkeycube/wrapped/wolpincube(src) diff --git a/code/modules/vore/fluffstuff/custom_items_vr.dm b/code/modules/vore/fluffstuff/custom_items_vr.dm index fbacc37690b..8f2054c8f0b 100644 --- a/code/modules/vore/fluffstuff/custom_items_vr.dm +++ b/code/modules/vore/fluffstuff/custom_items_vr.dm @@ -1352,4 +1352,19 @@ obj/item/weapon/material/hatchet/tacknife/combatknife/fluff/katarina/handle_shie access = list(access_cent_general,access_cent_thunder,access_cent_medical,access_cent_living,access_cent_storage,access_cent_teleporter,access_research,access_xenobiology,access_maint_tunnels,access_xenoarch,access_robotics,access_tox_storage,access_tox) //Yes, this looks awful. I tried calling both central and resarch access but it didn't work. age = 39 blood_type = "O-" - sex = "Female" \ No newline at end of file + sex = "Female" +/obj/item/weapon/fluff/kitchi_injector + name = "Kitchi Monkey Injector" + desc = "Allows the user (Kitchi) to transform into a monkey. Single use." + icon = 'icons/obj/items.dmi' + icon_state = "dnainjector" + +/obj/item/weapon/fluff/kitchi_injector/attack_self(mob/user as mob) + + if(user.ckey != "Ketrai") + user << "You inject yourself.... Nothing happens." + return + if(ishuman(user)) + var/mob/living/carbon/human/H = user + H.monkeyize() + qdel(src) //One time use. diff --git a/config/custom_items.txt b/config/custom_items.txt index 7363485b3d7..c940cdd8487 100644 --- a/config/custom_items.txt +++ b/config/custom_items.txt @@ -348,6 +348,12 @@ character_name: Ketrai item_path: /obj/item/clothing/head/fluff/ketrai } +{ +ckey: ketrai +character_name: Kitchi +item_path: /obj/item/weapon/fluff/kitchi_injector +} + { ckey: kiraalitruss character_name: Amaya Rahl diff --git a/maps/RandomZLevels/zoo.dmm b/maps/RandomZLevels/zoo.dmm index 38d5162c2f7..edede57b18e 100644 --- a/maps/RandomZLevels/zoo.dmm +++ b/maps/RandomZLevels/zoo.dmm @@ -198,7 +198,7 @@ "dP" = (/obj/machinery/door/window/southleft,/turf/simulated/shuttle/floor/black,/area/awaymission/zoo/tradeship) "dQ" = (/obj/machinery/door/window/southright,/turf/simulated/shuttle/floor/black,/area/awaymission/zoo/tradeship) "dR" = (/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced,/obj/structure/grille,/obj/structure/window/reinforced{dir = 4},/turf/simulated/shuttle/plating,/area/awaymission/zoo/tradeship) -"dS" = (/obj/structure/table/standard,/obj/item/clothing/gloves/latex,/obj/item/clothing/mask/surgical,/obj/item/weapon/surgical/retractor{pixel_x = 0; pixel_y = 6},/obj/item/weapon/surgical/scalpel,/obj/item/weapon/surgical/surgicaldrill,/obj/item/weapon/surgical/circular_saw,/obj/item/stack/nanopaste,/obj/item/weapon/surgical/hemostat{pixel_y = 4},/obj/item/weapon/surgical/cautery{pixel_y = 4},/obj/item/weapon/surgical/FixOVein{pixel_x = -6; pixel_y = 1},/obj/item/stack/medical/advanced/bruise_pack,/obj/item/weapon/surgical/bonesetter,/obj/item/weapon/surgical/bonegel{pixel_x = 4; pixel_y = 3},/turf/simulated/shuttle/floor/black,/area/awaymission/zoo/tradeship) +"dS" = (/obj/structure/table/standard,/obj/item/clothing/gloves/sterile,/obj/item/clothing/mask/surgical,/obj/item/weapon/surgical/retractor{pixel_x = 0; pixel_y = 6},/obj/item/weapon/surgical/scalpel,/obj/item/weapon/surgical/surgicaldrill,/obj/item/weapon/surgical/circular_saw,/obj/item/stack/nanopaste,/obj/item/weapon/surgical/hemostat{pixel_y = 4},/obj/item/weapon/surgical/cautery{pixel_y = 4},/obj/item/weapon/surgical/FixOVein{pixel_x = -6; pixel_y = 1},/obj/item/stack/medical/advanced/bruise_pack,/obj/item/weapon/surgical/bonesetter,/obj/item/weapon/surgical/bonegel{pixel_x = 4; pixel_y = 3},/turf/simulated/shuttle/floor/black,/area/awaymission/zoo/tradeship) "dT" = (/obj/machinery/iv_drip,/turf/simulated/shuttle/floor/black,/area/awaymission/zoo/tradeship) "dU" = (/obj/structure/table/reinforced,/turf/simulated/floor/carpet,/area/awaymission/zoo/pirateship) "dV" = (/obj/structure/bed/chair/office/dark{dir = 8},/turf/simulated/floor/carpet,/area/awaymission/zoo/pirateship) @@ -455,7 +455,7 @@ "iM" = (/obj/machinery/telecomms/allinone{intercept = 1},/obj/machinery/door/window/northright{name = "Telecoms Mainframe"; req_access = list(150)},/turf/simulated/shuttle/floor/darkred,/area/awaymission/zoo/syndieship) "iN" = (/obj/machinery/door/blast/regular{id = "syndieshutters_telebay"; name = "Outer Airlock"},/turf/simulated/shuttle/plating,/area/awaymission/zoo/syndieship) "iO" = (/obj/machinery/light/small{dir = 8},/turf/simulated/shuttle/floor/darkred,/area/awaymission/zoo/syndieship) -"iP" = (/obj/structure/sink{dir = 4; icon_state = "sink"; pixel_x = 11; pixel_y = 0},/obj/structure/closet/secure_closet/medical_wall{pixel_x = 32; pixel_y = 0; req_access = list(150)},/obj/item/weapon/tank/anesthetic,/obj/item/clothing/mask/breath/medical,/obj/item/clothing/mask/surgical,/obj/item/clothing/gloves/latex,/obj/item/weapon/reagent_containers/syringe,/obj/item/weapon/reagent_containers/glass/bottle/stoxin,/obj/item/weapon/reagent_containers/glass/bottle/stoxin,/turf/simulated/shuttle/floor/darkred,/area/awaymission/zoo/syndieship) +"iP" = (/obj/structure/sink{dir = 4; icon_state = "sink"; pixel_x = 11; pixel_y = 0},/obj/structure/closet/secure_closet/medical_wall{pixel_x = 32; pixel_y = 0; req_access = list(150)},/obj/item/weapon/tank/anesthetic,/obj/item/clothing/mask/breath/medical,/obj/item/clothing/mask/surgical,/obj/item/clothing/gloves/sterile,/obj/item/weapon/reagent_containers/syringe,/obj/item/weapon/reagent_containers/glass/bottle/stoxin,/obj/item/weapon/reagent_containers/glass/bottle/stoxin,/turf/simulated/shuttle/floor/darkred,/area/awaymission/zoo/syndieship) "iQ" = (/obj/machinery/portable_atmospherics/canister/oxygen,/turf/simulated/shuttle/floor/darkred,/area/awaymission/zoo/syndieship) "iR" = (/obj/item/weapon/crowbar,/turf/simulated/shuttle/floor/darkred,/area/awaymission/zoo/syndieship) "iS" = (/obj/structure/sign/nosmoking_2{pixel_x = 32},/turf/simulated/shuttle/floor/darkred,/area/awaymission/zoo/syndieship) @@ -753,7 +753,7 @@ "oy" = (/obj/effect/overlay/palmtree_l,/turf/simulated/floor/holofloor/beach/sand{tag = "icon-fullgrass0"; icon_state = "fullgrass0"},/area/awaymission/zoo) "oz" = (/obj/structure/flora/ausbushes/fullgrass,/turf/simulated/floor/holofloor/beach/sand{tag = "icon-dgrass0"; icon_state = "dgrass0"},/area/awaymission/zoo) "oA" = (/obj/structure/flora/ausbushes/lavendergrass,/mob/living/simple_animal/cat{faction = "zoo"},/turf/simulated/floor/holofloor/beach/sand{tag = "icon-dgrass4"; icon_state = "dgrass4"},/area/awaymission/zoo) -"oB" = (/mob/living/simple_animal/hostile/bee{faction = "zoo"},/turf/simulated/floor/holofloor/grass{icon = 'icons/turf/flooring/misc_vr.dmi'; icon_state = "hive"; name = "giant honeycomb"},/area/awaymission/zoo) +"oB" = (/mob/living/simple_animal/retaliate/bee{faction = "zoo"},/turf/simulated/floor/holofloor/grass{icon = 'icons/turf/flooring/misc_vr.dmi'; icon_state = "hive"; name = "giant honeycomb"},/area/awaymission/zoo) "oC" = (/obj/structure/flora/ausbushes/sparsegrass,/turf/simulated/floor/holofloor/grass{icon = 'icons/jungle.dmi'; icon_state = "grass2"},/area/awaymission/zoo) "oD" = (/obj/structure/flora/ausbushes/palebush,/turf/simulated/floor/holofloor/grass{icon = 'icons/jungle.dmi'; icon_state = "grass2"},/area/awaymission/zoo) "oE" = (/obj/structure/bed/chair,/turf/simulated/floor/lino,/area/awaymission/zoo) @@ -1035,7 +1035,7 @@ "tU" = (/obj/effect/decal/remains/human,/turf/simulated/floor/holofloor/desert{icon = 'icons/turf/floors.dmi'; icon_state = "asteroidplating"; name = "scorched sand"},/area/awaymission/zoo) "tV" = (/mob/living/simple_animal/adultslime{faction = "zoo"},/turf/simulated/floor/holofloor/desert,/area/awaymission/zoo) "tW" = (/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced{dir = 8},/obj/structure/grille,/turf/simulated/floor/holofloor/desert,/area/awaymission/zoo) -"tX" = (/mob/living/simple_animal/hostile/large/dragon{faction = "zoo"},/turf/simulated/floor/holofloor/desert{icon = 'icons/turf/floors.dmi'; icon_state = "asteroidplating"; name = "scorched sand"},/area/awaymission/zoo) +"tX" = (/mob/living/simple_animal/hostile/dragon{faction = "zoo"},/turf/simulated/floor/holofloor/desert{icon = 'icons/turf/floors.dmi'; icon_state = "asteroidplating"; name = "scorched sand"},/area/awaymission/zoo) "tY" = (/mob/living/simple_animal/lizard{faction = "zoo"},/turf/simulated/floor/holofloor/desert,/area/awaymission/zoo) "tZ" = (/mob/living/simple_animal/hostile/tomato{faction = "zoo"},/turf/simulated/floor/holofloor/grass,/area/awaymission/zoo) "ua" = (/mob/living/simple_animal/fox{faction = "zoo"},/turf/simulated/floor/holofloor/snow,/area/awaymission/zoo) @@ -1134,7 +1134,7 @@ "vP" = (/obj/machinery/body_scanconsole,/turf/simulated/floor/tiled/white,/area/awaymission/zoo) "vQ" = (/obj/structure/curtain/open/privacy,/turf/simulated/floor/tiled/white,/area/awaymission/zoo) "vR" = (/obj/machinery/optable,/turf/simulated/floor/tiled/white,/area/awaymission/zoo) -"vS" = (/obj/structure/table/standard,/obj/item/clothing/gloves/latex,/obj/item/clothing/mask/surgical,/obj/item/weapon/surgical/retractor{pixel_x = 0; pixel_y = 6},/obj/item/weapon/surgical/scalpel,/obj/item/weapon/surgical/surgicaldrill,/obj/item/weapon/surgical/circular_saw,/obj/item/stack/nanopaste,/obj/item/weapon/surgical/hemostat{pixel_y = 4},/obj/item/weapon/surgical/cautery{pixel_y = 4},/obj/item/weapon/surgical/FixOVein{pixel_x = -6; pixel_y = 1},/obj/item/stack/medical/advanced/bruise_pack,/obj/item/weapon/surgical/bonesetter,/obj/item/weapon/surgical/bonegel{pixel_x = 4; pixel_y = 3},/turf/simulated/floor/tiled/white,/area/awaymission/zoo) +"vS" = (/obj/structure/table/standard,/obj/item/clothing/gloves/sterile,/obj/item/clothing/mask/surgical,/obj/item/weapon/surgical/retractor{pixel_x = 0; pixel_y = 6},/obj/item/weapon/surgical/scalpel,/obj/item/weapon/surgical/surgicaldrill,/obj/item/weapon/surgical/circular_saw,/obj/item/stack/nanopaste,/obj/item/weapon/surgical/hemostat{pixel_y = 4},/obj/item/weapon/surgical/cautery{pixel_y = 4},/obj/item/weapon/surgical/FixOVein{pixel_x = -6; pixel_y = 1},/obj/item/stack/medical/advanced/bruise_pack,/obj/item/weapon/surgical/bonesetter,/obj/item/weapon/surgical/bonegel{pixel_x = 4; pixel_y = 3},/turf/simulated/floor/tiled/white,/area/awaymission/zoo) "vT" = (/obj/machinery/iv_drip,/turf/simulated/floor/tiled/white,/area/awaymission/zoo) "vU" = (/obj/structure/table/standard,/turf/simulated/floor/tiled/dark,/area/awaymission/zoo) "vV" = (/obj/machinery/computer,/turf/simulated/floor/tiled/dark,/area/awaymission/zoo) diff --git a/maps/tether/tether-01-surface.dmm b/maps/tether/tether-01-surface.dmm index 0f0130a6602..d1a3ab0d05c 100644 --- a/maps/tether/tether-01-surface.dmm +++ b/maps/tether/tether-01-surface.dmm @@ -5242,7 +5242,7 @@ "bWP" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 5; icon_state = "fwindow"},/obj/machinery/door/firedoor,/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 4},/turf/simulated/floor/plating,/area/crew_quarters/bar) "bWQ" = (/obj/structure/grille,/obj/machinery/door/firedoor,/obj/structure/window/reinforced/polarized{dir = 8},/obj/structure/window/reinforced/polarized/full,/turf/simulated/floor/plating,/area/rnd/rdoffice) "bWR" = (/obj/structure/table/glass,/obj/item/weapon/paper_bin{pixel_x = 1; pixel_y = 9},/obj/item/device/megaphone,/obj/item/weapon/paper/monitorkey,/obj/effect/floor_decal/borderfloor{dir = 8},/obj/effect/floor_decal/corner/mauve/border{dir = 8},/turf/simulated/floor/tiled,/area/rnd/rdoffice) -"bWS" = (/obj/effect/step_trigger/teleporter/wild/to_wild_1,/turf/simulated/floor/tiled/steel_dirty/virgo3b,/area/tether/surfacebase/outside/outside1) +"bWS" = (/obj/effect/step_trigger/teleporter/wild/to_wild_1,/turf/unsimulated/wall/planetary/virgo3b,/area/tether/surfacebase/outside/outside1) "bWT" = (/obj/structure/table/glass,/obj/machinery/computer/skills,/turf/simulated/floor/tiled,/area/rnd/rdoffice) "bWU" = (/turf/simulated/floor/tiled,/area/rnd/rdoffice) "bWV" = (/obj/effect/floor_decal/borderfloor{dir = 4},/obj/effect/floor_decal/corner/mauve/border{dir = 4},/turf/simulated/floor/tiled,/area/rnd/rdoffice) diff --git a/maps/tether/tether-03-station.dmm b/maps/tether/tether-03-station.dmm index ccd2520e007..b730fcedc5c 100644 --- a/maps/tether/tether-03-station.dmm +++ b/maps/tether/tether-03-station.dmm @@ -774,9 +774,9 @@ "aoT" = (/obj/structure/cable/green{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/obj/machinery/status_display{pixel_y = 30},/obj/effect/floor_decal/borderfloor{dir = 1},/obj/effect/floor_decal/corner/lightgrey/border{dir = 1},/obj/effect/floor_decal/steeldecal/steel_decals7{dir = 4},/obj/effect/floor_decal/steeldecal/steel_decals7,/turf/simulated/floor/tiled,/area/crew_quarters/visitor_dining) "aoU" = (/obj/structure/cable/green{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/structure/cable/green{d1 = 1; d2 = 8; icon_state = "1-8"},/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers,/obj/machinery/atmospherics/pipe/manifold/hidden/supply,/obj/effect/floor_decal/steeldecal/steel_decals6{dir = 1},/turf/simulated/floor/tiled,/area/crew_quarters/visitor_dining) "aoV" = (/obj/machinery/door/firedoor/glass,/obj/effect/floor_decal/steeldecal/steel_decals_central1{dir = 1},/turf/simulated/floor/tiled/monofloor{dir = 1},/area/holodeck_control) -"aoW" = (/obj/machinery/atmospherics/pipe/simple/visible/supply{tag = "icon-intact-supply (EAST)"; icon_state = "intact-supply"; dir = 4},/obj/machinery/atmospherics/pipe/simple/visible/scrubbers{tag = "icon-intact-scrubbers (EAST)"; icon_state = "intact-scrubbers"; dir = 4},/obj/machinery/pipedispenser,/obj/structure/extinguisher_cabinet{dir = 1; icon_state = "extinguisher_closed"; pixel_y = 32; tag = "icon-extinguisher_closed (NORTH)"},/turf/simulated/floor/tiled,/area/engineering/atmos/backup) -"aoX" = (/obj/machinery/atmospherics/pipe/simple/visible/supply{tag = "icon-intact-supply (EAST)"; icon_state = "intact-supply"; dir = 4},/obj/machinery/light{dir = 1},/obj/structure/table/reinforced,/obj/item/stack/material/glass{amount = 50},/obj/item/stack/material/steel{amount = 50},/obj/machinery/atmospherics/pipe/manifold/visible/scrubbers{tag = "icon-map-scrubbers (NORTH)"; icon_state = "map-scrubbers"; dir = 1},/turf/simulated/floor/tiled,/area/engineering/atmos/backup) -"aoY" = (/obj/machinery/atmospherics/pipe/simple/visible/supply{tag = "icon-intact-supply (SOUTHWEST)"; icon_state = "intact-supply"; dir = 10},/obj/machinery/atmospherics/pipe/simple/visible/scrubbers{tag = "icon-intact-scrubbers (SOUTHWEST)"; icon_state = "intact-scrubbers"; dir = 10},/obj/machinery/pipedispenser/disposal,/turf/simulated/floor/tiled,/area/engineering/atmos/backup) +"aoW" = (/obj/effect/floor_decal/industrial/warning/corner{dir = 4},/obj/structure/table/reinforced,/obj/item/device/pipe_painter,/turf/simulated/floor/tiled,/area/engineering/atmos/backup) +"aoX" = (/obj/structure/table/reinforced,/obj/item/stack/material/steel{amount = 50},/obj/item/stack/material/glass{amount = 50},/turf/simulated/floor/tiled,/area/engineering/atmos/backup) +"aoY" = (/obj/machinery/atmospherics/pipe/simple/visible/supply{tag = "icon-intact-supply (EAST)"; icon_state = "intact-supply"; dir = 4},/obj/machinery/light{dir = 1},/obj/machinery/atmospherics/pipe/manifold/visible/scrubbers{tag = "icon-map-scrubbers (NORTH)"; icon_state = "map-scrubbers"; dir = 1},/turf/simulated/floor/tiled,/area/engineering/atmos/backup) "aoZ" = (/obj/structure/disposalpipe/trunk{dir = 4},/obj/machinery/disposal,/obj/effect/floor_decal/steeldecal/steel_decals9{dir = 8},/obj/effect/floor_decal/steeldecal/steel_decals9{dir = 1},/obj/effect/floor_decal/steeldecal/steel_decals9{dir = 4},/obj/effect/floor_decal/steeldecal/steel_decals9,/turf/simulated/floor/tiled,/area/engineering/hallway) "apa" = (/obj/structure/sign/securearea{desc = "A warning sign which reads 'HIGH VOLTAGE'"; icon_state = "shock"; name = "HIGH VOLTAGE"; pixel_y = 0},/turf/simulated/wall/r_wall,/area/engineering/hallway) "apb" = (/obj/structure/disposalpipe/segment{dir = 4},/turf/simulated/floor/tiled,/area/engineering/hallway) @@ -788,7 +788,7 @@ "aph" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"; pixel_y = 0},/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/obj/structure/disposalpipe/segment,/obj/effect/floor_decal/rust,/turf/simulated/floor,/area/maintenance/station/eng_lower) "api" = (/obj/effect/decal/cleanable/dirt,/obj/random/trash_pile,/turf/simulated/floor,/area/maintenance/station/eng_lower) "apj" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"; pixel_y = 0},/obj/random/junk,/obj/effect/decal/cleanable/dirt,/turf/simulated/floor,/area/maintenance/station/eng_lower) -"apk" = (/obj/machinery/atmospherics/pipe/simple/visible/universal,/turf/simulated/floor/tiled,/area/engineering/atmos/backup) +"apk" = (/obj/machinery/atmospherics/pipe/simple/visible/supply{tag = "icon-intact-supply (EAST)"; icon_state = "intact-supply"; dir = 4},/obj/machinery/atmospherics/pipe/simple/visible/scrubbers{tag = "icon-intact-scrubbers (EAST)"; icon_state = "intact-scrubbers"; dir = 4},/obj/structure/extinguisher_cabinet{dir = 1; icon_state = "extinguisher_closed"; pixel_y = 32; tag = "icon-extinguisher_closed (NORTH)"},/turf/simulated/floor/tiled,/area/engineering/atmos/backup) "apl" = (/obj/structure/cable/green{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/obj/effect/floor_decal/borderfloor{dir = 1},/obj/effect/floor_decal/corner/lightgrey/border{dir = 1},/obj/effect/floor_decal/borderfloor/corner2{dir = 4},/obj/effect/floor_decal/corner/lightgrey/bordercorner2{dir = 4},/obj/effect/floor_decal/steeldecal/steel_decals7,/obj/effect/floor_decal/steeldecal/steel_decals7{dir = 4},/turf/simulated/floor/tiled,/area/crew_quarters/visitor_dining) "apm" = (/obj/structure/cable/green{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/obj/structure/disposalpipe/segment,/obj/effect/floor_decal/steeldecal/steel_decals6{dir = 4},/turf/simulated/floor/tiled,/area/crew_quarters/visitor_dining) "apn" = (/obj/structure/cable/green{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/obj/machinery/camera/network/northern_star,/obj/effect/floor_decal/borderfloor{dir = 1},/obj/effect/floor_decal/corner/lightgrey/border{dir = 1},/obj/effect/floor_decal/steeldecal/steel_decals7,/obj/effect/floor_decal/steeldecal/steel_decals7{dir = 4},/obj/item/device/radio/intercom{pixel_y = 24; req_access = list()},/turf/simulated/floor/tiled,/area/crew_quarters/visitor_dining) @@ -799,10 +799,10 @@ "aps" = (/obj/structure/cable/green{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/obj/effect/floor_decal/borderfloor{dir = 1},/obj/effect/floor_decal/corner/lightgrey/border{dir = 1},/obj/effect/floor_decal/steeldecal/steel_decals7,/obj/effect/floor_decal/steeldecal/steel_decals7{dir = 4},/obj/machinery/firealarm{dir = 2; layer = 3.3; pixel_x = 0; pixel_y = 26},/turf/simulated/floor/tiled,/area/crew_quarters/visitor_dining) "apt" = (/obj/structure/cable/green{d1 = 2; d2 = 8; icon_state = "2-8"},/obj/structure/cable/green{d1 = 1; d2 = 8; icon_state = "1-8"},/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{dir = 4},/obj/machinery/atmospherics/pipe/manifold/hidden/supply{dir = 4},/obj/effect/floor_decal/borderfloor{dir = 4},/obj/effect/floor_decal/corner/lightgrey/border{dir = 4},/obj/effect/floor_decal/steeldecal/steel_decals7{dir = 10},/obj/effect/floor_decal/steeldecal/steel_decals7{dir = 9},/turf/simulated/floor/tiled,/area/crew_quarters/visitor_dining) "apu" = (/obj/machinery/door/airlock/multi_tile/glass{autoclose = 1; dir = 2; id_tag = null; name = "Holodeck"; req_access = list()},/obj/machinery/door/firedoor/glass,/obj/effect/floor_decal/steeldecal/steel_decals_central1,/turf/simulated/floor/tiled/monofloor,/area/holodeck_control) -"apv" = (/obj/machinery/atmospherics/pipe/simple/visible/supply{tag = "icon-intact-supply (EAST)"; icon_state = "intact-supply"; dir = 4},/obj/item/device/radio/intercom{pixel_y = 24; req_access = list()},/obj/structure/table/reinforced,/obj/item/device/pipe_painter,/obj/machinery/atmospherics/pipe/simple/visible/scrubbers{tag = "icon-intact-scrubbers (EAST)"; icon_state = "intact-scrubbers"; dir = 4},/turf/simulated/floor/tiled,/area/engineering/atmos/backup) +"apv" = (/obj/machinery/atmospherics/pipe/simple/visible/supply{tag = "icon-intact-supply (EAST)"; icon_state = "intact-supply"; dir = 4},/obj/item/device/radio/intercom{pixel_y = 24; req_access = list()},/obj/machinery/atmospherics/pipe/simple/visible/scrubbers{tag = "icon-intact-scrubbers (EAST)"; icon_state = "intact-scrubbers"; dir = 4},/turf/simulated/floor/tiled,/area/engineering/atmos/backup) "apw" = (/obj/machinery/atmospherics/pipe/simple/visible/cyan{dir = 6},/obj/machinery/meter,/obj/structure/cable/green{d1 = 1; d2 = 4; icon_state = "1-4"},/turf/simulated/floor/tiled,/area/engineering/atmos/backup) "apx" = (/obj/structure/cable/green{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/machinery/atmospherics/binary/pump{dir = 4},/turf/simulated/floor/tiled,/area/engineering/atmos/backup) -"apy" = (/obj/machinery/atmospherics/pipe/simple/visible/cyan{dir = 4},/obj/structure/cable/green{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/machinery/atmospherics/pipe/simple/visible/scrubbers,/turf/simulated/floor/tiled,/area/engineering/atmos/backup) +"apy" = (/obj/machinery/atmospherics/pipe/simple/visible/supply{tag = "icon-intact-supply (SOUTHWEST)"; icon_state = "intact-supply"; dir = 10},/obj/machinery/atmospherics/pipe/simple/visible/scrubbers{tag = "icon-intact-scrubbers (SOUTHWEST)"; icon_state = "intact-scrubbers"; dir = 10},/turf/simulated/floor/tiled,/area/engineering/atmos/backup) "apz" = (/obj/structure/cable/green{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/machinery/atmospherics/pipe/simple/hidden/cyan{tag = "icon-intact (EAST)"; icon_state = "intact"; dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/obj/machinery/door/firedoor/glass,/obj/machinery/door/airlock/glass_atmos{name = "Atmospherics Substation"; req_access = list(24)},/turf/simulated/floor/tiled/steel_grid,/area/engineering/atmos/backup) "apA" = (/obj/structure/cable/green{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/machinery/atmospherics/pipe/simple/visible/supply{tag = "icon-intact-supply (NORTHEAST)"; icon_state = "intact-supply"; dir = 5},/obj/machinery/atmospherics/pipe/simple/visible/scrubbers{tag = "icon-intact-scrubbers (NORTHEAST)"; icon_state = "intact-scrubbers"; dir = 5},/obj/machinery/atmospherics/pipe/simple/visible/cyan{dir = 4},/obj/effect/floor_decal/steeldecal/steel_decals4{dir = 10},/obj/effect/floor_decal/steeldecal/steel_decals4,/obj/structure/cable/green{d1 = 2; d2 = 4; icon_state = "2-4"},/turf/simulated/floor/tiled,/area/engineering/atmos/backup) "apB" = (/obj/machinery/atmospherics/pipe/simple/hidden/cyan{tag = "icon-intact (EAST)"; icon_state = "intact"; dir = 4},/obj/effect/floor_decal/borderfloor{dir = 1},/obj/effect/floor_decal/corner/yellow/border{dir = 1},/obj/effect/floor_decal/steeldecal/steel_decals7,/obj/effect/floor_decal/steeldecal/steel_decals7{dir = 4},/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{dir = 1},/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/obj/structure/cable/green{d1 = 4; d2 = 8; icon_state = "4-8"},/turf/simulated/floor/tiled,/area/engineering/hallway) @@ -864,9 +864,9 @@ "aqF" = (/obj/machinery/atmospherics/pipe/simple/heat_exchanging{dir = 9},/obj/structure/lattice,/turf/space,/area/space) "aqG" = (/obj/structure/bed/chair/comfy/beige,/obj/effect/landmark/start{name = "Atmospheric Technician"},/turf/simulated/floor/carpet,/area/engineering/break_room) "aqH" = (/obj/machinery/vending/coffee,/obj/effect/floor_decal/corner/white/diagonal,/turf/simulated/floor/tiled,/area/engineering/break_room) -"aqI" = (/obj/machinery/atmospherics/pipe/manifold/visible/cyan{tag = "icon-map (WEST)"; icon_state = "map"; dir = 8},/turf/simulated/floor/tiled,/area/engineering/atmos/backup) +"aqI" = (/obj/machinery/atmospherics/pipe/simple/visible/universal,/obj/machinery/meter,/turf/simulated/floor/tiled,/area/engineering/atmos/backup) "aqJ" = (/obj/machinery/atmospherics/binary/pump,/turf/simulated/floor/tiled,/area/engineering/atmos/backup) -"aqK" = (/obj/machinery/atmospherics/pipe/manifold/visible/cyan{dir = 4},/turf/simulated/floor/tiled,/area/engineering/atmos/backup) +"aqK" = (/obj/machinery/pipedispenser,/turf/simulated/floor/tiled,/area/engineering/atmos/backup) "aqL" = (/obj/machinery/atmospherics/pipe/simple/visible/red,/turf/simulated/floor/tiled,/area/engineering/atmos/backup) "aqM" = (/turf/simulated/wall,/area/engineering/workshop) "aqN" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 5; icon_state = "fwindow"},/obj/machinery/door/firedoor/glass,/turf/simulated/floor,/area/engineering/workshop) @@ -897,7 +897,7 @@ "arm" = (/obj/machinery/atmospherics/pipe/simple/visible/red{tag = "icon-intact (NORTHEAST)"; icon_state = "intact"; dir = 5},/turf/simulated/floor/tiled,/area/engineering/atmos/backup) "arn" = (/obj/machinery/atmospherics/pipe/simple/visible/cyan{dir = 9},/turf/simulated/floor/tiled,/area/engineering/atmos/backup) "aro" = (/obj/machinery/atmospherics/binary/pump{dir = 1},/obj/machinery/firealarm{dir = 4; layer = 3.3; pixel_x = 26},/turf/simulated/floor/tiled,/area/engineering/atmos/backup) -"arp" = (/obj/machinery/atmospherics/pipe/manifold/visible/red{tag = "icon-map (EAST)"; icon_state = "map"; dir = 4},/turf/simulated/floor/tiled,/area/engineering/atmos/backup) +"arp" = (/obj/machinery/atmospherics/pipe/simple/visible/cyan{dir = 4},/obj/structure/cable/green{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/machinery/atmospherics/pipe/simple/visible/universal,/turf/simulated/floor/tiled,/area/engineering/atmos/backup) "arq" = (/turf/simulated/wall/r_wall,/area/engineering/shaft) "arr" = (/obj/structure/table/reinforced,/obj/machinery/light{dir = 1},/obj/item/weapon/storage/toolbox/mechanical{pixel_y = 5},/obj/item/weapon/storage/toolbox/electrical,/turf/simulated/floor/tiled,/area/engineering/workshop) "ars" = (/obj/structure/table/reinforced,/obj/item/device/radio/intercom{pixel_y = 24; req_access = list()},/obj/item/device/radio/off{pixel_y = 6},/obj/item/device/radio/off{pixel_x = -6; pixel_y = 4},/obj/item/device/radio/off{pixel_x = 6; pixel_y = 4},/obj/item/device/radio/off,/turf/simulated/floor/tiled,/area/engineering/workshop) @@ -4567,6 +4567,7 @@ "bJQ" = (/obj/machinery/camera/network/medbay{dir = 8},/turf/simulated/floor/wood,/area/medical/psych) "bJR" = (/obj/effect/floor_decal/borderfloor{dir = 1},/obj/effect/floor_decal/corner/lightgrey/border{dir = 1},/obj/effect/floor_decal/steeldecal/steel_decals7{dir = 4},/obj/effect/floor_decal/steeldecal/steel_decals7,/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 6},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 6},/obj/machinery/door/firedoor/glass/hidden/steel{dir = 2},/turf/simulated/floor/tiled,/area/hallway/station/upper) "bJS" = (/obj/effect/floor_decal/borderfloor{dir = 1},/obj/effect/floor_decal/corner/lightgrey/border{dir = 1},/obj/effect/floor_decal/steeldecal/steel_decals7{dir = 4},/obj/effect/floor_decal/steeldecal/steel_decals7,/obj/machinery/atmospherics/unary/vent_scrubber/on,/turf/simulated/floor/tiled,/area/hallway/station/upper) +"bJT" = (/obj/machinery/door/firedoor/glass,/obj/machinery/door/blast/regular{density = 0; dir = 1; icon_state = "pdoor0"; id = "englockdown"; name = "Engineering Lockdown"; opacity = 0},/obj/structure/grille,/obj/structure/window/reinforced{dir = 5; icon_state = "fwindow"},/obj/structure/window/reinforced{dir = 8},/obj/machinery/atmospherics/pipe/simple/visible/red{tag = "icon-intact (EAST)"; icon_state = "intact"; dir = 4},/turf/simulated/floor,/area/engineering/atmos/backup) "bJU" = (/obj/effect/floor_decal/steeldecal/steel_decals6{dir = 1},/obj/machinery/atmospherics/pipe/manifold/hidden/supply{dir = 4},/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{dir = 4},/turf/simulated/floor/tiled,/area/hallway/station/upper) "bJV" = (/obj/effect/floor_decal/borderfloor{dir = 1},/obj/effect/floor_decal/corner/red/border{dir = 1},/obj/effect/floor_decal/borderfloor/corner2{dir = 1},/obj/effect/floor_decal/corner/red/bordercorner2{dir = 1},/obj/effect/floor_decal/steeldecal/steel_decals7,/obj/effect/floor_decal/steeldecal/steel_decals7{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/turf/simulated/floor/tiled,/area/hallway/station/upper) "bJW" = (/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 6},/turf/simulated/floor/tiled,/area/quartermaster/qm) @@ -5507,9 +5508,16 @@ "cbV" = (/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/structure/extinguisher_cabinet{dir = 2; icon_state = "extinguisher_closed"; pixel_x = 30; tag = "icon-extinguisher_closed (WEST)"},/turf/simulated/floor/tiled,/area/tether/station/dock_two) "cbW" = (/obj/machinery/door/airlock/external{frequency = 1380; icon_state = "door_locked"; id_tag = "specops_dock_inner"; locked = 1; name = "Docking Port Airlock"; req_access = list(13)},/obj/machinery/atmospherics/pipe/simple/hidden{dir = 4},/turf/simulated/floor/tiled,/area/hallway/secondary/entry/D1) "cbX" = (/obj/structure/closet/emcloset,/obj/effect/floor_decal/industrial/warning/corner{dir = 8},/obj/structure/extinguisher_cabinet{dir = 2; icon_state = "extinguisher_closed"; pixel_x = 30; tag = "icon-extinguisher_closed (WEST)"},/turf/simulated/floor/tiled,/area/tether/station/dock_one) +"cbY" = (/obj/machinery/atmospherics/unary/vent_pump/on{dir = 4},/turf/simulated/floor/airless,/area/engineering/atmos/backup) "cbZ" = (/obj/effect/floor_decal/borderfloor{dir = 10},/obj/effect/floor_decal/corner/lightgrey/border{dir = 10},/obj/machinery/disposal,/obj/structure/disposalpipe/trunk{dir = 1},/obj/effect/floor_decal/borderfloor/corner2{dir = 8},/obj/effect/floor_decal/corner/lightgrey/bordercorner2{dir = 8},/turf/simulated/floor/tiled,/area/hallway/station/upper) "cca" = (/obj/effect/floor_decal/industrial/outline/yellow,/obj/item/clothing/suit/space/void/wizard,/obj/item/clothing/head/helmet/space/void/wizard,/obj/structure/table/rack,/obj/machinery/light{dir = 1},/turf/simulated/floor/tiled/dark,/area/security/nuke_storage) "ccb" = (/obj/effect/floor_decal/industrial/outline/yellow,/obj/structure/closet/secure_closet/freezer/money,/obj/item/weapon/storage/secure/briefcase/money{desc = "An sleek tidy briefcase."; name = "secure briefcase"},/obj/machinery/light,/turf/simulated/floor/tiled/dark,/area/security/nuke_storage) +"ccc" = (/obj/machinery/pipedispenser/disposal,/obj/machinery/atmospherics/pipe/simple/visible/red{tag = "icon-intact (SOUTHWEST)"; icon_state = "intact"; dir = 10},/turf/simulated/floor/tiled,/area/engineering/atmos/backup) +"ccd" = (/obj/machinery/atmospherics/pipe/simple/visible/red{tag = "icon-intact (EAST)"; icon_state = "intact"; dir = 4},/obj/machinery/atmospherics/pipe/simple/visible/cyan,/turf/simulated/floor/tiled,/area/engineering/atmos/backup) +"cce" = (/obj/machinery/atmospherics/pipe/manifold/visible/red,/turf/simulated/floor/tiled,/area/engineering/atmos/backup) +"ccf" = (/obj/machinery/atmospherics/pipe/manifold/visible/red{tag = "icon-map (EAST)"; icon_state = "map"; dir = 4},/obj/machinery/meter,/turf/simulated/floor/tiled,/area/engineering/atmos/backup) +"ccg" = (/obj/machinery/atmospherics/pipe/manifold4w/visible/cyan,/obj/machinery/meter,/turf/simulated/floor/tiled,/area/engineering/atmos/backup) +"cch" = (/obj/machinery/atmospherics/pipe/simple/visible/cyan,/obj/machinery/atmospherics/valve/digital{tag = "icon-map_valve0 (WEST)"; icon_state = "map_valve0"; dir = 8},/turf/simulated/floor/tiled,/area/engineering/atmos/backup) (1,1,1) = {" aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa @@ -5549,13 +5557,13 @@ aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaahVaccaiAaiBapVaiBaiBarEacgamvalKamxamwamyacgagJag aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaahVabpaqCapVapVapVapVaqDacgamTamSamVamUamWacgaacaacaacaacaacaacaacaacaacaacaacaacaacaacaacaczafSanaaJsanbancaiUaneaMaanfaJsangamsabCabCaacaacaacaacaacacmacnacnacnacnacnacnadEadFadGadHadIadJadKadLadMadNadOabYadPadQabYaacaacaacaacaacaacaacaacaacaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaahVaccaiAaiBapVaiBaiBarEacgamSanhanjaniankacgaacaacaacaacaacarqarqarqaczaczaczaczaczaczaczanlannanmaJsaJsaJsabUaNcaJsaJsaJsaikaiDackabCaacaacaacaacaacacmacmacmacmacmacmacmacmacmacmaeqaeraesaesaesaesaesaesaesaesaesaesaacaacaacaacaacaacaacaacaacaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaahWabpaqCapVapVapVapVaqDacgacgacganJanIanKabZaacaacaacaacaacarqatlasEaczanLanPanOaowanSaoManRanUanTanWanVanYanXaoaanZaocaobaczaiDackabCaacaacaacaacaacaeMaeNaeNaeNaeNaeNaeNaeOaePaeMaeQaeRaesaeSaeTaeUaeVaeWaesaeXaeYaesaacaacaacaacaacaacaacaacaacaacaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa -aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaahVajiaiBaiBapVaiBaiBarEahWaaaaacabZaoeaojabZabZabZabZabZaacarqatEatDaczaopaoraoqaoqaoqaoqaosaouaotaoxaovaovaovaozaoyaoBaoAaoDaoCackabCaacaacaacaacaacaeMaeNaeNaeNaeNaeNaeNafvafwaeMafxafyaesafzafAafBafCafBafDafEafFaesafGafGafGafGafGafGafGafGafGaacaacaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa -aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaahVahVahWahVahVahVahVahVahWahWahWaoKaoHaoNaoXapvaoWaoYabZaczaczaJyaczapaaoZapcapbapbapbapbapbapeapdaijapgapgapgaijapgapgapgaijaphaclabCaacaacaacaacaacaeMaeNaeNaeNaeNaeNaeNafYafZagaadHadIagbagcagdageagfaggaesaghagiaesagjagkaglagmagnagoagpagqafGaacaacaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa -aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaahWaaaaaaaaaaaaaaaaaaahVaaaaaaaaaaoKapkapwapyapZapxapAapzapCapBaMAapDapGapFapIapHapKapJapJapJaqeapMapgapNapPapOapRapQapQapXaijapYachabCaacaacaacaacaacaeMaeMaeMaeMaeMaeMaeMaeMaeMaeMagDagEaesaesaesaesaesaesaesaesaesaesagFagGagGagGagGagGagHagIafGaacaacaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa -aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaahWaaaaaaaaaaaaaaaaaaahVaaaaaaaaaaoKadSaqaapkaqbadYaqdaqcaqfaqgaqiaqhaqkaqjaqmaqlaqoaqnaqraqqaTIaquapgaqvajFaqGaqGajFapQaqHaijapYachabCaacaacaacaacaacagQagRagRagRagRagRagRagSagTagQagUagVagWagXagYagZahaahbagWahcahdagWaheahfahgahhahiahjagHahkafGaacaacaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa -aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaahWaaaaaaaaaaaaaaaaaaahWahWahWabZabZaqIarnaqJaqLadeaqMaqMaqMaqMacSaqNaqNaqOaqPaqNaqNacSaqRaqQaqTaqSaqVaqUaqXaqWaqZaqYarjarcaijapYacjabCaacaacaacaacaacagQagRagRagRagRagRagRahFahGagQacVacWagWahHahIahJahKahJahLahMahNagWahOahPahQahRahSahTagHahUafGaacaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa -aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabiaaaaaaaaaaaaaaaaaaahVaaaaaaaoKarlaqKatgarmarparoaqMaQBarsarraruartarxarvarBaryarFaqNaqRaqQarHarGapgarIarKarJarNarLapQarOaijarPaiCabCaacaacaacaacaacagQagRagRagRagRagRagRailaimainadHadIaioaipaiqairaisaitagWaiuaivagWaiwahPaixahRahSaiyagHaizafGaacaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa -aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaahVaaaaaaaoKarlarQarSarRarUarTaqMarVarXarWarXarXasbarYaslaskasmaqNaqRasnaspasoasrasqajFassastajFapQasuaijasvapiabCaacaacabCabCabCagQagQagQagQagQagQagQagQagQagQajaajbagWagWagWagWagWagWagWagWagWagWajcahPajdajeajfajgagHajhafGaacaaaaaaaaaaaaaaaaaaaaaaaaaabaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa +aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaahVajiaiBaiBapVaiBaiBarEahWaaaabZaoWaoeaojabZabZabZabZabZaacarqatEatDaczaopaoraoqaoqaoqaoqaosaouaotaoxaovaovaovaozaoyaoBaoAaoDaoCackabCaacaacaacaacaacaeMaeNaeNaeNaeNaeNaeNafvafwaeMafxafyaesafzafAafBafCafBafDafEafFaesafGafGafGafGafGafGafGafGafGaacaacaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa +aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaahVahVahWahVahVahVahVahVahWahWaoKaoXaoHaoNaoYapvapkapyabZaczaczaJyaczapaaoZapcapbapbapbapbapbapeapdaijapgapgapgaijapgapgapgaijaphaclabCaacaacaacaacaacaeMaeNaeNaeNaeNaeNaeNafYafZagaadHadIagbagcagdageagfaggaesaghagiaesagjagkaglagmagnagoagpagqafGaacaacaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa +aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaahWaaaaaaaaaaaaaaaaaaahVaaaaaaaoKaqKaqIapwarpapZapxapAapzapCapBaMAapDapGapFapIapHapKapJapJapJaqeapMapgapNapPapOapRapQapQapXaijapYachabCaacaacaacaacaacaeMaeMaeMaeMaeMaeMaeMaeMaeMaeMagDagEaesaesaesaesaesaesaesaesaesaesagFagGagGagGagGagGagHagIafGaacaacaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa +aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaahWaaaaaaaaaaaaaaaaaaahVaaacbYbJTcccadSaqaaqJaqbadYaqdaqcaqfaqgaqiaqhaqkaqjaqmaqlaqoaqnaqraqqaTIaquapgaqvajFaqGaqGajFapQaqHaijapYachabCaacaacaacaacaacagQagRagRagRagRagRagRagSagTagQagUagVagWagXagYagZahaahbagWahcahdagWaheahfahgahhahiahjagHahkafGaacaacaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa +aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaahWaaaaaaaaaaaaaaaaaaahWahWahWabZarmccdcchcceccfadeaqMaqMaqMaqMacSaqNaqNaqOaqPaqNaqNacSaqRaqQaqTaqSaqVaqUaqXaqWaqZaqYarjarcaijapYacjabCaacaacaacaacaacagQagRagRagRagRagRagRahFahGagQacVacWagWahHahIahJahKahJahLahMahNagWahOahPahQahRahSahTagHahUafGaacaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa +aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabiaaaaaaaaaaaaaaaaaaahVaaaaaaaoKarlarQarnatgaqLaroaqMaQBarsarraruartarxarvarBaryarFaqNaqRaqQarHarGapgarIarKarJarNarLapQarOaijarPaiCabCaacaacaacaacaacagQagRagRagRagRagRagRailaimainadHadIaioaipaiqairaisaitagWaiuaivagWaiwahPaixahRahSaiyagHaizafGaacaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa +aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaahVaaaaaaaoKarlccgarSarRarUarTaqMarVarXarWarXarXasbarYaslaskasmaqNaqRasnaspasoasrasqajFassastajFapQasuaijasvapiabCaacaacabCabCabCagQagQagQagQagQagQagQagQagQagQajaajbagWagWagWagWagWagWagWagWagWagWajcahPajdajeajfajgagHajhafGaacaaaaaaaaaaaaaaaaaaaaaaaaaabaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaabaaaaaaaaaaaaaaaaaaaaaaaaahVaaaaaaaoKarlarnasxaswaszasyaqMasAaenaenaenaenaenasUasUaryasXacSasZasYarHataapgatdapQateapQapQapQatfaijasvaiXabCaacaacabCajHabCaacaacaacaacaacaacaacaacajIajJajKajLajMajIaacaacaacaacafGajNajOajPajQajRajSajTajUajVajWajXafGaacaacaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaahWaaaaaaabZabZarkatiathatkatjaqMbkxbYYbYIbZcatQbZdatNatSatRatVatTatXatWarHapLapgatYatZateaubauaaudaucaijanCabCabCabCabCabCakuabCanDanDanDanDanDanDanDanDanDajIakwakxajIanDanDanDanDanDafGakyakzakAakBakCakDakEakFakGakHakIafGaacaacaacaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaahWahWahWahWabZaueaueaueaueaueaqMaqMaqMaqMacSaukaenaulauuaenahBaqNauwauvauyauxaijauzauzauCauzauzauzauzaijasvanEachauFauEauEauGauJaokaonaomaoPaooaoRaoQaoTaoSapfaoUapmaplapoapnapqappapsaprapSaptalAalAalAalAalAalAalAalAalAalAalAalAaacaacaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa diff --git a/maps/tether/tether.dm b/maps/tether/tether.dm index f3d5350a4c7..bdd75b6d6d2 100644 --- a/maps/tether/tether.dm +++ b/maps/tether/tether.dm @@ -21,7 +21,7 @@ #include "tether-08-ships.dmm" #include "tether-09-empty-surface.dmm" #include "tether-10-empty-space.dmm" - #include "tether-11-wild-surface.dmm" +// #include "tether-11-wild-surface.dmm" // Wilderness stuff removed until mobs can be optimized better. #define USING_MAP_DATUM /datum/map/tether diff --git a/maps/tether/tether_defines.dm b/maps/tether/tether_defines.dm index 37c8f809182..f5e5067d071 100644 --- a/maps/tether/tether_defines.dm +++ b/maps/tether/tether_defines.dm @@ -36,6 +36,8 @@ #define Z_LEVEL_SHIPS 12 #define Z_LEVEL_EMPTY_SURFACE 13 #define Z_LEVEL_EMPTY_SPACE 14 + +// These are still defined here, but the levels have been removed. I could delete these but it will cause compile errors. Don't delete them unless you have to. #define Z_LEVEL_SURFACE_WILDERNESS_1 15 #define Z_LEVEL_SURFACE_WILDERNESS_2 16 #define Z_LEVEL_SURFACE_WILDERNESS_3 17 @@ -247,6 +249,7 @@ frozen_mobs -= M frozen_mobs.Cut() +/* /datum/map_z_level/tether/wilderness/wild_1 z = Z_LEVEL_SURFACE_WILDERNESS_1 @@ -270,6 +273,7 @@ /datum/map_z_level/tether/wilderness/wild_ruins z = Z_LEVEL_SURFACE_WILDERNESS_RUINS +*/ // Wilderness stuff removed until mobs can be optimized better. /proc/get_z_level_datum(atom/A) var/turf/T = get_turf(A) diff --git a/maps/tether/tether_shuttle_defs.dm b/maps/tether/tether_shuttle_defs.dm index 6a9270f6384..961b5995bbd 100644 --- a/maps/tether/tether_shuttle_defs.dm +++ b/maps/tether/tether_shuttle_defs.dm @@ -153,7 +153,7 @@ //"Northwest of the station" = /area/syndicate_station/northwest, //"North of the station" = /area/syndicate_station/north, //"Northeast of the station" = /area/syndicate_station/northeast, - "(Land) Southwest of Tether" = /area/syndicate_station/southwest, + //"(Land) Southwest of Tether" = /area/syndicate_station/southwest, //"South of the station" = /area/syndicate_station/south, //"Southeast of the station" = /area/syndicate_station/southeast, //"Telecomms Satellite" = /area/syndicate_station/commssat, diff --git a/maps/tether/tether_virgo3b.dm b/maps/tether/tether_virgo3b.dm index dbce4eb55a8..b158de6278a 100644 --- a/maps/tether/tether_virgo3b.dm +++ b/maps/tether/tether_virgo3b.dm @@ -14,7 +14,7 @@ var/datum/planet/virgo3b/planet_virgo3b = null Z_LEVEL_SURFACE_MID, Z_LEVEL_SURFACE_HIGH, Z_LEVEL_SURFACE_MINE, - Z_LEVEL_SOLARS, + Z_LEVEL_SOLARS/*, Z_LEVEL_SURFACE_WILDERNESS_1, Z_LEVEL_SURFACE_WILDERNESS_2, Z_LEVEL_SURFACE_WILDERNESS_3, @@ -22,7 +22,7 @@ var/datum/planet/virgo3b/planet_virgo3b = null Z_LEVEL_SURFACE_WILDERNESS_5, Z_LEVEL_SURFACE_WILDERNESS_6, Z_LEVEL_SURFACE_WILDERNESS_CRASH, - Z_LEVEL_SURFACE_WILDERNESS_RUINS, + Z_LEVEL_SURFACE_WILDERNESS_RUINS,*/ // Wilderness stuff removed until mobs can be optimized better. ) planetary_wall_type = /turf/unsimulated/wall/planetary/virgo3b diff --git a/vorestation.dme b/vorestation.dme index b36a95c38d2..dc5c539c8c9 100644 --- a/vorestation.dme +++ b/vorestation.dme @@ -1967,7 +1967,6 @@ #include "code\modules\mob\living\simple_animal\vore\frog.dm" #include "code\modules\mob\living\simple_animal\vore\gaslamp.dm" #include "code\modules\mob\living\simple_animal\vore\horse.dm" -#include "code\modules\mob\living\simple_animal\vore\otie.dm" #include "code\modules\mob\living\simple_animal\vore\panther.dm" #include "code\modules\mob\living\simple_animal\vore\snake.dm" #include "code\modules\mob\living\simple_animal\vore\wah.dm"