Merge remote-tracking branch 'upstream/master' into so-edgey

This commit is contained in:
Fox-McCloud
2017-07-01 20:17:16 -04:00
71 changed files with 648 additions and 572 deletions
-1
View File
@@ -99,6 +99,5 @@
flag = "bullet"
pass_flags = PASSTABLE | PASSGLASS | PASSGRILLE
embed = 0
weaken = 5
stun = 5
@@ -169,8 +169,6 @@
/obj/item/weapon/arrow/rod/removed()
if(superheated) // The rod has been superheated - we don't want it to be useable when removed from the bow.
visible_message("[src] shatters into a scattering of overstressed metal shards as it leaves the crossbow.")
var/obj/item/weapon/shard/shrapnel/S = new /obj/item/weapon/shard/shrapnel
S.loc = get_turf(src)
qdel(src)
#undef XBOW_TENSION_20
-1
View File
@@ -48,7 +48,6 @@
var/drowsy = 0
var/stamina = 0
var/jitter = 0
var/embed = 0 // whether or not the projectile can embed itself in the mob
var/forcedodge = 0 //to pass through everything
var/dismemberment = 0 //The higher the number, the greater the bonus to dismembering. 0 will not dismember at all.
@@ -4,7 +4,6 @@
damage = 60
damage_type = BRUTE
flag = "bullet"
embed = 1
hitsound_wall = "ricochet"
/obj/item/projectile/bullet/weakbullet //beanbag, heavy stamina damage
@@ -13,10 +12,8 @@
stamina = 80
/obj/item/projectile/bullet/weakbullet/rubber //beanbag that shells that don't embed
embed = 0
/obj/item/projectile/bullet/weakbullet/booze
embed = 0
/obj/item/projectile/bullet/weakbullet/booze/on_hit(atom/target, blocked = 0)
if(..(target, blocked))
@@ -43,7 +40,6 @@
icon_state = "bullet-r"
/obj/item/projectile/bullet/weakbullet2/rubber //detective's bullets that don't embed
embed = 0
/obj/item/projectile/bullet/weakbullet3
damage = 20
@@ -53,7 +49,6 @@
damage = 5
stamina = 30
icon_state = "bullet-r"
embed = 0
/obj/item/projectile/bullet/toxinbullet
damage = 15
@@ -141,7 +136,6 @@
name = "rubber pellet"
damage = 3
stamina = 25
embed = 0
icon_state = "bullet-r"
/obj/item/projectile/bullet/stunshot//taser slugs for shotguns, nothing special
@@ -152,7 +146,6 @@
stutter = 5
jitter = 20
range = 7
embed = 0
icon_state = "spark"
color = "#FFFF00"
@@ -203,7 +196,6 @@
stun = 5
forcedodge = 1
nodamage = 1
embed = 0
pass_flags = PASSTABLE | PASSGLASS | PASSGRILLE
hitsound = 'sound/items/bikehorn.ogg'
icon = 'icons/obj/hydroponics/harvest.dmi'
@@ -237,7 +229,6 @@
name = "dart"
icon_state = "cbbolt"
damage = 6
embed = 0
var/piercing = 0
/obj/item/projectile/bullet/dart/New()
@@ -299,7 +290,6 @@
name = "cap"
damage = 0
nodamage = 1
embed = 0
/obj/item/projectile/bullet/cap/fire()
loc = null
@@ -4,7 +4,6 @@
icon_state = "ice_1"
damage = 20
flag = "energy"
embed = 1
/obj/item/projectile/forcebolt/strong
name = "force bolt"
@@ -35,7 +35,6 @@
ammo_type = /obj/item/ammo_casing/caseless/foam_dart
range = 10
var/obj/item/weapon/pen/pen = null
embed = 0
log_override = TRUE//it won't log even when there's a pen inside, but since the damage will be so low, I don't think there's any point in making it any more complex
/obj/item/projectile/bullet/reusable/foam_dart/handle_drop()