diff --git a/baystation12.dme b/baystation12.dme
index 44326b7ee9..b897555fc3 100644
--- a/baystation12.dme
+++ b/baystation12.dme
@@ -1163,6 +1163,14 @@
 #include "code\WorkInProgress\Cael_Aislinn\sculpture.dm"
 #include "code\WorkInProgress\Cael_Aislinn\shield_capacitor.dm"
 #include "code\WorkInProgress\Cael_Aislinn\shield_gen.dm"
+#include "code\WorkInProgress\Cael_Aislinn\Jungle\falsewall.dm"
+#include "code\WorkInProgress\Cael_Aislinn\Jungle\jungle.dm"
+#include "code\WorkInProgress\Cael_Aislinn\Jungle\jungle_animals.dm"
+#include "code\WorkInProgress\Cael_Aislinn\Jungle\jungle_plants.dm"
+#include "code\WorkInProgress\Cael_Aislinn\Jungle\jungle_temple.dm"
+#include "code\WorkInProgress\Cael_Aislinn\Jungle\jungle_tribe.dm"
+#include "code\WorkInProgress\Cael_Aislinn\Jungle\jungle_turfs.dm"
+#include "code\WorkInProgress\Cael_Aislinn\Jungle\misc_helpers.dm"
 #include "code\WorkInProgress\Cael_Aislinn\Rust\areas.dm"
 #include "code\WorkInProgress\Cael_Aislinn\Rust\core_field.dm"
 #include "code\WorkInProgress\Cael_Aislinn\Rust\core_gen.dm"
diff --git a/code/WorkInProgress/Cael_Aislinn/Jungle/jungle_temple.dm b/code/WorkInProgress/Cael_Aislinn/Jungle/jungle_temple.dm
index 81de9f02a7..c34cce4e3d 100644
--- a/code/WorkInProgress/Cael_Aislinn/Jungle/jungle_temple.dm
+++ b/code/WorkInProgress/Cael_Aislinn/Jungle/jungle_temple.dm
@@ -235,7 +235,7 @@
 				var/obj/structure/closet/crate/secure/gear/C = new(src.loc)
 				var/num = rand(2,6)
 				for(var/i=0,i<num,i++)
-					var/spawn_type = pick(/obj/item/device/flashlight/flare, /obj/item/trash/candle, /obj/item/candle/, /obj/item/weapon/storage/matchbox)
+					var/spawn_type = pick(/obj/item/device/flashlight/flare, /obj/item/trash/candle, /obj/item/candle/, /obj/item/weapon/storage/box/matches)
 					new spawn_type(C)
 			if("engineering")
 				var/obj/structure/closet/crate/secure/gear/C = new(src.loc)
diff --git a/code/modules/clothing/spacesuits/rig.dm b/code/modules/clothing/spacesuits/rig.dm
index 068f8f87db..a2c432f372 100644
--- a/code/modules/clothing/spacesuits/rig.dm
+++ b/code/modules/clothing/spacesuits/rig.dm
@@ -85,7 +85,7 @@
 	slowdown = 1
 	w_class = 3
 	armor = list(melee = 60, bullet = 50, laser = 30, energy = 15, bomb = 35, bio = 100, rad = 60)
-	allowed = list(/obj/item/weapon/gun,/obj/item/ammo_magazine,/obj/item/ammo_casing,/obj/item/weapon/melee/baton,/obj/item/weapon/melee/energy/sword,/obj/item/weapon/handcuffs,/obj/item/weapon/tank/emergency_oxygen)
+	allowed = list(/obj/item/device/flashlight,/obj/item/weapon/tank/emergency_oxygen,/obj/item/weapon/gun,/obj/item/ammo_magazine,/obj/item/ammo_casing,/obj/item/weapon/melee/baton,/obj/item/weapon/melee/energy/sword,/obj/item/weapon/handcuffs)
 
 //Wizard Rig
 /obj/item/clothing/head/helmet/space/rig/wizard
@@ -107,7 +107,6 @@
 	allowed = list(/obj/item/weapon/teleportation_scroll,/obj/item/weapon/tank/emergency_oxygen)
 
 
-
 //Medical Rig
 /obj/item/clothing/head/helmet/space/rig/medical
 	name = "medical hardsuit helmet"
@@ -119,4 +118,40 @@
 	icon_state = "rig-medical"
 	name = "medical hardsuit"
 	item_state = "medical_hardsuit"
-	allowed = list(/obj/item/device/flashlight,/obj/item/weapon/tank,/obj/item/weapon/storage/firstaid,/obj/item/device/healthanalyzer,/obj/item/stack/medical)
\ No newline at end of file
+	allowed = list(/obj/item/device/flashlight,/obj/item/weapon/tank/emergency_oxygen,/obj/item/weapon/storage/firstaid,/obj/item/device/healthanalyzer,/obj/item/stack/medical)
+
+
+//Security Rig (BS12)
+/obj/item/clothing/head/helmet/space/rig/security
+	name = "security hardsuit helmet"
+	desc = "A special helmet designed for work in a hazardous, low pressure environment. Has additional layers of armour and ablative shielding in lieu of radiation shielding."
+	icon_state = "rig0-security"
+	item_state = "security_helm"
+	color = "security"
+	armor = list(melee = 45, bullet = 10, laser = 25,energy = 10, bomb = 40, bio = 100, rad = 5)
+
+/obj/item/clothing/suit/space/rig/security
+	desc = "A special suit that protects against hazardous, low pressure environments. Has additional layers of armour and ablative shielding in lieu of radiation shielding."
+	icon_state = "rig-security"
+	name = "atmos hardsuit"
+	item_state = "atmos_hardsuit"
+	armor = list(melee = 45, bullet = 10, laser = 25,energy = 10, bomb = 40, bio = 100, rad = 5)
+	allowed = list(/obj/item/device/flashlight,/obj/item/weapon/tank/emergency_oxygen,/obj/item/weapon/melee/baton,/obj/item/weapon/handcuffs,/obj/item/weapon/gun/energy)
+
+
+//Atmospherics Rig (BS12)
+/obj/item/clothing/head/helmet/space/rig/atmos
+	desc = "A special helmet designed for work in a hazardou, low pressure environments. Has reduced radiation shielding and protective plating to allow for greater mobility."
+	name = "atmospherics hardsuit helmet"
+	icon_state = "rig0-atmos"
+	item_state = "atmos_helm"
+	color = "atmos"
+	armor = list(melee = 35, bullet = 5, laser = 15,energy = 5, bomb = 30, bio = 100, rad = 5)
+
+/obj/item/clothing/suit/space/rig/atmos
+	desc = "A special suit that protects against hazardous, low pressure environments. Has reduced radiation shielding to allow for greater mobility."
+	icon_state = "rig-atmos"
+	name = "atmos hardsuit"
+	item_state = "atmos_hardsuit"
+	armor = list(melee = 35, bullet = 5, laser = 15,energy = 5, bomb = 30, bio = 100, rad = 5)
+	allowed = list(/obj/item/device/flashlight,/obj/item/weapon/tank/emergency_oxygen)
diff --git a/icons/mob/head.dmi b/icons/mob/head.dmi
index a7ac7f24eb..88df70ff78 100644
Binary files a/icons/mob/head.dmi and b/icons/mob/head.dmi differ
diff --git a/icons/mob/suit.dmi b/icons/mob/suit.dmi
index 3581e193f7..37c92cba15 100644
Binary files a/icons/mob/suit.dmi and b/icons/mob/suit.dmi differ
diff --git a/maps/RandomZLevels/jungle.dmm b/maps/RandomZLevels/jungle.dmm
index 732bc4fde0..c275df7409 100644
--- a/maps/RandomZLevels/jungle.dmm
+++ b/maps/RandomZLevels/jungle.dmm
@@ -148,7 +148,7 @@
 "cR" = (/obj/item/trash/chips,/turf/unsimulated/jungle/clear,/area/jungle)
 "cS" = (/obj/item/trash/pistachios,/turf/unsimulated/jungle/clear,/area/jungle)
 "cT" = (/obj/item/weapon/firstaid_arm_assembly,/turf/unsimulated/jungle/clear,/area/jungle)
-"cU" = (/obj/structure/barricade/wooden,/obj/effect/sign/redcross,/turf/unsimulated/floor,/area/jungle)
+"cU" = (/obj/structure/barricade/wooden,/obj/structure/sign/redcross,/turf/unsimulated/floor,/area/jungle)
 "cV" = (/obj/machinery/gateway{tag = "icon-off (NORTHWEST)"; icon_state = "off"; dir = 9},/turf/unsimulated/floor,/area/jungle)
 "cW" = (/obj/machinery/gateway{tag = "icon-off (NORTH)"; icon_state = "off"; dir = 1},/turf/unsimulated/floor,/area/jungle)
 "cX" = (/obj/machinery/gateway{tag = "icon-off (NORTHEAST)"; icon_state = "off"; dir = 5},/turf/unsimulated/floor,/area/jungle)
@@ -172,7 +172,7 @@
 "dp" = (/obj/item/weapon/secbot_assembly,/turf/unsimulated/jungle/clear,/area/jungle)
 "dq" = (/obj/item/trash/candy,/turf/unsimulated/jungle/clear,/area/jungle)
 "dr" = (/obj/item/weapon/rack_parts,/turf/unsimulated/floor,/area/jungle)
-"ds" = (/obj/structure/barricade/wooden,/obj/effect/sign/securearea{desc = "A warning sign which reads 'DANGEROUS WILDLIFE'. Sounds like some of the local fauna are vicious."; name = "DANGEROUS WILDLIFE"},/turf/unsimulated/jungle/clear,/area/jungle)
+"ds" = (/obj/structure/barricade/wooden,/obj/structure/sign/securearea{desc = "A warning sign which reads 'DANGEROUS WILDLIFE'. Sounds like some of the local fauna are vicious."; name = "DANGEROUS WILDLIFE"},/turf/unsimulated/jungle/clear,/area/jungle)
 "dt" = (/obj/structure/largecrate,/turf/unsimulated/floor,/area/jungle)
 "du" = (/turf/unsimulated/jungle/clear,/area/jungle/crash_ship_two)
 "dv" = (/turf/unsimulated/jungle,/area/jungle/crash_ship_source)