cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-22 03:27:05 +01:00
Code Issues Packages Projects Releases Wiki Activity

Adds the titanium push broom, a janitor-exclusive traitor item (#21496)

Browse Source 
* adds it

* fixes the thing

* !! scope size increasing !!

* trait rename

* surplus removing

* Apply suggestions from code review

Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>

* code review commit 2

* fixes a minor issue

* check_grep please have mercy

* Apply suggestions from code review

Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>

---------

Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
This commit is contained in:
JimKil3
2023-07-23 23:28:24 +01:00
committed by GitHub
co-authored by Henri215 Luc
parent b41d4be848
commit 86874ce415
5 changed files with 108 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/mob/living/carbon/human/human_defense.dm
+17
View File
@@ -60,6 +60,23 @@ emp_act
else
return FALSE
if(HAS_TRAIT(src, TRAIT_DEFLECTS_PROJECTILES))
add_attack_logs(P.firer, src, "Hit by [P.type], but deflected by something other than martial arts")
playsound(src, pick('sound/weapons/bulletflyby.ogg', 'sound/weapons/bulletflyby2.ogg', 'sound/weapons/bulletflyby3.ogg'), 75, TRUE)
if(HAS_TRAIT(src, TRAIT_PACIFISM) || !P.is_reflectable(REFLECTABILITY_PHYSICAL))
// Pacifism and unreflectables hitting the ground logic. Copied from above
var/turf/T = get_turf(src)
P.firer = src
T.bullet_act(P)
visible_message("<span class='danger'>[src] deflects the projectile into the ground!</span>", "<span class='userdanger'>You deflect the projectile towards the ground beneath your feet!</span>")
return FALSE
visible_message("<span class='danger'>[src] deflects the projectile!</span>", "<span class='userdanger'>You deflect the projectile!</span>")
P.firer = src
P.set_angle(rand(0, 360))
return -1
var/obj/item/organ/external/organ = get_organ(check_zone(def_zone))
if(isnull(organ))
return bullet_act(P, "chest") //act on chest instead