MERGE SHIT REEEEE IMMAH PUNCH A WALL

This commit is contained in:
datlo
2018-12-18 11:47:29 +00:00
135 changed files with 1985 additions and 761 deletions
@@ -6,6 +6,7 @@
anchored = 1
health = 200
req_access = list()
layer = 2.9 // ensures the loot they drop always appears on top of them.
var/is_armory = FALSE
var/ignore_use = FALSE
@@ -245,6 +245,7 @@
new /obj/item/restraints/handcuffs(src)
new /obj/item/melee/baton/loaded(src)
new /obj/item/clothing/glasses/sunglasses(src)
new /obj/item/clothing/glasses/hud/security/sunglasses/read_only(src)
new /obj/item/clothing/glasses/hud/health/health_advanced
new /obj/item/clothing/head/beret/centcom/officer(src)
new /obj/item/clothing/head/beret/centcom/officer/navy(src)
@@ -637,3 +637,8 @@
icon_state = "electricalcrate"
icon_opened = "electricalcrateopen"
icon_closed = "electricalcrate"
/obj/structure/closet/crate/tape/New()
if(prob(10))
new /obj/item/bikehorn/rubberducky(src)
..()