Merge pull request #10177 from farie82/boxes

Added new box sprites props to Shazbot for the sprites
This commit is contained in:
tigercat2000
2018-11-10 12:43:29 -08:00
committed by GitHub
6 changed files with 59 additions and 57 deletions
@@ -285,20 +285,6 @@
if(isliving(user))
user.visible_message("<span class='warning'>[user] invades [M]'s personal space, thrusting [src] into [M.p_their()] face insistently.</span>","<span class='warning'>You invade [M]'s personal space, thrusting [src] into [M.p_their()] face insistently. You are the law.</span>")
/obj/item/storage/box/holobadge
name = "holobadge box"
desc = "A box claiming to contain holobadges."
New()
new /obj/item/clothing/accessory/holobadge(src)
new /obj/item/clothing/accessory/holobadge(src)
new /obj/item/clothing/accessory/holobadge(src)
new /obj/item/clothing/accessory/holobadge(src)
new /obj/item/clothing/accessory/holobadge/cord(src)
new /obj/item/clothing/accessory/holobadge/cord(src)
..()
return
///////////
//SCARVES//
///////////
-12
View File
@@ -84,15 +84,3 @@
to_chat(user, "[src] is empty.")
icon_state = "evidenceobj"
/obj/item/storage/box/evidence
name = "evidence bag box"
desc = "A box claiming to contain evidence bags."
/obj/item/storage/box/evidence/New()
new /obj/item/evidencebag(src)
new /obj/item/evidencebag(src)
new /obj/item/evidencebag(src)
new /obj/item/evidencebag(src)
new /obj/item/evidencebag(src)
new /obj/item/evidencebag(src)
..()
-13
View File
@@ -353,16 +353,3 @@ var/ert_request_answered = FALSE
name = "centcomm bounced radio"
frequency = ERT_FREQ
icon_state = "radio"
/obj/item/storage/box/responseteam/
name = "boxed survival kit"
/obj/item/storage/box/responseteam/New()
..()
new /obj/item/clothing/mask/breath(src)
new /obj/item/tank/emergency_oxygen/engi(src)
new /obj/item/flashlight/flare(src)
new /obj/item/kitchen/knife/combat(src)
new /obj/item/radio/centcom(src)
new /obj/item/reagent_containers/food/pill/patch/synthflesh(src)
new /obj/item/reagent_containers/hypospray/autoinjector(src)