From 4bccbedc916f3932d31a471ce5c7776fb06630dc Mon Sep 17 00:00:00 2001 From: Unknown Date: Sat, 24 Aug 2019 18:26:50 -0400 Subject: [PATCH 01/36] Minor Fixes - Brings pizza back at 50 points which it was supposed to be. --- code/datums/supplypacks/hospitality_vr.dm | 3 +++ 1 file changed, 3 insertions(+) diff --git a/code/datums/supplypacks/hospitality_vr.dm b/code/datums/supplypacks/hospitality_vr.dm index 822773b6f9..decb7027db 100644 --- a/code/datums/supplypacks/hospitality_vr.dm +++ b/code/datums/supplypacks/hospitality_vr.dm @@ -1,3 +1,6 @@ +/datum/supply_pack/randomised/hospitality/pizza + cost = 50 + /datum/supply_pack/randomised/hospitality/burgers_vr num_contained = 5 contains = list( From 5aad52346a3caf443d54892941d1de84a0c7e351 Mon Sep 17 00:00:00 2001 From: Unknown Date: Sun, 25 Aug 2019 12:38:34 -0400 Subject: [PATCH 02/36] More Fixes --- .../subtypes/humanoid/mercs/mercs_vr.dm | 14 ++++++- .../surface_submaps/plains/Thiefc_vr.dmm | 39 +++++++++++++------ maps/tether/tether-07-station3.dmm | 10 +---- 3 files changed, 42 insertions(+), 21 deletions(-) diff --git a/code/modules/mob/living/simple_mob/subtypes/humanoid/mercs/mercs_vr.dm b/code/modules/mob/living/simple_mob/subtypes/humanoid/mercs/mercs_vr.dm index e7bb82bb5d..55a9172c07 100644 --- a/code/modules/mob/living/simple_mob/subtypes/humanoid/mercs/mercs_vr.dm +++ b/code/modules/mob/living/simple_mob/subtypes/humanoid/mercs/mercs_vr.dm @@ -10,4 +10,16 @@ /mob/living/simple_mob/humanoid/merc/ranged/space name = "mercenary commando" - maxbodytemp = 700 \ No newline at end of file + maxbodytemp = 700 + +/mob/living/simple_mob/humanoid/merc/ranged/virgo + name = "suspicious individual" + min_oxy = 0 + max_oxy = 0 + min_tox = 0 + max_tox = 0 + min_co2 = 0 + max_co2 = 0 + min_n2 = 0 + max_n2 = 0 + minbodytemp = 0 \ No newline at end of file diff --git a/maps/submaps/surface_submaps/plains/Thiefc_vr.dmm b/maps/submaps/surface_submaps/plains/Thiefc_vr.dmm index 956eb21ac1..aab0b0eb08 100644 --- a/maps/submaps/surface_submaps/plains/Thiefc_vr.dmm +++ b/maps/submaps/surface_submaps/plains/Thiefc_vr.dmm @@ -64,23 +64,27 @@ "j" = ( /obj/structure/table/steel, /obj/item/weapon/beartrap, +/obj/item/device/survivalcapsule, /turf/simulated/floor/outdoors/dirt{ outdoors = 0 }, /area/submap/Thiefc) "k" = ( /obj/vehicle/train/trolley, -/obj/item/weapon/storage/firstaid/combat, +/obj/random/firstaid, +/obj/random/firstaid, +/obj/random/firstaid, +/obj/random/firstaid, +/obj/random/firstaid, /turf/simulated/floor/outdoors/dirt{ outdoors = 0 }, /area/submap/Thiefc) "l" = ( /obj/structure/closet/crate, -/obj/item/weapon/folder/blue, -/obj/item/weapon/folder/red, -/obj/item/weapon/folder/white, -/obj/item/weapon/folder/yellow, +/obj/item/device/nif, +/obj/item/device/nif/bad, +/obj/item/device/nif/bad, /turf/simulated/floor/outdoors/dirt{ outdoors = 0 }, @@ -97,6 +101,9 @@ /area/submap/Thiefc) "n" = ( /obj/vehicle/train/trolley, +/obj/random/multiple/voidsuit, +/obj/random/multiple/voidsuit, +/obj/random/multiple/voidsuit, /turf/simulated/floor/outdoors/dirt{ outdoors = 0 }, @@ -105,6 +112,9 @@ /obj/structure/closet/crate, /obj/item/weapon/cell/device/weapon, /obj/item/weapon/cell/device/weapon, +/obj/item/weapon/cell/device/weapon, +/obj/item/weapon/cell/device/weapon, +/obj/item/device/perfect_tele/one_beacon, /turf/simulated/floor/outdoors/dirt{ outdoors = 0 }, @@ -113,12 +123,19 @@ /obj/structure/closet/crate, /obj/item/weapon/storage/box/shotgunammo, /obj/item/weapon/storage/box/practiceshells, +/obj/item/weapon/grenade/spawnergrenade/manhacks/station, /turf/simulated/floor/outdoors/dirt{ outdoors = 0 }, /area/submap/Thiefc) -"I" = ( -/mob/living/simple_mob/humanoid/merc/melee/sword/space, +"u" = ( +/mob/living/simple_mob/humanoid/merc/ranged/virgo, +/turf/simulated/floor/outdoors/dirt{ + outdoors = 0 + }, +/area/submap/Thiefc) +"P" = ( +/obj/machinery/door/airlock, /turf/simulated/floor/outdoors/dirt{ outdoors = 0 }, @@ -269,7 +286,7 @@ c c c c -h +P c c b @@ -305,7 +322,7 @@ a c c c -h +u h h h @@ -371,7 +388,7 @@ a c e h -I +u h h h @@ -397,7 +414,7 @@ i h h h -h +u c c c diff --git a/maps/tether/tether-07-station3.dmm b/maps/tether/tether-07-station3.dmm index a4c0f9cd6e..55e3162cda 100644 --- a/maps/tether/tether-07-station3.dmm +++ b/maps/tether/tether-07-station3.dmm @@ -2681,14 +2681,6 @@ }, /turf/simulated/floor/tiled/dark, /area/security/security_lockerroom) -"er" = ( -/obj/machinery/shuttle_sensor{ - dir = 5; - id_tag = "shuttlesens_exp"; - pixel_y = -6 - }, -/turf/simulated/wall/thull, -/area/shuttle/excursion/tether) "es" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/railing{ @@ -41527,7 +41519,7 @@ cG VB WD dE -er +dj TY dj dj From 28bc1e9bc7fb99a5b4df288ae0ebee8bf6c9e9b0 Mon Sep 17 00:00:00 2001 From: Unknown Date: Sun, 25 Aug 2019 22:05:59 -0400 Subject: [PATCH 03/36] Removes shuttle cryopod --- maps/tether/tether-07-station3.dmm | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/maps/tether/tether-07-station3.dmm b/maps/tether/tether-07-station3.dmm index 55e3162cda..b74573743a 100644 --- a/maps/tether/tether-07-station3.dmm +++ b/maps/tether/tether-07-station3.dmm @@ -6334,12 +6334,6 @@ }, /turf/simulated/floor/bluegrid, /area/ai) -"kn" = ( -/obj/machinery/cryopod{ - dir = 4 - }, -/turf/simulated/floor/tiled/techfloor/grid, -/area/shuttle/excursion/tether) "ko" = ( /turf/simulated/wall/r_wall, /area/security/security_equiptment_storage) @@ -40818,7 +40812,7 @@ Um dj iK jY -kn +iW WS dj XN From 74c6d018c8130e00997c72db8dfe32ff27c960a4 Mon Sep 17 00:00:00 2001 From: Unknown Date: Sun, 25 Aug 2019 22:34:22 -0400 Subject: [PATCH 04/36] Blood Packs stored hygenically --- maps/tether/tether-07-station3.dmm | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/maps/tether/tether-07-station3.dmm b/maps/tether/tether-07-station3.dmm index b74573743a..c3e6a6fa48 100644 --- a/maps/tether/tether-07-station3.dmm +++ b/maps/tether/tether-07-station3.dmm @@ -12478,13 +12478,15 @@ /turf/simulated/wall, /area/quartermaster/office) "tC" = ( -/obj/structure/table/standard, /obj/effect/floor_decal/borderfloorwhite, /obj/effect/floor_decal/corner/white/border, /obj/machinery/button/windowtint{ id = "surgery_2"; pixel_y = -26 }, +/obj/item/weapon/reagent_containers/blood/OMinus, +/obj/item/weapon/reagent_containers/blood/OMinus, +/obj/structure/closet/crate/freezer, /turf/simulated/floor/tiled/white, /area/medical/surgery2) "tD" = ( @@ -21000,7 +21002,6 @@ /turf/simulated/floor/tiled/white, /area/medical/surgery) "Hn" = ( -/obj/structure/table/standard, /obj/effect/floor_decal/borderfloorwhite{ dir = 1 }, @@ -21013,6 +21014,7 @@ pixel_x = 0; pixel_y = 26 }, +/obj/structure/closet/crate/freezer, /obj/item/weapon/reagent_containers/blood/OMinus, /turf/simulated/floor/tiled/white, /area/medical/surgery) @@ -23618,7 +23620,6 @@ /turf/simulated/floor/tiled/white, /area/medical/medbay_primary_storage) "Lv" = ( -/obj/structure/table/standard, /obj/item/weapon/reagent_containers/blood/OMinus, /obj/item/weapon/reagent_containers/blood/OMinus, /obj/item/weapon/reagent_containers/blood/OMinus, @@ -23634,6 +23635,7 @@ /obj/effect/floor_decal/corner/paleblue/bordercorner2{ dir = 8 }, +/obj/structure/closet/crate/freezer, /turf/simulated/floor/tiled/white, /area/medical/surgery_hallway) "Lw" = ( @@ -24204,7 +24206,6 @@ /turf/simulated/floor/tiled/white, /area/medical/exam_room) "Mp" = ( -/obj/structure/table/standard, /obj/item/weapon/reagent_containers/blood/AMinus, /obj/item/weapon/reagent_containers/blood/APlus, /obj/item/weapon/reagent_containers/blood/BMinus, @@ -24216,6 +24217,7 @@ /obj/effect/floor_decal/corner/paleblue/border{ dir = 8 }, +/obj/structure/closet/crate/freezer, /turf/simulated/floor/tiled/white, /area/medical/surgery_hallway) "Mq" = ( @@ -25101,8 +25103,6 @@ /obj/structure/table/standard, /obj/effect/floor_decal/borderfloorwhite, /obj/effect/floor_decal/corner/white/border, -/obj/item/weapon/reagent_containers/blood/OMinus, -/obj/item/weapon/reagent_containers/blood/OMinus, /turf/simulated/floor/tiled/white, /area/medical/surgery2) "Nt" = ( From 6166d271065264b14d13780138270f49e6fd4d48 Mon Sep 17 00:00:00 2001 From: Unknown Date: Mon, 26 Aug 2019 13:58:20 -0400 Subject: [PATCH 05/36] Changes shuttle walls to reinforced steel --- maps/tether/tether-07-station3.dmm | 32 +++++++++++++++--------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/maps/tether/tether-07-station3.dmm b/maps/tether/tether-07-station3.dmm index c3e6a6fa48..304b25f68d 100644 --- a/maps/tether/tether-07-station3.dmm +++ b/maps/tether/tether-07-station3.dmm @@ -1984,7 +1984,7 @@ /turf/simulated/floor/tiled/techfloor/grid, /area/shuttle/excursion/tether) "dj" = ( -/turf/simulated/wall/thull, +/turf/simulated/wall/rshull, /area/shuttle/excursion/tether) "dk" = ( /obj/machinery/atmospherics/unary/vent_scrubber/on{ @@ -3112,7 +3112,7 @@ /obj/machinery/light/spot{ pixel_y = 32 }, -/turf/simulated/wall/thull, +/turf/simulated/wall/rshull, /area/shuttle/excursion/tether) "fi" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ @@ -5533,13 +5533,13 @@ /obj/machinery/atmospherics/pipe/simple/hidden/yellow{ dir = 6 }, -/turf/simulated/wall/thull, +/turf/simulated/wall/rshull, /area/shuttle/excursion/tether) "iY" = ( /obj/machinery/atmospherics/pipe/simple/hidden/yellow{ dir = 4 }, -/turf/simulated/wall/thull, +/turf/simulated/wall/rshull, /area/shuttle/excursion/tether) "iZ" = ( /obj/effect/floor_decal/borderfloorblack/full, @@ -27731,7 +27731,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/yellow{ dir = 10 }, -/turf/simulated/wall/thull, +/turf/simulated/wall/rshull, /area/shuttle/excursion/tether) "Rw" = ( /obj/structure/catwalk, @@ -28774,7 +28774,7 @@ dir = 8; icon_state = "pipe-c" }, -/turf/simulated/wall/thull, +/turf/simulated/wall/rshull, /area/shuttle/excursion/tether) "UK" = ( /obj/effect/floor_decal/industrial/hatch/yellow, @@ -28832,7 +28832,7 @@ dir = 6; icon_state = "intact" }, -/turf/simulated/wall/thull, +/turf/simulated/wall/rshull, /area/shuttle/excursion/tether) "US" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ @@ -28968,7 +28968,7 @@ dir = 2; id_tag = "shuttlesens_exp_psg" }, -/turf/simulated/wall/thull, +/turf/simulated/wall/rshull, /area/shuttle/excursion/tether) "Vm" = ( /obj/structure/bed/chair/shuttle{ @@ -29091,7 +29091,7 @@ dir = 8; icon_state = "map" }, -/turf/simulated/wall/thull, +/turf/simulated/wall/rshull, /area/shuttle/excursion/tether) "VR" = ( /obj/machinery/atmospherics/binary/pump{ @@ -29149,7 +29149,7 @@ dir = 5; id_tag = "shuttlesens_exp_int" }, -/turf/simulated/wall/thull, +/turf/simulated/wall/rshull, /area/shuttle/excursion/tether) "Wo" = ( /obj/structure/bed/chair/shuttle, @@ -29160,7 +29160,7 @@ /area/shuttle/excursion/tether) "Ws" = ( /obj/machinery/atmospherics/pipe/simple/hidden, -/turf/simulated/wall/thull, +/turf/simulated/wall/rshull, /area/shuttle/excursion/tether) "Wx" = ( /obj/structure/grille, @@ -29240,7 +29240,7 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/turf/simulated/wall/thull, +/turf/simulated/wall/rshull, /area/shuttle/excursion/tether) "Xc" = ( /obj/structure/grille, @@ -29329,7 +29329,7 @@ /area/tether/exploration) "Xr" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/yellow, -/turf/simulated/wall/thull, +/turf/simulated/wall/rshull, /area/shuttle/excursion/tether) "XA" = ( /obj/structure/shuttle/engine/heater, @@ -29355,7 +29355,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/yellow{ dir = 5 }, -/turf/simulated/wall/thull, +/turf/simulated/wall/rshull, /area/shuttle/excursion/tether) "XE" = ( /obj/machinery/conveyor_switch/oneway{ @@ -29597,13 +29597,13 @@ dir = 5; id_tag = "shuttlesens_exp" }, -/turf/simulated/wall/thull, +/turf/simulated/wall/rshull, /area/shuttle/excursion/tether) "ZD" = ( /obj/machinery/atmospherics/pipe/simple/hidden/yellow{ dir = 9 }, -/turf/simulated/wall/thull, +/turf/simulated/wall/rshull, /area/shuttle/excursion/tether) "ZE" = ( /obj/machinery/door/airlock/glass_external{ From 6b81965253d29092f9538b03e286215e63a43b4b Mon Sep 17 00:00:00 2001 From: Unknown Date: Mon, 26 Aug 2019 22:30:03 -0400 Subject: [PATCH 06/36] Map Changes - Adds Command Consoles to Heads of Staff Offices (except HoP/CD since they are next to the bridge) - Adds two keycard authentication devices in the command conference room - Adds some micrometeorite shielding for the CMO's office, because runtime must live. --- maps/tether/tether-02-surface2.dmm | 3 ++ maps/tether/tether-05-station1.dmm | 16 +++++++-- maps/tether/tether-06-station2.dmm | 11 ++++++- maps/tether/tether-07-station3.dmm | 53 ++++++++++++++++-------------- 4 files changed, 54 insertions(+), 29 deletions(-) diff --git a/maps/tether/tether-02-surface2.dmm b/maps/tether/tether-02-surface2.dmm index 41a48c7e8a..0ed23dab20 100644 --- a/maps/tether/tether-02-surface2.dmm +++ b/maps/tether/tether-02-surface2.dmm @@ -5685,6 +5685,9 @@ /obj/effect/floor_decal/corner/mauve/bordercorner2{ dir = 10 }, +/obj/machinery/computer/communications{ + dir = 4 + }, /turf/simulated/floor/tiled, /area/rnd/rdoffice) "md" = ( diff --git a/maps/tether/tether-05-station1.dmm b/maps/tether/tether-05-station1.dmm index 745de78959..c079db281e 100644 --- a/maps/tether/tether-05-station1.dmm +++ b/maps/tether/tether-05-station1.dmm @@ -22328,6 +22328,16 @@ }, /turf/simulated/floor/tiled, /area/bridge_hallway) +"gkC" = ( +/obj/machinery/status_display, +/turf/simulated/wall/r_wall, +/area/bridge) +"hhC" = ( +/obj/machinery/computer/communications{ + dir = 1 + }, +/turf/simulated/floor/carpet/oracarpet, +/area/crew_quarters/heads/chief) "hPi" = ( /obj/machinery/light/small, /turf/simulated/floor, @@ -27410,7 +27420,7 @@ agc aYF aRX aSe -aRX +hhC aVz aRb bYg @@ -31538,7 +31548,7 @@ awy awy awy awy -awy +gkC awy awy awy @@ -32958,7 +32968,7 @@ awA awE awE awy -awy +gkC boL awy bqR diff --git a/maps/tether/tether-06-station2.dmm b/maps/tether/tether-06-station2.dmm index 6b845eafc1..251de4e3f1 100644 --- a/maps/tether/tether-06-station2.dmm +++ b/maps/tether/tether-06-station2.dmm @@ -15085,6 +15085,9 @@ "wR" = ( /obj/structure/table/woodentable, /obj/machinery/chemical_dispenser/bar_soft/full, +/obj/machinery/keycard_auth{ + pixel_y = 28 + }, /turf/simulated/floor/wood, /area/bridge/meeting_room) "wS" = ( @@ -20152,6 +20155,12 @@ }, /turf/simulated/floor, /area/maintenance/station/sec_lower) +"HU" = ( +/obj/machinery/keycard_auth{ + pixel_y = -28 + }, +/turf/simulated/floor/wood, +/area/bridge/meeting_room) "Ik" = ( /obj/machinery/light/small{ dir = 8 @@ -35883,7 +35892,7 @@ wV ys wV wV -wV +HU wo ac ac diff --git a/maps/tether/tether-07-station3.dmm b/maps/tether/tether-07-station3.dmm index 304b25f68d..e8e48e2d46 100644 --- a/maps/tether/tether-07-station3.dmm +++ b/maps/tether/tether-07-station3.dmm @@ -9253,6 +9253,13 @@ d2 = 8; icon_state = "4-8" }, +/obj/item/device/taperecorder{ + pixel_y = 0 + }, +/obj/item/weapon/reagent_containers/food/drinks/flask/barflask{ + pixel_x = -4; + pixel_y = 8 + }, /turf/simulated/floor/wood, /area/crew_quarters/heads/hos) "oX" = ( @@ -14091,6 +14098,7 @@ pixel_x = -20; pixel_y = -25 }, +/obj/structure/flora/pottedplant/stoutbush, /turf/simulated/floor/tiled/white, /area/crew_quarters/heads/cmo) "wg" = ( @@ -24323,7 +24331,6 @@ /turf/simulated/open, /area/medical/surgery_hallway) "My" = ( -/obj/structure/flora/pottedplant/stoutbush, /obj/effect/floor_decal/borderfloorwhite{ dir = 9 }, @@ -24339,6 +24346,7 @@ /obj/machinery/camera/network/medbay{ dir = 4 }, +/obj/machinery/computer/communications, /turf/simulated/floor/tiled/white, /area/crew_quarters/heads/cmo) "Mz" = ( @@ -28415,13 +28423,8 @@ /turf/simulated/floor/tiled/techfloor/grid, /area/shuttle/excursion/tether) "SP" = ( -/obj/structure/table/woodentable, -/obj/item/device/taperecorder{ - pixel_y = 0 - }, -/obj/item/weapon/reagent_containers/food/drinks/flask/barflask{ - pixel_x = -4; - pixel_y = 8 +/obj/machinery/computer/communications{ + dir = 1 }, /turf/simulated/floor/wood, /area/crew_quarters/heads/hos) @@ -35038,12 +35041,12 @@ ab ab aa aa -aa -aa -aa -aa -aa -aa +ad +ad +ae +ad +ad +ae aa aa aa @@ -35182,10 +35185,10 @@ ab ab aa aa +ae aa aa -aa -aa +ad aa aa aa @@ -35324,10 +35327,10 @@ ab ab aa aa +ae aa aa -aa -aa +ad aa aa aa @@ -35467,9 +35470,9 @@ Me uK uK Me -aa -aa -aa +ae +ae +ad aa aa aa @@ -35611,7 +35614,7 @@ wf xh aa aa -aa +ae aa aa aa @@ -35753,7 +35756,7 @@ NP xh aa aa -aa +ad aa aa aa @@ -35895,7 +35898,7 @@ NP xh aa aa -aa +ad aa aa aa @@ -36037,7 +36040,7 @@ NQ Me ab aa -aa +ad aa aa aa From fdb3ed2695da2c00cd1e79703e4e7132bff4d58d Mon Sep 17 00:00:00 2001 From: Unknown Date: Mon, 26 Aug 2019 22:44:41 -0400 Subject: [PATCH 07/36] Modular computers instead --- maps/tether/tether-02-surface2.dmm | 2 +- maps/tether/tether-05-station1.dmm | 10 ++-------- maps/tether/tether-07-station3.dmm | 4 ++-- 3 files changed, 5 insertions(+), 11 deletions(-) diff --git a/maps/tether/tether-02-surface2.dmm b/maps/tether/tether-02-surface2.dmm index 0ed23dab20..394dbcdc46 100644 --- a/maps/tether/tether-02-surface2.dmm +++ b/maps/tether/tether-02-surface2.dmm @@ -5685,7 +5685,7 @@ /obj/effect/floor_decal/corner/mauve/bordercorner2{ dir = 10 }, -/obj/machinery/computer/communications{ +/obj/item/modular_computer/console/preset/command{ dir = 4 }, /turf/simulated/floor/tiled, diff --git a/maps/tether/tether-05-station1.dmm b/maps/tether/tether-05-station1.dmm index c079db281e..4eda0973a8 100644 --- a/maps/tether/tether-05-station1.dmm +++ b/maps/tether/tether-05-station1.dmm @@ -17153,7 +17153,7 @@ /turf/simulated/floor/carpet, /area/engineering/foyer) "bft" = ( -/obj/machinery/computer/atmos_alert{ +/obj/item/modular_computer/console/preset/command{ dir = 4 }, /turf/simulated/floor/tiled, @@ -22332,12 +22332,6 @@ /obj/machinery/status_display, /turf/simulated/wall/r_wall, /area/bridge) -"hhC" = ( -/obj/machinery/computer/communications{ - dir = 1 - }, -/turf/simulated/floor/carpet/oracarpet, -/area/crew_quarters/heads/chief) "hPi" = ( /obj/machinery/light/small, /turf/simulated/floor, @@ -27420,7 +27414,7 @@ agc aYF aRX aSe -hhC +aRX aVz aRb bYg diff --git a/maps/tether/tether-07-station3.dmm b/maps/tether/tether-07-station3.dmm index e8e48e2d46..a6f155c1e3 100644 --- a/maps/tether/tether-07-station3.dmm +++ b/maps/tether/tether-07-station3.dmm @@ -24346,7 +24346,7 @@ /obj/machinery/camera/network/medbay{ dir = 4 }, -/obj/machinery/computer/communications, +/obj/item/modular_computer/console/preset/command, /turf/simulated/floor/tiled/white, /area/crew_quarters/heads/cmo) "Mz" = ( @@ -28423,7 +28423,7 @@ /turf/simulated/floor/tiled/techfloor/grid, /area/shuttle/excursion/tether) "SP" = ( -/obj/machinery/computer/communications{ +/obj/item/modular_computer/console/preset/command{ dir = 1 }, /turf/simulated/floor/wood, From ec9f1e0e3d1351e75d0b9f2e3430b44ab0d9942e Mon Sep 17 00:00:00 2001 From: Atermonera Date: Mon, 26 Aug 2019 19:31:21 -0800 Subject: [PATCH 08/36] Merge pull request #6420 from Mechoid/WhyAmILikeThis Fix SLED infinite looping. --- code/modules/mob/living/bot/SLed209bot.dm | 1 - 1 file changed, 1 deletion(-) diff --git a/code/modules/mob/living/bot/SLed209bot.dm b/code/modules/mob/living/bot/SLed209bot.dm index 989c2e708d..7b5bbc76e5 100644 --- a/code/modules/mob/living/bot/SLed209bot.dm +++ b/code/modules/mob/living/bot/SLed209bot.dm @@ -21,7 +21,6 @@ xeno_harm_strength = 9 req_one_access = list(access_research, access_robotics) botcard_access = list(access_research, access_robotics, access_xenobiology, access_xenoarch, access_tox, access_tox_storage, access_maint_tunnels) - used_weapon = /obj/item/weapon/melee/baton/slime var/xeno_stun_strength = 6 /mob/living/bot/secbot/ed209/slime/update_icons() From 7fc19250e621a4ed02b3a5cdc79dacf5915ba95a Mon Sep 17 00:00:00 2001 From: Atermonera Date: Mon, 26 Aug 2019 19:31:09 -0800 Subject: [PATCH 10/36] Merge pull request #6419 from Mechoid/PrinterHREF Should solve the I.C. printer HREF exploit. --- code/modules/integrated_electronics/core/printer.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/integrated_electronics/core/printer.dm b/code/modules/integrated_electronics/core/printer.dm index 871051a258..cdf4652d5e 100644 --- a/code/modules/integrated_electronics/core/printer.dm +++ b/code/modules/integrated_electronics/core/printer.dm @@ -148,7 +148,7 @@ else var/obj/item/I = build_type cost = initial(I.w_class) - if(!build_type in SScircuit.circuit_fabricator_recipe_list[current_category]) + if(!(build_type in SScircuit.circuit_fabricator_recipe_list[current_category])) return if(!debug) From 0cc54904e29b47afca26059a2abf22a7642b03c5 Mon Sep 17 00:00:00 2001 From: Heroman Date: Tue, 27 Aug 2019 19:52:15 +1000 Subject: [PATCH 12/36] Fixes slimes not dying outside --- code/modules/mob/living/simple_mob/life.dm | 2 +- code/modules/mob/living/simple_mob/simple_mob_vr.dm | 2 ++ .../mob/living/simple_mob/subtypes/slime/xenobio/subtypes_vr.dm | 1 + 3 files changed, 4 insertions(+), 1 deletion(-) diff --git a/code/modules/mob/living/simple_mob/life.dm b/code/modules/mob/living/simple_mob/life.dm index 4c063e4bd9..d4ed684deb 100644 --- a/code/modules/mob/living/simple_mob/life.dm +++ b/code/modules/mob/living/simple_mob/life.dm @@ -88,7 +88,7 @@ if(Environment) - if( abs(Environment.temperature - bodytemperature) > 40 ) + if( abs(Environment.temperature - bodytemperature) > temperature_range ) //VOREStation Edit: heating adjustments bodytemperature += ((Environment.temperature - bodytemperature) / 5) if(min_oxy) diff --git a/code/modules/mob/living/simple_mob/simple_mob_vr.dm b/code/modules/mob/living/simple_mob/simple_mob_vr.dm index d388d1ec88..24faf9cc2a 100644 --- a/code/modules/mob/living/simple_mob/simple_mob_vr.dm +++ b/code/modules/mob/living/simple_mob/simple_mob_vr.dm @@ -4,6 +4,8 @@ #define SA_ICON_REST 0x03 /mob/living/simple_mob + var/temperature_range = 40 // How close will they get to environmental temperature before their body stops changing its heat + var/vore_active = 0 // If vore behavior is enabled for this mob var/vore_capacity = 1 // The capacity (in people) this person can hold diff --git a/code/modules/mob/living/simple_mob/subtypes/slime/xenobio/subtypes_vr.dm b/code/modules/mob/living/simple_mob/subtypes/slime/xenobio/subtypes_vr.dm index 43cec1e80c..3188ae0aa1 100644 --- a/code/modules/mob/living/simple_mob/subtypes/slime/xenobio/subtypes_vr.dm +++ b/code/modules/mob/living/simple_mob/subtypes/slime/xenobio/subtypes_vr.dm @@ -1,4 +1,5 @@ /mob/living/simple_mob/slime/xenobio + temperature_range = 5 mob_bump_flag = 0 /mob/living/simple_mob/slime/xenobio/Initialize(mapload, var/mob/living/simple_mob/slime/xenobio/my_predecessor) From abe27da940647bc45cc05e350e633f3d2e284467 Mon Sep 17 00:00:00 2001 From: Anewbe Date: Tue, 27 Aug 2019 15:09:40 -0500 Subject: [PATCH 13/36] Merge pull request #6412 from Atermonera/changelog eggolaunch --- html/changelog.html | 51 +++++++++++++++ html/changelogs/.all_changelog.yml | 63 +++++++++++++++++++ html/changelogs/Atermonera - atmos remap.yml | 4 -- .../Mechoid - ExplorerExpansion.yml | 56 ----------------- .../Mechoid - Promethean Organs.yml | 40 ------------ html/changelogs/Nalarac - Cable Layer.yml | 36 ----------- ...alarac - Turret Shooting Downed People.yml | 36 ----------- ...FurryFeline - Orange Is The New Orange.yml | 37 ----------- html/changelogs/Woodrat - Uniform Fix.yml | 38 ----------- 9 files changed, 114 insertions(+), 247 deletions(-) delete mode 100644 html/changelogs/Atermonera - atmos remap.yml delete mode 100644 html/changelogs/Mechoid - ExplorerExpansion.yml delete mode 100644 html/changelogs/Mechoid - Promethean Organs.yml delete mode 100644 html/changelogs/Nalarac - Cable Layer.yml delete mode 100644 html/changelogs/Nalarac - Turret Shooting Downed People.yml delete mode 100644 html/changelogs/TheFurryFeline - Orange Is The New Orange.yml delete mode 100644 html/changelogs/Woodrat - Uniform Fix.yml diff --git a/html/changelog.html b/html/changelog.html index f122636ec5..a1b7e3bd02 100644 --- a/html/changelog.html +++ b/html/changelog.html @@ -53,6 +53,57 @@ -->
+

21 August 2019

+

Atermonera updated:

+
    +
  • Atmospherics is now bigger, with more room for fun and sanity-destroying spaghetti!
    • +
+

Mechoid updated:

+
    +
  • Exosuits are now targetted by turrets again.
    • +
  • Mining charge strength lowered, price increased. Can be upgraded through R&D laser components.
    • +
  • Searing damage type added. Energy axe now uses searing damage.
    • +
  • Survey points added. Vendor added for explorer use. Costs are universally 'lower' compared to the mining vendor due to the rarity of points.
    • +
  • Swiping an ID card on a cataloguer will transfer the points to the card.
    • +
  • Any melee energy weapon can now be made to use a cell and charge.
    • +
  • Energy Axe prototype added to R&D.
    • +
  • Anomalous 'hunting trap' added to R&D. Useful for an initial stun on mobs for explorer scanning.
    • +
  • Beartraps now stun for a quarter of a second, so they are actually useful again, due to resistability.
    • +
  • Emergency welding pack added. Incredibly slow, but requires no protection.
    • +
  • Random turf modifier added for mapping use. Random humanoid remains spawner added for mapping use.
    • +
  • Plants under obj/structure/flora now can be made to be harvestable / forage-able.
    • +
  • Sif trees now occasionally have fruit containing useful microbes. Microbes slow blood flow resulting in slower chemical absorption and blood loss.
    • +
  • Flora by default are now under mobs, on the same layer as turf decals. Flora can now also randomize their size, previously only codified in Sivian trees.
    • +
  • Moss tendrils added to Sif, making eye-plants more rare.
    • +
  • Multiple PoIs added. 'Blue shuttle down' variant, 'UFO Frigate', multiple geysers, cliffs, and two variants of SFR which take drastically different approaches to the SFR standard. A vault was added, too.
    • +
  • Vault PoIs are now in a template group.
    • +
  • Generic AI-controlled humanoids added. Subtype made for use on Sif, clad in weak armor and temperature resistance, used as 'mindless clones'.
    • +
  • More artifice added.
    • +
  • Fultons made to be [somewhat] sane. Now only useable planetside.
    • +
  • Graviton Visor moved to R&D from the mining equipment vendor. Silver and Diamond pickaxes removed.
    • +
  • Added multiple new organs for Prometheans. Removing them will cause them to take large amounts of Toxloss untill they are Regenerated using the active regeneration verb.
    • +
  • Organ: pneumatic network, a series of skeletal tubes with high pressure used to move nutrients and waste.
    • +
  • Organs: -regenesis systems, different 'networks' of clumped cellular matter that allow Prometheans to recover rapidly from small injuries. Large or numerous injuries cause un-needed stress, and pain.
    • +
  • Internal organs now properly add themselves to the internal organ-by-name list, the one referenced 99.9% of the time.
    • +
  • Active regeneration will now replace internal organs if they are nonexistant, as it does for limbs.
    • +
+

Nalarac updated:

+
    +
  • Mech cable layer works again.
    • +
  • Added setting for turrets to fire upon downed/laying targets.
    • +
+

TheFurryFeline updated:

+
    +
  • New orange jumpsuit for loadout that doesn't get locked to tracking.
    • +
  • Prison jumpsuit filepath changed accordingly and closets with obj updated.
    • +
+

Woodrat updated:

+
    +
  • Made the solgov uniforms use accessories for denoting department instead of having several different sprites in the uniform dmi folder.
    • +
  • Removed redundant solgov uniforms from uniform.dmi and moved the sprites for the solgov uniforms to their own dmi.
    • +
  • Fixed storage vests and drop pouches disappearing when one rolls down a uniform.
    • +
+

08 August 2019

Mechoid updated:

    diff --git a/html/changelogs/.all_changelog.yml b/html/changelogs/.all_changelog.yml index 4b1d6be2b8..fe2730f067 100644 --- a/html/changelogs/.all_changelog.yml +++ b/html/changelogs/.all_changelog.yml @@ -4680,3 +4680,66 @@ DO NOT EDIT THIS FILE BY HAND! AUTOMATICALLY GENERATED BY ss13_genchangelog.py. - tweak: Updates the Supermatter Engine Operating Manual. mistyLuminescence: - tweak: Serenity mech can now be built by robotics. +2019-08-21: + Atermonera: + - tweak: Atmospherics is now bigger, with more room for fun and sanity-destroying + spaghetti! + Mechoid: + - bugfix: Exosuits are now targetted by turrets again. + - tweak: Mining charge strength lowered, price increased. Can be upgraded through + R&D laser components. + - rscadd: Searing damage type added. Energy axe now uses searing damage. + - rscadd: Survey points added. Vendor added for explorer use. Costs are universally + 'lower' compared to the mining vendor due to the rarity of points. + - rscadd: Swiping an ID card on a cataloguer will transfer the points to the card. + - tweak: Any melee energy weapon can now be made to use a cell and charge. + - rscadd: Energy Axe prototype added to R&D. + - rscadd: Anomalous 'hunting trap' added to R&D. Useful for an initial stun on mobs + for explorer scanning. + - tweak: Beartraps now stun for a quarter of a second, so they are actually useful + again, due to resistability. + - rscadd: Emergency welding pack added. Incredibly slow, but requires no protection. + - rscadd: Random turf modifier added for mapping use. Random humanoid remains spawner + added for mapping use. + - rscadd: Plants under obj/structure/flora now can be made to be harvestable / forage-able. + - rscadd: Sif trees now occasionally have fruit containing useful microbes. Microbes + slow blood flow resulting in slower chemical absorption and blood loss. + - tweak: Flora by default are now under mobs, on the same layer as turf decals. + Flora can now also randomize their size, previously only codified in Sivian + trees. + - rscadd: Moss tendrils added to Sif, making eye-plants more rare. + - rscadd: Multiple PoIs added. 'Blue shuttle down' variant, 'UFO Frigate', multiple + geysers, cliffs, and two variants of SFR which take drastically different approaches + to the SFR standard. A vault was added, too. + - tweak: Vault PoIs are now in a template group. + - rscadd: Generic AI-controlled humanoids added. Subtype made for use on Sif, clad + in weak armor and temperature resistance, used as 'mindless clones'. + - rscadd: More artifice added. + - tweak: Fultons made to be [somewhat] sane. Now only useable planetside. + - tweak: Graviton Visor moved to R&D from the mining equipment vendor. Silver and + Diamond pickaxes removed. + - rscadd: Added multiple new organs for Prometheans. Removing them will cause them + to take large amounts of Toxloss untill they are Regenerated using the active + regeneration verb. + - rscadd: 'Organ: pneumatic network, a series of skeletal tubes with high pressure + used to move nutrients and waste.' + - rscadd: 'Organs: -regenesis systems, different ''networks'' of clumped cellular + matter that allow Prometheans to recover rapidly from small injuries. Large + or numerous injuries cause un-needed stress, and pain.' + - bugfix: Internal organs now properly add themselves to the internal organ-by-name + list, the one referenced 99.9% of the time. + - tweak: Active regeneration will now replace internal organs if they are nonexistant, + as it does for limbs. + Nalarac: + - bugfix: Mech cable layer works again. + - rscadd: Added setting for turrets to fire upon downed/laying targets. + TheFurryFeline: + - rscadd: New orange jumpsuit for loadout that doesn't get locked to tracking. + - tweak: Prison jumpsuit filepath changed accordingly and closets with obj updated. + Woodrat: + - tweak: Made the solgov uniforms use accessories for denoting department instead + of having several different sprites in the uniform dmi folder. + - tweak: Removed redundant solgov uniforms from uniform.dmi and moved the sprites + for the solgov uniforms to their own dmi. + - bugfix: Fixed storage vests and drop pouches disappearing when one rolls down + a uniform. diff --git a/html/changelogs/Atermonera - atmos remap.yml b/html/changelogs/Atermonera - atmos remap.yml deleted file mode 100644 index 94bdbfde76..0000000000 --- a/html/changelogs/Atermonera - atmos remap.yml +++ /dev/null @@ -1,4 +0,0 @@ -author: Atermonera -delete-after: True -changes: - - tweak: "Atmospherics is now bigger, with more room for fun and sanity-destroying spaghetti!" \ No newline at end of file diff --git a/html/changelogs/Mechoid - ExplorerExpansion.yml b/html/changelogs/Mechoid - ExplorerExpansion.yml deleted file mode 100644 index 25c5488d00..0000000000 --- a/html/changelogs/Mechoid - ExplorerExpansion.yml +++ /dev/null @@ -1,56 +0,0 @@ -################################ -# 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 -################################# - -# Your name. -author: Mechoid - -# 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: - - bugfix: "Exosuits are now targetted by turrets again." - - tweak: "Mining charge strength lowered, price increased. Can be upgraded through R&D laser components." - - rscadd: "Searing damage type added. Energy axe now uses searing damage." - - rscadd: "Survey points added. Vendor added for explorer use. Costs are universally 'lower' compared to the mining vendor due to the rarity of points." - - rscadd: "Swiping an ID card on a cataloguer will transfer the points to the card." - - tweak: "Any melee energy weapon can now be made to use a cell and charge." - - rscadd: "Energy Axe prototype added to R&D." - - rscadd: "Anomalous 'hunting trap' added to R&D. Useful for an initial stun on mobs for explorer scanning." - - tweak: "Beartraps now stun for a quarter of a second, so they are actually useful again, due to resistability." - - rscadd: "Emergency welding pack added. Incredibly slow, but requires no protection." - - rscadd: "Random turf modifier added for mapping use. Random humanoid remains spawner added for mapping use." - - rscadd: "Plants under obj/structure/flora now can be made to be harvestable / forage-able." - - rscadd: "Sif trees now occasionally have fruit containing useful microbes. Microbes slow blood flow resulting in slower chemical absorption and blood loss." - - tweak: "Flora by default are now under mobs, on the same layer as turf decals. Flora can now also randomize their size, previously only codified in Sivian trees." - - rscadd: "Moss tendrils added to Sif, making eye-plants more rare." - - rscadd: "Multiple PoIs added. 'Blue shuttle down' variant, 'UFO Frigate', multiple geysers, cliffs, and two variants of SFR which take drastically different approaches to the SFR standard. A vault was added, too." - - tweak: "Vault PoIs are now in a template group." - - rscadd: "Generic AI-controlled humanoids added. Subtype made for use on Sif, clad in weak armor and temperature resistance, used as 'mindless clones'." - - rscadd: "More artifice added." - - tweak: "Fultons made to be [somewhat] sane. Now only useable planetside." - - tweak: "Graviton Visor moved to R&D from the mining equipment vendor. Silver and Diamond pickaxes removed." diff --git a/html/changelogs/Mechoid - Promethean Organs.yml b/html/changelogs/Mechoid - Promethean Organs.yml deleted file mode 100644 index c579478d5a..0000000000 --- a/html/changelogs/Mechoid - Promethean Organs.yml +++ /dev/null @@ -1,40 +0,0 @@ -################################ -# 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 -################################# - -# Your name. -author: Mechoid - -# 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: - - rscadd: "Added multiple new organs for Prometheans. Removing them will cause them to take large amounts of Toxloss untill they are Regenerated using the active regeneration verb." - - rscadd: "Organ: pneumatic network, a series of skeletal tubes with high pressure used to move nutrients and waste." - - rscadd: "Organs: -regenesis systems, different 'networks' of clumped cellular matter that allow Prometheans to recover rapidly from small injuries. Large or numerous injuries cause un-needed stress, and pain." - - bugfix: "Internal organs now properly add themselves to the internal organ-by-name list, the one referenced 99.9% of the time." - - tweak: "Active regeneration will now replace internal organs if they are nonexistant, as it does for limbs." diff --git a/html/changelogs/Nalarac - Cable Layer.yml b/html/changelogs/Nalarac - Cable Layer.yml deleted file mode 100644 index 041f0d033e..0000000000 --- a/html/changelogs/Nalarac - Cable Layer.yml +++ /dev/null @@ -1,36 +0,0 @@ -################################ -# 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 -################################# - -# Your name. -author: Nalarac - -# 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: - - bugfix: "Mech cable layer works again." diff --git a/html/changelogs/Nalarac - Turret Shooting Downed People.yml b/html/changelogs/Nalarac - Turret Shooting Downed People.yml deleted file mode 100644 index f950bbe9a1..0000000000 --- a/html/changelogs/Nalarac - Turret Shooting Downed People.yml +++ /dev/null @@ -1,36 +0,0 @@ -################################ -# 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 -################################# - -# Your name. -author: Nalarac - -# 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: - - rscadd: "Added setting for turrets to fire upon downed/laying targets." diff --git a/html/changelogs/TheFurryFeline - Orange Is The New Orange.yml b/html/changelogs/TheFurryFeline - Orange Is The New Orange.yml deleted file mode 100644 index 41df57e47f..0000000000 --- a/html/changelogs/TheFurryFeline - Orange Is The New Orange.yml +++ /dev/null @@ -1,37 +0,0 @@ -################################ -# 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 -################################# - -# Your name. -author: TheFurryFeline - -# 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: - - rscadd: "New orange jumpsuit for loadout that doesn't get locked to tracking." - - tweak: "Prison jumpsuit filepath changed accordingly and closets with obj updated." diff --git a/html/changelogs/Woodrat - Uniform Fix.yml b/html/changelogs/Woodrat - Uniform Fix.yml deleted file mode 100644 index e3bdaa68e9..0000000000 --- a/html/changelogs/Woodrat - Uniform Fix.yml +++ /dev/null @@ -1,38 +0,0 @@ -################################ -# 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 -################################# - -# Your name. -author: Woodrat - -# 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: - - tweak: "Made the solgov uniforms use accessories for denoting department instead of having several different sprites in the uniform dmi folder." - - tweak: "Removed redundant solgov uniforms from uniform.dmi and moved the sprites for the solgov uniforms to their own dmi." - - bugfix: "Fixed storage vests and drop pouches disappearing when one rolls down a uniform." \ No newline at end of file From bf558eacfd73ccf0c8bbebf13f147759ba9c27b4 Mon Sep 17 00:00:00 2001 From: Atermonera Date: Tue, 27 Aug 2019 21:23:34 -0800 Subject: [PATCH 15/36] Merge pull request #6417 from MisterLayne/conductivity_fix Non-conductive Things Do Not Conduct --- .../weapons/material/material_weapons.dm | 5 ++- .../MisterLayne - conductivity_fix.yml | 36 +++++++++++++++++++ 2 files changed, 40 insertions(+), 1 deletion(-) create mode 100644 html/changelogs/MisterLayne - conductivity_fix.yml diff --git a/code/game/objects/items/weapons/material/material_weapons.dm b/code/game/objects/items/weapons/material/material_weapons.dm index 4f08c61a4c..a911d1e137 100644 --- a/code/game/objects/items/weapons/material/material_weapons.dm +++ b/code/game/objects/items/weapons/material/material_weapons.dm @@ -42,6 +42,9 @@ if(!isnull(matter[material_type])) matter[material_type] *= force_divisor // May require a new var instead. + if(!(material.conductive)) + src.flags |= NOCONDUCT + /obj/item/weapon/material/get_material() return material @@ -67,7 +70,7 @@ if(applies_material_colour) color = material.icon_colour if(material.products_need_process()) - START_PROCESSING(SSobj, src) + START_PROCESSING(SSobj, src) update_force() /obj/item/weapon/material/Destroy() diff --git a/html/changelogs/MisterLayne - conductivity_fix.yml b/html/changelogs/MisterLayne - conductivity_fix.yml new file mode 100644 index 0000000000..5d8d4a06b7 --- /dev/null +++ b/html/changelogs/MisterLayne - conductivity_fix.yml @@ -0,0 +1,36 @@ +################################ +# 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 +################################# + +# Your name. +author: MisterLayne + +# 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: + - tweak: "Material weapons that should not conduct, do not conduct." From 20d87447a998155c559d26a1e40ce72c937d858c Mon Sep 17 00:00:00 2001 From: Unknown Date: Wed, 28 Aug 2019 01:24:48 -0400 Subject: [PATCH 17/36] Removes HoS Voidsuit Stats --- code/modules/vore/fluffstuff/custom_clothes_vr.dm | 4 ---- 1 file changed, 4 deletions(-) diff --git a/code/modules/vore/fluffstuff/custom_clothes_vr.dm b/code/modules/vore/fluffstuff/custom_clothes_vr.dm index 4396932eab..fa24a83424 100644 --- a/code/modules/vore/fluffstuff/custom_clothes_vr.dm +++ b/code/modules/vore/fluffstuff/custom_clothes_vr.dm @@ -693,9 +693,6 @@ icon_override = 'icons/vore/custom_clothes_vr.dmi' item_state = "rig-hos_mob" - //Slightly improved security voidsuit, which when made, was: - //armor = list(melee = 50, bullet = 25, laser = 25, energy = 5, bomb = 45, bio = 100, rad = 10) - armor = list("melee" = 60, "bullet" = 35, "laser" = 35, "energy" = 15, "bomb" = 50, "bio" = 100, "rad" = 10) species_restricted = null //HOS Hardsuit Helmet @@ -709,7 +706,6 @@ icon_override = 'icons/vore/custom_clothes_vr.dmi' item_state = "rig0-hos_mob" - armor = list("melee" = 60, "bullet" = 35, "laser" = 35, "energy" = 15, "bomb" = 50, "bio" = 100, "rad" = 10) species_restricted = null //adk09:Lethe From 4bb05991531a398a0b570e1ba2d88bfcceb1bb08 Mon Sep 17 00:00:00 2001 From: Atermonera Date: Tue, 27 Aug 2019 21:25:06 -0800 Subject: [PATCH 18/36] Merge pull request #6423 from chaoko99/stomach_pump Ports Bay's stomach pump. --- code/game/machinery/Sleeper.dm | 42 ++++++++++++++++----- html/changelogs/chaoko99 - stomach_pump.yml | 36 ++++++++++++++++++ nano/templates/sleeper.tmpl | 3 ++ 3 files changed, 72 insertions(+), 9 deletions(-) create mode 100644 html/changelogs/chaoko99 - stomach_pump.yml diff --git a/code/game/machinery/Sleeper.dm b/code/game/machinery/Sleeper.dm index b259fe1ded..f89927e375 100644 --- a/code/game/machinery/Sleeper.dm +++ b/code/game/machinery/Sleeper.dm @@ -29,8 +29,7 @@ sleeper = sleepernew sleepernew.console = src set_dir(get_dir(src, sleepernew)) - return - return + /obj/machinery/sleep_console/attack_ai(var/mob/user) return attack_hand(user) @@ -45,7 +44,7 @@ to_chat(user, "Sleeper not found!") return - if(sleeper.panel_open) + if(panel_open) to_chat(user, "Close the maintenance panel first.") return @@ -108,6 +107,7 @@ else data["beaker"] = -1 data["filtering"] = S.filtering + data["pump"] = S.pumping var/stasis_level_name = "Error!" for(var/N in S.stasis_choices) @@ -142,6 +142,9 @@ if(href_list["sleeper_filter"]) if(S.filtering != text2num(href_list["sleeper_filter"])) S.toggle_filter() + if(href_list["pump"]) + if(S.pumping != text2num(href_list["pump"])) + S.toggle_pump() if(href_list["chemical"] && href_list["amount"]) if(S.occupant && S.occupant.stat != DEAD) if(href_list["chemical"] in S.available_chemicals) // Your hacks are bad and you should feel bad @@ -166,6 +169,7 @@ var/list/base_chemicals = list("inaprovaline" = "Inaprovaline", "paracetamol" = "Paracetamol", "anti_toxin" = "Dylovene", "dexalin" = "Dexalin") var/obj/item/weapon/reagent_containers/glass/beaker = null var/filtering = 0 + var/pumping = 0 var/obj/machinery/sleep_console/console var/stasis_level = 0 //Every 'this' life ticks are applied to the mob (when life_ticks%stasis_level == 1) var/stasis_choices = list("Complete (1%)" = 100, "Deep (10%)" = 10, "Moderate (20%)" = 5, "Light (50%)" = 2, "None (100%)" = 0) @@ -263,6 +267,17 @@ else toggle_filter() + if(pumping > 0) + if(beaker) + if(beaker.reagents.total_volume < beaker.reagents.maximum_volume) + var/pumped = 0 + for(var/datum/reagent/x in occupant.ingested.reagent_list) + occupant.reagents.trans_to_obj(beaker, 3) + pumped++ + if(ishuman(occupant)) + occupant.ingested.trans_to_obj(beaker, pumped + 1) + else + toggle_pump() /obj/machinery/sleeper/update_icon() icon_state = "sleeper_[occupant ? "1" : "0"]" @@ -301,14 +316,12 @@ return if(UNCONSCIOUS) to_chat(usr, "You struggle through the haze to hit the eject button. This will take a couple of minutes...") - sleep(2 MINUTES) - if(!src || !usr || !occupant || (occupant != usr)) //Check if someone's released/replaced/bombed him already - return - go_out() + if(do_after(usr, 2 MINUTES, src)) + go_out() if(CONSCIOUS) go_out() else - if(usr.stat != 0) + if(usr.stat != CONSCIOUS) return go_out() add_fingerprint(usr) @@ -326,6 +339,9 @@ if(filtering) toggle_filter() + if(pumping) + toggle_pump() + if(stat & (BROKEN|NOPOWER)) ..(severity) return @@ -340,6 +356,12 @@ return filtering = !filtering +/obj/machinery/sleeper/proc/toggle_pump() + if(!occupant || !beaker) + pumping = 0 + return + pumping = !pumping + /obj/machinery/sleeper/proc/go_in(var/mob/M, var/mob/user) if(!M) return @@ -370,7 +392,8 @@ update_icon() /obj/machinery/sleeper/proc/go_out() - if(!occupant) + if(!occupant || occupant.loc != src) + occupant = null // JUST IN CASE return if(occupant.client) occupant.client.eye = occupant.client.mob @@ -387,6 +410,7 @@ update_use_power(1) update_icon() toggle_filter() + toggle_pump() /obj/machinery/sleeper/proc/remove_beaker() if(beaker) diff --git a/html/changelogs/chaoko99 - stomach_pump.yml b/html/changelogs/chaoko99 - stomach_pump.yml new file mode 100644 index 0000000000..ff753858eb --- /dev/null +++ b/html/changelogs/chaoko99 - stomach_pump.yml @@ -0,0 +1,36 @@ +################################ +# 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 +################################# hey can we PLEASE get a changelog bot already + +# Your name. +author: chaoko99 + +# 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: + - rscadd: "Ported Bay's stomach pump." \ No newline at end of file diff --git a/nano/templates/sleeper.tmpl b/nano/templates/sleeper.tmpl index a0e9da787c..885a1c025c 100644 --- a/nano/templates/sleeper.tmpl +++ b/nano/templates/sleeper.tmpl @@ -51,6 +51,9 @@
    {{:helper.link(data.filtering ? "Dialysis active" : "Dialysis inactive", null, {'sleeper_filter' : !data.filtering})}}
    +
    + {{:helper.link(data.pump ? "Stomach pump active" : "Stomach pump inactive", null, {'pump' : !data.pump})}} +
    {{:helper.link("Eject occupant", null, {'eject' : 0})}}
    From 2162dbfa0b14214dff642cfc76ead1c613de73c2 Mon Sep 17 00:00:00 2001 From: Atermonera Date: Tue, 27 Aug 2019 21:23:52 -0800 Subject: [PATCH 20/36] Merge pull request #6418 from MisterLayne/glass_shard_self_harm Shards Do Damage to Holder --- .../objects/items/weapons/material/shards.dm | 52 +++++++++++++++++++ .../MisterLayne - glass_shard_self_harm.yml | 36 +++++++++++++ 2 files changed, 88 insertions(+) create mode 100644 html/changelogs/MisterLayne - glass_shard_self_harm.yml diff --git a/code/game/objects/items/weapons/material/shards.dm b/code/game/objects/items/weapons/material/shards.dm index ba7438a685..937391737a 100644 --- a/code/game/objects/items/weapons/material/shards.dm +++ b/code/game/objects/items/weapons/material/shards.dm @@ -61,6 +61,58 @@ return return ..() +/obj/item/weapon/material/shard/afterattack(var/atom/target, mob/living/carbon/human/user as mob) + var/active_hand //hand the shard is in + var/will_break + var/gloves_are_heavy = FALSE//this is a fucking mess + var/break_damage = 4 + var/light_glove_d = rand(2, 4) + var/no_glove_d = rand(4, 6) + var/list/h_gloves = list(/obj/item/clothing/gloves/captain, /obj/item/clothing/gloves/cyborg, + /obj/item/clothing/gloves/swat, /obj/item/clothing/gloves/combat, + /obj/item/clothing/gloves/botanic_leather, /obj/item/clothing/gloves/duty, + /obj/item/clothing/gloves/tactical, /obj/item/clothing/gloves/vox, + /obj/item/clothing/gloves/gauntlets) + + if(istype(user.l_hand, src)) + active_hand = BP_L_HAND + else + active_hand = BP_R_HAND + + if(prob(75)) + will_break = TRUE + else + will_break = FALSE + + if(user.gloves && (user.gloves.body_parts_covered & HANDS)) + var/obj/item/clothing/gloves/UG = user.gloves.type + for(var/I in h_gloves) + if(UG == I) + gloves_are_heavy = TRUE + if(will_break) + user.visible_message("[user] hit \the [target] with \the [src], shattering it!", "You shatter \the [src] in your hand!") + playsound(user, pick('sound/effects/Glassbr1.ogg', 'sound/effects/Glassbr2.ogg', 'sound/effects/Glassbr3.ogg'), 30, 1) + qdel(src) + + if(gloves_are_heavy == FALSE) + to_chat(user, "\The [src] partially cuts into your hand through your gloves as you hit \the [target]!") + if(will_break) + user.visible_message("[user] hit \the [target] with \the [src], shattering it!", "You shatter \the [src] in your hand!") + user.apply_damage(light_glove_d + break_damage, BRUTE, active_hand, 0 ,0, src, src.sharp, src.edge) + playsound(user, pick('sound/effects/Glassbr1.ogg', 'sound/effects/Glassbr2.ogg', 'sound/effects/Glassbr3.ogg'), 30, 1) + qdel(src) + else + user.apply_damage(light_glove_d, BRUTE, active_hand, 0 ,0, src, src.sharp, src.edge) + else + to_chat(user, "\The [src] cuts into your hand as you hit \the [target]!") + if(will_break) + user.visible_message("[user] hit \the [target] with \the [src], shattering it!", "You shatter \the [src] in your hand!") + user.apply_damage(no_glove_d + break_damage, BRUTE, active_hand, 0 ,0, src, src.sharp, src.edge) + playsound(user, pick('sound/effects/Glassbr1.ogg', 'sound/effects/Glassbr2.ogg', 'sound/effects/Glassbr3.ogg'), 30, 1) + qdel(src) + else + user.apply_damage(no_glove_d, BRUTE, active_hand, 0 ,0, src, src.sharp, src.edge) + /obj/item/weapon/material/shard/Crossed(AM as mob|obj) ..() if(isliving(AM)) diff --git a/html/changelogs/MisterLayne - glass_shard_self_harm.yml b/html/changelogs/MisterLayne - glass_shard_self_harm.yml new file mode 100644 index 0000000000..dd0c47bf85 --- /dev/null +++ b/html/changelogs/MisterLayne - glass_shard_self_harm.yml @@ -0,0 +1,36 @@ +################################ +# 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 +################################# + +# Your name. +author: MisterLayne + +# 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: + - tweak: "Glass shards now do damage when you attack with them, based on the type of gloves you are wearing." From 14eb5250301e8f4f444dcc691964ceeed45c0eff Mon Sep 17 00:00:00 2001 From: Unknown Date: Wed, 28 Aug 2019 04:06:19 -0400 Subject: [PATCH 22/36] Adjusts Vorestation pills and pillbottles --- .../items/weapons/storage/firstaid_vr.dm | 10 +++++++ .../reagents/reagent_containers/pill_vr.dm | 30 ++++++++++++------- 2 files changed, 30 insertions(+), 10 deletions(-) diff --git a/code/game/objects/items/weapons/storage/firstaid_vr.dm b/code/game/objects/items/weapons/storage/firstaid_vr.dm index 6f9bf71fb4..55cce5358c 100644 --- a/code/game/objects/items/weapons/storage/firstaid_vr.dm +++ b/code/game/objects/items/weapons/storage/firstaid_vr.dm @@ -12,51 +12,61 @@ name = "bottle of Rezadone pills" desc = "A powder with almost magical properties, this substance can effectively treat genetic damage in humanoids, though excessive consumption has side effects." starts_with = list(/obj/item/weapon/reagent_containers/pill/rezadone = 7) + wrapper_color = COLOR_GREEN_GRAY /obj/item/weapon/storage/pill_bottle/peridaxon name = "bottle of Peridaxon pills" desc = "Used to encourage recovery of internal organs and nervous systems. Medicate cautiously." starts_with = list(/obj/item/weapon/reagent_containers/pill/peridaxon = 7) + wrapper_color = COLOR_PURPLE /obj/item/weapon/storage/pill_bottle/carthatoline name = "bottle of Carthatoline pills" desc = "Carthatoline is strong evacuant used to treat severe poisoning." starts_with = list(/obj/item/weapon/reagent_containers/pill/carthatoline = 7) + wrapper_color = COLOR_GREEN_GRAY /obj/item/weapon/storage/pill_bottle/alkysine name = "bottle of Alkysine pills" desc = "Alkysine is a drug used to lessen the damage to neurological tissue after a catastrophic injury. Can heal brain tissue." starts_with = list(/obj/item/weapon/reagent_containers/pill/alkysine = 7) + wrapper_color = COLOR_YELLOW /obj/item/weapon/storage/pill_bottle/imidazoline name = "bottle of Imidazoline pills" desc = "Heals eye damage." starts_with = list(/obj/item/weapon/reagent_containers/pill/imidazoline = 7) + wrapper_color = COLOR_PURPLE_GRAY /obj/item/weapon/storage/pill_bottle/osteodaxon name = "bottle of Osteodaxon pills" desc = "An experimental drug used to heal bone fractures." starts_with = list(/obj/item/weapon/reagent_containers/pill/osteodaxon = 7) + wrapper_color = COLOR_WHITE /obj/item/weapon/storage/pill_bottle/myelamine name = "bottle of Myelamine pills" desc = "Used to rapidly clot internal hemorrhages by increasing the effectiveness of platelets." starts_with = list(/obj/item/weapon/reagent_containers/pill/myelamine = 7) + wrapper_color = COLOR_PALE_PURPLE_GRAY /obj/item/weapon/storage/pill_bottle/hyronalin name = "bottle of Hyronalin pills" desc = "Hyronalin is a medicinal drug used to counter the effect of radiation poisoning." starts_with = list(/obj/item/weapon/reagent_containers/pill/hyronalin = 7) + wrapper_color = COLOR_TEAL /obj/item/weapon/storage/pill_bottle/arithrazine name = "bottle of Arithrazine pills" desc = "Arithrazine is an unstable medication used for the most extreme cases of radiation poisoning." starts_with = list(/obj/item/weapon/reagent_containers/pill/arithrazine = 7) + wrapper_color = COLOR_TEAL /obj/item/weapon/storage/pill_bottle/corophizine name = "bottle of Corophizine pills" desc = "A wide-spectrum antibiotic drug. Powerful and uncomfortable in equal doses." starts_with = list(/obj/item/weapon/reagent_containers/pill/corophizine = 7) + wrapper_color = COLOR_PALE_GREEN_GRAY /obj/item/weapon/storage/pill_bottle/healing_nanites name = "bottle of Healing nanites capsules" diff --git a/code/modules/reagents/reagent_containers/pill_vr.dm b/code/modules/reagents/reagent_containers/pill_vr.dm index ad9663d020..30d084570f 100644 --- a/code/modules/reagents/reagent_containers/pill_vr.dm +++ b/code/modules/reagents/reagent_containers/pill_vr.dm @@ -1,7 +1,7 @@ /obj/item/weapon/reagent_containers/pill/nutriment name = "Nutriment pill" desc = "Used to feed people on the field. Contains 30 units of Nutriment." - icon_state = "pill6" + icon_state = "pill10" /obj/item/weapon/reagent_containers/pill/nutriment/Initialize() ..() @@ -10,7 +10,7 @@ /obj/item/weapon/reagent_containers/pill/protein name = "Meat pill" desc = "Used to feed carnivores on the field. Contains 30 units of Protein." - icon_state = "pill20" + icon_state = "pill24" /obj/item/weapon/reagent_containers/pill/protein/Initialize() ..() @@ -19,11 +19,12 @@ /obj/item/weapon/reagent_containers/pill/rezadone name = "Rezadone pill" desc = "A powder with almost magical properties, this substance can effectively treat genetic damage in humanoids, though excessive consumption has side effects." - icon_state = "pill13" + icon_state = "pill2" /obj/item/weapon/reagent_containers/pill/rezadone/Initialize() ..() reagents.add_reagent("rezadone", 5) + color = reagents.get_color() /obj/item/weapon/reagent_containers/pill/peridaxon name = "Peridaxon pill" @@ -37,38 +38,42 @@ /obj/item/weapon/reagent_containers/pill/carthatoline name = "Carthatoline pill" desc = "Carthatoline is strong evacuant used to treat severe poisoning." - icon_state = "pill17" + icon_state = "pill4" /obj/item/weapon/reagent_containers/pill/carthatoline/Initialize() ..() reagents.add_reagent("carthatoline", 10) + color = reagents.get_color() /obj/item/weapon/reagent_containers/pill/alkysine name = "Alkysine pill" desc = "Alkysine is a drug used to lessen the damage to neurological tissue after a catastrophic injury. Can heal brain tissue." - icon_state = "pill7" + icon_state = "pill3" /obj/item/weapon/reagent_containers/pill/alkysine/Initialize() ..() reagents.add_reagent("alkysine", 10) + color = reagents.get_color() /obj/item/weapon/reagent_containers/pill/imidazoline name = "Imidazoline pill" desc = "Heals eye damage." - icon_state = "pill9" + icon_state = "pill3" /obj/item/weapon/reagent_containers/pill/imidazoline/Initialize() ..() reagents.add_reagent("imidazoline", 15) + color = reagents.get_color() /obj/item/weapon/reagent_containers/pill/osteodaxon name = "Osteodaxon pill" desc = "An experimental drug used to heal bone fractures." - icon_state = "pill19" + icon_state = "pill2" /obj/item/weapon/reagent_containers/pill/osteodaxon/Initialize() ..() reagents.add_reagent("osteodaxon", 10) + color = reagents.get_color() /obj/item/weapon/reagent_containers/pill/myelamine name = "Myelamine pill" @@ -78,15 +83,17 @@ /obj/item/weapon/reagent_containers/pill/myelamine/Initialize() ..() reagents.add_reagent("myelamine", 10) + color = reagents.get_color() /obj/item/weapon/reagent_containers/pill/hyronalin name = "Hyronalin pill" desc = "Hyronalin is a medicinal drug used to counter the effect of radiation poisoning." - icon_state = "pill17" + icon_state = "pill4" /obj/item/weapon/reagent_containers/pill/hyronalin/Initialize() ..() reagents.add_reagent("hyronalin", 15) + color = reagents.get_color() /obj/item/weapon/reagent_containers/pill/arithrazine name = "Arithrazine pill" @@ -96,21 +103,24 @@ /obj/item/weapon/reagent_containers/pill/arithrazine/Initialize() ..() reagents.add_reagent("arithrazine", 5) + color = reagents.get_color() /obj/item/weapon/reagent_containers/pill/corophizine name = "Corophizine pill" desc = "A wide-spectrum antibiotic drug. Powerful and uncomfortable in equal doses." - icon_state = "pill9" + icon_state = "pill2" /obj/item/weapon/reagent_containers/pill/corophizine/Initialize() ..() reagents.add_reagent("corophizine", 5) + color = reagents.get_color() /obj/item/weapon/reagent_containers/pill/healing_nanites name = "Healing nanites capsule" desc = "Miniature medical robots that swiftly restore bodily damage." - icon_state = "pill5" + icon_state = "pill1" /obj/item/weapon/reagent_containers/pill/healing_nanites/Initialize() ..() reagents.add_reagent("healing_nanites", 30) + color = reagents.get_color() From 819d211b230adc769fcb29e3a59e36afb814a806 Mon Sep 17 00:00:00 2001 From: Heroman Date: Wed, 28 Aug 2019 18:21:52 +1000 Subject: [PATCH 23/36] Fixes power not updating when shuttle moves --- code/game/area/areas_vr.dm | 6 ++++++ code/game/machinery/telecomms/presets_vr.dm | 3 +++ code/modules/power/apc_vr.dm | 9 +++++++++ vorestation.dme | 2 ++ 4 files changed, 20 insertions(+) create mode 100644 code/game/area/areas_vr.dm create mode 100644 code/modules/power/apc_vr.dm diff --git a/code/game/area/areas_vr.dm b/code/game/area/areas_vr.dm new file mode 100644 index 0000000000..d422c1cd0f --- /dev/null +++ b/code/game/area/areas_vr.dm @@ -0,0 +1,6 @@ +/area/shuttle_arrived() + .=..() + for(var/obj/machinery/telecomms/relay/R in contents) + R.reset_z() + for(var/obj/machinery/power/apc/A in contents) + A.update_area() diff --git a/code/game/machinery/telecomms/presets_vr.dm b/code/game/machinery/telecomms/presets_vr.dm index 1bd6b92460..01a07a5f5e 100644 --- a/code/game/machinery/telecomms/presets_vr.dm +++ b/code/game/machinery/telecomms/presets_vr.dm @@ -3,3 +3,6 @@ hide = 1 produces_heat = 0 autolinkers = list("hb_relay") + +/obj/machinery/telecomms/relay/proc/reset_z() + listening_level = z diff --git a/code/modules/power/apc_vr.dm b/code/modules/power/apc_vr.dm new file mode 100644 index 0000000000..c08c9b8db0 --- /dev/null +++ b/code/modules/power/apc_vr.dm @@ -0,0 +1,9 @@ +/obj/machinery/power/apc/proc/update_area() + var/area/NA = get_area(src) + if(!(NA == area)) + if(area.apc == src) + area.apc = null + NA.apc = src + area = NA + name = "[area.name] APC" + update() \ No newline at end of file diff --git a/vorestation.dme b/vorestation.dme index e68f4c096a..a12fd39804 100644 --- a/vorestation.dme +++ b/vorestation.dme @@ -483,6 +483,7 @@ #include "code\game\antagonist\station\traitor.dm" #include "code\game\area\ai_monitored.dm" #include "code\game\area\areas.dm" +#include "code\game\area\areas_vr.dm" #include "code\game\area\asteroid_areas.dm" #include "code\game\area\Away Mission areas.dm" #include "code\game\area\Space Station 13 areas.dm" @@ -2679,6 +2680,7 @@ #include "code\modules\planet\time.dm" #include "code\modules\planet\weather.dm" #include "code\modules\power\apc.dm" +#include "code\modules\power\apc_vr.dm" #include "code\modules\power\batteryrack.dm" #include "code\modules\power\breaker_box.dm" #include "code\modules\power\cable.dm" From 66c6c1b4226ffffc52f51137a104ae70712f9f92 Mon Sep 17 00:00:00 2001 From: Heroman Date: Wed, 28 Aug 2019 19:04:47 +1000 Subject: [PATCH 24/36] Fixes editing CD access breaking CD access list --- code/game/jobs/job/captain.dm | 2 +- code/game/jobs/job/special.dm | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/code/game/jobs/job/captain.dm b/code/game/jobs/job/captain.dm index 94a32c3841..450f59ec32 100644 --- a/code/game/jobs/job/captain.dm +++ b/code/game/jobs/job/captain.dm @@ -31,7 +31,7 @@ var/datum/announcement/minor/captain_announcement = new(do_newscast = 1) H.implant_loyalty(src) */ /datum/job/captain/get_access() - return get_all_station_access() + return get_all_station_access().Copy() /datum/job/hop title = "Head of Personnel" diff --git a/code/game/jobs/job/special.dm b/code/game/jobs/job/special.dm index 7d1ccead19..fbed745240 100644 --- a/code/game/jobs/job/special.dm +++ b/code/game/jobs/job/special.dm @@ -37,8 +37,7 @@ return 1 get_access() - var/access = get_all_accesses() - return access + return get_all_accesses().Copy() /*/datum/job/centcom_visitor //For Pleasure // You mean for admin abuse... -Ace title = "CentCom Visitor" From c068e984f7ed2edbaa22d20b5a560bd9644e79c7 Mon Sep 17 00:00:00 2001 From: TheFurryFeline Date: Wed, 28 Aug 2019 13:37:20 -0400 Subject: [PATCH 25/36] Cleanup of Areas Placement On the tin, moves all areas from Space Station 13 areas_vr.dm and puts it in tether_areas2.dm --- code/game/area/Space Station 13 areas_vr.dm | 301 ------------------- maps/tether/tether_areas2.dm | 317 +++++++++++++++++++- vorestation.dme | 1 - 3 files changed, 311 insertions(+), 308 deletions(-) delete mode 100644 code/game/area/Space Station 13 areas_vr.dm diff --git a/code/game/area/Space Station 13 areas_vr.dm b/code/game/area/Space Station 13 areas_vr.dm deleted file mode 100644 index 396ab60821..0000000000 --- a/code/game/area/Space Station 13 areas_vr.dm +++ /dev/null @@ -1,301 +0,0 @@ -/area/crew_quarters/sleep/vistor_room_1 - flags = RAD_SHIELDED | BLUE_SHIELDED - -/area/crew_quarters/sleep/vistor_room_2 - flags = RAD_SHIELDED | BLUE_SHIELDED - -/area/crew_quarters/sleep/vistor_room_3 - flags = RAD_SHIELDED | BLUE_SHIELDED - -/area/crew_quarters/sleep/vistor_room_4 - flags = RAD_SHIELDED | BLUE_SHIELDED - -/area/crew_quarters/sleep/vistor_room_5 - flags = RAD_SHIELDED | BLUE_SHIELDED - -/area/crew_quarters/sleep/vistor_room_6 - flags = RAD_SHIELDED | BLUE_SHIELDED - -/area/crew_quarters/sleep/vistor_room_7 - flags = RAD_SHIELDED | BLUE_SHIELDED - -/area/crew_quarters/sleep/vistor_room_8 - flags = RAD_SHIELDED | BLUE_SHIELDED - -/area/crew_quarters/sleep/vistor_room_9 - flags = RAD_SHIELDED | BLUE_SHIELDED - -/area/crew_quarters/sleep/vistor_room_10 - flags = RAD_SHIELDED | BLUE_SHIELDED - -/area/crew_quarters/sleep/vistor_room_11 - flags = RAD_SHIELDED | BLUE_SHIELDED - -/area/crew_quarters/sleep/vistor_room_12 - flags = RAD_SHIELDED | BLUE_SHIELDED - -/area/crew_quarters/sleep/Dorm_1 - flags = RAD_SHIELDED | BLUE_SHIELDED - -/area/crew_quarters/sleep/Dorm_2 - flags = RAD_SHIELDED | BLUE_SHIELDED - -/area/crew_quarters/sleep/Dorm_3 - flags = RAD_SHIELDED | BLUE_SHIELDED - -/area/crew_quarters/sleep/Dorm_4 - flags = RAD_SHIELDED | BLUE_SHIELDED - -/area/crew_quarters/sleep/Dorm_5 - flags = RAD_SHIELDED | BLUE_SHIELDED - -/area/crew_quarters/sleep/Dorm_6 - flags = RAD_SHIELDED | BLUE_SHIELDED - -/area/crew_quarters/sleep/Dorm_7 - flags = RAD_SHIELDED | BLUE_SHIELDED - -/area/crew_quarters/sleep/Dorm_8 - flags = RAD_SHIELDED | BLUE_SHIELDED - -/area/crew_quarters/sleep/Dorm_9 - flags = RAD_SHIELDED | BLUE_SHIELDED - -/area/crew_quarters/sleep/Dorm_10 - flags = RAD_SHIELDED | BLUE_SHIELDED - -/area/teleporter/departing - name = "\improper Long-Range Teleporter" - icon_state = "teleporter" - music = "signal" - -// Override telescience shielding on some areas -/area/security/armoury - flags = BLUE_SHIELDED - -/area/security/tactical - flags = BLUE_SHIELDED - -/area/security/nuke_storage - flags = BLUE_SHIELDED - -/area/supply - flags = BLUE_SHIELDED - -// Add rad shielding to maintenance and construction sites -/area/vacant - flags = RAD_SHIELDED - -/area/maintenance - flags = RAD_SHIELDED - -/area/rnd/research_storage //Located entirely in maint under public access, so why not that too - flags = RAD_SHIELDED - -// New shuttles -/area/shuttle/administration/transit - name = "Deep Space (AS)" - icon_state = "shuttle" - -/area/shuttle/administration/away_mission - name = "Away Mission (AS)" - icon_state = "shuttle" - -/area/shuttle/awaymission/home - name = "NSB Adephagia (AM)" - icon_state = "shuttle2" - -/area/shuttle/awaymission/warp - name = "Deep Space (AM)" - icon_state = "shuttle" - -/area/shuttle/awaymission/away - name = "Away Mission (AM)" - icon_state = "shuttle2" - -/area/shuttle/awaymission/oldengbase - name = "Old Construction Site (AM)" - icon_state = "shuttle2" - -/area/shuttle/belter/station - name = "Belter Shuttle Landed" - icon_state = "shuttle2" - base_turf = /turf/simulated/floor/tiled/asteroid_steel/airless - -/area/shuttle/belter/belt //Don't use this one, use a subtype - name = "Belter Shuttle Holding Position" - icon_state = "shuttle2" - -//Placeholders -/area/shuttle/belter/belt/zone1 -/area/shuttle/belter/belt/zone2 -/area/shuttle/belter/belt/zone3 -/area/shuttle/belter/belt/zone4 - -/area/shuttle/belter/transit - name = "Belter Shuttle Warp" - icon_state = "shuttle" - -//Rouguelike Mining -/area/asteroid/rogue - var/asteroid_spawns = list() - var/mob_spawns = list() - var/shuttle_area //It would be neat if this were more dynamic, but eh. - -/area/asteroid/rogue/zone1 - name = "Asteroid Belt Zone 1" - icon_state = "red2" - shuttle_area = /area/shuttle/belter/belt/zone1 - -/area/asteroid/rogue/zone2 - name = "Asteroid Belt Zone 2" - icon_state = "blue2" - shuttle_area = /area/shuttle/belter/belt/zone2 - -/area/asteroid/rogue/zone3 - name = "Asteroid Belt Zone 3" - icon_state = "blue2" - shuttle_area = /area/shuttle/belter/belt/zone3 - -/area/asteroid/rogue/zone4 - name = "Asteroid Belt Zone 4" - icon_state = "red2" - shuttle_area = /area/shuttle/belter/belt/zone4 - -/area/medical/resleeving - name = "Resleeving Lab" - icon_state = "genetics" - -/area/bigship - name = "Bigship" - requires_power = 0 - flags = RAD_SHIELDED - sound_env = SMALL_ENCLOSED - base_turf = /turf/space - icon_state = "red2" - -/area/bigship/teleporter - name = "Bigship Teleporter Room" - -//////// Small Cruiser Areas //////// -/area/houseboat - name = "Small Cruiser" - requires_power = 0 - flags = RAD_SHIELDED - base_turf = /turf/space - icon_state = "red2" - lightswitch = TRUE - -/area/houseboat/holodeck_area - name = "Small Cruiser - Holodeck" - icon_state = "blue2" - -/area/houseboat/holodeck/off - name = "Small Cruiser Holo - Off" - icon_state = "blue2" -/area/houseboat/holodeck/beach - name = "Small Cruiser Holo - Beach" - icon_state = "blue2" -/area/houseboat/holodeck/snow - name = "Small Cruiser Holo - Snow" - icon_state = "blue2" -/area/houseboat/holodeck/desert - name = "Small Cruiser Holo - Desert" - icon_state = "blue2" -/area/houseboat/holodeck/picnic - name = "Small Cruiser Holo - Picnic" - icon_state = "blue2" -/area/houseboat/holodeck/thunderdome - name = "Small Cruiser Holo - Thunderdome" - icon_state = "blue2" -/area/houseboat/holodeck/basketball - name = "Small Cruiser Holo - Basketball" - icon_state = "blue2" -/area/houseboat/holodeck/gaming - name = "Small Cruiser Holo - Gaming Table" - icon_state = "blue2" -/area/houseboat/holodeck/space - name = "Small Cruiser Holo - Space" - icon_state = "blue2" -/area/houseboat/holodeck/bunking - name = "Small Cruiser Holo - Bunking" - icon_state = "blue2" - -/area/shuttle/cruiser/cruiser - name = "Small Cruiser Shuttle - Cruiser" - icon_state = "blue2" - base_turf = /turf/simulated/floor/tiled/techfloor -/area/shuttle/cruiser/station - name = "Small Cruiser Shuttle - Station" - icon_state = "blue2" - - -// Tether Map has this shuttle -/area/shuttle/tether/surface - name = "Tether Shuttle Landed" - icon_state = "shuttle" - base_turf = /turf/simulated/floor/reinforced - -/area/shuttle/tether/station - name = "Tether Shuttle Dock" - icon_state = "shuttle2" - -/area/shuttle/tether/transit - name = "Tether Shuttle Transit" - icon_state = "shuttle2" - -// rnd (Research and Development) -/area/rnd/research/testingrange - name = "\improper Weapons Testing Range" - icon_state = "firingrange" - -/area/rnd/research/researchdivision - name = "\improper Research Division" - icon_state = "research" - -/area/rnd/outpost - name = "\improper Research Outpost Hallway" - icon_state = "research" - -/area/rnd/outpost/airlock - name = "\improper Research Outpost Airlock" - icon_state = "green" - -/area/rnd/outpost/eva - name = "Research Outpost EVA Storage" - icon_state = "eva" - -/area/rnd/outpost/chamber - name = "\improper Research Outpost Burn Chamber" - icon_state = "engine" - -/area/rnd/outpost/atmos - name = "Research Outpost Atmospherics" - icon_state = "atmos" - -/area/rnd/outpost/storage - name = "\improper Research Outpost Gas Storage" - icon_state = "toxstorage" - -/area/rnd/outpost/mixing - name = "\improper Research Outpost Gas Mixing" - icon_state = "toxmix" - -/area/rnd/outpost/heating - name = "\improper Research Outpost Gas Heating" - icon_state = "toxmix" - -/area/rnd/outpost/testing - name = "\improper Research Outpost Testing" - icon_state = "toxtest" - -/area/maintenance/substation/outpost - name = "Research Outpost Substation" - -/area/engineering/engine_gas - name = "\improper Engine Gas Storage" - icon_state = "engine_waste" - -/area/chapel/observation - name = "\improper Chapel Observation" - icon_state = "chapel" \ No newline at end of file diff --git a/maps/tether/tether_areas2.dm b/maps/tether/tether_areas2.dm index 23e80a6404..a60d638440 100644 --- a/maps/tether/tether_areas2.dm +++ b/maps/tether/tether_areas2.dm @@ -300,7 +300,57 @@ name = "\improper Research Bathroom" icon_state = "research" +//TFF 28/8/19 - cleanup of areas placement +/area/rnd/research/testingrange + name = "\improper Weapons Testing Range" + icon_state = "firingrange" + +/area/rnd/research/researchdivision + name = "\improper Research Division" + icon_state = "research" + + //Outpost areas +//TFF 28/8/19 - cleanup of areas placement +/area/rnd/outpost + name = "\improper Research Outpost Hallway" + icon_state = "research" + +/area/rnd/outpost/airlock + name = "\improper Research Outpost Airlock" + icon_state = "green" + +/area/rnd/outpost/eva + name = "Research Outpost EVA Storage" + icon_state = "eva" + +/area/rnd/outpost/chamber + name = "\improper Research Outpost Burn Chamber" + icon_state = "engine" + +/area/rnd/outpost/atmos + name = "Research Outpost Atmospherics" + icon_state = "atmos" + +/area/rnd/outpost/storage + name = "\improper Research Outpost Gas Storage" + icon_state = "toxstorage" + +/area/rnd/outpost/mixing + name = "\improper Research Outpost Gas Mixing" + icon_state = "toxmix" + +/area/rnd/outpost/heating + name = "\improper Research Outpost Gas Heating" + icon_state = "toxmix" + +/area/rnd/outpost/testing + name = "\improper Research Outpost Testing" + icon_state = "toxtest" + +/area/maintenance/substation/outpost + name = "Research Outpost Substation" + /area/rnd/outpost/anomaly_lab name = "\improper Research Outpost Anomaly Lab" icon_state = "research" @@ -316,6 +366,7 @@ /area/rnd/outpost/xenoarch_storage name = "\improper Research Outpost Xenoarch Storage" icon_state = "research" + // Misc /area/hallway/lower/third_south name = "\improper Hallway Third Floor South" @@ -343,7 +394,14 @@ name = "\improper Panic Shelter" flags = RAD_SHIELDED //It just makes sense - +/area/tether/station/public_meeting_room + name = "Public Meeting Room" + icon_state = "blue" + sound_env = SMALL_SOFTFLOOR +//TFF 28/8/19 - cleanup of areas placement +/area/chapel/observation + name = "\improper Chapel Observation" + icon_state = "chapel" // // Station Z Levels @@ -390,6 +448,73 @@ icon_state = "Sleep" flags = RAD_SHIELDED +//TFF 28/8/19 - cleanup of areas placement +/area/crew_quarters/sleep/vistor_room_1 + flags = RAD_SHIELDED | BLUE_SHIELDED + +/area/crew_quarters/sleep/vistor_room_2 + flags = RAD_SHIELDED | BLUE_SHIELDED + +/area/crew_quarters/sleep/vistor_room_3 + flags = RAD_SHIELDED | BLUE_SHIELDED + +/area/crew_quarters/sleep/vistor_room_4 + flags = RAD_SHIELDED | BLUE_SHIELDED + +/area/crew_quarters/sleep/vistor_room_5 + flags = RAD_SHIELDED | BLUE_SHIELDED + +/area/crew_quarters/sleep/vistor_room_6 + flags = RAD_SHIELDED | BLUE_SHIELDED + +/area/crew_quarters/sleep/vistor_room_7 + flags = RAD_SHIELDED | BLUE_SHIELDED + +/area/crew_quarters/sleep/vistor_room_8 + flags = RAD_SHIELDED | BLUE_SHIELDED + +/area/crew_quarters/sleep/vistor_room_9 + flags = RAD_SHIELDED | BLUE_SHIELDED + +/area/crew_quarters/sleep/vistor_room_10 + flags = RAD_SHIELDED | BLUE_SHIELDED + +/area/crew_quarters/sleep/vistor_room_11 + flags = RAD_SHIELDED | BLUE_SHIELDED + +/area/crew_quarters/sleep/vistor_room_12 + flags = RAD_SHIELDED | BLUE_SHIELDED + +/area/crew_quarters/sleep/Dorm_1 + flags = RAD_SHIELDED | BLUE_SHIELDED + +/area/crew_quarters/sleep/Dorm_2 + flags = RAD_SHIELDED | BLUE_SHIELDED + +/area/crew_quarters/sleep/Dorm_3 + flags = RAD_SHIELDED | BLUE_SHIELDED + +/area/crew_quarters/sleep/Dorm_4 + flags = RAD_SHIELDED | BLUE_SHIELDED + +/area/crew_quarters/sleep/Dorm_5 + flags = RAD_SHIELDED | BLUE_SHIELDED + +/area/crew_quarters/sleep/Dorm_6 + flags = RAD_SHIELDED | BLUE_SHIELDED + +/area/crew_quarters/sleep/Dorm_7 + flags = RAD_SHIELDED | BLUE_SHIELDED + +/area/crew_quarters/sleep/Dorm_8 + flags = RAD_SHIELDED | BLUE_SHIELDED + +/area/crew_quarters/sleep/Dorm_9 + flags = RAD_SHIELDED | BLUE_SHIELDED + +/area/crew_quarters/sleep/Dorm_10 + flags = RAD_SHIELDED | BLUE_SHIELDED + /area/crew_quarters/sleep/Dorm_1/holo name = "\improper Dorm 1 Holodeck" icon_state = "dk_yellow" @@ -488,6 +613,10 @@ name = "\improper Engine Room Balcony" /area/engineering/foyer_mezzenine name = "\improper Engineering Mezzenine" +//TFF 28/8/19 - cleanup of areas placement +/area/engineering/engine_gas + name = "\improper Engine Gas Storage" + icon_state = "engine_waste" /area/hallway/station icon_state = "hallC1" @@ -530,11 +659,6 @@ /area/maintenance/station/exploration name = "\improper Exploration Maintenance" -/area/tether/station/public_meeting_room - name = "Public Meeting Room" - icon_state = "blue" - sound_env = SMALL_SOFTFLOOR - /area/shuttle/tether/crash1 name = "\improper Crash Site 1" icon_state = "shuttle2" @@ -649,6 +773,187 @@ base_turf = /turf/simulated/floor/outdoors/dirt/virgo3b +//TFF 28/8/19 - cleanup of areas placement +/area/teleporter/departing + name = "\improper Long-Range Teleporter" + icon_state = "teleporter" + music = "signal" + +// Override telescience shielding on some areas +/area/security/armoury + flags = BLUE_SHIELDED + +/area/security/tactical + flags = BLUE_SHIELDED + +/area/security/nuke_storage + flags = BLUE_SHIELDED + +/area/supply + flags = BLUE_SHIELDED + +// Add rad shielding to maintenance and construction sites +/area/vacant + flags = RAD_SHIELDED + +/area/maintenance + flags = RAD_SHIELDED + +/area/rnd/research_storage //Located entirely in maint under public access, so why not that too + flags = RAD_SHIELDED + +// New shuttles +/area/shuttle/administration/transit + name = "Deep Space (AS)" + icon_state = "shuttle" + +/area/shuttle/administration/away_mission + name = "Away Mission (AS)" + icon_state = "shuttle" + +/area/shuttle/awaymission/home + name = "NSB Adephagia (AM)" + icon_state = "shuttle2" + +/area/shuttle/awaymission/warp + name = "Deep Space (AM)" + icon_state = "shuttle" + +/area/shuttle/awaymission/away + name = "Away Mission (AM)" + icon_state = "shuttle2" + +/area/shuttle/awaymission/oldengbase + name = "Old Construction Site (AM)" + icon_state = "shuttle2" + +/area/shuttle/belter/station + name = "Belter Shuttle Landed" + icon_state = "shuttle2" + base_turf = /turf/simulated/floor/tiled/asteroid_steel/airless + +/area/shuttle/belter/belt //Don't use this one, use a subtype + name = "Belter Shuttle Holding Position" + icon_state = "shuttle2" + +//Placeholders +/area/shuttle/belter/belt/zone1 +/area/shuttle/belter/belt/zone2 +/area/shuttle/belter/belt/zone3 +/area/shuttle/belter/belt/zone4 + +/area/shuttle/belter/transit + name = "Belter Shuttle Warp" + icon_state = "shuttle" + +//Rouguelike Mining +/area/asteroid/rogue + var/asteroid_spawns = list() + var/mob_spawns = list() + var/shuttle_area //It would be neat if this were more dynamic, but eh. + +/area/asteroid/rogue/zone1 + name = "Asteroid Belt Zone 1" + icon_state = "red2" + shuttle_area = /area/shuttle/belter/belt/zone1 + +/area/asteroid/rogue/zone2 + name = "Asteroid Belt Zone 2" + icon_state = "blue2" + shuttle_area = /area/shuttle/belter/belt/zone2 + +/area/asteroid/rogue/zone3 + name = "Asteroid Belt Zone 3" + icon_state = "blue2" + shuttle_area = /area/shuttle/belter/belt/zone3 + +/area/asteroid/rogue/zone4 + name = "Asteroid Belt Zone 4" + icon_state = "red2" + shuttle_area = /area/shuttle/belter/belt/zone4 + +/area/medical/resleeving + name = "Resleeving Lab" + icon_state = "genetics" + +/area/bigship + name = "Bigship" + requires_power = 0 + flags = RAD_SHIELDED + sound_env = SMALL_ENCLOSED + base_turf = /turf/space + icon_state = "red2" + +/area/bigship/teleporter + name = "Bigship Teleporter Room" + +//////// Small Cruiser Areas //////// +/area/houseboat + name = "Small Cruiser" + requires_power = 0 + flags = RAD_SHIELDED + base_turf = /turf/space + icon_state = "red2" + lightswitch = TRUE + +/area/houseboat/holodeck_area + name = "Small Cruiser - Holodeck" + icon_state = "blue2" + +/area/houseboat/holodeck/off + name = "Small Cruiser Holo - Off" + icon_state = "blue2" +/area/houseboat/holodeck/beach + name = "Small Cruiser Holo - Beach" + icon_state = "blue2" +/area/houseboat/holodeck/snow + name = "Small Cruiser Holo - Snow" + icon_state = "blue2" +/area/houseboat/holodeck/desert + name = "Small Cruiser Holo - Desert" + icon_state = "blue2" +/area/houseboat/holodeck/picnic + name = "Small Cruiser Holo - Picnic" + icon_state = "blue2" +/area/houseboat/holodeck/thunderdome + name = "Small Cruiser Holo - Thunderdome" + icon_state = "blue2" +/area/houseboat/holodeck/basketball + name = "Small Cruiser Holo - Basketball" + icon_state = "blue2" +/area/houseboat/holodeck/gaming + name = "Small Cruiser Holo - Gaming Table" + icon_state = "blue2" +/area/houseboat/holodeck/space + name = "Small Cruiser Holo - Space" + icon_state = "blue2" +/area/houseboat/holodeck/bunking + name = "Small Cruiser Holo - Bunking" + icon_state = "blue2" + +/area/shuttle/cruiser/cruiser + name = "Small Cruiser Shuttle - Cruiser" + icon_state = "blue2" + base_turf = /turf/simulated/floor/tiled/techfloor +/area/shuttle/cruiser/station + name = "Small Cruiser Shuttle - Station" + icon_state = "blue2" + + +// Tether Map has this shuttle +/area/shuttle/tether/surface + name = "Tether Shuttle Landed" + icon_state = "shuttle" + base_turf = /turf/simulated/floor/reinforced + +/area/shuttle/tether/station + name = "Tether Shuttle Dock" + icon_state = "shuttle2" + +/area/shuttle/tether/transit + name = "Tether Shuttle Transit" + icon_state = "shuttle2" + // Exclude some more areas from the atmos leak event so people don't get trapped when spawning. /datum/event/atmos_leak/setup() diff --git a/vorestation.dme b/vorestation.dme index e68f4c096a..546dc9effa 100644 --- a/vorestation.dme +++ b/vorestation.dme @@ -486,7 +486,6 @@ #include "code\game\area\asteroid_areas.dm" #include "code\game\area\Away Mission areas.dm" #include "code\game\area\Space Station 13 areas.dm" -#include "code\game\area\Space Station 13 areas_vr.dm" #include "code\game\dna\dna2.dm" #include "code\game\dna\dna2_domutcheck.dm" #include "code\game\dna\dna2_helpers.dm" From 11627e943f60a80fecd6730f137cc0b54fbf6ccc Mon Sep 17 00:00:00 2001 From: TheFurryFeline Date: Wed, 28 Aug 2019 15:14:43 -0400 Subject: [PATCH 26/36] Fix Rogueminer_vr Errors popped up in Travis that didn't show on DM. Thank you... Fixing the screechuing, I hope. --- code/game/area/Space Station 13 areas_vr.dm | 27 +++++++++++++++++++++ maps/tether/tether_areas2.dm | 26 -------------------- vorestation.dme | 1 + 3 files changed, 28 insertions(+), 26 deletions(-) create mode 100644 code/game/area/Space Station 13 areas_vr.dm diff --git a/code/game/area/Space Station 13 areas_vr.dm b/code/game/area/Space Station 13 areas_vr.dm new file mode 100644 index 0000000000..67d1b6b06e --- /dev/null +++ b/code/game/area/Space Station 13 areas_vr.dm @@ -0,0 +1,27 @@ +//TFF 28/8/19 - cleanup of areas placement - removes all but rogueminer_vr stuff. + +//Rouguelike Mining +/area/asteroid/rogue + var/asteroid_spawns = list() + var/mob_spawns = list() + var/shuttle_area //It would be neat if this were more dynamic, but eh. + +/area/asteroid/rogue/zone1 + name = "Asteroid Belt Zone 1" + icon_state = "red2" + shuttle_area = /area/shuttle/belter/belt/zone1 + +/area/asteroid/rogue/zone2 + name = "Asteroid Belt Zone 2" + icon_state = "blue2" + shuttle_area = /area/shuttle/belter/belt/zone2 + +/area/asteroid/rogue/zone3 + name = "Asteroid Belt Zone 3" + icon_state = "blue2" + shuttle_area = /area/shuttle/belter/belt/zone3 + +/area/asteroid/rogue/zone4 + name = "Asteroid Belt Zone 4" + icon_state = "red2" + shuttle_area = /area/shuttle/belter/belt/zone4 \ No newline at end of file diff --git a/maps/tether/tether_areas2.dm b/maps/tether/tether_areas2.dm index a60d638440..6d272a9f88 100644 --- a/maps/tether/tether_areas2.dm +++ b/maps/tether/tether_areas2.dm @@ -846,32 +846,6 @@ name = "Belter Shuttle Warp" icon_state = "shuttle" -//Rouguelike Mining -/area/asteroid/rogue - var/asteroid_spawns = list() - var/mob_spawns = list() - var/shuttle_area //It would be neat if this were more dynamic, but eh. - -/area/asteroid/rogue/zone1 - name = "Asteroid Belt Zone 1" - icon_state = "red2" - shuttle_area = /area/shuttle/belter/belt/zone1 - -/area/asteroid/rogue/zone2 - name = "Asteroid Belt Zone 2" - icon_state = "blue2" - shuttle_area = /area/shuttle/belter/belt/zone2 - -/area/asteroid/rogue/zone3 - name = "Asteroid Belt Zone 3" - icon_state = "blue2" - shuttle_area = /area/shuttle/belter/belt/zone3 - -/area/asteroid/rogue/zone4 - name = "Asteroid Belt Zone 4" - icon_state = "red2" - shuttle_area = /area/shuttle/belter/belt/zone4 - /area/medical/resleeving name = "Resleeving Lab" icon_state = "genetics" diff --git a/vorestation.dme b/vorestation.dme index 546dc9effa..e68f4c096a 100644 --- a/vorestation.dme +++ b/vorestation.dme @@ -486,6 +486,7 @@ #include "code\game\area\asteroid_areas.dm" #include "code\game\area\Away Mission areas.dm" #include "code\game\area\Space Station 13 areas.dm" +#include "code\game\area\Space Station 13 areas_vr.dm" #include "code\game\dna\dna2.dm" #include "code\game\dna\dna2_domutcheck.dm" #include "code\game\dna\dna2_helpers.dm" From 3ea538b21761055b4c913d968f7c0f3b813bb7d3 Mon Sep 17 00:00:00 2001 From: TheFurryFeline Date: Wed, 28 Aug 2019 15:36:47 -0400 Subject: [PATCH 27/36] Shush, Travis More error fixing that don't show up in DM. --- code/game/area/Space Station 13 areas_vr.dm | 19 +++++++++++++++++++ maps/tether/tether_areas2.dm | 19 ------------------- 2 files changed, 19 insertions(+), 19 deletions(-) diff --git a/code/game/area/Space Station 13 areas_vr.dm b/code/game/area/Space Station 13 areas_vr.dm index 67d1b6b06e..6e8cbff08c 100644 --- a/code/game/area/Space Station 13 areas_vr.dm +++ b/code/game/area/Space Station 13 areas_vr.dm @@ -1,5 +1,24 @@ //TFF 28/8/19 - cleanup of areas placement - removes all but rogueminer_vr stuff. +/area/shuttle/belter/station + name = "Belter Shuttle Landed" + icon_state = "shuttle2" + base_turf = /turf/simulated/floor/tiled/asteroid_steel/airless + +/area/shuttle/belter/belt //Don't use this one, use a subtype + name = "Belter Shuttle Holding Position" + icon_state = "shuttle2" + +//Placeholders +/area/shuttle/belter/belt/zone1 +/area/shuttle/belter/belt/zone2 +/area/shuttle/belter/belt/zone3 +/area/shuttle/belter/belt/zone4 + +/area/shuttle/belter/transit + name = "Belter Shuttle Warp" + icon_state = "shuttle" + //Rouguelike Mining /area/asteroid/rogue var/asteroid_spawns = list() diff --git a/maps/tether/tether_areas2.dm b/maps/tether/tether_areas2.dm index 6d272a9f88..465e333dd1 100644 --- a/maps/tether/tether_areas2.dm +++ b/maps/tether/tether_areas2.dm @@ -827,25 +827,6 @@ name = "Old Construction Site (AM)" icon_state = "shuttle2" -/area/shuttle/belter/station - name = "Belter Shuttle Landed" - icon_state = "shuttle2" - base_turf = /turf/simulated/floor/tiled/asteroid_steel/airless - -/area/shuttle/belter/belt //Don't use this one, use a subtype - name = "Belter Shuttle Holding Position" - icon_state = "shuttle2" - -//Placeholders -/area/shuttle/belter/belt/zone1 -/area/shuttle/belter/belt/zone2 -/area/shuttle/belter/belt/zone3 -/area/shuttle/belter/belt/zone4 - -/area/shuttle/belter/transit - name = "Belter Shuttle Warp" - icon_state = "shuttle" - /area/medical/resleeving name = "Resleeving Lab" icon_state = "genetics" From 73f9a0d2df9b0328f4ad82da2bdf961cc481f1ed Mon Sep 17 00:00:00 2001 From: TheFurryFeline Date: Wed, 28 Aug 2019 16:41:53 -0400 Subject: [PATCH 28/36] Please, Travis.... One additional attempt to get travis to cooperate... --- code/game/area/Space Station 13 areas_vr.dm | 6 +++++- maps/tether/tether_areas2.dm | 4 ---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/code/game/area/Space Station 13 areas_vr.dm b/code/game/area/Space Station 13 areas_vr.dm index 6e8cbff08c..c03489b307 100644 --- a/code/game/area/Space Station 13 areas_vr.dm +++ b/code/game/area/Space Station 13 areas_vr.dm @@ -43,4 +43,8 @@ /area/asteroid/rogue/zone4 name = "Asteroid Belt Zone 4" icon_state = "red2" - shuttle_area = /area/shuttle/belter/belt/zone4 \ No newline at end of file + shuttle_area = /area/shuttle/belter/belt/zone4 + +/area/engineering/engine_gas + name = "\improper Engine Gas Storage" + icon_state = "engine_waste" diff --git a/maps/tether/tether_areas2.dm b/maps/tether/tether_areas2.dm index 465e333dd1..2cf0a3f141 100644 --- a/maps/tether/tether_areas2.dm +++ b/maps/tether/tether_areas2.dm @@ -613,10 +613,6 @@ name = "\improper Engine Room Balcony" /area/engineering/foyer_mezzenine name = "\improper Engineering Mezzenine" -//TFF 28/8/19 - cleanup of areas placement -/area/engineering/engine_gas - name = "\improper Engine Gas Storage" - icon_state = "engine_waste" /area/hallway/station icon_state = "hallC1" From ba7102500774d12d82e7d4b5e5568c74a1b01673 Mon Sep 17 00:00:00 2001 From: Heroman Date: Thu, 29 Aug 2019 07:59:39 +1000 Subject: [PATCH 29/36] Adds description to Request Spice --- code/modules/admin/verbs/adminhelp_vr.dm | 1 + 1 file changed, 1 insertion(+) diff --git a/code/modules/admin/verbs/adminhelp_vr.dm b/code/modules/admin/verbs/adminhelp_vr.dm index 8d27022ae4..68d1e0c6a1 100644 --- a/code/modules/admin/verbs/adminhelp_vr.dm +++ b/code/modules/admin/verbs/adminhelp_vr.dm @@ -18,6 +18,7 @@ /client/verb/adminspice() set category = "Admin" set name = "Request Spice" + set desc = "Request admins to spice round up for you" //handle muting and automuting if(prefs.muted & MUTE_ADMINHELP) From cd5f25b853ad1a50beb77d03d475a3467e345e26 Mon Sep 17 00:00:00 2001 From: Heroman Date: Thu, 29 Aug 2019 08:12:11 +1000 Subject: [PATCH 30/36] Also adds feedback message --- code/modules/admin/verbs/adminhelp_vr.dm | 1 + 1 file changed, 1 insertion(+) diff --git a/code/modules/admin/verbs/adminhelp_vr.dm b/code/modules/admin/verbs/adminhelp_vr.dm index 68d1e0c6a1..f2df8e4eb2 100644 --- a/code/modules/admin/verbs/adminhelp_vr.dm +++ b/code/modules/admin/verbs/adminhelp_vr.dm @@ -27,6 +27,7 @@ if(alert(usr, "Are you sure you want to request the admins spice things up for you? You accept the consequences if you do.",,"No","Yes") != "No") message_admins("[ADMIN_FULLMONTY(usr)] has requested the round be spiced up a little.") + to_chat(usr, "You have requested some more spice in your round.") else to_chat(usr, "Spice request cancelled.") return From 485a458cc5699db0fd68e8228858cdf5a3776b7f Mon Sep 17 00:00:00 2001 From: Unknown Date: Thu, 29 Aug 2019 01:35:35 -0400 Subject: [PATCH 31/36] Fixes ERT Frequencies on the Tether --- maps/tether/tether-10-colony.dmm | 128 ++++++++++++++++++++++--------- maps/tether/tether_telecomms.dm | 27 +++++++ 2 files changed, 118 insertions(+), 37 deletions(-) diff --git a/maps/tether/tether-10-colony.dmm b/maps/tether/tether-10-colony.dmm index 9ced842fdb..517c9d7b21 100644 --- a/maps/tether/tether-10-colony.dmm +++ b/maps/tether/tether-10-colony.dmm @@ -16848,6 +16848,24 @@ icon_state = "dark" }, /area/centcom/specops) +"Hv" = ( +/obj/machinery/telecomms/relay/preset/centcom/tether/station_mid, +/turf/unsimulated/floor{ + icon_state = "steel" + }, +/area/centcom/command) +"HL" = ( +/obj/machinery/telecomms/relay/preset/centcom/tether/midpoint, +/turf/unsimulated/floor{ + icon_state = "steel" + }, +/area/centcom/command) +"JB" = ( +/obj/machinery/telecomms/relay/preset/centcom/tether/station_low, +/turf/unsimulated/floor{ + icon_state = "steel" + }, +/area/centcom/command) "JC" = ( /obj/machinery/power/thermoregulator, /turf/unsimulated/floor{ @@ -16860,6 +16878,18 @@ icon_state = "dark" }, /area/centcom/specops) +"JW" = ( +/obj/machinery/telecomms/relay/preset/centcom/tether/base_low, +/turf/unsimulated/floor{ + icon_state = "steel" + }, +/area/centcom/command) +"Lb" = ( +/obj/machinery/telecomms/relay/preset/centcom/tether/base_high, +/turf/unsimulated/floor{ + icon_state = "steel" + }, +/area/centcom/command) "Nt" = ( /obj/structure/reagent_dispensers/watertank, /turf/unsimulated/floor{ @@ -16893,6 +16923,18 @@ icon_state = "dark" }, /area/centcom/specops) +"Rx" = ( +/obj/machinery/telecomms/relay/preset/centcom/underdark, +/turf/unsimulated/floor{ + icon_state = "steel" + }, +/area/centcom/command) +"Sp" = ( +/obj/machinery/telecomms/relay/preset/centcom/tether/station_high, +/turf/unsimulated/floor{ + icon_state = "steel" + }, +/area/centcom/command) "UC" = ( /obj/structure/table/steel_reinforced, /obj/item/stack/cable_coil, @@ -16911,6 +16953,12 @@ icon_state = "dark" }, /area/centcom/specops) +"Xi" = ( +/obj/machinery/telecomms/relay/preset/centcom/tether/base_mid, +/turf/unsimulated/floor{ + icon_state = "steel" + }, +/area/centcom/command) "XA" = ( /obj/structure/table/steel_reinforced, /obj/item/weapon/smes_coil, @@ -16922,6 +16970,12 @@ icon_state = "dark" }, /area/centcom/specops) +"YM" = ( +/obj/machinery/telecomms/relay/preset/centcom/tether/sci_outpost, +/turf/unsimulated/floor{ + icon_state = "steel" + }, +/area/centcom/command) (1,1,1) = {" aa @@ -34372,7 +34426,7 @@ ac nK nK nK -nK +CZ nK nK ac @@ -34511,12 +34565,12 @@ Cg ho ho ac -ac -ac -ac -ac -ac -ac +nK +JW +CE +CE +JB +nK ac ac ac @@ -34653,12 +34707,12 @@ Ch Ct ho ac -ac -ac -ac -ac -ac -ac +nK +Xi +CE +CE +Hv +nK ac ac ac @@ -34795,12 +34849,12 @@ Ch BW ho ac -ac -ac -ac -ac -ac -ac +nK +Lb +CE +CE +Sp +nK ac ac ac @@ -34937,12 +34991,12 @@ Ch Ct ho ac -ac -ac -ac -ac -ac -ac +nK +CE +CE +CE +YM +nK ac ac ac @@ -35079,12 +35133,12 @@ Ch BW ho ac -ac -ac -ac -ac -ac -ac +nK +HL +CE +CE +Rx +nK ac ac ac @@ -35221,12 +35275,12 @@ Ch Ct ho ac -ac -ac -ac -ac -ac -ac +nK +nK +nK +nK +nK +nK ac ac ac diff --git a/maps/tether/tether_telecomms.dm b/maps/tether/tether_telecomms.dm index d60188b834..e64a33d40c 100644 --- a/maps/tether/tether_telecomms.dm +++ b/maps/tether/tether_telecomms.dm @@ -8,48 +8,75 @@ listening_level = Z_LEVEL_SURFACE_LOW autolinkers = list("tbl_relay") +/obj/machinery/telecomms/relay/preset/centcom/tether/base_low + listening_level = Z_LEVEL_SURFACE_LOW + /obj/machinery/telecomms/relay/preset/tether/base_mid id = "Base Relay 2" listening_level = Z_LEVEL_SURFACE_MID autolinkers = list("tbm_relay") +/obj/machinery/telecomms/relay/preset/centcom/tether/base_mid + listening_level = Z_LEVEL_SURFACE_MID + /obj/machinery/telecomms/relay/preset/tether/base_high id = "Base Relay 3" listening_level = Z_LEVEL_SURFACE_HIGH autolinkers = list("tbh_relay") +/obj/machinery/telecomms/relay/preset/centcom/tether/base_high + listening_level = Z_LEVEL_SURFACE_HIGH + //Some coverage for midpoint /obj/machinery/telecomms/relay/preset/tether/midpoint id = "Midpoint Relay" listening_level = Z_LEVEL_TRANSIT autolinkers = list("tmp_relay") +/obj/machinery/telecomms/relay/preset/centcom/tether/midpoint + listening_level = Z_LEVEL_TRANSIT + // The station of course needs relays fluff-wise to connect to ground station. But again, no multi-z so, we need one for each z level. /obj/machinery/telecomms/relay/preset/tether/station_low id = "Station Relay 1" listening_level = Z_LEVEL_SPACE_LOW autolinkers = list("tsl_relay") +/obj/machinery/telecomms/relay/preset/centcom/tether/station_low + listening_level = Z_LEVEL_SPACE_LOW + /obj/machinery/telecomms/relay/preset/tether/station_mid id = "Station Relay 2" listening_level = Z_LEVEL_SPACE_MID autolinkers = list("tsm_relay") +/obj/machinery/telecomms/relay/preset/centcom/tether/station_mid + listening_level = Z_LEVEL_SPACE_MID + /obj/machinery/telecomms/relay/preset/tether/station_high id = "Station Relay 3" listening_level = Z_LEVEL_SPACE_HIGH autolinkers = list("tsh_relay") +/obj/machinery/telecomms/relay/preset/centcom/tether/station_high + listening_level = Z_LEVEL_SPACE_HIGH + /obj/machinery/telecomms/relay/preset/tether/sci_outpost id = "Science Outpost Relay" listening_level = Z_LEVEL_SOLARS autolinkers = list("sci_o_relay") +/obj/machinery/telecomms/relay/preset/centcom/tether/sci_outpost + listening_level = Z_LEVEL_SOLARS + /obj/machinery/telecomms/relay/preset/underdark id = "Mining Underground Relay" listening_level = Z_LEVEL_UNDERDARK autolinkers = list("ud_relay") +/obj/machinery/telecomms/relay/preset/centcom/underdark + listening_level = Z_LEVEL_UNDERDARK + // #### Hub #### /obj/machinery/telecomms/hub/preset/tether id = "Hub" From 083a0634a072d59d73c6e340541418945b2cda3d Mon Sep 17 00:00:00 2001 From: Anewbe Date: Thu, 29 Aug 2019 17:26:45 -0500 Subject: [PATCH 32/36] Merge pull request #6429 from Heroman3003/idfix Fixes editing colony director IDs editing global 'station access' list --- code/game/antagonist/station/highlander.dm | 4 ++-- code/game/objects/items/weapons/id cards/station_ids.dm | 4 ++-- code/modules/admin/verbs/debug.dm | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/code/game/antagonist/station/highlander.dm b/code/game/antagonist/station/highlander.dm index e2ec983818..f483b1df3b 100644 --- a/code/game/antagonist/station/highlander.dm +++ b/code/game/antagonist/station/highlander.dm @@ -47,8 +47,8 @@ var/datum/antagonist/highlander/highlanders var/obj/item/weapon/card/id/W = new(player) W.name = "[player.real_name]'s ID Card" W.icon_state = "centcom" - W.access = get_all_station_access() - W.access += get_all_centcom_access() + W.access = get_all_station_access().Copy + W.access |= get_all_centcom_access() W.assignment = "Highlander" W.registered_name = player.real_name player.equip_to_slot_or_del(W, slot_wear_id) diff --git a/code/game/objects/items/weapons/id cards/station_ids.dm b/code/game/objects/items/weapons/id cards/station_ids.dm index 867085be09..4d37f154b3 100644 --- a/code/game/objects/items/weapons/id cards/station_ids.dm +++ b/code/game/objects/items/weapons/id cards/station_ids.dm @@ -171,7 +171,7 @@ /obj/item/weapon/card/id/synthetic/Initialize() . = ..() - access = get_all_station_access() + access_synth + access = get_all_station_access().Copy() + access_synth /obj/item/weapon/card/id/centcom name = "\improper CentCom. ID" @@ -182,7 +182,7 @@ /obj/item/weapon/card/id/centcom/Initialize() . = ..() - access = get_all_centcom_access() + access = get_all_centcom_access().Copy() /obj/item/weapon/card/id/centcom/station/Initialize() . = ..() diff --git a/code/modules/admin/verbs/debug.dm b/code/modules/admin/verbs/debug.dm index 321655bb15..11541128c5 100644 --- a/code/modules/admin/verbs/debug.dm +++ b/code/modules/admin/verbs/debug.dm @@ -282,11 +282,11 @@ var/obj/item/device/pda/pda = H.wear_id id = pda.id id.icon_state = "gold" - id.access = get_all_accesses() + id.access = get_all_accesses().Copy() else var/obj/item/weapon/card/id/id = new/obj/item/weapon/card/id(M); id.icon_state = "gold" - id.access = get_all_accesses() + id.access = get_all_accesses().Copy() id.registered_name = H.real_name id.assignment = "Colony Director" id.name = "[id.registered_name]'s ID Card ([id.assignment])" From 9278ad11d3aecd09326e84a81840d87d4008c726 Mon Sep 17 00:00:00 2001 From: Heroman Date: Fri, 30 Aug 2019 10:06:36 +1000 Subject: [PATCH 34/36] Maps in distilleries --- maps/tether/tether-03-surface3.dmm | 35 +++++++++++----------- maps/tether/tether-07-station3.dmm | 47 +++++++++++++++--------------- 2 files changed, 42 insertions(+), 40 deletions(-) diff --git a/maps/tether/tether-03-surface3.dmm b/maps/tether/tether-03-surface3.dmm index 2127ee7d9d..f325ca6d4b 100644 --- a/maps/tether/tether-03-surface3.dmm +++ b/maps/tether/tether-03-surface3.dmm @@ -1069,6 +1069,15 @@ }, /turf/simulated/floor/wood, /area/tether/surfacebase/reading_room) +"cj" = ( +/obj/structure/table/woodentable, +/obj/machinery/firealarm{ + dir = 1; + pixel_y = -24 + }, +/obj/machinery/portable_atmospherics/powered/reagent_distillery, +/turf/simulated/floor/wood, +/area/tether/surfacebase/bar_backroom) "ck" = ( /obj/effect/floor_decal/borderfloor{ dir = 1 @@ -1104,6 +1113,11 @@ }, /turf/simulated/floor/tiled, /area/tether/surfacebase/atrium_three) +"cm" = ( +/obj/structure/shuttle/engine/propulsion, +/turf/simulated/floor/reinforced, +/turf/simulated/shuttle/plating/carry, +/area/shuttle/tether/surface) "cn" = ( /obj/machinery/atm{ pixel_y = 31 @@ -20261,11 +20275,6 @@ /obj/machinery/light, /turf/simulated/floor/tiled, /area/tether/surfacebase/shuttle_pad) -"HG" = ( -/obj/structure/shuttle/engine/propulsion, -/turf/simulated/floor/reinforced, -/turf/simulated/shuttle/plating/carry, -/area/shuttle/tether/surface) "HH" = ( /obj/structure/disposalpipe/segment, /obj/effect/floor_decal/borderfloor{ @@ -21321,14 +21330,6 @@ /obj/item/weapon/storage/briefcase/inflatable, /turf/simulated/floor/plating, /area/maintenance/lower/atrium) -"OV" = ( -/obj/structure/table/woodentable, -/obj/machinery/firealarm{ - dir = 1; - pixel_y = -24 - }, -/turf/simulated/floor/wood, -/area/tether/surfacebase/bar_backroom) "Pe" = ( /obj/structure/table, /turf/simulated/floor/carpet, @@ -36777,7 +36778,7 @@ Jr Js Wh JE -HG +cm IY bg RO @@ -36919,7 +36920,7 @@ Js Js Jz JE -HG +cm IY bg RO @@ -37061,7 +37062,7 @@ Jt Js Jz JE -HG +cm IY bg RO @@ -37905,7 +37906,7 @@ Tv Hw TP NO -OV +cj RB ac ac diff --git a/maps/tether/tether-07-station3.dmm b/maps/tether/tether-07-station3.dmm index a6f155c1e3..cebc944428 100644 --- a/maps/tether/tether-07-station3.dmm +++ b/maps/tether/tether-07-station3.dmm @@ -2681,6 +2681,11 @@ }, /turf/simulated/floor/tiled/dark, /area/security/security_lockerroom) +"er" = ( +/obj/structure/shuttle/engine/propulsion, +/turf/simulated/floor/reinforced, +/turf/simulated/shuttle/plating/airless/carry, +/area/shuttle/excursion/tether) "es" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/railing{ @@ -2926,10 +2931,16 @@ /turf/simulated/floor, /area/maintenance/station/ai) "eN" = ( -/obj/structure/shuttle/engine/propulsion, -/turf/simulated/floor/reinforced, -/turf/simulated/shuttle/plating/airless/carry, -/area/shuttle/excursion/tether) +/obj/structure/table/reinforced, +/obj/effect/floor_decal/borderfloorwhite{ + dir = 1 + }, +/obj/effect/floor_decal/corner/paleblue/border{ + dir = 1 + }, +/obj/machinery/portable_atmospherics/powered/reagent_distillery, +/turf/simulated/floor/tiled/white, +/area/medical/chemistry) "eS" = ( /obj/item/frame, /obj/effect/floor_decal/rust, @@ -19160,16 +19171,6 @@ /obj/item/weapon/reagent_containers/dropper, /turf/simulated/floor/tiled/white, /area/medical/chemistry) -"DX" = ( -/obj/structure/table/reinforced, -/obj/effect/floor_decal/borderfloorwhite{ - dir = 1 - }, -/obj/effect/floor_decal/corner/paleblue/border{ - dir = 1 - }, -/turf/simulated/floor/tiled/white, -/area/medical/chemistry) "DY" = ( /obj/machinery/chemical_dispenser/full, /obj/structure/table/reinforced, @@ -38576,7 +38577,7 @@ Aq Aw Ck Dq -DX +eN ES FH Gx @@ -40535,7 +40536,7 @@ Zy WG dj XA -eN +er ms Oz be @@ -40677,7 +40678,7 @@ UJ Xb dj XN -eN +er ms Xq be @@ -40819,7 +40820,7 @@ iW WS dj XN -eN +er ms Vb be @@ -41102,7 +41103,7 @@ jZ WR Xo XN -eN +er cK ms Xq @@ -41670,7 +41671,7 @@ ea kx dj XN -eN +er cK ms mq @@ -41955,7 +41956,7 @@ kQ TG dj XN -eN +er ms nA be @@ -42097,7 +42098,7 @@ kR Vd dj XN -eN +er ms QL be @@ -42239,7 +42240,7 @@ ZE ZB dj XB -eN +er ms Sq be From 7aa1002e6888ed9fc562a23857ae0b63c5bde720 Mon Sep 17 00:00:00 2001 From: Spades Date: Fri, 30 Aug 2019 07:40:15 -0400 Subject: [PATCH 35/36] Update ISSUE_TEMPLATE.md --- .github/ISSUE_TEMPLATE.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md index 9af84740ad..9a687fb442 100644 --- a/.github/ISSUE_TEMPLATE.md +++ b/.github/ISSUE_TEMPLATE.md @@ -1,4 +1,4 @@ -#### Brief description of the issue +#### Brief description of the bug #### What you expected to happen From febabf8899eb79c3fa89d335fa63322899894b4d Mon Sep 17 00:00:00 2001 From: Verkister Date: Fri, 30 Aug 2019 15:53:16 +0300 Subject: [PATCH 36/36] Actually fixes icon scaling on later byond versions -Fixes the missing KEEP_TOGETHER flag required for overlay scaling in the newer versions. -Fixes it for all atoms, not just mobs that have gone through vore setup. Literally nothing needs mismatched overlay scaling. -Fixes the toggle scaling mode verb having been made to toggle the inheritance flag as well for no fucking reason what the hell. -Actually tested working before pushing. --- code/game/atoms_movable.dm | 2 +- code/modules/client/preference_setup/vore/02_size.dm | 1 - code/modules/vore/eating/living_vr.dm | 1 - 3 files changed, 1 insertion(+), 3 deletions(-) diff --git a/code/game/atoms_movable.dm b/code/game/atoms_movable.dm index adaabce442..c8f0b44c3d 100644 --- a/code/game/atoms_movable.dm +++ b/code/game/atoms_movable.dm @@ -1,6 +1,6 @@ /atom/movable layer = OBJ_LAYER - appearance_flags = TILE_BOUND|PIXEL_SCALE + appearance_flags = TILE_BOUND|PIXEL_SCALE|KEEP_TOGETHER //VOREStation Edit var/last_move = null var/anchored = 0 // var/elevation = 2 - not used anywhere diff --git a/code/modules/client/preference_setup/vore/02_size.dm b/code/modules/client/preference_setup/vore/02_size.dm index dcccf64ae0..2fe8b54e98 100644 --- a/code/modules/client/preference_setup/vore/02_size.dm +++ b/code/modules/client/preference_setup/vore/02_size.dm @@ -46,7 +46,6 @@ character.weight_loss = pref.weight_loss character.fuzzy = pref.fuzzy character.appearance_flags -= pref.fuzzy*PIXEL_SCALE - character.appearance_flags |= KEEP_TOGETHER character.resize(pref.size_multiplier, animate = FALSE) /datum/category_item/player_setup_item/vore/size/content(var/mob/user) diff --git a/code/modules/vore/eating/living_vr.dm b/code/modules/vore/eating/living_vr.dm index f372ebe37d..8c5f15f741 100644 --- a/code/modules/vore/eating/living_vr.dm +++ b/code/modules/vore/eating/living_vr.dm @@ -658,7 +658,6 @@ set category = "Preferences" set desc = "Switch sharp/fuzzy scaling for current mob." appearance_flags ^= PIXEL_SCALE - appearance_flags ^= KEEP_TOGETHER /mob/living/examine(mob/user, distance, infix, suffix) . = ..(user, distance, infix, suffix)