mirror of
https://github.com/yogstation13/Yogstation.git
synced 2025-02-26 09:04:50 +00:00
1ea0e47aa4
The message when firing a gun is removed. To keep things balanced melee attacks (punches, alien attacks, animal attacks, etc...) now show a visual effect (similar to what we current have with item attacks. Fixes muzzle flash effect not appearing for mech guns. Fixes muzzle flash effect not appearing for certain ranged animal. Fixes the item attack effect not being visible to camera viewers and mech occupants. Fixes toy guns foam dart not dropping on the ground when shooting a mob on the same tile as us. Fixes toy smg magazine sprite being invisible sometimes. Fixes foam dart not facing the correct direction when fired. Changes the bullet projectile sprite to have a slight tracer effect so as to be more visible.
69 lines
1.9 KiB
Plaintext
69 lines
1.9 KiB
Plaintext
/obj/item/projectile/bullet/reusable
|
|
name = "reusable bullet"
|
|
desc = "How do you even reuse a bullet?"
|
|
var/ammo_type = /obj/item/ammo_casing/caseless/
|
|
var/dropped = 0
|
|
impact_effect_type = null
|
|
|
|
/obj/item/projectile/bullet/reusable/on_hit(atom/target, blocked = 0)
|
|
. = ..()
|
|
handle_drop()
|
|
|
|
/obj/item/projectile/bullet/reusable/on_range()
|
|
handle_drop()
|
|
..()
|
|
|
|
/obj/item/projectile/bullet/reusable/proc/handle_drop()
|
|
if(!dropped)
|
|
var/turf/T = get_turf(src)
|
|
new ammo_type(T)
|
|
dropped = 1
|
|
|
|
/obj/item/projectile/bullet/reusable/magspear
|
|
name = "magnetic spear"
|
|
desc = "WHITE WHALE, HOLY GRAIL"
|
|
damage = 30 //takes 3 spears to kill a mega carp, one to kill a normal carp
|
|
icon_state = "magspear"
|
|
ammo_type = /obj/item/ammo_casing/caseless/magspear
|
|
|
|
/obj/item/projectile/bullet/reusable/foam_dart
|
|
name = "foam dart"
|
|
desc = "I hope you're wearing eye protection."
|
|
damage = 0 // It's a damn toy.
|
|
damage_type = OXY
|
|
nodamage = 1
|
|
icon = 'icons/obj/guns/toy.dmi'
|
|
icon_state = "foamdart_proj"
|
|
ammo_type = /obj/item/ammo_casing/caseless/foam_dart
|
|
range = 10
|
|
var/obj/item/weapon/pen/pen = null
|
|
|
|
/obj/item/projectile/bullet/reusable/foam_dart/handle_drop()
|
|
if(dropped)
|
|
return
|
|
var/turf/T = get_turf(src)
|
|
dropped = 1
|
|
var/obj/item/ammo_casing/caseless/foam_dart/newdart = new ammo_type(T)
|
|
var/obj/item/ammo_casing/caseless/foam_dart/old_dart = ammo_casing
|
|
newdart.modified = old_dart.modified
|
|
if(pen)
|
|
var/obj/item/projectile/bullet/reusable/foam_dart/newdart_FD = newdart.BB
|
|
newdart_FD.pen = pen
|
|
pen.loc = newdart_FD
|
|
pen = null
|
|
newdart.BB.damage = damage
|
|
newdart.BB.nodamage = nodamage
|
|
newdart.BB.damage_type = damage_type
|
|
newdart.update_icon()
|
|
|
|
|
|
/obj/item/projectile/bullet/reusable/foam_dart/Destroy()
|
|
pen = null
|
|
return ..()
|
|
|
|
/obj/item/projectile/bullet/reusable/foam_dart/riot
|
|
name = "riot foam dart"
|
|
icon_state = "foamdart_riot_proj"
|
|
ammo_type = /obj/item/ammo_casing/caseless/foam_dart/riot
|
|
stamina = 25
|