mirror of
https://github.com/ParadiseSS13/Paradise.git
synced 2026-08-23 12:07:27 +01:00
Fix varedited areas on Meta. (#20122)
* Fix varedited areas on Meta. * inherited vars
This commit is contained in:
+1035
-2755
File diff suppressed because it is too large
Load Diff
@@ -890,6 +890,9 @@ NOTE: there are two lists of areas in the end of this file: centcom and station
|
||||
icon_state = "meeting"
|
||||
sound_environment = SOUND_AREA_MEDIUM_SOFTFLOOR
|
||||
|
||||
/area/bridge/hall
|
||||
name = "\improper Command Hallway"
|
||||
|
||||
/area/crew_quarters/captain
|
||||
name = "\improper Captain's Office"
|
||||
icon_state = "captainoffice"
|
||||
@@ -981,6 +984,9 @@ NOTE: there are two lists of areas in the end of this file: centcom and station
|
||||
icon_state = "toilet"
|
||||
sound_environment = SOUND_AREA_SMALL_ENCLOSED
|
||||
|
||||
/area/crew_quarters/toilet/aux
|
||||
name = "\improper Auxiliary Toilets"
|
||||
|
||||
/area/crew_quarters/sleep
|
||||
name = "\improper Primary Cyrogenic Dormitories"
|
||||
icon_state = "Sleep"
|
||||
@@ -1002,6 +1008,9 @@ NOTE: there are two lists of areas in the end of this file: centcom and station
|
||||
name = "\improper Fitness Room"
|
||||
icon_state = "fitness"
|
||||
|
||||
/area/crew_quarters/recreation
|
||||
name = "\improper Recreation Area"
|
||||
|
||||
/area/crew_quarters/dorms
|
||||
name = "\improper Dorms"
|
||||
icon_state = "dorms"
|
||||
@@ -1010,8 +1019,8 @@ NOTE: there are two lists of areas in the end of this file: centcom and station
|
||||
name = "\improper Arcade"
|
||||
icon_state = "arcade"
|
||||
|
||||
/area/crew_quarters/cafeteria
|
||||
name = "\improper Cafeteria"
|
||||
/area/crew_quarters/cafe
|
||||
name = "\improper Cafe"
|
||||
icon_state = "cafeteria"
|
||||
|
||||
/area/crew_quarters/kitchen
|
||||
@@ -1630,15 +1639,15 @@ NOTE: there are two lists of areas in the end of this file: centcom and station
|
||||
icon_state = "quart"
|
||||
sound_environment = SOUND_AREA_STANDARD_STATION
|
||||
|
||||
///////////WORK IN PROGRESS//////////
|
||||
/area/quartermaster/lobby
|
||||
name = "\improper Cargo Lobby"
|
||||
icon_state = "cargooffice"
|
||||
|
||||
/area/quartermaster/sorting
|
||||
name = "\improper Delivery Office"
|
||||
icon_state = "cargobay"
|
||||
sound_environment = SOUND_AREA_STANDARD_STATION
|
||||
|
||||
////////////WORK IN PROGRESS//////////
|
||||
|
||||
/area/quartermaster/office
|
||||
name = "\improper Cargo Office"
|
||||
icon_state = "cargooffice"
|
||||
@@ -2050,10 +2059,6 @@ NOTE: there are two lists of areas in the end of this file: centcom and station
|
||||
icon_state = "tcomms"
|
||||
sound_environment = SOUND_AREA_MEDIUM_SOFTFLOOR
|
||||
|
||||
/area/tcommsat/server
|
||||
name = "\improper Telecoms Server Room"
|
||||
icon_state = "tcomms"
|
||||
|
||||
// Away Missions
|
||||
/area/awaymission
|
||||
name = "\improper Strange Location"
|
||||
|
||||
@@ -5,7 +5,6 @@
|
||||
var/restraining = FALSE //used in cqc's disarm_act to check if the disarmed is being restrained and so whether they should be put in a chokehold or not
|
||||
var/chokehold_active = FALSE //Then uses this to determine if the restrain actually goes anywhere
|
||||
var/static/list/areas_under_siege = typecacheof(list(/area/crew_quarters/kitchen,
|
||||
/area/crew_quarters/cafeteria,
|
||||
/area/crew_quarters/bar))
|
||||
|
||||
/datum/martial_art/cqc/under_siege
|
||||
|
||||
Reference in New Issue
Block a user