cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-07-21 04:57:57 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #7034 from paprka/nosenseofrightandwrongiguess

Browse Source 
Crossbow, speargun, and grenade updates
This commit is contained in:
Swag McYolosteinen
2015-01-16 16:43:50 +01:00
parent f5ab9bad47 4a0aa0c0a5
commit 0ebd227f71
24 changed files with 112 additions and 86 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/items/toys.dm
+1 -1
View File
@@ -190,7 +190,7 @@
name = "foam dart crossbow"
desc = "A weapon favored by many overactive children. Ages 8 and up."
icon = 'icons/obj/gun.dmi'
icon_state = "crossbow"
icon_state = "crossbow100"
item_state = "crossbow"
w_class = 2.0
attack_verb = list("attacked", "struck", "hit")
code/game/objects/items/weapons/grenades/chem_grenade.dm
+1
View File
@@ -36,6 +36,7 @@
message_admins("[key_name(usr)]<A HREF='?_src_=holder;adminmoreinfo=\ref[usr]'>?</A> has primed a [name] for detonation at <A HREF='?_src_=holder;adminplayerobservecoodjump=1;X=[bombturf.x];Y=[bombturf.y];Z=[bombturf.z]'>[A.name] (JMP)</a>.")
log_game("[key_name(usr)] has primed a [name] for detonation at [A.name] ([bombturf.x],[bombturf.y],[bombturf.z]).")
user << "<span class='warning'>You prime the [name]! [det_time / 10] second\s!</span>"
playsound(user.loc, 'sound/weapons/armbomb.ogg', 60, 1)
active = 1
icon_state = initial(icon_state) + "_active"
if(iscarbon(user))
code/game/objects/items/weapons/grenades/grenade.dm
+1
View File
@@ -58,6 +58,7 @@
if(!active)
if(clown_check(user))
user << "<span class='warning'>You prime the [name]! [det_time/10] seconds!</span>"
playsound(user.loc, 'sound/weapons/armbomb.ogg', 60, 1)
active = 1
icon_state = initial(icon_state) + "_active"
add_fingerprint(user)
code/game/objects/items/weapons/storage/storage.dm
+1 -1
View File
@@ -276,7 +276,7 @@
add_fingerprint(usr)
if(!prevent_warning && !istype(W, /obj/item/weapon/gun/projectile/automatic/crossbow))
if(!prevent_warning && !istype(W, /obj/item/weapon/gun/energy/kinetic_accelerator/crossbow))
for(var/mob/M in viewers(usr, null))
if(M == usr)
usr << "<span class='notice'>You put [W] [preposition]to [src].</span>"
code/game/objects/items/weapons/storage/uplink_kits.dm
+1 -1
View File
@@ -13,7 +13,7 @@
return
if("stealth")
new /obj/item/weapon/gun/projectile/automatic/crossbow(src)
new /obj/item/weapon/gun/energy/kinetic_accelerator/crossbow(src)
new /obj/item/weapon/pen/sleepy(src)
new /obj/item/device/chameleon(src)
return