mirror of
https://github.com/ParadiseSS13/Paradise.git
synced 2026-08-23 12:07:27 +01:00
The Most Non-Edgey PR Ever
This commit is contained in:
@@ -5,7 +5,6 @@
|
||||
damage_type = BRUTE
|
||||
flag = "bullet"
|
||||
embed = 1
|
||||
sharp = 1
|
||||
hitsound_wall = "ricochet"
|
||||
|
||||
/obj/item/projectile/bullet/weakbullet //beanbag, heavy stamina damage
|
||||
@@ -15,7 +14,6 @@
|
||||
|
||||
/obj/item/projectile/bullet/weakbullet/rubber //beanbag that shells that don't embed
|
||||
embed = 0
|
||||
sharp = 0
|
||||
|
||||
/obj/item/projectile/bullet/weakbullet/booze
|
||||
embed = 0
|
||||
@@ -46,7 +44,6 @@
|
||||
|
||||
/obj/item/projectile/bullet/weakbullet2/rubber //detective's bullets that don't embed
|
||||
embed = 0
|
||||
sharp = 0
|
||||
|
||||
/obj/item/projectile/bullet/weakbullet3
|
||||
damage = 20
|
||||
@@ -57,7 +54,6 @@
|
||||
stamina = 30
|
||||
icon_state = "bullet-r"
|
||||
embed = 0
|
||||
sharp = 0
|
||||
|
||||
/obj/item/projectile/bullet/toxinbullet
|
||||
damage = 15
|
||||
@@ -146,7 +142,6 @@
|
||||
damage = 3
|
||||
stamina = 25
|
||||
embed = 0
|
||||
sharp = 0
|
||||
icon_state = "bullet-r"
|
||||
|
||||
/obj/item/projectile/bullet/stunshot//taser slugs for shotguns, nothing special
|
||||
@@ -158,7 +153,6 @@
|
||||
jitter = 20
|
||||
range = 7
|
||||
embed = 0
|
||||
sharp = 0
|
||||
icon_state = "spark"
|
||||
color = "#FFFF00"
|
||||
|
||||
@@ -210,7 +204,6 @@
|
||||
forcedodge = 1
|
||||
nodamage = 1
|
||||
embed = 0
|
||||
sharp = 0
|
||||
pass_flags = PASSTABLE | PASSGLASS | PASSGRILLE
|
||||
hitsound = 'sound/items/bikehorn.ogg'
|
||||
icon = 'icons/obj/hydroponics/harvest.dmi'
|
||||
@@ -245,7 +238,6 @@
|
||||
icon_state = "cbbolt"
|
||||
damage = 6
|
||||
embed = 0
|
||||
sharp = 0
|
||||
var/piercing = 0
|
||||
|
||||
/obj/item/projectile/bullet/dart/New()
|
||||
@@ -308,7 +300,6 @@
|
||||
damage = 0
|
||||
nodamage = 1
|
||||
embed = 0
|
||||
sharp = 0
|
||||
|
||||
/obj/item/projectile/bullet/cap/fire()
|
||||
loc = null
|
||||
|
||||
@@ -35,7 +35,6 @@
|
||||
ammo_type = /obj/item/ammo_casing/caseless/foam_dart
|
||||
range = 10
|
||||
var/obj/item/weapon/pen/pen = null
|
||||
edge = 0
|
||||
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
|
||||
|
||||
|
||||
@@ -23,8 +23,6 @@
|
||||
icon_state= "bolter"
|
||||
damage = 50
|
||||
flag = "bullet"
|
||||
sharp = 1
|
||||
edge = 1
|
||||
|
||||
/obj/item/projectile/bullet/gyro/on_hit(var/atom/target, var/blocked = 0)
|
||||
..()
|
||||
|
||||
Reference in New Issue
Block a user