rej clean up
more areas
This commit is contained in:
LetterJay
@@ -1,161 +0,0 @@
|
||||
diff a/_maps/map_files/Cerestation/cerestation.dmm b/_maps/map_files/Cerestation/cerestation.dmm (rejected hunks)
|
||||
@@ -8756,7 +8756,7 @@
|
||||
/turf/closed/wall/r_wall{
|
||||
baseturf = /turf/open/floor/plating/asteroid/airless
|
||||
},
|
||||
-/area/medical/cmo/private)
|
||||
+/area/crew_quarters/heads/cmo/private)
|
||||
"arL" = (
|
||||
/obj/machinery/vending/cigarette{
|
||||
extended_inventory = 1
|
||||
@@ -9169,7 +9169,7 @@
|
||||
/turf/open/floor/carpet{
|
||||
baseturf = /turf/open/floor/plating/asteroid/airless
|
||||
},
|
||||
-/area/medical/cmo/private)
|
||||
+/area/crew_quarters/heads/cmo/private)
|
||||
"asG" = (
|
||||
/obj/machinery/light_switch{
|
||||
pixel_y = 25
|
||||
@@ -9177,26 +9177,26 @@
|
||||
/turf/open/floor/carpet{
|
||||
baseturf = /turf/open/floor/plating/asteroid/airless
|
||||
},
|
||||
-/area/medical/cmo/private)
|
||||
+/area/crew_quarters/heads/cmo/private)
|
||||
"asH" = (
|
||||
/obj/structure/table/wood,
|
||||
/obj/item/device/modular_computer/laptop/preset/civillian,
|
||||
/turf/open/floor/carpet{
|
||||
baseturf = /turf/open/floor/plating/asteroid/airless
|
||||
},
|
||||
-/area/medical/cmo/private)
|
||||
+/area/crew_quarters/heads/cmo/private)
|
||||
"asI" = (
|
||||
/obj/structure/table/wood,
|
||||
/obj/item/weapon/paper_bin,
|
||||
/turf/open/floor/carpet{
|
||||
baseturf = /turf/open/floor/plating/asteroid/airless
|
||||
},
|
||||
-/area/medical/cmo/private)
|
||||
+/area/crew_quarters/heads/cmo/private)
|
||||
"asJ" = (
|
||||
/turf/closed/wall{
|
||||
baseturf = /turf/open/floor/plating/asteroid/airless
|
||||
},
|
||||
-/area/medical/cmo/private)
|
||||
+/area/crew_quarters/heads/cmo/private)
|
||||
"asK" = (
|
||||
/obj/machinery/vending/boozeomat,
|
||||
/turf/open/floor/carpet{
|
||||
@@ -9739,12 +9739,12 @@
|
||||
/turf/open/floor/carpet{
|
||||
baseturf = /turf/open/floor/plating/asteroid/airless
|
||||
},
|
||||
-/area/medical/cmo/private)
|
||||
+/area/crew_quarters/heads/cmo/private)
|
||||
"atO" = (
|
||||
/turf/open/floor/carpet{
|
||||
baseturf = /turf/open/floor/plating/asteroid/airless
|
||||
},
|
||||
-/area/medical/cmo/private)
|
||||
+/area/crew_quarters/heads/cmo/private)
|
||||
"atP" = (
|
||||
/obj/structure/chair{
|
||||
dir = 1
|
||||
@@ -9752,14 +9752,14 @@
|
||||
/turf/open/floor/carpet{
|
||||
baseturf = /turf/open/floor/plating/asteroid/airless
|
||||
},
|
||||
-/area/medical/cmo/private)
|
||||
+/area/crew_quarters/heads/cmo/private)
|
||||
"atQ" = (
|
||||
/obj/structure/table/wood,
|
||||
/obj/item/device/flashlight/lamp,
|
||||
/turf/open/floor/carpet{
|
||||
baseturf = /turf/open/floor/plating/asteroid/airless
|
||||
},
|
||||
-/area/medical/cmo/private)
|
||||
+/area/crew_quarters/heads/cmo/private)
|
||||
"atR" = (
|
||||
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
|
||||
/turf/closed/wall{
|
||||
@@ -10213,7 +10213,7 @@
|
||||
/turf/open/floor/carpet{
|
||||
baseturf = /turf/open/floor/plating/asteroid/airless
|
||||
},
|
||||
-/area/medical/cmo/private)
|
||||
+/area/crew_quarters/heads/cmo/private)
|
||||
"auN" = (
|
||||
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
|
||||
dir = 4
|
||||
@@ -10221,7 +10221,7 @@
|
||||
/turf/open/floor/carpet{
|
||||
baseturf = /turf/open/floor/plating/asteroid/airless
|
||||
},
|
||||
-/area/medical/cmo/private)
|
||||
+/area/crew_quarters/heads/cmo/private)
|
||||
"auO" = (
|
||||
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
|
||||
dir = 4
|
||||
@@ -10229,7 +10229,7 @@
|
||||
/turf/closed/wall{
|
||||
baseturf = /turf/open/floor/plating/asteroid/airless
|
||||
},
|
||||
-/area/medical/cmo/private)
|
||||
+/area/crew_quarters/heads/cmo/private)
|
||||
"auP" = (
|
||||
/obj/structure/table/wood,
|
||||
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
|
||||
@@ -10937,13 +10937,13 @@
|
||||
/turf/open/floor/plating{
|
||||
baseturf = /turf/open/floor/plating/asteroid/airless
|
||||
},
|
||||
-/area/medical/cmo/private)
|
||||
+/area/crew_quarters/heads/cmo/private)
|
||||
"awa" = (
|
||||
/obj/structure/dresser,
|
||||
/turf/open/floor/carpet{
|
||||
baseturf = /turf/open/floor/plating/asteroid/airless
|
||||
},
|
||||
-/area/medical/cmo/private)
|
||||
+/area/crew_quarters/heads/cmo/private)
|
||||
"awb" = (
|
||||
/obj/structure/closet{
|
||||
icon_door = "blue";
|
||||
@@ -10958,7 +10958,7 @@
|
||||
/turf/open/floor/carpet{
|
||||
baseturf = /turf/open/floor/plating/asteroid/airless
|
||||
},
|
||||
-/area/medical/cmo/private)
|
||||
+/area/crew_quarters/heads/cmo/private)
|
||||
"awc" = (
|
||||
/obj/machinery/light/small,
|
||||
/obj/machinery/atmospherics/components/unary/vent_pump{
|
||||
@@ -10968,7 +10968,7 @@
|
||||
/turf/open/floor/carpet{
|
||||
baseturf = /turf/open/floor/plating/asteroid/airless
|
||||
},
|
||||
-/area/medical/cmo/private)
|
||||
+/area/crew_quarters/heads/cmo/private)
|
||||
"awd" = (
|
||||
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
|
||||
dir = 4
|
||||
@@ -10976,7 +10976,7 @@
|
||||
/turf/open/floor/carpet{
|
||||
baseturf = /turf/open/floor/plating/asteroid/airless
|
||||
},
|
||||
-/area/medical/cmo/private)
|
||||
+/area/crew_quarters/heads/cmo/private)
|
||||
"awe" = (
|
||||
/obj/machinery/door/airlock/medical{
|
||||
name = "Chief Medical Officer's Personal Quarters";
|
||||
@@ -10988,7 +10988,7 @@
|
||||
/turf/open/floor/carpet{
|
||||
baseturf = /turf/open/floor/plating/asteroid/airless
|
||||
},
|
||||
-/area/medical/cmo/private)
|
||||
+/area/crew_quarters/heads/cmo/private)
|
||||
"awf" = (
|
||||
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
|
||||
/turf/open/floor/plasteel/black{
|
||||
File diff suppressed because it is too large
Load Diff
@@ -1,22 +0,0 @@
|
||||
diff a/_maps/map_files/MetaStation/MetaStation.dmm b/_maps/map_files/MetaStation/MetaStation.dmm (rejected hunks)
|
||||
@@ -19704,17 +19704,17 @@
|
||||
/turf/open/floor/plasteel/neutral/corner{
|
||||
dir = 1
|
||||
},
|
||||
-/area/crew_quarters/sleep)
|
||||
+/area/crew_quarters/dorms)
|
||||
"aJf" = (
|
||||
/obj/structure/disposalpipe/segment,
|
||||
/turf/open/floor/plasteel,
|
||||
-/area/crew_quarters/sleep)
|
||||
+/area/crew_quarters/dorms)
|
||||
"aJg" = (
|
||||
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
|
||||
/turf/open/floor/plasteel/neutral/corner{
|
||||
dir = 2
|
||||
},
|
||||
-/area/crew_quarters/sleep)
|
||||
+/area/crew_quarters/dorms)
|
||||
"aJh" = (
|
||||
/turf/closed/wall,
|
||||
/area/hydroponics/garden)
|
||||
File diff suppressed because it is too large
Load Diff
@@ -1,36 +0,0 @@
|
||||
diff a/_maps/map_files/PubbyStation/PubbyStation.dmm b/_maps/map_files/PubbyStation/PubbyStation.dmm (rejected hunks)
|
||||
@@ -7901,7 +7901,7 @@
|
||||
/area/chapel/main/monastery)
|
||||
"aqa" = (
|
||||
/turf/open/floor/plating,
|
||||
-/area/crew_quarters/sleep)
|
||||
+/area/crew_quarters/dorms)
|
||||
"aqb" = (
|
||||
/obj/machinery/light/small{
|
||||
dir = 4
|
||||
@@ -8760,14 +8760,14 @@
|
||||
/area/chapel/main/monastery)
|
||||
"arM" = (
|
||||
/turf/open/floor/plasteel,
|
||||
-/area/crew_quarters/sleep)
|
||||
+/area/crew_quarters/dorms)
|
||||
"arN" = (
|
||||
/obj/machinery/firealarm{
|
||||
dir = 4;
|
||||
pixel_x = 28
|
||||
},
|
||||
/turf/open/floor/plasteel,
|
||||
-/area/crew_quarters/sleep)
|
||||
+/area/crew_quarters/dorms)
|
||||
"arO" = (
|
||||
/obj/structure/grille,
|
||||
/obj/structure/window/reinforced/fulltile,
|
||||
@@ -12924,7 +12924,7 @@
|
||||
"aAv" = (
|
||||
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
|
||||
/turf/open/floor/plasteel,
|
||||
-/area/crew_quarters/sleep)
|
||||
+/area/crew_quarters/dorms)
|
||||
"aAw" = (
|
||||
/turf/closed/wall,
|
||||
/area/crew_quarters/toilet/restrooms)
|
||||
@@ -1,101 +0,0 @@
|
||||
diff a/_maps/map_files/TgStation/tgstation.2.1.3.dmm b/_maps/map_files/TgStation/tgstation.2.1.3.dmm (rejected hunks)
|
||||
@@ -26775,17 +26763,17 @@
|
||||
/turf/open/floor/plasteel/whitepurple/side{
|
||||
dir = 1
|
||||
},
|
||||
-/area/toxins/lab)
|
||||
+/area/science/lab)
|
||||
"biV" = (
|
||||
/obj/structure/chair/stool,
|
||||
/obj/effect/landmark/start/scientist,
|
||||
/turf/open/floor/plasteel/whitepurple/side{
|
||||
dir = 1
|
||||
},
|
||||
-/area/toxins/lab)
|
||||
+/area/science/lab)
|
||||
"biW" = (
|
||||
/turf/open/floor/plasteel/white,
|
||||
-/area/toxins/lab)
|
||||
+/area/science/lab)
|
||||
"biX" = (
|
||||
/obj/machinery/camera{
|
||||
c_tag = "Research and Development";
|
||||
@@ -26804,7 +26792,7 @@
|
||||
/turf/open/floor/plasteel/whitepurple/corner{
|
||||
dir = 1
|
||||
},
|
||||
-/area/toxins/lab)
|
||||
+/area/science/lab)
|
||||
"biY" = (
|
||||
/obj/structure/disposalpipe/segment,
|
||||
/obj/structure/cable{
|
||||
@@ -31498,17 +31452,13 @@
|
||||
/turf/open/floor/plasteel/white/side{
|
||||
dir = 5
|
||||
},
|
||||
-/area/medical/research{
|
||||
- name = "Research Division"
|
||||
- })
|
||||
+/area/science/research)
|
||||
"bsA" = (
|
||||
/obj/machinery/atmospherics/pipe/manifold4w/scrubbers,
|
||||
/turf/open/floor/plasteel/white/side{
|
||||
dir = 9
|
||||
},
|
||||
-/area/medical/research{
|
||||
- name = "Research Division"
|
||||
- })
|
||||
+/area/science/research)
|
||||
"bsB" = (
|
||||
/obj/structure/reagent_dispensers/fueltank,
|
||||
/turf/open/floor/mineral/plastitanium,
|
||||
@@ -33607,9 +33493,7 @@
|
||||
/turf/open/floor/plasteel/white/side{
|
||||
dir = 9
|
||||
},
|
||||
-/area/medical/research{
|
||||
- name = "Research Division"
|
||||
- })
|
||||
+/area/science/research)
|
||||
"bwP" = (
|
||||
/obj/structure/table,
|
||||
/obj/item/weapon/storage/box/donkpockets{
|
||||
@@ -37035,7 +36889,7 @@
|
||||
},
|
||||
/mob/living/simple_animal/mouse,
|
||||
/turf/open/floor/plasteel/floorgrime,
|
||||
-/area/toxins/storage)
|
||||
+/area/science/storage)
|
||||
"bDY" = (
|
||||
/obj/structure/cable{
|
||||
d1 = 4;
|
||||
@@ -39989,17 +39807,17 @@
|
||||
},
|
||||
/obj/structure/window/reinforced/fulltile,
|
||||
/turf/open/floor/engine,
|
||||
-/area/toxins/xenobiology)
|
||||
+/area/science/xenobiology)
|
||||
"bJN" = (
|
||||
/turf/closed/wall,
|
||||
-/area/toxins/xenobiology)
|
||||
+/area/science/xenobiology)
|
||||
"bJO" = (
|
||||
/obj/machinery/door/airlock/research{
|
||||
name = "Testing Lab";
|
||||
req_access_txt = "47"
|
||||
},
|
||||
/turf/open/floor/plasteel,
|
||||
-/area/toxins/misc_lab)
|
||||
+/area/science/misc_lab)
|
||||
"bJP" = (
|
||||
/obj/machinery/vending/boozeomat,
|
||||
/turf/open/floor/plasteel/bar,
|
||||
@@ -54609,7 +54415,7 @@
|
||||
pipe_type = 14
|
||||
},
|
||||
/turf/open/floor/engine,
|
||||
-/area/toxins/misc_lab)
|
||||
+/area/science/misc_lab)
|
||||
"coU" = (
|
||||
/obj/structure/table,
|
||||
/obj/item/weapon/surgicaldrill,
|
||||
File diff suppressed because it is too large
Load Diff
@@ -1,74 +0,0 @@
|
||||
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"
|
||||
@@ -116,14 +116,21 @@
|
||||
name = "Solitary Confinement"
|
||||
icon_state = "brig"
|
||||
|
||||
/area/prison/cell_block/A
|
||||
/area/prison/execution_room
|
||||
name = "Prisoner Education Chamber"
|
||||
icon_state = "armory"
|
||||
|
||||
/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"
|
||||
|
||||
@@ -1,22 +0,0 @@
|
||||
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"
|
||||
@@ -1,10 +0,0 @@
|
||||
diff a/code/modules/projectiles/projectile/special.dm b/code/modules/projectiles/projectile/special.dm (rejected hunks)
|
||||
@@ -203,7 +203,7 @@
|
||||
range = 4
|
||||
dismemberment = 20
|
||||
impact_effect_type = /obj/effect/temp_visual/impact_effect/purple_laser
|
||||
- var/mine_range = 4 //mines this many additional tiles
|
||||
+ var/mine_range = 3 //mines this many additional tiles
|
||||
|
||||
/obj/item/projectile/plasma/Initialize()
|
||||
. = ..()
|
||||
Reference in New Issue
Block a user