This commit is contained in:
timothyteakettle
2020-07-18 02:29:12 +01:00
parent 8bb9b11922
commit e8fade4f7f
35 changed files with 861 additions and 76 deletions
@@ -12,13 +12,13 @@ obj/item/ammo_casing/shotgun/executioner
name = "executioner slug"
desc = "A 12 gauge lead slug purpose built to annihilate flesh on impact."
icon_state = "stunshell"
projectile_type = /obj/projectile/bullet/shotgun_slug/executioner
projectile_type = /obj/item/projectile/bullet/shotgun_slug/executioner
/obj/item/ammo_casing/shotgun/pulverizer
name = "pulverizer slug"
desc = "A 12 gauge lead slug purpose built to annihilate bones on impact."
icon_state = "stunshell"
projectile_type = /obj/projectile/bullet/shotgun_slug/pulverizer
projectile_type = /obj/item/projectile/bullet/shotgun_slug/pulverizer
/obj/item/ammo_casing/shotgun/beanbag
name = "beanbag slug"
@@ -38,7 +38,7 @@
fire_sound = 'sound/weapons/lasercannonfire.ogg'
/obj/item/ammo_casing/energy/laser/hellfire
projectile_type = /obj/projectile/beam/laser/hellfire
projectile_type = /obj/item/projectile/beam/laser/hellfire
e_cost = 130
select_name = "maim"
+1 -1
View File
@@ -156,7 +156,7 @@
wound_bonus = CANT_WOUND
/// For telling whether we want to roll for bone breaking or lacerations if we're bothering with wounds
var/sharpness = FALSE
sharpness = FALSE
/obj/item/projectile/Initialize()
. = ..()
+2 -3
View File
@@ -25,13 +25,12 @@
bare_wound_bonus = 40
//overclocked laser, does a bit more damage but has much higher wound power (-0 vs -20)
/obj/projectile/beam/laser/hellfire
/obj/item/projectile/beam/laser/hellfire
name = "hellfire laser"
wound_bonus = 0
damage = 25
speed = 0.6 // higher power = faster, that's how light works right
/obj/projectile/beam/laser/hellfire/Initialize()
/obj/item/projectile/beam/laser/hellfire/Initialize()
. = ..()
transform *= 2
@@ -2,12 +2,12 @@
name = "12g shotgun slug"
damage = 60
/obj/projectile/bullet/shotgun_slug/executioner
/obj/item/projectile/bullet/shotgun_slug/executioner
name = "executioner slug" // admin only, can dismember limbs
sharpness = TRUE
wound_bonus = 0
/obj/projectile/bullet/shotgun_slug/pulverizer
/obj/item/projectile/bullet/shotgun_slug/pulverizer
name = "pulverizer slug" // admin only, can crush bones
sharpness = FALSE
wound_bonus = 0