cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2025-12-24 09:02:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

More combat/gun/medical tweaks. (#8615)

Browse Source
This commit is contained in:
Matt Atlas
2020-04-19 14:28:33 +02:00
committed by GitHub
parent 7ef1c10f7a
commit d403ee314d
12 changed files with 132 additions and 90 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
code/modules/projectiles/gun.dm
View File

@@ -291,7 +291,7 @@
process_point_blank(projectile, user, target)
if(process_projectile(projectile, user, target, user.zone_sel.selecting, clickparams))
handle_post_fire(user, target, pointblank, reflex, i == burst)
handle_post_fire(user, target, pointblank, reflex, TRUE)
update_icon()
if(i < burst)
@@ -385,13 +385,13 @@
playsound(loc, 'sound/weapons/empty.ogg', 100, 1)
//called after successfully firing
/obj/item/gun/proc/handle_post_fire(mob/user, atom/target, var/pointblank=0, var/reflex=0, var/playemote = 1)
/obj/item/gun/proc/handle_post_fire(mob/user, atom/target, var/pointblank = FALSE, var/reflex = FALSE, var/playemote = TRUE)
if(silenced)
playsound(user, fire_sound, 10, 1)
else
playsound(user, fire_sound, 75, 1, 3, 0.5, 1)
if (playemote)
if(playemote)
if(reflex)
user.visible_message(
SPAN_DANGER("<b>\The [user] fires \the [src][pointblank ? " point blank at \the [target]" : ""] by reflex!</b>"),
@@ -414,7 +414,7 @@
if(ishuman(user) && user.invisibility == INVISIBILITY_LEVEL_TWO) //shooting will disable a rig cloaking device
var/mob/living/carbon/human/H = user
if(istype(H.back,/obj/item/rig))
if(istype(H.back, /obj/item/rig))
var/obj/item/rig/R = H.back
for(var/obj/item/rig_module/stealth_field/S in R.installed_modules)
S.deactivate()

6
code/modules/projectiles/projectile.dm
View File

@@ -183,13 +183,13 @@
//hit messages
if(silenced)
to_chat(target_mob, "<span class='danger'>You've been hit in the [parse_zone(def_zone)] by \the [src]!</span>")
to_chat(target_mob, "<span class='danger'>You've been hit in the [parse_zone(def_zone)] by \a [src]!</span>")
else
target_mob.visible_message("<span class='danger'>\The [target_mob] is hit by \the [src] in the [parse_zone(def_zone)]!</span>", "<span class='danger'><font size='2'>You're hit by \the [src] in the [parse_zone(def_zone)]!</font></span>")//X has fired Y is now given by the guns so you cant tell who shot you if you could not see the shooter
target_mob.visible_message("<span class='danger'>\The [target_mob] is hit by \a [src] in the [parse_zone(def_zone)]!</span>", "<span class='danger'><font size=2>You are hit by \a [src] in the [parse_zone(def_zone)]!</font></span>")//X has fired Y is now given by the guns so you cant tell who shot you if you could not see the shooter
//admin logs
if(!no_attack_log)
if(istype(firer, /mob))
if(ismob(firer))
var/attacker_message = "shot with \a [src.type]"
var/victim_message = "shot with \a [src.type]"