Merge pull request #2197 from sirbayer/srsbsns-deadlyboolets

Gun Revamp 2: Gun Harder: Director's Cut
This commit is contained in:
Cheridan
2014-01-14 11:10:05 -08:00
34 changed files with 514 additions and 482 deletions

View File

@@ -16,6 +16,11 @@
flag = "laser"
eyeblur = 2
/obj/item/projectile/beam/scatter
name = "laser pellet"
icon_state = "scatterlaser"
damage = 5
/obj/item/projectile/beam/heavylaser
name = "heavy laser"

View File

@@ -19,6 +19,11 @@
weaken = 5
/obj/item/projectile/bullet/pellet
name = "pellet"
damage = 15
/obj/item/projectile/bullet/midbullet
damage = 20
stun = 5

View File

@@ -30,7 +30,7 @@
damage_type = BURN
nodamage = 1
flag = "energy"
var/temperature = 300
var/temperature = 100
on_hit(var/atom/target, var/blocked = 0)//These two could likely check temp protection on the mob
@@ -39,6 +39,10 @@
M.bodytemperature = temperature
return 1
/obj/item/projectile/temp/hot
name = "heat beam"
temperature = 400
/obj/item/projectile/meteor
name = "meteor"
icon = 'icons/obj/meteor.dmi'