cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-26 13:37:58 +01:00
Code Issues Packages Projects Releases Wiki Activity

Refactors throwing (#25946)

Browse Source 
* refactors datum/thrownthing

* cleanup

* lewc review

* calling parent doesn't do anything lmao
This commit is contained in:
chuga-git
2024-06-26 21:03:51 +00:00
committed by GitHub
parent 936d19c0a0
commit da42a1c2f6
9 changed files with 173 additions and 92 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/items/sport.dm
+2 -1
View File
@@ -87,7 +87,8 @@
/obj/structure/holohoop/hitby(atom/movable/AM, skipcatch, hitpush, blocked, datum/thrownthing/throwingdatum)
if(isitem(AM) && !isprojectile(AM))
if(prob(50) || HAS_TRAIT(throwingdatum.thrower, TRAIT_BADASS))
var/atom/movable/thrower = throwingdatum?.get_thrower()
if(prob(50) || HAS_TRAIT(thrower, TRAIT_BADASS))
AM.forceMove(get_turf(src))
visible_message("<span class='notice'>Swish! [AM] lands in [src].</span>")
else
code/game/objects/items/theft_items.dm
+2 -2
View File
@@ -210,8 +210,8 @@
var/mob/living/victim = hit_atom
if(victim.incorporeal_move || victim.status_flags & GODMODE || HAS_TRAIT(victim, TRAIT_SUPERMATTER_IMMUNE)) //try to keep this in sync with supermatter's consume fail conditions
return ..()
if(throwingdatum?.thrower)
var/mob/user = throwingdatum.thrower
var/mob/user = throwingdatum?.get_thrower()
if(user)
add_attack_logs(user, victim, "[victim] consumed by [src] thrown by [user] ")
message_admins("[src] has consumed [key_name_admin(victim)] [ADMIN_JMP(src)], thrown by [key_name_admin(user)].")
investigate_log("has consumed [key_name(victim)], thrown by [key_name(user)]", "supermatter")