From 833ec48c4c156776d74e13d08bce4c719478d797 Mon Sep 17 00:00:00 2001 From: TheFurryFeline <38586851+TheFurryFeline@users.noreply.github.com> Date: Fri, 22 Nov 2019 19:05:15 -0500 Subject: [PATCH 1/3] Boss Event Fixy Used to be for Locker Room Maint, which was a dumb name for a maint that's in the FORE of the Chapel area, so... chapel_fore it is. --- code/modules/events/boss.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/modules/events/boss.dm b/code/modules/events/boss.dm index 31bc9dd09c..9d7b0b8f76 100644 --- a/code/modules/events/boss.dm +++ b/code/modules/events/boss.dm @@ -42,7 +42,7 @@ spawn_area_type = /area/hydroponics/garden locstring = "the public garden" if(LOC_MAINTENANCE) - spawn_area_type = /area/maintenance/locker + spawn_area_type = /area/maintenance/chapel_fore locstring = "far northern maintenance tunnels" if(LOC_CONSTR) spawn_area_type = /area/construction @@ -113,4 +113,4 @@ #undef BOSS_DRAGON #undef BOSS_PANTHER #undef BOSS_MOTHER -#undef BOSS_CHUNGUS \ No newline at end of file +#undef BOSS_CHUNGUS From f843acc64704d7135e4d2fa4f45dfe78ba918193 Mon Sep 17 00:00:00 2001 From: TheFurryFeline <38586851+TheFurryFeline@users.noreply.github.com> Date: Sat, 23 Nov 2019 05:11:17 -0500 Subject: [PATCH 2/3] Shut up, Travis --- code/modules/events/boss.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/modules/events/boss.dm b/code/modules/events/boss.dm index 9d7b0b8f76..a20599a8e9 100644 --- a/code/modules/events/boss.dm +++ b/code/modules/events/boss.dm @@ -2,7 +2,7 @@ #define LOC_CHAPEL 1 #define LOC_LIBRARY 2 #define LOC_GARDEN 3 -#define LOC_MAINTENANCE 4 +#define LOC_MAINTENANCE 4 #define LOC_CONSTR 5 #define BOSS_METROID 0 @@ -102,7 +102,7 @@ #undef LOC_CHAPEL #undef LOC_LIBRARY #undef LOC_GARDEN -#undef LOC_MAINTENANCE +#undef LOC_MAINTENANCE #undef LOC_CONSTR #undef BOSS_METROID From 85e8aa23b859b3dceda46905cfd4a36f085baf6f Mon Sep 17 00:00:00 2001 From: TheFurryFeline <38586851+TheFurryFeline@users.noreply.github.com> Date: Sun, 24 Nov 2019 18:17:13 -0500 Subject: [PATCH 3/3] Now Sod Off, Travis Turns out that issue was area test didn't have chapel_fore/aft enabled and needed to be in Space Station 13 areas_vr.dm. Pbt. --- code/game/area/Space Station 13 areas_vr.dm | 10 ++++++++++ maps/northern_star/northern_star_areas.dm | 8 -------- 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/code/game/area/Space Station 13 areas_vr.dm b/code/game/area/Space Station 13 areas_vr.dm index 330d703ac0..1acffac70d 100644 --- a/code/game/area/Space Station 13 areas_vr.dm +++ b/code/game/area/Space Station 13 areas_vr.dm @@ -248,3 +248,13 @@ /area/engineering/engine_gas name = "\improper Engine Gas Storage" icon_state = "engine_waste" + +//CHOMPStation Addition Start - TFF 24/11/19 - New areas for Chapel Maint. +/area/maintenance/chapel_aft + name = "Chapel Maintenance - Aft" + icon_state = "maint_chapel" + +/area/maintenance/chapel_fore + name = "Chapel Maintenance - Fore" + icon_state = "maint_chapel" +//CHOMPStation Addition End \ No newline at end of file diff --git a/maps/northern_star/northern_star_areas.dm b/maps/northern_star/northern_star_areas.dm index a2aefa226c..b83c762aba 100644 --- a/maps/northern_star/northern_star_areas.dm +++ b/maps/northern_star/northern_star_areas.dm @@ -26,14 +26,6 @@ name = "Mining Outpost Emergency Storage" //TFF 28/9/19 - Add more areas. Again. -/area/maintenance/chapel_aft - name = "Chapel Maintenance - Aft" - icon_state = "maint_chapel" - -/area/maintenance/chapel_fore - name = "Chapel Maintenance - Fore" - icon_state = "maint_chapel" - /area/crew_quarters/bar_backroom name = "Bar Backroom" icon_state = "bar"