From 6891c26a1a44edaf2feb0a66e422c96158b5c757 Mon Sep 17 00:00:00 2001 From: Nadyr <41974248+Darlantanis@users.noreply.github.com> Date: Wed, 6 Nov 2019 23:22:01 -0500 Subject: [PATCH 1/7] Fixes spelling mistakes in the bullvalene and alizene recipes. --- code/modules/reagents/Chemistry-Recipes.dm | 38 +++++++++---------- code/modules/reagents/Chemistry-Recipes_vr.dm | 2 +- 2 files changed, 20 insertions(+), 20 deletions(-) diff --git a/code/modules/reagents/Chemistry-Recipes.dm b/code/modules/reagents/Chemistry-Recipes.dm index f9b3f0864b..3fa43cb990 100644 --- a/code/modules/reagents/Chemistry-Recipes.dm +++ b/code/modules/reagents/Chemistry-Recipes.dm @@ -365,11 +365,11 @@ required_reagents = list("inaprovaline" = 1, "carbon" = 1) inhibitors = list("sugar" = 1) // Messes up with inaprovaline result_amount = 2 - -/datum/chemical_reaction/alizine - name = "Alizine" - id = "alizine" - result = "alizine" + +/datum/chemical_reaction/alizene + name = "Alizene" + id = "alizene" + result = "alizene" required_reagents = list("bicaridine" = 1, "serazine" = 1, "tungsten" = 1) result_amount = 3 @@ -1919,7 +1919,7 @@ result = "watermelontea" required_reagents = list("tea" = 5, "watermelonjuice" = 1) result_amount = 6 - + /datum/chemical_reaction/drinks/sakebomb name = "Sake Bomb" id = "sakebomb" @@ -2236,7 +2236,7 @@ result = "eggnog" required_reagents = list("sugar" = 1, "egg" = 1, "milk" = 1, "cream" = 1, "cognac" = 2) result_amount = 6 - + /datum/chemical_reaction/drinks/spiderdrink name = "Brimming glass of spiders" id = "spiderdrink" @@ -2250,28 +2250,28 @@ result = "bubbleteawatermelon" required_reagents = list("gelatin" = 2, "watermelontea" = 6, "milk" = 2) result_amount = 10 - + /datum/chemical_reaction/drinks/bubbleteastrawberry name = "Strawberry bubble tea" id = "bubbleteastrawberry" result = "bubbleteastrawberry" required_reagents = list("gelatin" = 2, "berrytea" = 6, "milk" = 2) result_amount = 10 - + /datum/chemical_reaction/drinks/bubbleteacherry name = "Cherry bubble tea" id = "bubbleteacherry" result = "bubbleteacherry" required_reagents = list("gelatin" = 2, "cherrytea" = 6, "milk" = 2) result_amount = 10 - + /datum/chemical_reaction/drinks/bubbleteacoffee name = "Coffee bubble tea" id = "bubbleteacoffee" result = "bubbleteacoffee" required_reagents = list("gelatin" = 2, "tea" = 5, "cafe_latte" = 3) result_amount = 10 - + /datum/chemical_reaction/drinks/bubbleteabanana name = "Banana bubble tea" id = "bubbleteabanana" @@ -2284,7 +2284,7 @@ id = "horchata" result = "horchata" required_reagents = list("milk" = 1, "sugar" = 2, "rice" = 2) - result_amount = 5 + result_amount = 5 /datum/chemical_reaction/drinks/bluetrain name = "Blue train" @@ -2292,49 +2292,49 @@ result = "bluetrain" required_reagents = list("coolant" = 2, "ethanol" = 2, "nutriment" = 1) result_amount = 5 - + /datum/chemical_reaction/drinks/lowpower name = "The low power" id = "lowpower" result = "lowpower" required_reagents = list("lemonade" = 1, "cream" = 1, "limejuice" = 1) result_amount = 3 - + /datum/chemical_reaction/drinks/jackbrew name = "Jack's brew" id = "jackbrew" result = "jackbrew" required_reagents = list("irishcoffee" = 1, "hyperzine" = 1) result_amount = 2 - + /datum/chemical_reaction/drinks/bookwyrm name = "Bookwyrm's bite" id = "bookwyrm" result = "bookwyrm" required_reagents = list("coldfront" = 1, "limejuice" = 1, "stoxin" = 1) result_amount = 3 - + /datum/chemical_reaction/drinks/highpower name = "The high power" id = "highpower" result = "highpower" required_reagents = list("lowpower" = 1, "iron" = 1, "uranium" = 1) result_amount = 3 - + /datum/chemical_reaction/drinks/flapper name = "Flapper" id = "flapper" result = "flapper" required_reagents = list("whiskey" = 1, "blood" = 1, "ice" = 1) result_amount = 3 - + /datum/chemical_reaction/toxin/oilslide name = "Oil slide" id = "oilslide" result = "oilslide" required_reagents = list("moonshine" = 1, "lube" = 1, "fuel" = 1) result_amount = 3 - + /datum/chemical_reaction/drinks/sitonmyface name = "Sit on my face" id = "sitonmyface" diff --git a/code/modules/reagents/Chemistry-Recipes_vr.dm b/code/modules/reagents/Chemistry-Recipes_vr.dm index bccfc57640..cf220d7173 100644 --- a/code/modules/reagents/Chemistry-Recipes_vr.dm +++ b/code/modules/reagents/Chemistry-Recipes_vr.dm @@ -134,7 +134,7 @@ name = "Bullvalene" id = "bullvalene" result = "bullvalene" - required_reagents = list("dermaline" = 1, "orangesap" = 1, "Copper" = 1) + required_reagents = list("dermaline" = 1, "orangesap" = 1, "copper" = 1) result_amount = 1 /datum/chemical_reaction/nutrient From 7a6cddb503b988e1d634e3382a5500b4d2e78053 Mon Sep 17 00:00:00 2001 From: TheFurryFeline <38586851+TheFurryFeline@users.noreply.github.com> Date: Fri, 22 Nov 2019 10:11:59 -0500 Subject: [PATCH 2/7] One More Time More map fixes. Again. - Fixes Request Consoles in Medical. - - Also add two more for the bar and the kitchen, for easy access when Supply Demand event arises. - Empty Medkit in Xenobio replaced with filled one. - Access fixes for Medical Stations at Outposts. - - Access fixes for First Aid Stations on main station. --- maps/northern_star/polaris-1.dmm | 12 ++++++------ maps/northern_star/polaris-5.dmm | 6 +++--- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/maps/northern_star/polaris-1.dmm b/maps/northern_star/polaris-1.dmm index 61f7afadb7..08e07ef43b 100644 --- a/maps/northern_star/polaris-1.dmm +++ b/maps/northern_star/polaris-1.dmm @@ -764,7 +764,7 @@ "aoJ" = (/obj/effect/floor_decal/corner/paleblue{dir = 1},/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/turf/simulated/floor/tiled/white,/area/medical/first_aid_station_starboard) "aoK" = (/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 6},/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/turf/simulated/floor/tiled/white,/area/medical/first_aid_station_starboard) "aoL" = (/obj/effect/floor_decal/corner/paleblue{dir = 6},/obj/structure/cable/green{d1 = 2; d2 = 4; icon_state = "2-4"},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/turf/simulated/floor/tiled/white,/area/medical/first_aid_station_starboard) -"aoM" = (/obj/machinery/door/airlock/glass_medical{name = "First-Aid Station"; req_one_access = list(5,10,50,63)},/obj/machinery/door/firedoor/glass,/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},/turf/simulated/floor/tiled/white,/area/medical/first_aid_station_starboard) +"aoM" = (/obj/machinery/door/airlock/glass_medical{name = "First-Aid Station"; req_one_access = newlist()},/obj/machinery/door/firedoor/glass,/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},/turf/simulated/floor/tiled/white,/area/medical/first_aid_station_starboard) "aoN" = (/obj/structure/cable/green{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/structure/cable/green{d1 = 1; d2 = 8; icon_state = "1-8"},/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/turf/simulated/floor/tiled,/area/hallway/secondary/civilian_hallway_fore) "aoO" = (/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{dir = 4},/obj/machinery/atmospherics/pipe/manifold/hidden/supply{dir = 4},/turf/simulated/floor/tiled,/area/hallway/secondary/civilian_hallway_fore) "aoP" = (/obj/structure/table/glass,/obj/machinery/status_display{pixel_x = 32; pixel_y = 0},/turf/simulated/floor/tiled/dark,/area/hallway/secondary/civilian_hallway_fore) @@ -4645,7 +4645,7 @@ "bLq" = (/obj/effect/floor_decal/corner/grey/diagonal{dir = 4},/obj/structure/closet/secure_closet/freezer/fridge,/obj/item/device/radio/intercom{dir = 1; name = "Station Intercom (General)"; pixel_y = 21},/obj/machinery/atmospherics/unary/vent_scrubber/on,/turf/simulated/floor/tiled/white,/area/crew_quarters/kitchen) "bLr" = (/obj/effect/floor_decal/corner/grey/diagonal{dir = 4},/obj/structure/disposalpipe/segment,/obj/structure/cable/green{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/turf/simulated/floor/tiled/white,/area/crew_quarters/kitchen) "bLs" = (/obj/effect/floor_decal/corner/grey/diagonal{dir = 4},/obj/structure/sink/kitchen{pixel_y = 28},/turf/simulated/floor/tiled/white,/area/crew_quarters/kitchen) -"bLt" = (/obj/effect/floor_decal/corner/grey/diagonal{dir = 4},/obj/machinery/cooker/oven,/turf/simulated/floor/tiled/white,/area/crew_quarters/kitchen) +"bLt" = (/obj/effect/floor_decal/corner/grey/diagonal{dir = 4},/obj/machinery/cooker/oven,/obj/machinery/requests_console{announcementConsole = 1; department = "Service Department"; departmentType = 3; name = "Kitchen RC"; pixel_x = 0; pixel_y = 28},/turf/simulated/floor/tiled/white,/area/crew_quarters/kitchen) "bLu" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced{dir = 1},/obj/machinery/door/firedoor/border_only,/obj/structure/window/reinforced,/turf/simulated/floor/plating,/area/crew_quarters/kitchen) "bLv" = (/obj/machinery/atmospherics/unary/vent_scrubber/on{dir = 4},/turf/simulated/floor/tiled,/area/hallway/primary/central_two) "bLw" = (/turf/simulated/wall/r_wall,/area/medical/chemistry) @@ -5136,7 +5136,7 @@ "bUN" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced{dir = 1},/obj/machinery/door/firedoor/border_only,/turf/simulated/floor/plating,/area/crew_quarters/bar) "bUO" = (/obj/machinery/computer/guestpass{pixel_x = 30; pixel_y = 0},/turf/simulated/floor/wood,/area/crew_quarters/bar) "bUP" = (/obj/item/device/radio/intercom{name = "Station Intercom (General)"; pixel_y = -21},/obj/structure/flora/pottedplant{icon_state = "plant-22"},/turf/simulated/floor/tiled/dark,/area/hallway/primary/central_two) -"bUQ" = (/obj/effect/floor_decal/corner/paleblue{dir = 10},/obj/machinery/door/firedoor/border_only,/obj/machinery/requests_console{department = "Medical"; name = "Medical RC"; pixel_x = 0; pixel_y = -30},/turf/simulated/floor/tiled/white,/area/medical/sleeper) +"bUQ" = (/obj/effect/floor_decal/corner/paleblue{dir = 10},/obj/machinery/door/firedoor/border_only,/obj/machinery/requests_console{announcementConsole = 1; department = "Medical Department"; departmentType = 3; name = "Medical RC"; pixel_x = 0; pixel_y = -30},/turf/simulated/floor/tiled/white,/area/medical/sleeper) "bUR" = (/obj/structure/table/reinforced,/obj/item/weapon/reagent_containers/glass/beaker/large,/obj/effect/floor_decal/corner/beige{dir = 10},/turf/simulated/floor/tiled/white,/area/medical/chemistry) "bUS" = (/obj/structure/table/reinforced,/obj/item/device/mass_spectrometer/adv,/obj/item/clothing/glasses/science,/obj/item/clothing/glasses/science,/obj/item/device/radio/intercom{name = "Station Intercom (General)"; pixel_y = -21},/obj/effect/floor_decal/corner/beige{dir = 10},/turf/simulated/floor/tiled/white,/area/medical/chemistry) "bUT" = (/obj/structure/table/reinforced,/obj/item/weapon/reagent_containers/glass/beaker/large,/obj/effect/floor_decal/corner/beige{dir = 10},/obj/machinery/camera/network/medbay{c_tag = "MED - Chemistry"; dir = 1},/turf/simulated/floor/tiled/white,/area/medical/chemistry) @@ -5443,7 +5443,7 @@ "caI" = (/obj/machinery/light/small{dir = 4; pixel_y = 0},/turf/simulated/floor,/area/maintenance/central) "caJ" = (/obj/structure/disposalpipe/segment,/obj/structure/table/woodentable,/turf/simulated/floor/wood,/area/crew_quarters/bar) "caK" = (/obj/structure/window/reinforced,/obj/structure/extinguisher_cabinet{pixel_x = -27},/obj/machinery/disposal,/obj/structure/disposalpipe/trunk{dir = 4},/turf/simulated/floor/lino,/area/crew_quarters/bar) -"caL" = (/obj/structure/table/reinforced,/obj/machinery/chemical_dispenser/bar_soft/full,/turf/simulated/floor/lino,/area/crew_quarters/bar) +"caL" = (/obj/structure/table/reinforced,/obj/machinery/chemical_dispenser/bar_soft/full,/obj/machinery/requests_console{announcementConsole = 1; department = "Service Department"; departmentType = 3; name = "Bar RC"; pixel_x = -30; pixel_y = 0},/turf/simulated/floor/lino,/area/crew_quarters/bar) "caM" = (/turf/simulated/floor/lino,/area/crew_quarters/bar) "caN" = (/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 6},/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{dir = 8},/obj/structure/cable/green{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/structure/cable/green{d1 = 1; d2 = 4; icon_state = "1-4"},/turf/simulated/floor/tiled/freezer,/area/crew_quarters/pool) "caO" = (/obj/structure/cable/green{d1 = 1; d2 = 4; icon_state = "1-4"},/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 5},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 5},/turf/simulated/floor/wood,/area/crew_quarters/bar) @@ -5474,7 +5474,7 @@ "cbn" = (/obj/machinery/meter,/obj/effect/floor_decal/industrial/warning{dir = 10},/obj/machinery/atmospherics/pipe/manifold/hidden/cyan,/obj/structure/door_assembly/door_assembly_com,/turf/simulated/floor/plating,/area/maintenance/medbay_aft) "cbo" = (/obj/machinery/atmospherics/pipe/tank/air{dir = 8},/obj/effect/floor_decal/industrial/warning,/turf/simulated/floor/plating,/area/maintenance/medbay_aft) "cbp" = (/turf/simulated/wall/r_wall,/area/hallway/secondary/escape/medical_escape_pod_hallway) -"cbq" = (/obj/structure/table/reinforced,/obj/item/weapon/reagent_containers/dropper,/obj/effect/floor_decal/corner/beige/full,/obj/machinery/requests_console{department = "Medical"; name = "Medical RC"; pixel_x = -30; pixel_y = 0},/turf/simulated/floor/tiled/white,/area/medical/chemistry) +"cbq" = (/obj/structure/table/reinforced,/obj/item/weapon/reagent_containers/dropper,/obj/effect/floor_decal/corner/beige/full,/obj/machinery/requests_console{announcementConsole = 1; department = "Medical Department"; departmentType = 3; name = "Medical RC"; pixel_x = -30; pixel_y = 0},/turf/simulated/floor/tiled/white,/area/medical/chemistry) "cbr" = (/obj/machinery/door/airlock/glass_external{frequency = 1380; icon_state = "door_locked"; id_tag = "large_escape_pod_1_berth_hatch"; locked = 1; name = "Large Escape Pod 1"; req_access = list(13)},/obj/effect/floor_decal/industrial/hatch/yellow,/obj/machinery/door/firedoor/glass,/turf/simulated/floor/tiled/dark,/area/hallway/secondary/escape/medical_escape_pod_hallway) "cbs" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced,/obj/machinery/door/firedoor/border_only,/obj/structure/window/reinforced{dir = 1},/turf/simulated/floor/plating,/area/hallway/secondary/escape/medical_escape_pod_hallway) "cbt" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced{dir = 4},/obj/machinery/door/firedoor/border_only,/turf/simulated/floor/plating,/area/quartermaster/miningdock) @@ -7372,7 +7372,7 @@ "cLN" = (/obj/structure/table/standard,/obj/machinery/firealarm{dir = 2; pixel_y = 24},/obj/item/weapon/soap,/obj/random/soap,/turf/simulated/floor/tiled/freezer,/area/crew_quarters/locker/locker_toilet) "cLO" = (/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/structure/cable/green{d1 = 1; d2 = 4; icon_state = "1-4"},/turf/simulated/floor/tiled/freezer,/area/crew_quarters/locker/locker_toilet) "cLP" = (/obj/machinery/power/apc{dir = 1; name = "north bump"; pixel_x = 0; pixel_y = 24},/obj/structure/cable/green{d2 = 8; icon_state = "0-8"},/obj/machinery/light_switch{pixel_x = 11; pixel_y = 24},/turf/simulated/floor/tiled/freezer,/area/crew_quarters/locker/locker_toilet) -"cLQ" = (/obj/machinery/door/airlock/glass_medical{name = "First-Aid Station"; req_one_access = list(5,10,50,63)},/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/turf/simulated/floor/tiled/white,/area/medical/first_aid_station) +"cLQ" = (/obj/machinery/door/airlock/glass_medical{name = "First-Aid Station"; req_one_access = newlist()},/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/turf/simulated/floor/tiled/white,/area/medical/first_aid_station) "cLR" = (/obj/machinery/light/small,/obj/machinery/recharge_station,/turf/simulated/floor/tiled/freezer,/area/crew_quarters/locker/locker_toilet) "cLS" = (/obj/structure/disposalpipe/segment,/turf/simulated/wall,/area/crew_quarters/sleep/vistor_room_3) "cLT" = (/obj/structure/disposalpipe/segment,/turf/simulated/wall,/area/crew_quarters/sleep/vistor_room_9) diff --git a/maps/northern_star/polaris-5.dmm b/maps/northern_star/polaris-5.dmm index 97b6814b00..7999de7880 100644 --- a/maps/northern_star/polaris-5.dmm +++ b/maps/northern_star/polaris-5.dmm @@ -323,7 +323,7 @@ "gk" = (/obj/structure/table/reinforced,/obj/structure/cable/blue{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/effect/floor_decal/industrial/warning,/obj/machinery/button/remote/blast_door{id = "xenobio2"; name = "Containment Blast Doors"; pixel_x = 0; pixel_y = 4; req_access = list(55)},/obj/structure/window/reinforced{dir = 4},/turf/simulated/floor/tiled/white,/area/outpost/research/xenobiology) "gl" = (/obj/machinery/disposal,/obj/structure/disposalpipe/trunk{dir = 1},/obj/structure/cable/blue{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/effect/floor_decal/industrial/warning{dir = 6},/obj/structure/window/reinforced{dir = 8},/turf/simulated/floor/tiled/white,/area/outpost/research/xenobiology) "gm" = (/obj/effect/floor_decal/industrial/warning,/obj/structure/sink{pixel_y = 30},/obj/structure/cable/blue{d2 = 2; icon_state = "0-2"},/obj/machinery/light{dir = 1},/turf/simulated/floor/tiled,/area/outpost/research/xenobiology) -"gn" = (/obj/structure/table/standard,/obj/item/clothing/suit/storage/hooded/wintercoat/science,/obj/item/clothing/suit/storage/hooded/wintercoat/science,/obj/item/weapon/storage/firstaid,/turf/simulated/floor/tiled/dark,/area/outpost/research/xenobiology) +"gn" = (/obj/structure/table/standard,/obj/item/clothing/suit/storage/hooded/wintercoat/science,/obj/item/clothing/suit/storage/hooded/wintercoat/science,/obj/item/weapon/storage/firstaid/regular,/turf/simulated/floor/tiled/dark,/area/outpost/research/xenobiology) "go" = (/obj/structure/window/reinforced{dir = 4},/turf/simulated/floor/airless,/area/mine/explored) "gp" = (/obj/structure/window/reinforced{dir = 8},/obj/machinery/light/small{dir = 1},/obj/effect/floor_decal/industrial/warning/corner{icon_state = "warningcorner"; dir = 4},/turf/simulated/floor/tiled,/area/outpost/research/hallway/catwalk) "gq" = (/obj/structure/cable/blue{d1 = 1; d2 = 4; icon_state = "1-4"},/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/obj/effect/floor_decal/industrial/warning{dir = 1},/turf/simulated/floor/tiled,/area/outpost/research/hallway/catwalk) @@ -567,7 +567,7 @@ "kU" = (/obj/machinery/sleeper{dir = 8},/turf/simulated/floor/tiled/white,/area/outpost/research/medical) "kV" = (/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 5},/obj/machinery/sleep_console,/turf/simulated/floor/tiled/white,/area/outpost/research/medical) "kW" = (/obj/effect/floor_decal/corner/paleblue{dir = 6},/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 6},/obj/structure/cable/blue{d1 = 1; d2 = 4; icon_state = "1-4"},/turf/simulated/floor/tiled/white,/area/outpost/research/medical) -"kX" = (/obj/machinery/door/firedoor/glass,/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/obj/structure/cable/blue{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/machinery/door/airlock/glass_medical{req_access = list(5,7,47,55,66); req_one_access = list(5,7,47,55,66)},/turf/simulated/floor/tiled/white,/area/outpost/research/medical) +"kX" = (/obj/machinery/door/firedoor/glass,/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/obj/structure/cable/blue{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/machinery/door/airlock/glass_medical{req_access = list(5,7,8,29,47,55,66); req_one_access = list(5,7,8,29,47,55,66)},/turf/simulated/floor/tiled/white,/area/outpost/research/medical) "kY" = (/obj/effect/floor_decal/corner/paleblue{dir = 9},/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/obj/structure/cable/blue{d1 = 4; d2 = 8; icon_state = "4-8"},/turf/simulated/floor/tiled/white,/area/outpost/research/dock) "kZ" = (/obj/machinery/atmospherics/pipe/manifold4w/hidden/scrubbers,/obj/machinery/atmospherics/pipe/manifold4w/hidden/supply,/obj/structure/cable/blue{d1 = 2; d2 = 8; icon_state = "2-8"},/obj/structure/cable/blue{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor/tiled/white,/area/outpost/research/dock) "la" = (/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/obj/structure/disposalpipe/segment{dir = 1; icon_state = "pipe-c"},/turf/simulated/floor/tiled/white,/area/outpost/research/dock) @@ -623,7 +623,7 @@ "lY" = (/obj/machinery/conveyor{dir = 4; id = "anolongstorage"},/turf/simulated/floor/airless{icon_state = "asteroidplating2"},/area/outpost/research/tempstorage) "lZ" = (/obj/structure/grille,/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced{dir = 8},/obj/machinery/door/firedoor/border_only,/turf/simulated/floor/plating,/area/outpost/research/medical) "ma" = (/obj/structure/grille,/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced{dir = 4},/obj/machinery/door/firedoor/border_only,/turf/simulated/floor/plating,/area/outpost/research/medical) -"mb" = (/obj/machinery/door/firedoor/glass,/obj/machinery/door/airlock/glass_medical{name = "Medbay"; req_access = list(5,7,47,55,66); req_one_access = list(5,7,47,55,66)},/turf/simulated/floor/tiled/white,/area/outpost/research/medical) +"mb" = (/obj/machinery/door/firedoor/glass,/obj/machinery/door/airlock/glass_medical{name = "Medbay"; req_access = newlist(); req_one_access = newlist()},/turf/simulated/floor/tiled/white,/area/outpost/research/medical) "mc" = (/obj/structure/sign/greencross,/turf/simulated/wall/r_wall,/area/outpost/research/medical) "md" = (/obj/machinery/portable_atmospherics/canister/air/airlock,/obj/effect/floor_decal/corner/purple{dir = 9},/turf/simulated/floor/tiled/white,/area/outpost/research/dock) "me" = (/obj/effect/floor_decal/corner/purple,/turf/simulated/floor/tiled/white,/area/outpost/research/dock) From 833ec48c4c156776d74e13d08bce4c719478d797 Mon Sep 17 00:00:00 2001 From: TheFurryFeline <38586851+TheFurryFeline@users.noreply.github.com> Date: Fri, 22 Nov 2019 19:05:15 -0500 Subject: [PATCH 3/7] Boss Event Fixy Used to be for Locker Room Maint, which was a dumb name for a maint that's in the FORE of the Chapel area, so... chapel_fore it is. --- code/modules/events/boss.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/modules/events/boss.dm b/code/modules/events/boss.dm index 31bc9dd09c..9d7b0b8f76 100644 --- a/code/modules/events/boss.dm +++ b/code/modules/events/boss.dm @@ -42,7 +42,7 @@ spawn_area_type = /area/hydroponics/garden locstring = "the public garden" if(LOC_MAINTENANCE) - spawn_area_type = /area/maintenance/locker + spawn_area_type = /area/maintenance/chapel_fore locstring = "far northern maintenance tunnels" if(LOC_CONSTR) spawn_area_type = /area/construction @@ -113,4 +113,4 @@ #undef BOSS_DRAGON #undef BOSS_PANTHER #undef BOSS_MOTHER -#undef BOSS_CHUNGUS \ No newline at end of file +#undef BOSS_CHUNGUS From f843acc64704d7135e4d2fa4f45dfe78ba918193 Mon Sep 17 00:00:00 2001 From: TheFurryFeline <38586851+TheFurryFeline@users.noreply.github.com> Date: Sat, 23 Nov 2019 05:11:17 -0500 Subject: [PATCH 4/7] Shut up, Travis --- code/modules/events/boss.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/modules/events/boss.dm b/code/modules/events/boss.dm index 9d7b0b8f76..a20599a8e9 100644 --- a/code/modules/events/boss.dm +++ b/code/modules/events/boss.dm @@ -2,7 +2,7 @@ #define LOC_CHAPEL 1 #define LOC_LIBRARY 2 #define LOC_GARDEN 3 -#define LOC_MAINTENANCE 4 +#define LOC_MAINTENANCE 4 #define LOC_CONSTR 5 #define BOSS_METROID 0 @@ -102,7 +102,7 @@ #undef LOC_CHAPEL #undef LOC_LIBRARY #undef LOC_GARDEN -#undef LOC_MAINTENANCE +#undef LOC_MAINTENANCE #undef LOC_CONSTR #undef BOSS_METROID From 78bcd164ac86519b2fc7dc291b119706ab51ddae Mon Sep 17 00:00:00 2001 From: TheFurryFeline <38586851+TheFurryFeline@users.noreply.github.com> Date: Sun, 24 Nov 2019 09:57:56 -0500 Subject: [PATCH 5/7] Sync Between PRs, Reeeee Will be.... Prioritising the larger changes after this PR's merged first. --- maps/northern_star/polaris-5.dmm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/maps/northern_star/polaris-5.dmm b/maps/northern_star/polaris-5.dmm index 7999de7880..04ab310b1b 100644 --- a/maps/northern_star/polaris-5.dmm +++ b/maps/northern_star/polaris-5.dmm @@ -567,7 +567,7 @@ "kU" = (/obj/machinery/sleeper{dir = 8},/turf/simulated/floor/tiled/white,/area/outpost/research/medical) "kV" = (/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 5},/obj/machinery/sleep_console,/turf/simulated/floor/tiled/white,/area/outpost/research/medical) "kW" = (/obj/effect/floor_decal/corner/paleblue{dir = 6},/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 6},/obj/structure/cable/blue{d1 = 1; d2 = 4; icon_state = "1-4"},/turf/simulated/floor/tiled/white,/area/outpost/research/medical) -"kX" = (/obj/machinery/door/firedoor/glass,/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/obj/structure/cable/blue{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/machinery/door/airlock/glass_medical{req_access = list(5,7,8,29,47,55,66); req_one_access = list(5,7,8,29,47,55,66)},/turf/simulated/floor/tiled/white,/area/outpost/research/medical) +"kX" = (/obj/machinery/door/firedoor/glass,/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/obj/structure/cable/blue{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/machinery/door/airlock/glass_medical{req_access = newlist(); req_one_access = newlist()},/turf/simulated/floor/tiled/white,/area/outpost/research/medical) "kY" = (/obj/effect/floor_decal/corner/paleblue{dir = 9},/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/obj/structure/cable/blue{d1 = 4; d2 = 8; icon_state = "4-8"},/turf/simulated/floor/tiled/white,/area/outpost/research/dock) "kZ" = (/obj/machinery/atmospherics/pipe/manifold4w/hidden/scrubbers,/obj/machinery/atmospherics/pipe/manifold4w/hidden/supply,/obj/structure/cable/blue{d1 = 2; d2 = 8; icon_state = "2-8"},/obj/structure/cable/blue{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor/tiled/white,/area/outpost/research/dock) "la" = (/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/obj/structure/disposalpipe/segment{dir = 1; icon_state = "pipe-c"},/turf/simulated/floor/tiled/white,/area/outpost/research/dock) From 85e8aa23b859b3dceda46905cfd4a36f085baf6f Mon Sep 17 00:00:00 2001 From: TheFurryFeline <38586851+TheFurryFeline@users.noreply.github.com> Date: Sun, 24 Nov 2019 18:17:13 -0500 Subject: [PATCH 6/7] Now Sod Off, Travis Turns out that issue was area test didn't have chapel_fore/aft enabled and needed to be in Space Station 13 areas_vr.dm. Pbt. --- code/game/area/Space Station 13 areas_vr.dm | 10 ++++++++++ maps/northern_star/northern_star_areas.dm | 8 -------- 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/code/game/area/Space Station 13 areas_vr.dm b/code/game/area/Space Station 13 areas_vr.dm index 330d703ac0..1acffac70d 100644 --- a/code/game/area/Space Station 13 areas_vr.dm +++ b/code/game/area/Space Station 13 areas_vr.dm @@ -248,3 +248,13 @@ /area/engineering/engine_gas name = "\improper Engine Gas Storage" icon_state = "engine_waste" + +//CHOMPStation Addition Start - TFF 24/11/19 - New areas for Chapel Maint. +/area/maintenance/chapel_aft + name = "Chapel Maintenance - Aft" + icon_state = "maint_chapel" + +/area/maintenance/chapel_fore + name = "Chapel Maintenance - Fore" + icon_state = "maint_chapel" +//CHOMPStation Addition End \ No newline at end of file diff --git a/maps/northern_star/northern_star_areas.dm b/maps/northern_star/northern_star_areas.dm index a2aefa226c..b83c762aba 100644 --- a/maps/northern_star/northern_star_areas.dm +++ b/maps/northern_star/northern_star_areas.dm @@ -26,14 +26,6 @@ name = "Mining Outpost Emergency Storage" //TFF 28/9/19 - Add more areas. Again. -/area/maintenance/chapel_aft - name = "Chapel Maintenance - Aft" - icon_state = "maint_chapel" - -/area/maintenance/chapel_fore - name = "Chapel Maintenance - Fore" - icon_state = "maint_chapel" - /area/crew_quarters/bar_backroom name = "Bar Backroom" icon_state = "bar" From d3a083d8cb015d48b59b13a2acd4485f9538fe97 Mon Sep 17 00:00:00 2001 From: TheFurryFeline <38586851+TheFurryFeline@users.noreply.github.com> Date: Sun, 24 Nov 2019 19:00:07 -0500 Subject: [PATCH 7/7] Fix Json Loading So the whole issue with remains leaving toggling not working? Syntax error. It WAS saving but kept being reset back to default for everyone. --- code/modules/vore/eating/living_vr.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/modules/vore/eating/living_vr.dm b/code/modules/vore/eating/living_vr.dm index 0359f7cd6b..eddb28456f 100644 --- a/code/modules/vore/eating/living_vr.dm +++ b/code/modules/vore/eating/living_vr.dm @@ -228,12 +228,12 @@ digestable = P.digestable //TFF 30/4/19: Ports VoreStation Remains Option - P.digest_leave_remains = src.digest_leave_remains + digest_leave_remains = P.digest_leave_remains allowmobvore = P.allowmobvore vore_taste = P.vore_taste can_be_drop_prey = P.can_be_drop_prey can_be_drop_pred = P.can_be_drop_pred - P.inflatable = src.inflatable + inflatable = P.inflatable release_vore_contents(silent = TRUE) vore_organs.Cut()