Revert All of Cael_Aislinn's stuff from the last day, committed by Cib.

Reason: Compile Error, hung server. Damnit Cael.
Baystation12 · Jun 15, 2012 · e68a32c · e68a32c · caelaislinn · Jun 16, 2012
1 parent 9064a15
commit e68a32c
Show file tree

Hide file tree

Showing 12 changed files with 17 additions and 525 deletions.
diff --git a/baystation12.dme b/baystation12.dme
@@ -206,7 +206,6 @@
 #define FILE_DIR "icons/vending_icons"
 #define FILE_DIR "interface"
 #define FILE_DIR "maps"
-#define FILE_DIR "maps/backup"
 #define FILE_DIR "maps/RandomZLevels"
 #define FILE_DIR "sound"
 #define FILE_DIR "sound/AI"
@@ -1167,11 +1166,7 @@
 #include "code\WorkInProgress\AI_Visibility\minimap.dm"
 #include "code\WorkInProgress\AI_Visibility\util.dm"
 #include "code\WorkInProgress\animusstation\atm.dm"
-#include "code\WorkInProgress\Cael_Aislinn\energy_field.dm"
-#include "code\WorkInProgress\Cael_Aislinn\external_shield_gen.dm"
 #include "code\WorkInProgress\Cael_Aislinn\power_monitor.dm"
-#include "code\WorkInProgress\Cael_Aislinn\shield_capacitor.dm"
-#include "code\WorkInProgress\Cael_Aislinn\shield_gen.dm"
 #include "code\WorkInProgress\Cael_Aislinn\Rust\core_field.dm"
 #include "code\WorkInProgress\Cael_Aislinn\Rust\core_gen.dm"
 #include "code\WorkInProgress\Cael_Aislinn\Rust\core_monitor.dm"

diff --git a/code/WorkInProgress/Cael_Aislinn/energy_field.dm b/code/WorkInProgress/Cael_Aislinn/energy_field.dm
diff --git a/code/WorkInProgress/Cael_Aislinn/external_shield_gen.dm b/code/WorkInProgress/Cael_Aislinn/external_shield_gen.dm
diff --git a/code/WorkInProgress/Cael_Aislinn/shield_capacitor.dm b/code/WorkInProgress/Cael_Aislinn/shield_capacitor.dm
diff --git a/code/ZAS/Creation.dm b/code/ZAS/Creation.dm
@@ -67,10 +67,10 @@ proc/FloodFill(turf/start)
 
 	return closed
 
-turf/proc/ZCanPass(turf/T, var/include_space = 0)
+turf/proc/ZCanPass(turf/T)
 	//Fairly standard pass checks for turfs, objects and directional windows. Also stops at the edge of space.
 
-	if(istype(T,/turf/space) && !include_space) return 0
+	if(istype(T,/turf/space)) return 0
 	else
 		if(T.blocks_air||blocks_air)
 			return 0

diff --git a/code/defines/obj/supplypacks.dm b/code/defines/obj/supplypacks.dm
@@ -804,8 +804,7 @@
 
 /datum/supply_packs/randomised/contraband
 	num_contained = 5
-	//We randomly pick 5 items from this list through the constructor, look below
-	contains = list("/obj/item/weapon/contraband/poster","/obj/item/weapon/cigpacket/dromedaryco","/obj/item/clothing/mask/cigarette/cigar/havana", "/obj/item/seeds/plumphelmet", "/obj/item/seeds/libertycap", "/obj/item/seeds/bloodtomato", "/obj/item/weapon/reagent_containers/food/drinks/bottle/absinthe", "/obj/item/weapon/reagent_containers/food/drinks/bottle/deadrum" )
+	contains = list("/obj/item/weapon/contraband/poster","/obj/item/weapon/cigpacket/dromedaryco") //We randomly pick 5 items from this list through the constructor, look below
 	name = "Contraband crate"
 	cost = 30
 	containertype = "/obj/structure/closet/crate"