From 1453c4c0894569dd6ea5d03eb36f2fcfdb795bfd Mon Sep 17 00:00:00 2001 From: Jack Edge Date: Sat, 4 Jun 2016 12:22:37 +0100 Subject: [PATCH] Makes winning a pulse rifle little more noticable :cl: coiax rscadd: When someone wins a pulse rifle via arcade games, everyone dead and admined are notified. Also it comes with a firing pin now. /:cl: --- code/game/machinery/computer/arcade.dm | 2 +- code/modules/projectiles/guns/energy/pulse.dm | 22 ++++++++++++++++++- 2 files changed, 22 insertions(+), 2 deletions(-) diff --git a/code/game/machinery/computer/arcade.dm b/code/game/machinery/computer/arcade.dm index 7f80531c354..e8bc97647a2 100644 --- a/code/game/machinery/computer/arcade.dm +++ b/code/game/machinery/computer/arcade.dm @@ -51,7 +51,7 @@ /obj/machinery/computer/arcade/proc/prizevend() if(prob(0.0001)) //1 in a million - new /obj/item/weapon/gun/energy/pulse(src) + new /obj/item/weapon/gun/energy/pulse/prize(src) if(!contents.len) var/prizeselect = pickweight(prizes) diff --git a/code/modules/projectiles/guns/energy/pulse.dm b/code/modules/projectiles/guns/energy/pulse.dm index 9b10f4d2933..29b4f0e388e 100644 --- a/code/modules/projectiles/guns/energy/pulse.dm +++ b/code/modules/projectiles/guns/energy/pulse.dm @@ -13,6 +13,26 @@ /obj/item/weapon/gun/energy/pulse/emp_act(severity) return +/obj/item/weapon/gun/energy/pulse/prize + pin = /obj/item/device/firing_pin + +/obj/item/weapon/gun/energy/pulse/prize/New() + . = ..() + poi_list |= src + var/msg = "A pulse rifle prize has been created at ([x],[y],[z] - (\ + \ + JMP)" + + message_admins(msg) + log_game(msg) + + notify_ghosts("Someone won a pulse rifle as a prize!", source = src, + action = NOTIFY_ORBIT) + +/obj/item/weapon/gun/energy/pulse/prize/Destroy() + poi_list -= src + . = ..() + /obj/item/weapon/gun/energy/pulse/loyalpin pin = /obj/item/device/firing_pin/implant/loyalty @@ -58,4 +78,4 @@ desc = "A compact pulse core in a classic handgun frame for Nanotrasen officers. It's not the size of the gun, it's the size of the hole it puts through people." icon_state = "m1911" item_state = "gun" - cell_type = "/obj/item/weapon/stock_parts/cell/infinite" \ No newline at end of file + cell_type = "/obj/item/weapon/stock_parts/cell/infinite"