mirror of
https://github.com/ParadiseSS13/Paradise.git
synced 2026-08-22 03:27:05 +01:00
Adds sharp and edge flags to appropriate items
Went through as many /obj/item/weapons as I could find and added sharp and edge flags where appropriate. Conflicts: code/modules/research/xenoarchaeology/finds/finds_misc.dm
This commit is contained in:
@@ -64,6 +64,7 @@
|
||||
attack_verb = list("hit", "pierced", "sliced", "attacked")
|
||||
var/drill_sound = 'sound/weapons/Genhit.ogg'
|
||||
var/drill_verb = "picking"
|
||||
sharp = 1
|
||||
|
||||
var/excavation_amount = 100
|
||||
|
||||
|
||||
@@ -748,5 +748,6 @@
|
||||
src.visible_message("\red [name] shatters.","\red You hear a small glass object shatter.")
|
||||
status = LIGHT_BROKEN
|
||||
force = 5
|
||||
sharp = 1
|
||||
playsound(src.loc, 'sound/effects/Glasshit.ogg', 75, 1)
|
||||
update()
|
||||
|
||||
@@ -86,6 +86,7 @@
|
||||
/obj/item/projectile/bullet/burstbullet//I think this one needs something for the on hit
|
||||
name = "exploding bullet"
|
||||
damage = 20
|
||||
embed = 0
|
||||
edge = 1
|
||||
|
||||
|
||||
|
||||
@@ -17,7 +17,8 @@
|
||||
icon_state= "bolter"
|
||||
damage = 50
|
||||
flag = "bullet"
|
||||
|
||||
sharp = 1
|
||||
edge = 1
|
||||
|
||||
on_hit(var/atom/target, var/blocked = 0)
|
||||
explosion(target, -1, 0, 2)
|
||||
|
||||
@@ -5,6 +5,8 @@
|
||||
force = 8.0
|
||||
throwforce = 15.0
|
||||
icon_state = "plasmalarge"
|
||||
sharp = 1
|
||||
edge = 1
|
||||
|
||||
/obj/item/weapon/shard/plasma/New()
|
||||
|
||||
|
||||
@@ -20,6 +20,7 @@
|
||||
icon = 'icons/obj/xenoarchaeology.dmi'
|
||||
icon_state = "sliver1" //0-4
|
||||
w_class = 1
|
||||
sharp = 1
|
||||
//item_state = "electronic"
|
||||
var/source_rock = "/turf/simulated/mineral/"
|
||||
var/datum/geosample/geological_data
|
||||
|
||||
Reference in New Issue
Block a user