Fixes some oversights with the protection of admin areas. (#6826)

This commit is contained in:
Werner
2019-08-07 00:51:39 +02:00
committed by GitHub
parent fd3df3e451
commit ca7468ea88
6 changed files with 156 additions and 54 deletions
+8 -1
View File
@@ -91,4 +91,11 @@
* Called whenever a captain is spawned.
* Parameters: var/mob/living/carbon/human
*/
/hook/captain_spawned
/hook/captain_spawned
/**
* Shuttle moved.
* Called whenever a shuttle performs a "long jump" or "short jump"
* Parameters: var/area/departing, var/area/destination
*/
/hook/shuttle_moved
+18 -1
View File
@@ -120,6 +120,13 @@
send_emergency_team = 0 // Can no longer join the ERT.
ert_type = "NT-ERT"
/datum/controller/subsystem/responseteam/proc/close_ert_blastdoors()
var/datum/wifi/sender/door/wifi_sender = new("ert_shuttle_lockdown", src)
wifi_sender.activate("close")
/datum/controller/subsystem/responseteam/proc/close_tcfl_blastdoors()
var/datum/wifi/sender/door/wifi_sender = new("tcfl_shuttle_lockdown", src)
wifi_sender.activate("close")
/client/proc/response_team()
set name = "Dispatch Emergency Response Team"
@@ -190,4 +197,14 @@
ert.create_default(usr)
else
to_chat(usr, "You need to be an observer or new player to use this.")
to_chat(usr, "You need to be an observer or new player to use this.")
/hook/shuttle_moved/proc/close_response_blastdoors(var/area/departing, var/area/destination)
//Check if we are departing from the Odin
if(istype(departing,/area/shuttle/specops/centcom))
SSresponseteam.close_ert_blastdoors()
//Check if we are departing from the TCFL base
else if(istype(departing,/area/shuttle/legion/centcom))
SSresponseteam.close_tcfl_blastdoors()
return TRUE
+37 -2
View File
@@ -197,7 +197,7 @@
// SUBTYPE: Regular
// Your classical blast door, found almost everywhere.
obj/machinery/door/blast/regular
/obj/machinery/door/blast/regular
icon_state_open = "pdoor0"
icon_state_opening = "pdoorc0"
icon_state_closed = "pdoor1"
@@ -206,7 +206,7 @@ obj/machinery/door/blast/regular
maxhealth = 600
block_air_zones = 1
obj/machinery/door/blast/regular/open
/obj/machinery/door/blast/regular/open
icon_state = "pdoor0"
density = 0
opacity = 0
@@ -226,5 +226,40 @@ obj/machinery/door/blast/regular/open
density = 0
opacity = 0
// SUBTYPE: Odin
// Found on the odin, or where people really shouldnt get into
/obj/machinery/door/blast/odin
icon_state_open = "pdoor0"
icon_state_opening = "pdoorc0"
icon_state_closed = "pdoor1"
icon_state_closing = "pdoorc1"
icon_state = "pdoor1"
maxhealth = 1000
block_air_zones = 1
/obj/machinery/door/blast/odin/open
icon_state = "pdoor0"
density = 0
opacity = 0
/obj/machinery/door/blast/odin/attackby(obj/item/weapon/C as obj, mob/user as mob)
return
/obj/machinery/door/blast/odin/ex_act(var/severity)
return
/obj/machinery/door/blast/odin/take_damage(var/damage)
return
/obj/machinery/door/blast/odin/shuttle
icon_state = "pdoor0"
density = 0
opacity = 0
/obj/machinery/door/blast/odin/shuttle/ert
_wifi_id = "ert_shuttle_lockdown"
/obj/machinery/door/blast/odin/shuttle/tcfl
_wifi_id = "tcfl_shuttle_lockdown"
#undef BLAST_DOOR_CRUSH_DAMAGE
#undef SHUTTER_CRUSH_DAMAGE
+4
View File
@@ -29,6 +29,8 @@
if (moving_status == SHUTTLE_IDLE)
return //someone cancelled the launch
callHook("shuttle_moved", list(origin,destination))
moving_status = SHUTTLE_INTRANSIT //shouldn't matter but just to be safe
move(origin, destination)
moving_status = SHUTTLE_IDLE
@@ -42,6 +44,8 @@
if (moving_status == SHUTTLE_IDLE)
return //someone cancelled the launch
callHook("shuttle_moved", list(departing,destination))
arrive_time = world.time + travel_time*10
moving_status = SHUTTLE_INTRANSIT
move(departing, interim, direction)
+13
View File
@@ -0,0 +1,13 @@
# Your name.
author: Arrow768
# 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:
- maptweak: "Fixes a few oversights in the protection of admin-areas on the odin."
+76 -50
View File
@@ -9095,7 +9095,7 @@
},
/area/centcom/specops)
"avr" = (
/obj/machinery/door/blast/regular{
/obj/machinery/door/blast/odin{
dir = 1;
id = "ert_synth_equipment";
name = "Synthetics Modification Equipment"
@@ -9195,7 +9195,7 @@
},
/area/centcom/living)
"avG" = (
/obj/machinery/door/blast/regular{
/obj/machinery/door/blast/odin{
dir = 1;
icon_state = "pdoor1";
id = "ASSAULT";
@@ -9366,7 +9366,7 @@
},
/area/centcom/specops)
"avX" = (
/obj/machinery/door/blast/regular{
/obj/machinery/door/blast/odin{
dir = 4;
icon_state = "pdoor1";
id = "ASSAULT";
@@ -9575,7 +9575,7 @@
},
/area/centcom/control)
"awx" = (
/obj/machinery/door/blast/regular{
/obj/machinery/door/blast/odin{
dir = 1;
id = "battery3";
name = "Battery 3 Firing Door"
@@ -9599,7 +9599,7 @@
},
/area/centcom/specops)
"awA" = (
/obj/machinery/door/blast/regular{
/obj/machinery/door/blast/odin{
dir = 4;
icon_state = "pdoor1";
id = "ASSAULT3";
@@ -9946,7 +9946,7 @@
},
/area/centcom/control)
"axq" = (
/obj/machinery/door/blast/regular{
/obj/machinery/door/blast/odin{
dir = 1;
icon_state = "pdoor1";
id = "ASSAULT";
@@ -9980,7 +9980,7 @@
opacity = 1;
req_access = list(108,109)
},
/obj/machinery/door/blast/regular{
/obj/machinery/door/blast/odin{
dir = 1;
icon_state = "pdoor1";
id = "CREED";
@@ -10483,7 +10483,7 @@
},
/area/centcom/control)
"ayo" = (
/obj/machinery/door/blast/regular{
/obj/machinery/door/blast/odin{
dir = 4;
icon_state = "pdoor1";
id = "ASSAULT2";
@@ -10818,7 +10818,7 @@
},
/area/centcom/control)
"ayX" = (
/obj/machinery/door/blast/regular{
/obj/machinery/door/blast/odin{
dir = 1;
id = "battery2";
name = "Battery 2 Firing Door"
@@ -10829,7 +10829,7 @@
},
/area/centcom/control)
"ayY" = (
/obj/machinery/door/blast/regular{
/obj/machinery/door/blast/odin{
dir = 4;
icon_state = "pdoor1";
id = "ASSAULT1";
@@ -11056,7 +11056,7 @@
name = "Bluespace Artillery Deck";
opacity = 1
},
/obj/machinery/door/blast/regular{
/obj/machinery/door/blast/odin{
dir = 4;
id = "centcomm_bsa";
name = "Bluespace Artillery Deck"
@@ -11138,6 +11138,7 @@
opacity = 1;
req_access = list(103)
},
/obj/machinery/door/blast/odin/shuttle/ert,
/turf/unsimulated/floor{
icon_state = "vault";
dir = 8
@@ -11149,6 +11150,7 @@
opacity = 1;
req_access = list(103)
},
/obj/machinery/door/blast/odin/shuttle/ert,
/turf/unsimulated/floor{
icon_state = "vault";
dir = 8
@@ -11160,7 +11162,7 @@
opacity = 1;
req_access = list(103)
},
/obj/machinery/door/blast/regular{
/obj/machinery/door/blast/odin{
dir = 4;
icon_state = "pdoor1";
id = "CREED";
@@ -11193,7 +11195,7 @@
opacity = 1;
req_access = list(103)
},
/obj/machinery/door/blast/regular{
/obj/machinery/door/blast/odin{
dir = 4;
icon_state = "pdoor1";
id = "CREED";
@@ -11223,7 +11225,7 @@
name = "Bluespace Artillery Deck";
opacity = 1
},
/obj/machinery/door/blast/regular{
/obj/machinery/door/blast/odin{
dir = 4;
id = "centcomm_bsa";
name = "Bluespace Artillery Deck"
@@ -11240,7 +11242,7 @@
/turf/space/transit/north/shuttlespace_ns1,
/area/shuttle/escape/transit)
"azO" = (
/obj/machinery/door/blast/regular{
/obj/machinery/door/blast/odin{
dir = 4;
icon_state = "pdoor1";
id = "ASSAULT0";
@@ -11277,6 +11279,7 @@
opacity = 1;
req_access = list(103)
},
/obj/machinery/door/blast/odin/shuttle/ert,
/turf/unsimulated/floor{
icon_state = "vault";
dir = 8
@@ -11538,6 +11541,7 @@
opacity = 1;
req_access = list(103)
},
/obj/machinery/door/blast/odin/shuttle/ert,
/turf/unsimulated/floor{
icon_state = "vault";
dir = 8
@@ -11662,7 +11666,7 @@
},
/area/centcom/control)
"aAH" = (
/obj/machinery/door/blast/regular{
/obj/machinery/door/blast/odin{
dir = 1;
id = "battery1";
name = "Battery 1 Firing Door"
@@ -12422,7 +12426,7 @@
opacity = 1;
req_access = list(101)
},
/obj/machinery/door/blast/regular{
/obj/machinery/door/blast/odin{
dir = 1;
id = "crescent_checkpoint_access";
name = "NMSS Odin Checkpoint"
@@ -12556,7 +12560,7 @@
opacity = 1;
req_access = list(101)
},
/obj/machinery/door/blast/regular{
/obj/machinery/door/blast/odin{
dir = 1;
id = "crescent_checkpoint_access";
name = "NMSS Odin Checkpoint"
@@ -12858,7 +12862,7 @@
},
/area/centcom/holding)
"aDc" = (
/obj/machinery/door/blast/regular{
/obj/machinery/door/blast/odin{
dir = 1;
id = "CentComPort";
name = "Security Doors"
@@ -13091,7 +13095,7 @@
},
/area/centcom/holding)
"aDG" = (
/obj/machinery/door/blast/regular{
/obj/machinery/door/blast/odin{
density = 0;
dir = 1;
icon_state = "pdoor0";
@@ -13463,7 +13467,7 @@
name = "Bar Airlock";
req_access = list(101)
},
/obj/machinery/door/blast/regular{
/obj/machinery/door/blast/odin{
dir = 1;
id = "crescent_vip_shuttle";
name = "NMSS Odin VIP Shuttle"
@@ -17770,7 +17774,7 @@
},
/area/centcom/spawning)
"aNX" = (
/obj/machinery/door/blast/regular/open{
/obj/machinery/door/blast/odin/open{
dir = 1;
id = "odinaslockdown"
},
@@ -17797,7 +17801,7 @@
},
/area/centcom/spawning)
"aNZ" = (
/obj/machinery/door/blast/regular/open{
/obj/machinery/door/blast/odin/open{
dir = 1;
id = "odinaslockdown"
},
@@ -17889,7 +17893,7 @@
},
/area/centcom/holding)
"aOk" = (
/obj/machinery/door/blast/regular/open{
/obj/machinery/door/blast/odin/open{
dir = 1;
id = "odinaslockdown"
},
@@ -18668,7 +18672,7 @@
},
/area/centcom/spawning)
"aPN" = (
/obj/machinery/door/blast/regular/open{
/obj/machinery/door/blast/odin/open{
dir = 1;
id = "odinaslockdown"
},
@@ -18691,7 +18695,7 @@
},
/area/centcom/spawning)
"aPP" = (
/obj/machinery/door/blast/regular/open{
/obj/machinery/door/blast/odin/open{
dir = 1;
id = "odinaslockdown"
},
@@ -21487,7 +21491,7 @@
/area/shuttle/escape/centcom)
"aWg" = (
/obj/effect/wingrille_spawn/reinforced/crescent,
/obj/machinery/door/blast/regular{
/obj/machinery/door/blast/odin{
dir = 1;
id = "CentComArrivalsForeChkpt";
name = "Security Doors"
@@ -21593,7 +21597,7 @@
/area/shuttle/escape/centcom)
"aWr" = (
/obj/effect/wingrille_spawn/reinforced/crescent,
/obj/machinery/door/blast/regular{
/obj/machinery/door/blast/odin{
dir = 1;
id = "CentComArrivalsAftChkpt";
name = "Security Doors"
@@ -22505,7 +22509,7 @@
opacity = 1;
req_access = list(108,109)
},
/obj/machinery/door/blast/regular{
/obj/machinery/door/blast/odin{
dir = 1;
icon_state = "pdoor1";
id = "ADMIN_SHUTTLE";
@@ -23027,7 +23031,7 @@
/area/centcom/legion)
"aZK" = (
/obj/effect/floor_decal/industrial/loading,
/obj/machinery/door/blast/regular{
/obj/machinery/door/blast/odin{
id = "tcfl"
},
/turf/simulated/floor/tiled/dark,
@@ -23129,6 +23133,7 @@
name = "Leader Preparation";
req_access = list(111)
},
/obj/machinery/door/blast/odin/shuttle/tcfl,
/turf/simulated/floor/tiled/dark,
/area/centcom/legion)
"bab" = (
@@ -23136,6 +23141,7 @@
name = "Security Preparation";
req_access = list(111)
},
/obj/machinery/door/blast/odin/shuttle/tcfl,
/turf/simulated/floor/tiled/dark,
/area/centcom/legion)
"bac" = (
@@ -23143,6 +23149,7 @@
name = "Medical Preparation";
req_access = list(111)
},
/obj/machinery/door/blast/odin/shuttle/tcfl,
/turf/simulated/floor/tiled/dark,
/area/centcom/legion)
"bad" = (
@@ -23150,6 +23157,7 @@
name = "Engineering Preparation";
req_access = list(111)
},
/obj/machinery/door/blast/odin/shuttle/tcfl,
/turf/simulated/floor/tiled/dark,
/area/centcom/legion)
"bae" = (
@@ -23157,6 +23165,7 @@
name = "General Supplies";
req_access = list(111)
},
/obj/machinery/door/blast/odin/shuttle/tcfl,
/turf/simulated/floor/tiled/dark,
/area/centcom/legion)
"baf" = (
@@ -23790,7 +23799,7 @@
name = "Cmdt Office";
req_access = list(108,109)
},
/obj/machinery/door/blast/regular{
/obj/machinery/door/blast/odin{
id = "tcfl";
name = "Heavy Support"
},
@@ -23834,7 +23843,7 @@
/turf/simulated/floor/tiled/dark,
/area/centcom/legion)
"bbx" = (
/obj/machinery/door/blast/regular{
/obj/machinery/door/blast/odin{
id = "tcfl";
name = "Heavy Support"
},
@@ -24263,7 +24272,7 @@
name = "Cmdt Office";
req_access = list(108,109)
},
/obj/machinery/door/blast/regular{
/obj/machinery/door/blast/odin{
dir = 4;
id = "tcfl-c";
name = "Cmdt Office"
@@ -24469,7 +24478,7 @@
/obj/machinery/door/window/northleft{
req_access = list(101)
},
/obj/machinery/door/blast/regular{
/obj/machinery/door/blast/odin{
dir = 1;
id = "CentComArrivalsAftChkpt";
name = "Security Doors"
@@ -24535,7 +24544,7 @@
"ioS" = (
/obj/structure/table/reinforced,
/obj/machinery/door/window/southright,
/obj/machinery/door/blast/regular{
/obj/machinery/door/blast/odin{
dir = 1;
id = "CentComArrivalsForeChkpt";
name = "Security Doors"
@@ -24604,6 +24613,13 @@
icon_state = "floor"
},
/area/centcom/holding)
"jiF" = (
/obj/effect/wingrille_spawn/reinforced/crescent,
/obj/machinery/door/blast/odin/shuttle/ert,
/turf/unsimulated/floor{
name = "plating"
},
/area/centcom/specops)
"jon" = (
/obj/machinery/door/airlock/centcom{
icon = 'icons/obj/doors/Doorcomglass.dmi';
@@ -24637,7 +24653,7 @@
"jDn" = (
/obj/structure/table/reinforced,
/obj/machinery/door/window/southleft,
/obj/machinery/door/blast/regular{
/obj/machinery/door/blast/odin{
dir = 1;
id = "CentComArrivalsForeChkpt";
name = "Security Doors"
@@ -24666,7 +24682,7 @@
/obj/machinery/door/window/northright{
req_access = list(101)
},
/obj/machinery/door/blast/regular{
/obj/machinery/door/blast/odin{
dir = 1;
id = "CentComArrivalsAftChkpt";
name = "Security Doors"
@@ -24691,7 +24707,7 @@
},
/area/centcom/ferry)
"kHc" = (
/obj/machinery/door/blast/regular{
/obj/machinery/door/blast/odin{
density = 0;
dir = 1;
icon_state = "pdoor0";
@@ -24745,7 +24761,7 @@
},
/area/centcom/living)
"lAK" = (
/obj/machinery/door/blast/regular{
/obj/machinery/door/blast/odin{
density = 0;
dir = 1;
icon_state = "pdoor0";
@@ -24758,7 +24774,7 @@
},
/area/centcom/checkpoint/aft)
"lUi" = (
/obj/machinery/door/blast/regular{
/obj/machinery/door/blast/odin{
density = 0;
dir = 1;
icon_state = "pdoor0";
@@ -24779,7 +24795,7 @@
},
/area/centcom/control)
"mak" = (
/obj/machinery/door/blast/regular{
/obj/machinery/door/blast/odin{
density = 0;
dir = 1;
icon_state = "pdoor0";
@@ -24863,7 +24879,7 @@
},
/area/centcom/ferry)
"ouU" = (
/obj/machinery/door/blast/regular{
/obj/machinery/door/blast/odin{
density = 0;
dir = 1;
icon_state = "pdoor0";
@@ -25028,6 +25044,16 @@
name = "plating"
},
/area/centcom/evac)
"rod" = (
/obj/machinery/computer/shuttle_control{
req_access = list(38);
shuttle_tag = "Centcom"
},
/turf/unsimulated/floor{
icon_state = "vault";
dir = 5
},
/area/centcom/ferry)
"rwg" = (
/turf/unsimulated/floor{
icon_state = "floor"
@@ -25126,7 +25152,7 @@
},
/area/centcom/living)
"tAQ" = (
/obj/machinery/door/blast/regular{
/obj/machinery/door/blast/odin{
density = 0;
dir = 1;
icon_state = "pdoor0";
@@ -25164,7 +25190,7 @@
},
/area/centcom/control)
"vio" = (
/obj/machinery/door/blast/regular{
/obj/machinery/door/blast/odin{
density = 0;
dir = 1;
icon_state = "pdoor0";
@@ -25333,7 +25359,7 @@
name = "Cmdt Office";
req_access = list(108,109)
},
/obj/machinery/door/blast/regular{
/obj/machinery/door/blast/odin{
id = "tcfl-c";
name = "Cmdt Office"
},
@@ -55071,8 +55097,8 @@ ave
azS
aAg
ave
axZ
axZ
jiF
jiF
ave
ave
ave
@@ -56607,8 +56633,8 @@ awK
ave
ave
ave
axZ
axZ
jiF
jiF
ave
azV
aAh
@@ -60224,7 +60250,7 @@ aDm
aDm
aDm
aDM
aDY
rod
aDY
aDY
aDM