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

Merge pull request #6994 from VOREStation/upstream-merge-6885

Browse Source 
[MIRROR] [Feature Tweak] Message Fixy For Snowballs/Kickstands
This commit is contained in:
Novacat
2020-03-25 19:22:39 -04:00
committed by GitHub
parent a765098a46 dc85cddd54
commit 3e8128c917
3 changed files with 43 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
code/game/objects/items/weapons/material/misc.dm
View File

@@ -73,12 +73,14 @@
/obj/item/weapon/material/snow/snowball/attack_self(mob/user as mob)
if(user.a_intent == I_HURT)
visible_message("[user] has smashed the snowball in their hand!", "You smash the snowball in your hand.")
//visible_message("[user] has smashed the snowball in their hand!", "You smash the snowball in your hand.")
to_chat(user, "<span class='notice'>You smash the snowball in your hand.</span>")
var/atom/S = new /obj/item/stack/material/snow(user.loc)
del(src)
user.put_in_hands(S)
else
visible_message("[user] starts compacting the snowball.", "You start compacting the snowball.")
//visible_message("[user] starts compacting the snowball.", "You start compacting the snowball.")
to_chat(user, "<span class='notice'>You start compacting the snowball.</span>")
if(do_after(user, 2 SECONDS))
var/atom/S = new /obj/item/weapon/material/snow/snowball/reinforced(user.loc)
del(src)

6
code/modules/vehicles/bike.dm
View File

@@ -71,7 +71,7 @@
turn_off()
src.visible_message("\The [src] putters before turning off.", "You hear something putter slowly.")
/obj/vehicle/bike/verb/kickstand()
/obj/vehicle/bike/verb/kickstand(var/mob/user as mob) //TFF 22/3/20 - Tweaking the visible_message output so it's not "You put kickstand down" to everyone.
set name = "Toggle Kickstand"
set category = "Vehicle"
set src in view(0)
@@ -82,12 +82,12 @@
if(usr.incapacitated()) return
if(kickstand)
src.visible_message("You put up \the [src]'s kickstand.")
visible_message("[user] puts up \the [src]'s kickstand.")
else
if(istype(src.loc,/turf/space) || istype(src.loc, /turf/simulated/floor/water))
to_chat(usr, "<span class='warning'> You don't think kickstands work here...</span>")
return
src.visible_message("You put down \the [src]'s kickstand.")
visible_message("[user] puts down \the [src]'s kickstand.")
if(pulledby)
pulledby.stop_pulling()