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

50DPS Urinal fix (#9471)

Browse Source
This commit is contained in:
HouseOfSynth
2020-07-28 16:09:14 +01:00
committed by GitHub
parent a0ebcda027
commit 00ebe0a0cb
3 changed files with 47 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
code/game/objects/structures/watercloset.dm
View File

@@ -109,7 +109,7 @@
density = 0
anchored = 1
/obj/structure/urinal/attackby(obj/item/I as obj, mob/user as mob)
/obj/structure/urinal/attackby(obj/item/I, mob/user)
if(istype(I, /obj/item/grab))
var/obj/item/grab/G = I
if(isliving(G.affecting))
@@ -119,7 +119,9 @@
to_chat(user, SPAN_NOTICE("[GM.name] needs to be on the urinal."))
return
user.visible_message(SPAN_DANGER("[user] slams [GM.name] into the [src]!"), SPAN_NOTICE("You slam [GM.name] into the [src]!"))
GM.adjustBruteLoss(8)
var/blocked = GM.run_armor_check("melee")
GM.apply_damage(8, def_zone = BP_HEAD, blocked = blocked, used_weapon = "blunt force")
user.setClickCooldown(DEFAULT_ATTACK_COOLDOWN * 1.5)
else
to_chat(user, SPAN_NOTICE("You need a tighter grip."))