shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

a tonne of fixes

Browse Source
This commit is contained in:
Timothy Teakettle
2020-06-11 20:18:36 +01:00
parent 4c55e86da7
commit 38bf529f3c
28 changed files with 57 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/items/grenades/flashbang.dm
+4 -4
View File
@@ -72,7 +72,7 @@
shrapnel_type = /obj/projectile/bullet/pellet/stingball
shrapnel_type = /obj/item/projectile/bullet/pellet/stingball
@@ -96,7 +96,7 @@
shrapnel_type = /obj/projectile/bullet/pellet/stingball/mega
shrapnel_type = /obj/item/projectile/bullet/pellet/stingball/mega
@@ -212,7 +212,7 @@
lefthand_file = 'icons/mob/inhands/equipment/security_lefthand.dmi'
righthand_file = 'icons/mob/inhands/equipment/security_righthand.dmi'
var/rots_per_mag = 3 /// how many times we need to "rotate" the charge in hand per extra tile of magnitude
shrapnel_type = /obj/projectile/bullet/shrapnel
shrapnel_type = /obj/item/projectile/bullet/shrapnel
var/rots = 1 /// how many times we've "rotated" the charge
/obj/item/grenade/primer/attack_self(mob/user)
@@ -233,4 +233,4 @@
lefthand_file = 'icons/mob/inhands/equipment/security_lefthand.dmi'
righthand_file = 'icons/mob/inhands/equipment/security_righthand.dmi'
rots_per_mag = 2
shrapnel_type = /obj/projectile/bullet/pellet/stingball
shrapnel_type = /obj/item/projectile/bullet/pellet/stingball
code/game/objects/items/grenades/grenade.dm
+1 -1
View File
@@ -41,7 +41,7 @@
shrapnel_initialized = TRUE
AddComponent(/datum/component/pellet_cloud, projectile_type=shrapnel_type, magnitude=shrapnel_radius)
playsound(src, 'sound/items/eatfood.ogg', 50, 1)
SEND_SIGNAL(src, COMSIG_GRENADE_ARMED, det_time, delayoverride)
SEND_SIGNAL(src, COMSIG_GRENADE_ARMED, det_time)
preprime(user, det_time)
user.transferItemToLoc(src, user, TRUE)//>eat a grenade set to 5 seconds >rush captain
sleep(det_time)//so you dont die instantly
code/game/objects/items/grenades/syndieminibomb.dm
+2 -2
View File
@@ -27,7 +27,7 @@
name = "frag grenade"
desc = "An anti-personnel fragmentation grenade, this weapon excels at killing soft targets by shredding them with metal shrapnel."
icon_state = "frag"
shrapnel_type = /obj/projectile/bullet/shrapnel
shrapnel_type = /obj/item/projectile/bullet/shrapnel
shrapnel_radius = 4
ex_heavy = 1
ex_light = 3
@@ -36,7 +36,7 @@
/obj/item/grenade/frag/mega
name = "FRAG grenade"
desc = "An anti-everything fragmentation grenade, this weapon excels at killing anything any everything by shredding them with metal shrapnel."
shrapnel_type = /obj/projectile/bullet/shrapnel/mega
shrapnel_type = /obj/item/projectile/bullet/shrapnel/mega
shrapnel_radius = 12
/obj/item/grenade/frag/prime()