Merge branch 'bleeding-edge-freeze' of https://github.com/Baystation12/Baystation12 into xenoarch

Conflicts:
	baystation12.dme
	code/WorkInProgress/Cael_Aislinn/ShieldGen/energy_field.dm
	icons/obj/device.dmi

Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
This commit is contained in:
Cael_Aislinn
2013-02-25 14:40:46 +10:00
141 changed files with 10412 additions and 8264 deletions
@@ -1,16 +1,4 @@
/obj/item/clothing/suit/bio_suit/anomaly
name = "Anomaly Suit"
desc = "A sealed bio suit capable of resisting exotic alien energies and low pressure environments."
icon_state = "engspace_suit"
item_state = "engspace_suit"
allowed = list(/obj/item/device/flashlight,/obj/item/weapon/tank/emergency_oxygen, /obj/item/weapon/pickaxe/hand_pick)
/obj/item/clothing/head/bio_hood/anomaly
name = "Anomaly Hood"
desc = "A sealed bio hood capable of resisting exotic alien energies and low pressure environments."
icon_state = "engspace_helmet"
item_state = "engspace_helmet"
/obj/structure/noticeboard/anomaly/New()
notices = 5
icon_state = "nboard05"