cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-13 11:43:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

TG: Fixed harmbatons on everything other than harm, now it is the opposite way

Browse Source 
round.
Clarified swirlie failure feedback.
Revision: r3781
Author: 	 petethegoat
This commit is contained in:
Erthilo
2012-06-26 00:10:30 +01:00
parent 2c3e008f1e
commit 6aaceee446
2 changed files with 16 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
code/game/objects/items/weapons/stunbaton.dm
View File

@@ -60,7 +60,7 @@
..() ..()
return return
if(user.a_intent != "help") if(user.a_intent == "hurt")
if(!..()) return if(!..()) return
H.apply_effect(5, WEAKEN, 0) H.apply_effect(5, WEAKEN, 0)
H.visible_message("<span class='danger'>[M] has been beaten with the [src] by [user]!</span>") H.visible_message("<span class='danger'>[M] has been beaten with the [src] by [user]!</span>")
@@ -75,9 +75,14 @@
H.apply_effect(10, STUTTER, 0) H.apply_effect(10, STUTTER, 0)
user.lastattacked = M user.lastattacked = M
H.lastattacker = user H.lastattacker = user
charges-- if(isrobot(src.loc))
var/mob/living/silicon/robot/R = src.loc
if(R && R.cell)
R.cell.use(50)
else
charges--
H.visible_message("<span class='danger'>[M] has been stunned with the [src] by [user]!</span>") H.visible_message("<span class='danger'>[M] has been stunned with the [src] by [user]!</span>")
playsound(src.loc, "sparks", 75, 1, -1) playsound(src.loc, 'Egloves.ogg', 50, 1, -1)
if(charges < 1) if(charges < 1)
status = 0 status = 0
update_icon() update_icon()

10
code/game/objects/watercloset.dm
View File

@@ -58,7 +58,10 @@
var/obj/item/weapon/grab/G = I var/obj/item/weapon/grab/G = I
var/mob/GM = G.affecting var/mob/GM = G.affecting
if(ismob(G.affecting)) if(ismob(G.affecting))
if(G.state>1 && GM.loc == get_turf(src)) if(G.state>1)
if(!GM.loc == get_turf(src))
user << "<span class='notice'>[GM.name] needs to be on the toilet.</span>"
return
if(open && !swirlie) if(open && !swirlie)
user.visible_message("<span class='danger'>[user] starts to give [GM.name] a swirlie!</span>", "<span class='notice'>You start to give [GM.name] a swirlie!</span>") user.visible_message("<span class='danger'>[user] starts to give [GM.name] a swirlie!</span>", "<span class='notice'>You start to give [GM.name] a swirlie!</span>")
swirlie = GM swirlie = GM
@@ -101,7 +104,10 @@
var/obj/item/weapon/grab/G = I var/obj/item/weapon/grab/G = I
var/mob/GM = G.affecting var/mob/GM = G.affecting
if(ismob(G.affecting)) if(ismob(G.affecting))
if(G.state>1 && GM.loc == get_turf(src)) if(G.state>1)
if(!GM.loc == get_turf(src))
user << "<span class='notice'>[GM.name] needs to be on the urinal.</span>"
return
user.visible_message("<span class='danger'>[user] slams [GM.name] into the [src]!</span>", "<span class='notice'>You slam [GM.name] into the [src]!</span>") user.visible_message("<span class='danger'>[user] slams [GM.name] into the [src]!</span>", "<span class='notice'>You slam [GM.name] into the [src]!</span>")
GM.adjustBruteLoss(8) GM.adjustBruteLoss(8)
else else