rej clean up

more areas
2017-05-30 20:08:53 -05:00
parent 24d6643623
commit adb7a9b6ff
11 changed files with 727 additions and 4240 deletions
@@ -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()
- 	. = ..()