From ac36c36794f494d72c7825f9d08adbf7c5dfc384 Mon Sep 17 00:00:00 2001 From: jbox1 <40789662+jbox144@users.noreply.github.com> Date: Sun, 22 Mar 2020 10:39:23 +1100 Subject: [PATCH] removes tania station and fixes some shit --- _maps/RandomRuins/SpaceRuins/taniastation.dmm | 93 ------------------- code/datums/ruins/space.dm | 10 +- code/game/area/areas/ruins/space.dm | 18 ---- hyperstation/code/modules/crafting/recipes.dm | 8 +- hyperstation/code/obj/milking machine.dm | 16 ++-- 5 files changed, 13 insertions(+), 132 deletions(-) delete mode 100644 _maps/RandomRuins/SpaceRuins/taniastation.dmm diff --git a/_maps/RandomRuins/SpaceRuins/taniastation.dmm b/_maps/RandomRuins/SpaceRuins/taniastation.dmm deleted file mode 100644 index 0b964cdb..00000000 --- a/_maps/RandomRuins/SpaceRuins/taniastation.dmm +++ /dev/null @@ -1,93 +0,0 @@ -"aa" = (/turf/open/space/basic,/area/template_noop) -"ab" = (/obj/machinery/power/tracker,/obj/structure/cable{icon_state = "0-2"},/turf/open/floor/plating/airless,/area/solar/tania) -"ac" = (/obj/machinery/power/solar,/obj/structure/cable{icon_state = "0-2"},/turf/open/floor/plating/airless,/area/solar/tania) -"ad" = (/obj/structure/lattice/catwalk,/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/open/space/basic,/area/solar/tania) -"ae" = (/obj/structure/lattice/catwalk,/obj/structure/cable{icon_state = "1-4"},/obj/structure/cable{icon_state = "2-4"},/turf/open/space/basic,/area/solar/tania) -"af" = (/obj/structure/grille,/obj/structure/window/fulltile,/turf/open/floor/plating,/area/ruin/space/tania/lounge) -"ag" = (/turf/closed/wall,/area/ruin/space/tania/maint) -"ah" = (/obj/structure/lattice/catwalk,/obj/structure/cable{icon_state = "1-4"},/obj/structure/cable{icon_state = "2-4"},/obj/structure/cable{icon_state = "4-8"},/turf/open/space/basic,/area/solar/tania) -"ai" = (/obj/structure/grille,/obj/structure/window/fulltile,/turf/open/floor/plating,/area/ruin/space/tania/maint) -"aj" = (/obj/structure/chair/wood/normal{dir = 4},/turf/open/floor/wood,/area/ruin/space/tania/lounge) -"ak" = (/obj/structure/table/wood,/turf/open/floor/wood,/area/ruin/space/tania/lounge) -"al" = (/obj/structure/chair/wood/normal{dir = 8},/turf/open/floor/wood,/area/ruin/space/tania/lounge) -"am" = (/turf/open/floor/wood,/area/ruin/space/tania/lounge) -"an" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/atmospherics/pipe/simple/supply/hidden,/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer1{icon_state = "manifold"; dir = 4},/obj/machinery/light{dir = 4},/turf/open/floor/wood,/area/ruin/space/tania/lounge) -"ao" = (/obj/structure/lattice/catwalk,/obj/structure/cable{icon_state = "1-8"},/obj/structure/cable{icon_state = "2-8"},/turf/open/space/basic,/area/solar/tania) -"ap" = (/obj/structure/lattice/catwalk,/obj/structure/cable{icon_state = "4-8"},/turf/open/space/basic,/area/solar/tania) -"aq" = (/obj/structure/chair/stool/bar,/turf/open/floor/wood,/area/ruin/space/tania/lounge) -"ar" = (/obj/machinery/power/solar,/obj/structure/cable{d2 = 4},/turf/open/floor/plating/airless,/area/solar/tania) -"as" = (/obj/machinery/door/airlock/external/glass,/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/open/floor/plating,/area/ruin/space/tania/maint) -"at" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/open/floor/plating,/area/ruin/space/tania/maint) -"au" = (/obj/structure/lattice/catwalk,/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/structure/cable{icon_state = "2-4"},/obj/structure/cable{icon_state = "2-8"},/turf/open/space/basic,/area/solar/tania) -"av" = (/obj/structure/lattice/catwalk,/obj/structure/cable{icon_state = "1-8"},/obj/structure/cable{icon_state = "2-8"},/obj/structure/cable{icon_state = "4-8"},/turf/open/space/basic,/area/solar/tania) -"aw" = (/turf/closed/wall,/area/ruin/space/tania/lounge) -"ax" = (/obj/machinery/atmospherics/components/unary/vent_pump/on,/turf/open/floor/wood,/area/ruin/space/tania/lounge) -"ay" = (/obj/machinery/airalarm/directional/east,/turf/open/floor/wood,/area/ruin/space/tania/lounge) -"az" = (/obj/machinery/atmospherics/components/unary/outlet_injector/on/layer1,/obj/structure/lattice,/turf/open/space/basic,/area/space/nearstation) -"aA" = (/obj/structure/table/wood,/obj/machinery/chem_dispenser/drinks{dir = 8},/turf/open/floor/wood,/area/ruin/space/tania/lounge) -"aB" = (/turf/closed/wall,/area/ruin/space/tania/dorms) -"aC" = (/obj/structure/chair/stool/bar,/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 5},/turf/open/floor/wood,/area/ruin/space/tania/lounge) -"aD" = (/turf/open/floor/carpet,/area/ruin/space/tania/dorms) -"aE" = (/obj/structure/chair/stool/bar,/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/turf/open/floor/wood,/area/ruin/space/tania/lounge) -"aF" = (/obj/structure/grille,/obj/structure/window/fulltile,/turf/open/floor/plating,/area/ruin/space/tania/dorms) -"aG" = (/obj/structure/cable{icon_state = "2-4"},/obj/machinery/atmospherics/pipe/manifold/supply/hidden{dir = 1},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{icon_state = "intact"; dir = 6},/turf/open/floor/wood,/area/ruin/space/tania/lounge) -"aH" = (/obj/machinery/door/airlock/maintenance,/obj/structure/cable{icon_state = "4-8"},/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{icon_state = "intact"; dir = 8},/turf/open/floor/plating,/area/ruin/space/tania/maint) -"aI" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1,/obj/structure/lattice,/turf/open/space/basic,/area/space/nearstation) -"aJ" = (/obj/machinery/power/terminal{dir = 1},/obj/structure/cable{icon_state = "0-8"},/obj/structure/cable{icon_state = "4-8"},/turf/open/floor/plating,/area/ruin/space/tania/maint) -"aK" = (/obj/structure/grille,/obj/structure/window/fulltile,/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1,/turf/open/floor/plating,/area/ruin/space/tania/maint) -"aL" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/structure/cable{icon_state = "4-8"},/obj/machinery/atmospherics/pipe/manifold/supply/hidden{dir = 1},/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer1{icon_state = "manifold"; dir = 1},/turf/open/floor/plating,/area/ruin/space/tania/maint) -"aM" = (/obj/structure/table/wood,/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{icon_state = "intact"; dir = 8},/turf/open/floor/wood,/area/ruin/space/tania/lounge) -"aN" = (/obj/machinery/power/smes,/obj/structure/cable{icon_state = "0-8"},/obj/machinery/atmospherics/components/unary/vent_pump/on{dir = 8},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{icon_state = "intact"; dir = 8},/turf/open/floor/plating,/area/ruin/space/tania/maint) -"aO" = (/obj/structure/cable{icon_state = "1-4"},/obj/machinery/airalarm/directional/west,/obj/machinery/atmospherics/pipe/simple/supply/hidden,/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1,/turf/open/floor/plating,/area/ruin/space/tania/maint) -"aP" = (/obj/machinery/power/solar_control,/obj/structure/cable{icon_state = "0-2"},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{icon_state = "intact"; dir = 9},/turf/open/floor/plating,/area/ruin/space/tania/maint) -"aQ" = (/obj/machinery/light{dir = 4},/turf/open/floor/plating,/area/ruin/space/tania/maint) -"aR" = (/obj/machinery/atmospherics/components/binary/pump{dir = 1},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{icon_state = "intact"; dir = 5},/turf/open/floor/plating,/area/ruin/space/tania/maint) -"aS" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/atmospherics/pipe/simple/supply/hidden,/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1,/turf/open/floor/wood,/area/ruin/space/tania/lounge) -"aT" = (/obj/machinery/atmospherics/components/unary/vent_pump/on{dir = 4},/turf/open/floor/carpet,/area/ruin/space/tania/dorms) -"aU" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/turf/open/floor/carpet,/area/ruin/space/tania/dorms) -"aV" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/atmospherics/pipe/simple/supply/hidden,/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1,/turf/open/floor/plasteel,/area/ruin/space/tania/lounge) -"aW" = (/obj/structure/table/wood,/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer1{icon_state = "scrub_map_on"; dir = 4},/turf/open/floor/wood,/area/ruin/space/tania/lounge) -"aX" = (/obj/machinery/atmospherics/components/unary/vent_pump/on{dir = 8},/turf/open/floor/carpet,/area/ruin/space/tania/dorms) -"aY" = (/obj/machinery/light,/turf/open/floor/wood,/area/ruin/space/tania/lounge) -"aZ" = (/obj/machinery/door/airlock,/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{icon_state = "intact"; dir = 8},/turf/open/floor/plasteel,/area/ruin/space/tania/dorms) -"ba" = (/obj/machinery/atmospherics/pipe/manifold/supply/hidden,/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer1,/turf/open/floor/plasteel,/area/ruin/space/tania/dorms) -"bb" = (/obj/machinery/atmospherics/components/unary/portables_connector{dir = 1},/obj/machinery/portable_atmospherics/canister/air,/turf/open/floor/plating,/area/ruin/space/tania/maint) -"bc" = (/obj/structure/cable{icon_state = "1-8"},/obj/structure/cable{d2 = 4},/obj/machinery/power/apc/auto_name/east,/turf/open/floor/plating,/area/ruin/space/tania/maint) -"bd" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/structure/cable{d2 = 4},/obj/machinery/atmospherics/pipe/simple/supply/hidden,/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1,/obj/machinery/power/apc/auto_name/east,/turf/open/floor/wood,/area/ruin/space/tania/lounge) -"be" = (/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer1{icon_state = "scrub_map_on"; dir = 8},/turf/open/floor/plating,/area/ruin/space/tania/maint) -"bf" = (/obj/structure/cable{d2 = 4},/obj/machinery/atmospherics/pipe/simple/supply/hidden,/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1,/obj/machinery/power/apc/auto_name/east,/turf/open/floor/plasteel,/area/ruin/space/tania/dorms) -"bg" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer1{icon_state = "scrub_map_on"; dir = 4},/turf/open/floor/carpet,/area/ruin/space/tania/dorms) -"bh" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer1{icon_state = "scrub_map_on"; dir = 8},/turf/open/floor/carpet,/area/ruin/space/tania/dorms) -"bi" = (/obj/machinery/telecomms/relay/preset/telecomms,/turf/open/floor/plating,/area/ruin/space/tania/maint) -"bj" = (/obj/structure/table/wood,/obj/item/flashlight/lamp/green,/turf/open/floor/wood,/area/ruin/space/tania/lounge) -"bk" = (/obj/structure/table/wood,/obj/item/reagent_containers/food/drinks/drinkingglass,/obj/item/reagent_containers/food/drinks/drinkingglass,/obj/item/reagent_containers/food/drinks/drinkingglass,/obj/item/reagent_containers/food/drinks/drinkingglass,/turf/open/floor/wood,/area/ruin/space/tania/lounge) -"bl" = (/obj/machinery/light{dir = 1},/turf/open/floor/carpet,/area/ruin/space/tania/dorms) -"bm" = (/obj/structure/dresser,/turf/open/floor/carpet,/area/ruin/space/tania/dorms) -"bn" = (/obj/structure/table/wood,/turf/open/floor/carpet,/area/ruin/space/tania/dorms) -"bo" = (/obj/structure/chair/wood/normal{dir = 8},/turf/open/floor/carpet,/area/ruin/space/tania/dorms) -"bp" = (/obj/machinery/airalarm/directional/west,/obj/machinery/light{dir = 4},/turf/open/floor/plasteel,/area/ruin/space/tania/dorms) -"bq" = (/obj/structure/chair/wood/normal{dir = 4},/turf/open/floor/carpet,/area/ruin/space/tania/dorms) -"br" = (/obj/item/toy/plush/slimeplushie/tania,/obj/structure/closet/crate{icon_state = "engi_e_crate"},/turf/open/floor/plating,/area/ruin/space/tania/maint) -"bs" = (/obj/structure/bed,/obj/item/bedsheet/purple,/turf/open/floor/carpet,/area/ruin/space/tania/dorms) -"bt" = (/obj/structure/bed,/obj/item/bedsheet/green,/turf/open/floor/carpet,/area/ruin/space/tania/dorms) -"bu" = (/obj/structure/table/wood,/obj/item/paper/fluff{info = "Love you honey! Hope you have a great day!"; step_x = 4; step_y = 8; text = "p"},/obj/item/pen{step_x = -4; step_y = -2},/turf/open/floor/carpet,/area/ruin/space/tania/dorms) - -(1,1,1) = {" -aaaaaaaaaaaaaaabaaaaaaaa -aaaaaaacacacaaadaaacacac -aaaaaaaeahahapauapavavao -aaaaaaarararaaadaaararar -aaaaaaaaaaaaaaadaaaaaaaa -afafafafafafagasaiazaaaa -afajbjalamamagataiaIaaaa -afamaxamamayagasaiaKagaa -afaqaCaEaEaGaHaLaNaPagaa -awbkakaWaManagaOaJbcagaa -awamamamaAbdagaRbeaQagaa -awamaYamamaSagbbbibragaa -aBaBaBaBaBaVagagagagagaa -aBbsblbmaBbfaBbmblbtaBaa -aFaTaUbgaZbaaZbhaUaXaFaa -aBbuboaDaBbpaBaDbqbnaBaa -aBaBaBaBaBaFaBaBaBaBaBaa -"} diff --git a/code/datums/ruins/space.dm b/code/datums/ruins/space.dm index 055c0b93..b89e9453 100644 --- a/code/datums/ruins/space.dm +++ b/code/datums/ruins/space.dm @@ -316,12 +316,4 @@ id = "advancedlab" suffix = "advancedlab.dmm" name = "Abductor Replication Lab" - description = "Some scientists tried and almost succeeded to recreate abductor tools. Somewhat slower and a bit less modern than their originals, these tools are the best you can get if you aren't an alien." - -/datum/map_template/ruin/space/taniastation - id = "taniastation" - suffix = "taniastation.dmm" - - name = "Mysterious Station" - - description = "A mysterious outpost built by a disgruntled Nanotransen Employee." \ No newline at end of file + description = "Some scientists tried and almost succeeded to recreate abductor tools. Somewhat slower and a bit less modern than their originals, these tools are the best you can get if you aren't an alien." \ No newline at end of file diff --git a/code/game/area/areas/ruins/space.dm b/code/game/area/areas/ruins/space.dm index 06415ed7..74b9e3a1 100644 --- a/code/game/area/areas/ruins/space.dm +++ b/code/game/area/areas/ruins/space.dm @@ -471,22 +471,4 @@ // Abductor Replication Lab /area/ruin/space/has_grav/powered/advancedlab name = "Abductor Replication Lab" - icon_state = "yellow" - -//TANIA STATION - -/area/solar/tania - name = "Solar Array" - icon_state = "panelsS" - -/area/ruin/space/tania/maint - name = "Maintainence" - icon_state = "yellow" - -/area/ruin/space/tania/lounge - name = "Lounge" - icon_state = "yellow" - -/area/ruin/space/tania/dorms - name = "Dorms" icon_state = "yellow" \ No newline at end of file diff --git a/hyperstation/code/modules/crafting/recipes.dm b/hyperstation/code/modules/crafting/recipes.dm index d64f1671..5be10633 100644 --- a/hyperstation/code/modules/crafting/recipes.dm +++ b/hyperstation/code/modules/crafting/recipes.dm @@ -1,11 +1,11 @@ -/datum/crafting_recipe/milker +/datum/crafting_recipe/milking_machine name = "Milking Machine" reqs = list(/obj/item/stack/cable_coil = 5, /obj/item/stack/rods = 2, /obj/item/stack/sheet/cardboard = 1, /obj/item/reagent_containers/glass/beaker = 2, /obj/item/stock_parts/manipulator = 1) - result = /obj/item/milker + result = /obj/item/milking_machine tools = list(TOOL_WELDER, TOOL_SCREWDRIVER, TOOL_WIRECUTTER) category = CAT_MISC -/datum/crafting_recipe/milker/penis +/datum/crafting_recipe/milking_machine/penis name = "Penis Milking Machine" reqs = list(/obj/item/stack/cable_coil = 5, /obj/item/stack/rods = 1, /obj/item/stack/sheet/cardboard = 1, /obj/item/reagent_containers/glass/beaker/large = 1, /obj/item/stock_parts/manipulator = 1) - result = /obj/item/milker/penis + result = /obj/item/milking_machine/penis diff --git a/hyperstation/code/obj/milking machine.dm b/hyperstation/code/obj/milking machine.dm index f9794dcc..87b56b8c 100644 --- a/hyperstation/code/obj/milking machine.dm +++ b/hyperstation/code/obj/milking machine.dm @@ -1,4 +1,4 @@ -/obj/item/milker +/obj/item/milking_machine icon = 'hyperstation/icons/obj/milking_machine.dmi' name = "milking machine" icon_state = "Off" @@ -13,7 +13,7 @@ var/transfer_rate = 0.25 // How much we transfer every 2 seconds var/target_organ = "breasts" // What organ we are transfering from -/obj/item/milker/examine(mob/user) +/obj/item/milking_machine/examine(mob/user) . = ..() to_chat(user, "[src] is currently [on ? "on" : "off"].") if (inserted_item) @@ -29,7 +29,7 @@ else return ..() -/obj/item/milker/interact(mob/user) +/obj/item/milking_machine/interact(mob/user) if(!isAI(user) && inserted_item) add_fingerprint(user) on = !on @@ -43,12 +43,12 @@ else ..() -/obj/item/milker/proc/UpdateIcon() +/obj/item/milking_machine/proc/UpdateIcon() icon_state = "[on ? "On" : "Off"][inserted_item ? "Beaker" : ""]" item_state = icon_state -/obj/item/milker/AltClick(mob/living/user) +/obj/item/milking_machine/AltClick(mob/living/user) add_fingerprint(user) user.put_in_hands(inserted_item) inserted_item = null @@ -56,7 +56,7 @@ STOP_PROCESSING(SSobj, src) UpdateIcon() -/obj/item/milker/process() +/obj/item/milking_machine/process() var/mob/living/carbon/W = loc if (W) var/obj/item/organ/genital/breasts/O = W.getorganslot(target_organ) @@ -70,7 +70,7 @@ STOP_PROCESSING(SSobj, src) UpdateIcon() -/obj/item/milker/penis +/obj/item/milking_machine/penis name = "penis milking machine" icon_state = "PenisOff" item_state = "PenisOff" @@ -78,6 +78,6 @@ target_organ = "testicles" // Since semen is stored in the balls -/obj/item/milker/penis/UpdateIcon() +/obj/item/milking_machine/penis/UpdateIcon() icon_state = "Penis[on ? "On" : "Off"][inserted_item ? "Beaker" : ""]" item_state = icon_state