From d6a70f03250f9aa44e5aff6d1dd517f0aa03ce05 Mon Sep 17 00:00:00 2001 From: fernerr <35879136+fernerr@users.noreply.github.com> Date: Mon, 22 Apr 2019 18:46:53 +0200 Subject: [PATCH] Replaces hydroponics closets in Xenoflora with xenobotany ones. (#6180) --- .../objects/items/weapons/tanks/watertank.dm | 2 +- .../closets/secure/hydroponics.dm | 29 ++++ .../[Ferner]-[200319-xenobotany_locker].yml | 41 ++++++ icons/obj/closet.dmi | Bin 73935 -> 75802 bytes maps/aurora/aurora-3_sublevel.dmm | 138 ++++++++---------- maps/exodus/exodus-1_station.dmm | 4 +- 6 files changed, 133 insertions(+), 81 deletions(-) create mode 100644 html/changelogs/[Ferner]-[200319-xenobotany_locker].yml diff --git a/code/game/objects/items/weapons/tanks/watertank.dm b/code/game/objects/items/weapons/tanks/watertank.dm index 86825e8ad44..50e60ea529d 100644 --- a/code/game/objects/items/weapons/tanks/watertank.dm +++ b/code/game/objects/items/weapons/tanks/watertank.dm @@ -1,6 +1,6 @@ /obj/item/watertank name = "backpack water tank" - desc = "A watertank backpack with nozzle to clean dirt and graffiti." + desc = "A watertank backpack with nozzle to water plants." icon = 'icons/obj/hydro_equipment.dmi' icon_state = "waterpack" item_state = "waterpack" diff --git a/code/game/objects/structures/crates_lockers/closets/secure/hydroponics.dm b/code/game/objects/structures/crates_lockers/closets/secure/hydroponics.dm index 63b545a0e1d..24c82c1912e 100644 --- a/code/game/objects/structures/crates_lockers/closets/secure/hydroponics.dm +++ b/code/game/objects/structures/crates_lockers/closets/secure/hydroponics.dm @@ -25,3 +25,32 @@ new /obj/item/weapon/wirecutters/clippers(src) new /obj/item/weapon/reagent_containers/spray/plantbgone(src) // new /obj/item/weapon/bee_net(src) //No more bees, March 2014 + +/obj/structure/closet/secure_closet/xenobotany + name = "xenobotanist's locker" + req_access = list(access_xenobiology) + icon_state = "xenobotsecure1" + icon_closed = "xenobotsecure" + icon_locked = "xenobotsecure1" + icon_opened = "xenobotsecureopen" + icon_broken = "xenobotsecurebroken" + icon_off = "xenobotsecureoff" + + fill() + ..() + switch(rand(1,2)) + if(1) + new /obj/item/clothing/suit/apron(src) + if(2) + new /obj/item/clothing/suit/apron/overalls/blue(src) + new /obj/item/weapon/storage/bag/plants(src) + new /obj/item/clothing/under/rank/scientist(src) + new /obj/item/device/analyzer/plant_analyzer(src) + new /obj/item/device/radio/headset/headset_sci(src) + new /obj/item/clothing/head/greenbandana(src) + new /obj/item/weapon/material/minihoe(src) + new /obj/item/weapon/material/hatchet(src) + new /obj/item/weapon/wirecutters/clippers(src) + new /obj/item/weapon/reagent_containers/spray/plantbgone(src) + new /obj/item/clothing/mask/gas/alt(src) + new /obj/item/watertank(src) diff --git a/html/changelogs/[Ferner]-[200319-xenobotany_locker].yml b/html/changelogs/[Ferner]-[200319-xenobotany_locker].yml new file mode 100644 index 00000000000..437685d16fb --- /dev/null +++ b/html/changelogs/[Ferner]-[200319-xenobotany_locker].yml @@ -0,0 +1,41 @@ +################################ +# Example Changelog File +# +# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb. +# +# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.) +# When it is, any changes listed below will disappear. +# +# Valid Prefixes: +# bugfix +# wip (For works in progress) +# tweak +# soundadd +# sounddel +# rscadd (general adding of nice things) +# rscdel (general deleting of nice things) +# imageadd +# imagedel +# maptweak +# spellcheck (typo fixes) +# experiment +# balance +# admin +# backend +# security +# refactor +################################# + +# Your name. +author: Ferner + +# Optional: Remove this file after generating master changelog. Useful for PR changelogs that won't get used again. +delete-after: True + +# Any changes you've made. See valid prefix list above. +# INDENT WITH TWO SPACES. NOT TABS. SPACES. +# SCREW THIS UP AND IT WON'T WORK. +# Also, all entries are changed into a single [] after a master changelog generation. Just remove the brackets when you add new entries. +# Please surround your changes in double quotes ("), as certain characters otherwise screws up compiling. The quotes will not show up in the changelog. +changes: + - maptweak: "Replaced the hydroponics closets in Xenoflora with newly added xenobotany ones. The new closets will contain the gas masks and watertanks instead of being mapped in. Added a distro to trays pump in xenobotany." \ No newline at end of file diff --git a/icons/obj/closet.dmi b/icons/obj/closet.dmi index beedb5ae49cb2dd83a26194e41a50abdd1c7f1c7..9998ac091fcc69efe375780be5a814cfcd4bb4ca 100644 GIT binary patch delta 10619 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 delta 8737 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 diff --git a/maps/aurora/aurora-3_sublevel.dmm b/maps/aurora/aurora-3_sublevel.dmm index e0d8d97ac2a..4688f6d6826 100644 --- a/maps/aurora/aurora-3_sublevel.dmm +++ b/maps/aurora/aurora-3_sublevel.dmm @@ -14244,34 +14244,12 @@ /turf/simulated/floor/tiled/dark, /area/rnd/xenobiology/xenoflora) "aBD" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 6 - }, /obj/structure/cable/green{ d1 = 1; d2 = 2; icon_state = "1-2" }, -/turf/simulated/floor/tiled/dark, -/area/rnd/xenobiology/xenoflora) -"aBE" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/effect/floor_decal/corner/green{ - icon_state = "corner_white"; - dir = 4 - }, -/turf/simulated/floor/tiled/dark, -/area/rnd/xenobiology/xenoflora) -"aBF" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/effect/floor_decal/corner/green{ - icon_state = "corner_white"; - dir = 1 - }, +/obj/machinery/atmospherics/unary/vent_scrubber/on, /turf/simulated/floor/tiled/dark, /area/rnd/xenobiology/xenoflora) "aBG" = ( @@ -14777,12 +14755,6 @@ /turf/simulated/floor/tiled/dark, /area/rnd/xenobiology/xenoflora) "aCJ" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 10 - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 1 - }, /obj/structure/cable/green{ d1 = 2; d2 = 4; @@ -14800,12 +14772,15 @@ /obj/machinery/atmospherics/pipe/simple/visible{ dir = 4 }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /turf/simulated/floor/tiled/dark, /area/rnd/xenobiology/xenoflora) "aCK" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 9 - }, /obj/structure/cable/green{ d1 = 1; d2 = 8; @@ -14814,6 +14789,12 @@ /obj/machinery/atmospherics/pipe/simple/visible{ dir = 4 }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 10 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 4 + }, /turf/simulated/floor/tiled/dark, /area/rnd/xenobiology/xenoflora) "aCL" = ( @@ -14822,12 +14803,6 @@ }, /turf/simulated/floor/tiled/dark, /area/rnd/xenobiology/xenoflora) -"aCM" = ( -/obj/machinery/atmospherics/pipe/manifold/visible{ - dir = 1 - }, -/turf/simulated/floor/tiled/dark, -/area/rnd/xenobiology/xenoflora) "aCN" = ( /obj/machinery/atmospherics/unary/heater{ dir = 8 @@ -15305,14 +15280,15 @@ dir = 4 }, /obj/effect/floor_decal/corner/green, -/obj/machinery/atmospherics/portables_connector{ - dir = 8 +/obj/machinery/atmospherics/binary/pump{ + dir = 8; + icon_state = "map_on"; + name = "Distro to Trays"; + use_power = 1 }, /turf/simulated/floor/tiled/dark, /area/rnd/xenobiology/xenoflora) "aDx" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/cable/green{ d1 = 1; d2 = 2; @@ -15323,11 +15299,13 @@ dir = 10 }, /obj/structure/disposalpipe/junction, +/obj/machinery/atmospherics/pipe/simple/visible/blue{ + icon_state = "intact"; + dir = 10 + }, /turf/simulated/floor/tiled/dark, /area/rnd/xenobiology/xenoflora) "aDy" = ( -/obj/item/clothing/mask/gas/alt, -/obj/item/clothing/mask/gas/alt, /obj/effect/floor_decal/corner/green{ icon_state = "corner_white"; dir = 10 @@ -15338,8 +15316,8 @@ network = list("Research Outpost") }, /obj/structure/closet/crate/hydroponics/prespawned, -/obj/item/watertank, -/obj/item/watertank, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/tiled/dark, /area/rnd/xenobiology/xenoflora) "aDz" = ( @@ -15355,7 +15333,8 @@ /area/rnd/xenobiology/xenoflora) "aDA" = ( /obj/machinery/atmospherics/binary/pump{ - dir = 8 + dir = 8; + name = "Trays to Scrubbers" }, /obj/effect/floor_decal/corner/green{ icon_state = "corner_white"; @@ -15744,13 +15723,12 @@ /area/rnd/xenobiology/xenoflora) "aEu" = ( /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/cable/green{ d1 = 1; d2 = 2; icon_state = "1-2" }, +/obj/machinery/atmospherics/pipe/simple/hidden/universal, /turf/simulated/floor/tiled/ramp/bottom{ icon_state = "rampbot"; dir = 1 @@ -16312,18 +16290,15 @@ dir = 1; icon_state = "pipe-c" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 5 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 5 - }, /obj/structure/cable/green{ d1 = 1; d2 = 4; icon_state = "1-4" }, /obj/machinery/firealarm/south, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 5 + }, /turf/simulated/floor/tiled/white, /area/rnd/xenobiology/xenoflora) "aFE" = ( @@ -16331,20 +16306,20 @@ dir = 2; icon_state = "pipe-c" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 10 - }, /obj/structure/cable/green{ d1 = 2; d2 = 8; icon_state = "2-8" }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 1 - }, /obj/machinery/light{ dir = 1 }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 8 + }, /turf/simulated/floor/tiled/white, /area/rnd/xenobiology/xenoflora) "aFF" = ( @@ -23361,7 +23336,10 @@ dir = 1 }, /obj/machinery/atmospherics/binary/pump{ - dir = 8 + dir = 8; + icon_state = "map_on"; + name = "Hazardous Specimens Inlet"; + use_power = 1 }, /turf/simulated/floor/tiled/white, /area/rnd/xenobiology/xenoflora_hazard) @@ -27346,6 +27324,12 @@ icon_state = "asteroidplating" }, /area/mine/unexplored) +"brp" = ( +/obj/machinery/atmospherics/binary/pump{ + dir = 2 + }, +/turf/simulated/floor/tiled/dark, +/area/rnd/xenobiology/xenoflora) "brs" = ( /obj/structure/bookcase/libraryspawn/religion, /turf/simulated/floor/carpet, @@ -28592,6 +28576,11 @@ }, /turf/simulated/floor/plating, /area/rnd/xenoarch_atrium) +"fxJ" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/turf/simulated/wall/r_wall, +/area/rnd/xenobiology/xenoflora) "fzF" = ( /obj/structure/table/steel, /obj/item/device/flashlight/lamp, @@ -28665,9 +28654,6 @@ /turf/simulated/floor/tiled, /area/rnd/xenoarch_atrium) "gaJ" = ( -/obj/structure/closet/secure_closet/hydroponics{ - req_access = list(47) - }, /obj/effect/floor_decal/corner/green{ icon_state = "corner_white"; dir = 10 @@ -28676,6 +28662,7 @@ icon_state = "spline_plain"; dir = 4 }, +/obj/structure/closet/secure_closet/xenobotany, /turf/simulated/floor/tiled/dark, /area/rnd/xenobiology/xenoflora) "ged" = ( @@ -29503,7 +29490,8 @@ icon_state = "1-8" }, /obj/machinery/atmospherics/binary/pump{ - dir = 4 + dir = 4; + name = "Hazardous Specimens Outlet" }, /obj/structure/disposalpipe/segment{ dir = 8; @@ -29760,9 +29748,7 @@ /turf/simulated/floor/tiled, /area/outpost/research/anomaly_storage) "kju" = ( -/obj/machinery/atmospherics/unary/vent_scrubber/on{ - dir = 8 - }, +/obj/machinery/atmospherics/portables_connector, /turf/simulated/floor/tiled/dark, /area/rnd/xenobiology/xenoflora) "ksm" = ( @@ -30647,13 +30633,11 @@ /turf/simulated/floor/plating, /area/rnd/xenobiology/xenoflora_hazard) "nkZ" = ( -/obj/structure/closet/secure_closet/hydroponics{ - req_access = list(47) - }, /obj/effect/floor_decal/corner/green{ icon_state = "corner_white"; dir = 10 }, +/obj/structure/closet/secure_closet/xenobotany, /turf/simulated/floor/tiled/dark, /area/rnd/xenobiology/xenoflora) "noC" = ( @@ -53436,7 +53420,7 @@ aBD aBZ aCK aDy -kJR +fxJ aFE aCO eUn @@ -53689,7 +53673,7 @@ aba kJR aAq nyX -aBE +wbE aCa aCL aDz @@ -53946,7 +53930,7 @@ aba hob aAp kKf -aBF +uMH aCb aCL aDA @@ -54204,8 +54188,8 @@ mZC cHa kKw kju -kKw -aCM +brp +aEs aDB aEs eBJ diff --git a/maps/exodus/exodus-1_station.dmm b/maps/exodus/exodus-1_station.dmm index cc2ee86d4e4..682cf23c07c 100644 --- a/maps/exodus/exodus-1_station.dmm +++ b/maps/exodus/exodus-1_station.dmm @@ -61564,13 +61564,11 @@ /turf/simulated/floor/tiled/white, /area/rnd/xenobiology/xenoflora_storage) "cfG" = ( -/obj/structure/closet/secure_closet/hydroponics{ - req_access = list(47) - }, /obj/effect/floor_decal/corner/lime{ icon_state = "corner_white"; dir = 5 }, +/obj/structure/closet/secure_closet/xenobotany, /turf/simulated/floor/tiled/white, /area/rnd/xenobiology/xenoflora_storage) "cfH" = (