Merge pull request #18235 from coiax/when-it-happens-we-will-know

[s] Makes winning a pulse rifle little more noticable
This commit is contained in:
oranges
2016-06-06 01:33:12 +12:00
2 changed files with 22 additions and 2 deletions
+1 -1
View File
@@ -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)
+21 -1
View File
@@ -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] - (\
<A HREF='?_src_=holder;adminplayerobservecoodjump=1;X=[x];Y=[y];Z=[z]'>\
JMP</a>)"
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"
cell_type = "/obj/item/weapon/stock_parts/cell/infinite"