Skip to content

Commit

Permalink
og
Browse files Browse the repository at this point in the history
  • Loading branch information
Zattarra committed Aug 18, 2024
1 parent 967b41e commit f14312b
Show file tree
Hide file tree
Showing 3 changed files with 16 additions and 11 deletions.
21 changes: 13 additions & 8 deletions maplestation_modules/story_content/deepred_warfare/code/curios.dm
Original file line number Diff line number Diff line change
Expand Up @@ -44,23 +44,28 @@
fire_sound = 'maplestation_modules/story_content/deepred_warfare/sound/godslayer.ogg'
// delay = 0.1 * SECONDS

var/obj/item/gun/fired_record

/obj/item/ammo_casing/shotgun/godslayer/Initialize(mapload)
. = ..()
AddElement(/datum/element/caseless)
// AddElement(/datum/element/caseless)

/obj/item/ammo_casing/shotgun/godslayer/fire_casing(atom/target, mob/living/user, params, distro, quiet, zone_override, spread, atom/fired_from)
if(isgun(fired_from))
var/obj/item/gun/shot_from = fired_from
shot_from.fire_sound_volume = 0
shot_from.recoil = inital(shot_from.recoil) + 2
fired_record = fired_from
fired_record.fire_sound_volume = 0
fired_record.recoil = initial(fired_record.recoil) + 2

. = ..()
playsound(src, fire_sound, 50)

if(isgun(fired_from))
var/obj/item/gun/shot_from = fired_from
shot_from.fire_sound_volume = initial(shot_from.fire_sound_volume)
shot_from.recoil = inital(shot_from.recoil)
if(fired_record)
addtimer(CALLBACK(src, PROC_REF(reset_gunstats)), 1)

/obj/item/ammo_casing/shotgun/godslayer/proc/reset_gunstats()
if(fired_record)
fired_record.fire_sound_volume = initial(fired_record.fire_sound_volume)
fired_record.recoil = initial(fired_record.recoil)

/obj/item/redtech_nan_sample
name = "crimson nanite sample"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -94,17 +94,17 @@

/obj/projectile/bullet/godslayer/on_hit(atom/target, blocked = 0, pierce_hit)
. = ..()
if(. == BULLET_ACT_HIT)
if(. == BULLET_ACT_HIT && !pierce_hit)
warp()
return
if(marked_target)
return
if(isliving(target) || ismecha(target))
if(isliving(target) || isvehicle(target))
marked_target = target

/obj/projectile/bullet/godslayer/proc/warp()
if(marked_target)
var/obj/projectile/A = new /obj/projectile/beam/laser(get_turf(firer))
var/obj/projectile/A = new /obj/projectile/bullet/coil/red_lightning(get_turf(firer))
A.preparePixelProjectile(marked_target, get_turf(firer))
A.firer = firer
A.fired_from = firer
Expand Down
Binary file not shown.

0 comments on commit f14312b

Please sign in to comment.