From 9d60ee8d0dfbd7c3dae1fe3ffeaa2c3cadd0df86 Mon Sep 17 00:00:00 2001 From: forest2001 Date: Wed, 11 Sep 2024 04:17:54 +0100 Subject: [PATCH] map tweak and cmb --- code/game/gamemodes/cm_initialize.dm | 2 +- .../objects/effects/landmarks/landmarks.dm | 4 +- .../lazy_templates/fax_responder_base.dmm | 983 +++++++++--------- 3 files changed, 509 insertions(+), 480 deletions(-) diff --git a/code/game/gamemodes/cm_initialize.dm b/code/game/gamemodes/cm_initialize.dm index 508063b37a1d..b5a0b48c18dc 100644 --- a/code/game/gamemodes/cm_initialize.dm +++ b/code/game/gamemodes/cm_initialize.dm @@ -303,7 +303,7 @@ Additional game mode variables. if(!new_responder) return FALSE - message_admins("([new_responder.key]) joined as a Fax Responder, [new_responder.real_name].") + message_admins(SPAN_HIGHDANGER("([new_responder.key]) joined as a Fax Responder, [new_responder.real_name].")) if(responder_candidate) responder_candidate.moveToNullspace() //Nullspace it for garbage collection later. diff --git a/code/game/objects/effects/landmarks/landmarks.dm b/code/game/objects/effects/landmarks/landmarks.dm index d3ba4fd3215a..4988e60e0014 100644 --- a/code/game/objects/effects/landmarks/landmarks.dm +++ b/code/game/objects/effects/landmarks/landmarks.dm @@ -477,7 +477,9 @@ name = "CLF Fax Responder late join" job = JOB_FAX_RESPONDER_CLF - +/obj/effect/landmark/late_join/responder/cmb + name = "CMB Fax Responder late join" + job = JOB_FAX_RESPONDER_CMB //****************************************** STATIC COMMS ************************************************// /obj/effect/landmark/static_comms diff --git a/maps/templates/lazy_templates/fax_responder_base.dmm b/maps/templates/lazy_templates/fax_responder_base.dmm index 7af99a93240c..35e41ac4143e 100644 --- a/maps/templates/lazy_templates/fax_responder_base.dmm +++ b/maps/templates/lazy_templates/fax_responder_base.dmm @@ -41,9 +41,8 @@ }, /turf/open/floor/wood/ship, /area/adminlevel/ert_station/fax_response_station) -"dc" = ( -/obj/structure/bed, -/obj/item/bedsheet/ce, +"fr" = ( +/obj/structure/machinery/cryopod, /turf/open/floor/wood/ship, /area/adminlevel/ert_station/fax_response_station) "gu" = ( @@ -163,6 +162,25 @@ }, /turf/open/floor/wood/ship, /area/adminlevel/ert_station/fax_response_station) +"pu" = ( +/obj/structure/machinery/door_control/brbutton{ + pixel_y = 24; + id = "Faxes" + }, +/turf/open/floor/plating, +/area/adminlevel/ert_station/fax_response_station) +"pH" = ( +/obj/structure/machinery/door/airlock/almayer/maint/reinforced/colony{ + dir = 1 + }, +/obj/structure/machinery/door/poddoor/almayer{ + unacidable = 1; + use_power = 0; + needs_power = 0; + id = "Faxes" + }, +/turf/open/floor/almayer/test_floor4, +/area/adminlevel/ert_station/fax_response_station) "rV" = ( /obj/effect/landmark/late_join/responder/uscm/provost, /turf/open/floor/wood/ship, @@ -208,6 +226,9 @@ }, /turf/open/floor/wood/ship, /area/adminlevel/ert_station/fax_response_station) +"vc" = ( +/turf/open/floor/plating, +/area/adminlevel/ert_station/fax_response_station) "wx" = ( /obj/structure/surface/table/woodentable/fancy, /obj/structure/machinery/computer/crew/alt{ @@ -243,6 +264,17 @@ hull = 1 }, /area/adminlevel/ert_station/fax_response_station) +"wK" = ( +/obj/structure/machinery/door/airlock/almayer/maint/reinforced/colony, +/obj/structure/machinery/door/poddoor/almayer{ + unacidable = 1; + use_power = 0; + needs_power = 0; + dir = 4; + id = "Faxes" + }, +/turf/open/floor/almayer/test_floor4, +/area/adminlevel/ert_station/fax_response_station) "xb" = ( /obj/effect/landmark/late_join/responder/wey_yu, /turf/open/floor/wood/ship, @@ -339,7 +371,7 @@ "BC" = ( /turf/closed/wall/r_wall/biodome/biodome_unmeltable, /area/adminlevel/ert_station/fax_response_station) -"BQ" = ( +"BL" = ( /obj/structure/surface/table/woodentable/fancy, /obj/item/folder/red{ pixel_x = 6 @@ -351,7 +383,7 @@ pixel_x = -6; pixel_y = 6; networks_transmit = list("USCM","Colonist","Colonial Marshal","Fax Responders"); - phone_id = "UPP High Command"; + phone_id = "Colonial Marshal Bureau"; phone_category = "Comms Relay"; networks_receive = list("Fax Responders"); phone_color = "green" @@ -441,11 +473,6 @@ }, /turf/open/floor/wood/ship, /area/adminlevel/ert_station/fax_response_station) -"HL" = ( -/obj/item/bedsheet/ce, -/obj/structure/bed, -/turf/open/floor/wood/ship, -/area/adminlevel/ert_station/fax_response_station) "NP" = ( /obj/structure/machinery/light, /obj/structure/surface/table/woodentable/fancy, @@ -789,17 +816,17 @@ Yy Yy Yy Yy -Yy -Yy -Yy -Yy -Yy -Yy -Yy -Yy -Yy -Yy -Yy +Ei +Ei +Ei +Ei +Ei +Ei +Ei +Ei +Ei +Ei +Ei Yy Yy Yy @@ -836,17 +863,17 @@ Yy Yy Yy Yy -Yy -Yy -Yy -Yy -Yy -Yy -Yy -Yy -Yy -Yy -Yy +Ei +YR +CT +rV +fr +Ei +nB +CT +YO +fr +Ei Yy Yy Yy @@ -881,6 +908,21 @@ Yy Yy Yy Yy +xX +xX +Ei +EI +gu +gu +gu +Pn +EI +gu +gu +gu +Ei +xX +xX Yy Yy Yy @@ -901,6 +943,8 @@ Yy Yy Yy Yy +"} +(8,1,1) = {" Yy Yy Yy @@ -911,13 +955,26 @@ Yy Yy Yy Yy +xX +vc +pH +gu +gu +gu +gu +Pn +gu +gu +gu +gu +pH +vc +xX Yy Yy Yy Yy Yy -"} -(8,1,1) = {" Yy Yy Yy @@ -933,6 +990,8 @@ Yy Yy Yy Yy +"} +(9,1,1) = {" Yy Yy Yy @@ -943,6 +1002,21 @@ Yy Yy Yy Yy +xX +vc +Ei +gu +gu +gu +gu +Pn +gu +gu +gu +gu +Ei +vc +xX Yy Yy Yy @@ -964,7 +1038,7 @@ Yy Yy Yy "} -(9,1,1) = {" +(10,1,1) = {" Yy Yy Yy @@ -975,6 +1049,21 @@ Yy Yy Yy Yy +xX +vc +Ei +UB +ST +gu +NP +Pn +ov +ST +gu +tq +Ei +vc +xX Yy Yy Yy @@ -995,6 +1084,8 @@ Yy Yy Yy Yy +"} +(11,1,1) = {" Yy Yy Yy @@ -1005,13 +1096,26 @@ Yy Yy Yy Yy +xX +vc +Ei +Ab +bT +Bp +sx +Ei +Ab +bT +Bp +sx +Ei +vc +xX Yy Yy Yy Yy Yy -"} -(10,1,1) = {" Yy Yy Yy @@ -1027,6 +1131,8 @@ Yy Yy Yy Yy +"} +(12,1,1) = {" Yy Yy Yy @@ -1037,6 +1143,21 @@ Yy Yy Yy Yy +xX +vc +Ei +Ei +Ei +Ei +Ei +Ei +Ei +Ei +Ei +Ei +Ei +vc +xX Yy Yy Yy @@ -1058,7 +1179,7 @@ Yy Yy Yy "} -(11,1,1) = {" +(13,1,1) = {" Yy Yy Yy @@ -1069,6 +1190,21 @@ Yy Yy Yy Yy +xX +vc +vc +vc +vc +vc +vc +vc +vc +vc +vc +vc +vc +vc +xX Yy Yy Yy @@ -1089,6 +1225,8 @@ Yy Yy Yy Yy +"} +(14,1,1) = {" Yy Yy Yy @@ -1099,13 +1237,26 @@ Yy Yy Yy Yy +xX +xX +xX +xX +xX +xX +xX +vc +xX +xX +xX +xX +xX +xX +xX Yy Yy Yy Yy Yy -"} -(12,1,1) = {" Yy Yy Yy @@ -1121,6 +1272,8 @@ Yy Yy Yy Yy +"} +(15,1,1) = {" Yy Yy Yy @@ -1131,6 +1284,21 @@ Yy Yy Yy Yy +xX +BC +BC +BC +BC +BC +BC +vc +wz +wz +wz +wz +wz +wz +xX Yy Yy Yy @@ -1152,11 +1320,7 @@ Yy Yy Yy "} -(13,1,1) = {" -Yy -Yy -Yy -Yy +(16,1,1) = {" Yy Yy Yy @@ -1164,20 +1328,24 @@ Yy Yy Yy Yy -Ei -Ei -Ei -Ei -Ei -Ei -Ei -Ei -Ei -Ei -Ei Yy Yy Yy +xX +BC +YR +CT +xb +fr +BC +vc +wz +YR +CT +VV +fr +wz +xX Yy Yy Yy @@ -1199,11 +1367,7 @@ Yy Yy Yy "} -(14,1,1) = {" -Yy -Yy -Yy -Yy +(17,1,1) = {" Yy Yy Yy @@ -1211,20 +1375,24 @@ Yy Yy Yy Yy -Ei -YR -CT -rV -HL -Ei -nB -CT -YO -dc -Ei Yy Yy Yy +xX +BC +EI +gu +gu +gu +BC +vc +wz +Ba +gu +gu +gu +wz +xX Yy Yy Yy @@ -1246,8 +1414,7 @@ Yy Yy Yy "} -(15,1,1) = {" -Yy +(18,1,1) = {" Yy Yy Yy @@ -1258,20 +1425,21 @@ Yy Yy Yy Yy -Ei -EI +xX +BC gu gu gu -Pn -Ba gu +pH +vc +pH gu gu -Ei -Yy -Yy -Yy +gu +gu +wz +xX Yy Yy Yy @@ -1293,55 +1461,7 @@ Yy Yy Yy "} -(16,1,1) = {" -Yy -Yy -Yy -Yy -Yy -Yy -Yy -Yy -Yy -Yy -Yy -Ei -gu -gu -gu -gu -Pn -gu -gu -gu -gu -Ei -Yy -Yy -Yy -Yy -Yy -Yy -Yy -Yy -Yy -Yy -Yy -Yy -Yy -Yy -Yy -Yy -Yy -Yy -Yy -Yy -Yy -Yy -Yy -"} -(17,1,1) = {" -Yy +(19,1,1) = {" Yy Yy Yy @@ -1352,20 +1472,21 @@ Yy Yy Yy Yy -Ei -UB +xX +BC +FD ST gu -NP -Pn -ov +FB +BC +vc +wz +Wp ST gu -tq -Ei -Yy -Yy -Yy +am +wz +xX Yy Yy Yy @@ -1387,8 +1508,7 @@ Yy Yy Yy "} -(18,1,1) = {" -Yy +(20,1,1) = {" Yy Yy Yy @@ -1399,20 +1519,21 @@ Yy Yy Yy Yy -Ei -Ab -bT +xX +BC +EK +im Bp sx -Ei -Ab -bT +BC +vc +wz +id +Vs Bp sx -Ei -Yy -Yy -Yy +wz +xX Yy Yy Yy @@ -1434,8 +1555,7 @@ Yy Yy Yy "} -(19,1,1) = {" -Yy +(21,1,1) = {" Yy Yy Yy @@ -1446,20 +1566,21 @@ Yy Yy Yy Yy -Ei -Ei -Ei -Ei -Ei -Ei -Ei -Ei -Ei -Ei -Ei -Yy -Yy -Yy +xX +BC +BC +BC +BC +BC +BC +vc +wz +wz +wz +wz +wz +wz +xX Yy Yy Yy @@ -1481,22 +1602,7 @@ Yy Yy Yy "} -(20,1,1) = {" -Yy -Yy -Yy -Yy -Yy -Yy -Yy -Yy -Yy -Yy -Yy -Yy -Yy -Yy -Yy +(22,1,1) = {" Yy Yy Yy @@ -1507,6 +1613,21 @@ Yy Yy Yy Yy +xX +xX +xX +xX +xX +xX +xX +pu +xX +xX +xX +xX +xX +xX +xX Yy Yy Yy @@ -1528,22 +1649,7 @@ Yy Yy Yy "} -(21,1,1) = {" -Yy -Yy -Yy -Yy -Yy -Yy -Yy -Yy -Yy -Yy -Yy -Yy -Yy -Yy -Yy +(23,1,1) = {" Yy Yy Yy @@ -1554,6 +1660,21 @@ Yy Yy Yy Yy +xX +xX +xX +xX +xX +xX +xX +vc +xX +xX +xX +xX +xX +xX +xX Yy Yy Yy @@ -1575,22 +1696,7 @@ Yy Yy Yy "} -(22,1,1) = {" -Yy -Yy -Yy -Yy -Yy -Yy -Yy -Yy -Yy -Yy -Yy -Yy -Yy -Yy -Yy +(24,1,1) = {" Yy Yy Yy @@ -1601,6 +1707,21 @@ Yy Yy Yy Yy +xX +jh +jh +jh +jh +jh +jh +vc +xc +xc +xc +xc +xc +xc +xX Yy Yy Yy @@ -1622,8 +1743,7 @@ Yy Yy Yy "} -(23,1,1) = {" -Yy +(25,1,1) = {" Yy Yy Yy @@ -1632,77 +1752,26 @@ Yy Yy Yy Yy -BC -BC -BC -BC -BC -BC -Yy -Yy -Yy -wz -wz -wz -wz -wz -wz -Yy Yy Yy xX -xX -xX -xX -xX -xX -Yy -Yy -Yy -Yy -Yy -Yy -Yy -Yy -Yy -Yy -Yy -Yy -"} -(24,1,1) = {" -Yy -Yy -Yy -Yy -Yy -Yy -Yy -Yy -Yy -BC +jh YR CT -xb -HL -BC -Yy -Yy -Yy -wz +tM +fr +jh +vc +xc YR CT -VV -HL -wz +XZ +fr +xc +xX Yy Yy Yy -xX -YR -CT -gu -HL -xX Yy Yy Yy @@ -1715,135 +1784,49 @@ Yy Yy Yy Yy -"} -(25,1,1) = {" Yy Yy Yy Yy Yy +"} +(26,1,1) = {" Yy Yy Yy Yy -BC -Ba -gu -gu -gu -BC Yy Yy Yy -wz -Ba -gu -gu -gu -wz Yy Yy Yy xX +jh Ba gu gu gu -xX -Yy -Yy -Yy -Yy -Yy -Yy -Yy -Yy -Yy -Yy -Yy -Yy -"} -(26,1,1) = {" -Yy -Yy -Yy -Yy -Yy -Yy -Yy -Yy -Yy -BC -FD -ST +jh +vc +xc +Ba gu -FB -BC -Yy -Yy -Yy -wz -Wp -ST gu -am -wz -Yy -Yy -Yy -xX -ny -ST gu -BQ -xX -Yy -Yy -Yy -Yy -Yy -Yy -Yy -Yy -Yy -Yy -Yy -Yy -"} -(27,1,1) = {" -Yy -Yy -Yy -Yy +xc +xX Yy Yy Yy Yy Yy -BC -EK -im -Bp -sx -BC Yy Yy Yy -wz -id -Vs -Bp -sx -wz Yy Yy Yy -xX -wx -Vs -Bp -sx -xX Yy Yy Yy @@ -1853,11 +1836,11 @@ Yy Yy Yy Yy +"} +(27,1,1) = {" Yy Yy Yy -"} -(28,1,1) = {" Yy Yy Yy @@ -1865,32 +1848,29 @@ Yy Yy Yy Yy +xX +jh +gu +gu +gu +gu +pH +vc +pH +gu +gu +gu +gu +xc +xX Yy Yy -BC -BC -BC -BC -BC -BC Yy Yy Yy -wz -wz -wz -wz -wz -wz Yy Yy Yy -xX -xX -xX -xX -xX -xX Yy Yy Yy @@ -1904,7 +1884,7 @@ Yy Yy Yy "} -(29,1,1) = {" +(28,1,1) = {" Yy Yy Yy @@ -1915,6 +1895,21 @@ Yy Yy Yy Yy +xX +jh +uX +ST +gu +Yv +jh +vc +xc +oA +ST +gu +jV +xc +xX Yy Yy Yy @@ -1935,6 +1930,8 @@ Yy Yy Yy Yy +"} +(29,1,1) = {" Yy Yy Yy @@ -1945,13 +1942,26 @@ Yy Yy Yy Yy +xX +jh +Rh +Vs +Bp +sx +jh +vc +xc +yv +Vs +Bp +sx +xc +xX Yy Yy Yy Yy Yy -"} -(30,1,1) = {" Yy Yy Yy @@ -1967,6 +1977,8 @@ Yy Yy Yy Yy +"} +(30,1,1) = {" Yy Yy Yy @@ -1977,6 +1989,21 @@ Yy Yy Yy Yy +xX +jh +jh +jh +jh +jh +jh +vc +xc +xc +xc +xc +xc +xc +xX Yy Yy Yy @@ -2009,6 +2036,21 @@ Yy Yy Yy Yy +xX +xX +xX +xX +xX +xX +xX +vc +xX +xX +xX +xX +xX +xX +xX Yy Yy Yy @@ -2029,6 +2071,8 @@ Yy Yy Yy Yy +"} +(32,1,1) = {" Yy Yy Yy @@ -2044,9 +2088,10 @@ Yy Yy Yy Yy -"} -(32,1,1) = {" Yy +xX +vc +xX Yy Yy Yy @@ -2055,21 +2100,9 @@ Yy Yy Yy Yy -jh -jh -jh -jh -jh -jh Yy Yy Yy -xc -xc -xc -xc -xc -xc Yy Yy Yy @@ -2085,14 +2118,14 @@ Yy Yy Yy Yy +"} +(33,1,1) = {" Yy Yy Yy Yy Yy Yy -"} -(33,1,1) = {" Yy Yy Yy @@ -2101,22 +2134,16 @@ Yy Yy Yy Yy +xX +xX +xX +wK +xX +xX Yy -jh -YR -CT -tM -HL -jh Yy Yy Yy -xc -YR -CT -XZ -HL -xc Yy Yy Yy @@ -2149,21 +2176,21 @@ Yy Yy Yy Yy -jh -Ba -gu -gu -gu -jh Yy Yy Yy -xc -Ba -gu -gu +Yy +Yy +xX +nB +CT gu -xc +fr +xX +Yy +Yy +Yy +Yy Yy Yy Yy @@ -2196,21 +2223,21 @@ Yy Yy Yy Yy -jh -uX -ST -gu -Yv -jh Yy Yy Yy -xc -oA -ST +Yy +Yy +xX +EI gu -jV -xc +gu +gu +xX +Yy +Yy +Yy +Yy Yy Yy Yy @@ -2243,23 +2270,17 @@ Yy Yy Yy Yy -jh -Rh -Vs -Bp -sx -jh Yy Yy Yy -xc -yv -Vs -Bp -sx -xc Yy Yy +xX +gu +gu +gu +gu +xX Yy Yy Yy @@ -2279,32 +2300,20 @@ Yy Yy Yy Yy -"} -(37,1,1) = {" Yy Yy Yy Yy Yy Yy +"} +(37,1,1) = {" Yy Yy Yy -jh -jh -jh -jh -jh -jh Yy Yy Yy -xc -xc -xc -xc -xc -xc Yy Yy Yy @@ -2313,6 +2322,12 @@ Yy Yy Yy Yy +xX +ny +ST +gu +BL +xX Yy Yy Yy @@ -2326,8 +2341,6 @@ Yy Yy Yy Yy -"} -(38,1,1) = {" Yy Yy Yy @@ -2340,6 +2353,8 @@ Yy Yy Yy Yy +"} +(38,1,1) = {" Yy Yy Yy @@ -2354,6 +2369,12 @@ Yy Yy Yy Yy +xX +wx +Vs +Bp +sx +xX Yy Yy Yy @@ -2373,14 +2394,14 @@ Yy Yy Yy Yy -"} -(39,1,1) = {" Yy Yy Yy Yy Yy Yy +"} +(39,1,1) = {" Yy Yy Yy @@ -2395,6 +2416,12 @@ Yy Yy Yy Yy +xX +xX +xX +xX +xX +xX Yy Yy Yy