Merge pull request #10307 from Seris02/stunglasses

stunglasses
This commit is contained in:
Ghom
2020-01-19 16:35:47 +01:00
committed by GitHub
3 changed files with 45 additions and 2 deletions
+31 -1
View File
@@ -250,6 +250,36 @@
throwforce = 12
glass_colour_type = /datum/client_colour/glass_colour/red
/obj/item/clothing/glasses/sunglasses/stunglasses
name = "stunglasses"
desc = "Sunglasses with inbuilt flashes. Made for those who prefer to walk around in style, who needs clumsy flashes anyway?"
actions_types = list(/datum/action/item_action/flash)
var/obj/item/assembly/flash/installed
/obj/item/clothing/glasses/sunglasses/stunglasses/Initialize()
. = ..()
if (!installed)
installed = new(src)
/obj/item/clothing/glasses/sunglasses/stunglasses/ui_action_click(mob/user)
if (installed && !installed.crit_fail)
installed.attack_self(user)
else
to_chat(user, "<span class = 'danger'>Install a new flash in [src]!</span>")
/obj/item/clothing/glasses/sunglasses/stunglasses/attackby(obj/item/W,mob/user)
if (istype(W,/obj/item/screwdriver))
if (installed)
installed.forceMove(get_turf(src))
to_chat(user, "<span class = 'notice'>You remove [installed] from [src].</span>")
installed = null
if (istype(W,/obj/item/assembly/flash))
if (!installed)
W.forceMove(src)
to_chat(user, "<span class = 'notice'>You install [W] into [src].</span>")
installed = W
. = ..()
/obj/item/clothing/glasses/welding
name = "welding goggles"
desc = "Protects the eyes from welders; approved by the mad scientist association."
@@ -458,4 +488,4 @@
if(client && client.prefs.uses_glasses_colour && glasses_equipped)
add_client_colour(G.glass_colour_type)
else
remove_client_colour(G.glass_colour_type)
remove_client_colour(G.glass_colour_type)
@@ -86,7 +86,17 @@
tools = list(TOOL_SCREWDRIVER, TOOL_WIRECUTTER)
reqs = list(/obj/item/clothing/glasses/sunglasses/reagent = 1)
category = CAT_CLOTHING
/* //Kevinz doesn't want it as a recipe for now, leaving it in if anything ever changes to let it in
/datum/crafting_recipe/stunglasses
name = "Stunglasses"
result = /obj/item/clothing/glasses/sunglasses/stunglasses
time = 60
tools = list(TOOL_SCREWDRIVER, TOOL_WIRECUTTER)
reqs = list(/obj/item/assembly/flash = 1,
/obj/item/clothing/glasses/sunglasses = 1,
/obj/item/stack/cable_coil = 5)
category = CAT_CLOTHING
*/
/datum/crafting_recipe/ghostsheet
name = "Ghost Sheet"
result = /obj/item/clothing/suit/ghost_sheet