This commit is contained in:
silicons
2020-11-12 23:36:18 -07:00
parent 803bff4e5f
commit 5b03f5b0ec
88 changed files with 88 additions and 88 deletions
@@ -33,4 +33,4 @@
ricochets_max = 2
ricochet_chance = 60
ricochet_auto_aim_range = 4
ricochet_incidence_leeway = 35
ricochet_incidence_leeway = 35
@@ -163,4 +163,4 @@ obj/item/ammo_casing/shotgun/executioner
projectile_type = /obj/item/projectile/bullet/pellet/shotgun_incapacitate
pellets = 12//double the pellets, but half the stun power of each, which makes this best for just dumping right in someone's face.
variance = 25
custom_materials = list(/datum/material/iron=4000)
custom_materials = list(/datum/material/iron=4000)
@@ -24,4 +24,4 @@
/obj/item/ammo_casing/energy/buster
e_cost = 25
projectile_type = /obj/item/projectile/energy/buster
fire_sound = 'sound/weapons/mmlbuster.ogg'
fire_sound = 'sound/weapons/mmlbuster.ogg'
@@ -80,4 +80,4 @@
/obj/item/ammo_casing/energy/pickle //ammo for an adminspawn gun
projectile_type = /obj/item/projectile/energy/pickle
select_name = "pickle ray"
e_cost = 0
e_cost = 0
+1 -1
View File
@@ -23,4 +23,4 @@
/obj/item/ammo_box/magazine/mm712x82/match
name = "box magazine (Match 7.12x82mm)"
ammo_type = /obj/item/ammo_casing/mm712x82/match
ammo_type = /obj/item/ammo_casing/mm712x82/match
@@ -113,4 +113,4 @@
name = "'MWS' microbattery - ION"
type_color = "#d084d6"
type_name = "<span class='ion'>ION</span>"
projectile_type = /obj/item/projectile/ion
projectile_type = /obj/item/projectile/ion
@@ -3,4 +3,4 @@
ammo_type = /obj/item/ammo_casing/caseless/arrow
caliber = "arrow"
max_ammo = 1
start_empty = 1
start_empty = 1
@@ -54,4 +54,4 @@
/obj/item/ammo_box/magazine/internal/shot/bounty
name = "triple-barrel shotgun internal magazine"
ammo_type = /obj/item/ammo_casing/shotgun/incapacitate
max_ammo = 3
max_ammo = 3
@@ -24,4 +24,4 @@
item_state = "mmlbuster"
w_class = WEIGHT_CLASS_SMALL
ammo_type = list(/obj/item/ammo_casing/energy/buster)
ammo_x_offset = 2
ammo_x_offset = 2
@@ -336,4 +336,4 @@
desc = "funniest shit i've ever seen"
icon_state = "decloner"
no_pin_required = TRUE
ammo_type = list(/obj/item/ammo_casing/energy/pickle)
ammo_type = list(/obj/item/ammo_casing/energy/pickle)
@@ -44,4 +44,4 @@
syringes_left++
if(chambered && !chambered.BB)
chambered.newshot()
last_synth = world.time
last_synth = world.time
@@ -138,4 +138,4 @@
/obj/item/projectile/bullet/pellet/shotgun_incapacitate
name = "incapacitating pellet"
damage = 1
stamina = 6
stamina = 6
@@ -31,4 +31,4 @@ obj/item/projectile/energy/plasmabolt
eyeblur = 4
irradiate = 25
stamina = 100
icon_state = "plasma3"
icon_state = "plasma3"
@@ -14,4 +14,4 @@
return BULLET_ACT_HIT
/obj/item/projectile/ion/weak
emp_radius = 0
emp_radius = 0
@@ -20,4 +20,4 @@
/obj/item/projectile/temp/cryo
name = "cryo beam"
range = 3
temperature = -240 // Single slow shot reduces temp greatly
temperature = -240 // Single slow shot reduces temp greatly