Merge pull request #192 from SamCroswell/master

Map changes, new ninja masks, more commits possibly to come

code/game/objects/effects/landmarks.dm

@@ -56,6 +56,9 @@
 			tdomeadmin	+= loc
 		if("tdomeobserve")
 			tdomeobserve += loc
+		if("aroomwarp")
+			aroomwarp += loc
+
 		//not prisoners
 		if("prisonsecuritywarp")
 			prisonsecuritywarp += loc

code/game/objects/structures/crates_lockers/closets/secure/engineering.dm

@@ -115,6 +115,7 @@
 			new /obj/item/clothing/tie/storage/webbing(src)
 		new /obj/item/weapon/storage/toolbox/mechanical(src)
 		new /obj/item/device/radio/headset/headset_eng(src)
+		new /obj/item/clothing/under/rank/engineer(src)
 		new /obj/item/clothing/suit/storage/hazardvest(src)
 		new /obj/item/clothing/mask/gas(src)
 		new /obj/item/clothing/glasses/meson(src)
@@ -151,4 +152,4 @@
 		new /obj/item/clothing/mask/gas(src)
 		new /obj/item/weapon/cartridge/atmos(src)
 		new /obj/item/taperoll/engineering(src)
-		return
+		return