shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Area Refactor + Var-edit Cleanup

Browse Source
This commit is contained in:
CitadelStationBot
2017-05-22 22:08:35 -05:00
parent 3cf30f3a6b
commit efa9de6da9
23 changed files with 15720 additions and 13643 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/__DEFINES/wires.dm
+2 -2
View File
@@ -3,8 +3,8 @@
#define WIRE_AI "AI Connection"
#define WIRE_ALARM "Alarm"
#define WIRE_AVOIDANCE "Avoidance"
#define WIRE_BACKUP1 "Auxillary Power 1"
#define WIRE_BACKUP2 "Auxillary Power 2"
#define WIRE_BACKUP1 "Auxiliary Power 1"
#define WIRE_BACKUP2 "Auxiliary Power 2"
#define WIRE_BEACON "Beacon"
#define WIRE_BOLTS "Bolts"
#define WIRE_BOOM "Boom"
code/controllers/subsystem/events.dm
+1 -1
View File
@@ -105,7 +105,7 @@ SUBSYSTEM_DEF(events)
//These are needed because /area/engine has to be removed from the list, but we still want these areas to get fucked up.
var/list/danger_areas = list(
/area/engine/break_room,
/area/engine/chiefs_office)
/area/crew_quarters/heads/chief)
//Need to locate() as it's just a list of paths.
return locate(pick((GLOB.the_station_areas - safe_areas) + danger_areas))
code/datums/weather/weather_types.dm
+1 -1
View File
@@ -134,7 +134,7 @@
area_type = /area
protected_areas = list(/area/maintenance, /area/ai_monitored/turret_protected/ai_upload, /area/ai_monitored/turret_protected/ai_upload_foyer,
/area/ai_monitored/turret_protected/ai, /area/storage/emergency, /area/storage/emergency2, /area/shuttle)
/area/ai_monitored/turret_protected/ai, /area/storage/emergency/starboard, /area/storage/emergency/port, /area/shuttle)
target_z = ZLEVEL_STATION
immunity_type = "rad"
code/game/area/Space_Station_13_areas.dm
+79 -47
View File
@@ -97,12 +97,8 @@ NOTE: there are two lists of areas in the end of this file: centcom and station
//STATION13
/area/atmos
name = "Atmospherics"
icon_state = "atmos"
flags = NONE
//Maintenance
/area/maintenance
ambientsounds = list('sound/ambience/ambimaint1.ogg',
'sound/ambience/ambimaint2.ogg',
@@ -220,15 +216,15 @@ NOTE: there are two lists of areas in the end of this file: centcom and station
/area/hallway/primary/aft
name = "Aft Primary Hallway"
icon_state = "hallA"
/area/hallway/primary/port
name = "Port Primary Hallway"
icon_state = "hallP"
/area/hallway/primary/central
name = "Central Primary Hallway"
icon_state = "hallC"
/area/hallway/secondary/exit
name = "Escape Shuttle Hallway"
icon_state = "escape"
@@ -291,7 +287,8 @@ NOTE: there are two lists of areas in the end of this file: centcom and station
//Crew
/area/crew_quarters
/area/crew_quarters/dorms
// /area/crew_quarters
name = "Dormitories"
icon_state = "Sleep"
safe = 1
@@ -498,7 +495,18 @@ NOTE: there are two lists of areas in the end of this file: centcom and station
//MedBay
/area/medical/medbay
/area/medical
name = "Medical"
icon_state = "medbay3"
/area/medical/abandoned
// /area/medical/abandoned_medbay
name = "Abandoned Medbay"
icon_state = "medbay3"
music = 'sound/ambience/signal.ogg'
/area/medical/medbay/central
// /area/medical/medbay
name = "Medbay Central"
icon_state = "medbay"
music = 'sound/ambience/signal.ogg'
@@ -588,7 +596,8 @@ NOTE: there are two lists of areas in the end of this file: centcom and station
name = "Genetics Lab"
icon_state = "genetics"
/area/medical/genetics_cloning
/area/medical/genetics/cloning
// /area/medical/genetics_cloning
name = "Cloning Lab"
icon_state = "cloning"
@@ -596,8 +605,13 @@ NOTE: there are two lists of areas in the end of this file: centcom and station
name = "Medbay Treatment Center"
icon_state = "exam_room"
//Security
/area/security
name = "Security"
icon_state = "security"
/area/security/main
name = "Security Office"
icon_state = "security"
@@ -605,6 +619,11 @@ NOTE: there are two lists of areas in the end of this file: centcom and station
/area/security/brig
name = "Brig"
icon_state = "brig"
/area/security/courtroom
// /area/crew_quarters/courtroom
name = "Courtroom"
icon_state = "courtroom"
/area/security/prison
name = "Prison Wing"
@@ -657,7 +676,8 @@ NOTE: there are two lists of areas in the end of this file: centcom and station
name = "Security Checkpoint"
icon_state = "checkpoint1"
/area/security/checkpoint2
/area/security/checkpoint/checkpoint2
// /area/security/checkpoint2
name = "Security Checkpoint"
icon_state = "security"
@@ -672,7 +692,7 @@ NOTE: there are two lists of areas in the end of this file: centcom and station
/area/security/checkpoint/medical
name = "Security Post - Medbay"
icon_state = "checkpoint1"
/area/security/checkpoint/science
name = "Security Post - Science"
icon_state = "checkpoint1"
@@ -799,9 +819,22 @@ NOTE: there are two lists of areas in the end of this file: centcom and station
name = "Art Supply Storage"
icon_state = "storage"
/area/storage/auxillary
name = "Auxillary Storage"
/area/storage/auxiliary
// /area/storage/auxillary
name = "Auxiliary Storage"
icon_state = "auxstorage"
/area/storage/atmos
// /area/maintenance/storage
name = "Atmospherics Storage"
icon_state = "atmos"
valid_territory = 0
/area/storage/tcom
// /area/maintenance/storage/tcom_storage
name = "Telecoms Storage"
icon_state = "green"
valid_territory = 0
/area/storage/eva
name = "EVA Storage"
@@ -811,11 +844,13 @@ NOTE: there are two lists of areas in the end of this file: centcom and station
name = "Secure Storage"
icon_state = "storage"
/area/storage/emergency
/area/storage/emergency/starboard
// /area/storage/emergency
name = "Starboard Emergency Storage"
icon_state = "emergencystorage"
/area/storage/emergency2
/area/storage/emergency/port
// /area/storage/emergency2
name = "Port Emergency Storage"
icon_state = "emergencystorage"
@@ -867,9 +902,15 @@ NOTE: there are two lists of areas in the end of this file: centcom and station
name = "Solar Panel Control"
icon_state = "yellow"
/area/construction/Storage
/area/construction/storage
name = "Construction Site Storage"
icon_state = "yellow"
/area/construction/storage/wing
// /area/construction/Storage
name = "Storage Wing"
icon_state = "yellow"
//AI
/area/ai_monitored/security/armory
@@ -987,14 +1028,6 @@ NOTE: there are two lists of areas in the end of this file: centcom and station
name = "Telecommunications Satellite Lounge"
icon_state = "tcomsatlounge"
/area/chapel/asteroid
name = "Chapel Asteroid"
icon_state = "explored"
/area/chapel/dock
name = "Chapel Dock"
icon_state = "construction"
/////////////////////////////////////////////////////////////////////
/*
Lists of areas to be used with is_type_in_list.
@@ -1003,28 +1036,27 @@ NOTE: there are two lists of areas in the end of this file: centcom and station
//SPACE STATION 13
GLOBAL_LIST_INIT(the_station_areas, list (
/area/atmos,
/area/maintenance,
/area/hallway,
/area/bridge,
/area/crew_quarters,
/area/holodeck,
/area/assembly,
/area/bridge,
/area/chapel,
/area/construction,
/area/crew_quarters,
/area/engine,
/area/hallway,
/area/holodeck,
/area/hydroponics,
/area/janitor,
/area/lawoffice,
/area/library,
/area/maintenance,
/area/medical,
// /area/mint, //not present on map
/area/library,
/area/chapel,
/area/lawoffice,
/area/engine,
/area/solar,
/area/assembly,
/area/teleporter,
/area/medical,
/area/security,
/area/quartermaster,
/area/janitor,
/area/hydroponics,
/area/toxins,
/area/storage,
/area/construction,
/area/quartermaster,
/area/science, // /area/toxins/
/area/security,
/area/solar,
/area/storage,
/area/teleporter,
/area/ai_monitored/storage/eva, //do not try to simplify to "/area/ai_monitored" --rastaf0
// /area/ai_monitored/storage/secure, //not present on map
// /area/ai_monitored/storage/emergency, //not present on map
code/game/area/Space_Station_13_areas.dm.rej
+74
View File
@@ -0,0 +1,74 @@
diff a/code/game/area/Space_Station_13_areas.dm b/code/game/area/Space_Station_13_areas.dm (rejected hunks)
@@ -513,10 +513,21 @@ NOTE: there are two lists of areas in the end of this file: centcom and station
/area/crew_quarters/dorms
// /area/crew_quarters
+// /area/crew_quarters/sleep
name = "Dormitories"
icon_state = "Sleep"
safe = 1
+/area/crew_quarters/dorms/male
+// /area/crew_quarters/sleep_male
+ name = "Male Dorm"
+ icon_state = "Sleep"
+
+/area/crew_quarters/dorms/female
+// /area/crew_quarters/sleep_female
+ name = "Female Dorm"
+ icon_state = "Sleep"
+
/area/crew_quarters/rehab_dome
name = "Rehabilitation Dome"
icon_state = "Sleep"
@@ -534,28 +545,18 @@ NOTE: there are two lists of areas in the end of this file: centcom and station
name = "Locker Toilets"
icon_state = "toilet"
-/area/crew_quarters/toilet/restrooms
- name = "Restrooms"
+/area/crew_quarters/toilet/female
+// /area/crew_quarters/sleep_female/toilet_female
+ name = "Female Toilets"
icon_state = "toilet"
-
-/area/crew_quarters/sleep
- name = "Dormitories"
- icon_state = "Sleep"
-
-/area/crew_quarters/sleep_male
- name = "Male Dorm"
- icon_state = "Sleep"
-
-/area/crew_quarters/sleep_male/toilet_male
+
+/area/crew_quarters/toilet/male
+// /area/crew_quarters/sleep_male/toilet_male
name = "Male Toilets"
icon_state = "toilet"
-
-/area/crew_quarters/sleep_female
- name = "Female Dorm"
- icon_state = "Sleep"
-
-/area/crew_quarters/sleep_female/toilet_female
- name = "Female Toilets"
+
+/area/crew_quarters/toilet/restrooms
+ name = "Restrooms"
icon_state = "toilet"
/area/crew_quarters/locker
@@ -565,11 +566,7 @@ NOTE: there are two lists of areas in the end of this file: centcom and station
/area/crew_quarters/lounge
name = "Lounge"
icon_state = "yellow"
-
-
-
-
-
+
/area/crew_quarters/fitness
name = "Fitness Room"
icon_state = "fitness"
code/game/area/areas/misc.dm.rej
+22
View File
@@ -0,0 +1,22 @@
diff a/code/game/area/areas/misc.dm b/code/game/area/areas/misc.dm (rejected hunks)
@@ -120,14 +120,17 @@
name = "Prisoner Education Chamber"
icon_state = "armory"
-/area/prison/cell_block/A
+/area/prison/cell_block/a
+// /area/prison/cell_block/A
name = "Prison Cell Block A"
icon_state = "brig"
-/area/prison/cell_block/B
+/area/prison/cell_block/b
+// /area/prison/cell_block/B
name = "Prison Cell Block B"
icon_state = "brig"
-/area/prison/cell_block/C
+/area/prison/cell_block/c
+// /area/prison/cell_block/C
name = "Prison Cell Block C"
icon_state = "brig"
code/game/turfs/simulated/dirtystation.dm
+4 -4
View File
@@ -25,7 +25,7 @@
//The code below here isn't exactly optimal, but because of the individual decals that each area uses it's still applicable.
//high dirt - 1/3
if(istype(A, /area/toxins/test_area) || istype(A, /area/mine/production) || istype(A, /area/mine/living_quarters) || istype(A, /area/mine/north_outpost) || istype(A, /area/mine/west_outpost) || istype(A, /area/wreck) || istype(A, /area/derelict) || istype(A, /area/djstation))
if(istype(A, /area/science/test_area) || istype(A, /area/mine/production) || istype(A, /area/mine/living_quarters) || istype(A, /area/mine/north_outpost) || istype(A, /area/mine/west_outpost) || istype(A, /area/wreck) || istype(A, /area/derelict) || istype(A, /area/djstation))
new /obj/effect/decal/cleanable/dirt(src) //vanilla, but it works
return
@@ -46,7 +46,7 @@
new /obj/effect/decal/cleanable/dirt(src)
return
if(istype(A, /area/crew_quarters/toilet) || istype(A, /area/crew_quarters/locker/locker_toilet))
if(istype(A, /area/crew_quarters/toilet) || istype(A, /area/crew_quarters/toilet/locker))
if(prob(40))
if(prob(90))
new /obj/effect/decal/cleanable/vomit/old(src)
@@ -79,7 +79,7 @@
new /obj/effect/decal/cleanable/flour(src)
return
if(istype(A, /area/medical)) //Kept clean, but chance of blood
if(istype(A, /area/medical) || !istype(A, /area/science/robotics)) //Kept clean, but chance of blood
if(prob(66))
if(prob(5))
new /obj/effect/decal/cleanable/blood/gibs/old(src)
@@ -92,7 +92,7 @@
new /obj/effect/decal/cleanable/vomit/old(src)
return
if(istype(A, /area/toxins))
if(istype(A, /area/science) || istype(A, /area/crew_quarters/heads/hor))
if(prob(20))
new /obj/effect/decal/cleanable/greenglow(src) //this cleans itself up but it might startle you when you see it.
return
code/modules/events/prison_break.dm
+2 -3
View File
@@ -8,13 +8,12 @@
announceWhen = 50
endWhen = 20
var/list/area/areasToOpen = list()
var/list/potential_areas = list(/area/atmos,
/area/bridge,
var/list/potential_areas = list(/area/bridge,
/area/engine,
/area/medical,
/area/security,
/area/quartermaster,
/area/toxins)
/area/science)
var/severity = 1
code/modules/mob/living/carbon/human/interactive.dm
+2 -2
View File
@@ -809,13 +809,13 @@
if(T.title == "Chief Medical Officer" || T.title == "Medical Doctor" || T.title == "Chemist" || T.title == "Virologist" || T.title == "Geneticist")
return /area/medical
if(T.title == "Research Director" || T.title == "Scientist" || T.title == "Roboticist")
return /area/toxins
return /area/science
if(T.title == "Head of Security" || T.title == "Warden" || T.title == "Security Officer" || T.title == "Detective")
return /area/security
if(T.title == "Botanist")
return /area/hydroponics
else
return pick(/area/hallway,/area/crew_quarters)
return pick(/area/hallway,/area/crew_quarters/locker)
/mob/living/carbon/human/interactive/proc/target_filter(target)
var/list/filtered_targets = list(/area, /turf, /obj/machinery/door, /atom/movable/light, /obj/structure/cable, /obj/machinery/atmospherics)
code/modules/research/xenobiology/xenobio_camera.dm
+1 -1
View File
@@ -12,7 +12,7 @@
/mob/camera/aiEye/remote/xenobio/setLoc(var/t)
var/area/new_area = get_area(t)
if(new_area && new_area.name == allowed_area || istype(new_area, /area/toxins/xenobiology ))
if(new_area && new_area.name == allowed_area || istype(new_area, /area/science/xenobiology ))
return ..()
else
return