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

[MIRROR] Fixes ?. nonsense. (#5152)

Browse Source 
* Fixes ?. nonsense. (#58630)

Co-authored-by: Fikou <piotrbryla@ onet.pl>

* Fixes ?. nonsense.

Co-authored-by: AnturK <AnturK@users.noreply.github.com>
Co-authored-by: Fikou <piotrbryla@ onet.pl>
This commit is contained in:
SkyratBot
2021-04-24 13:54:25 +01:00
committed by GitHub
co-authored by Fikou AnturK
parent de6abfd87f
commit 16cc1c4a1e
2 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/items/toy_mechs.dm
+4 -4
View File
@@ -446,19 +446,19 @@
/obj/item/toy/prize/proc/check_battle_start(mob/living/carbon/user, obj/item/toy/prize/attacker, mob/living/carbon/target)
if(attacker?.in_combat)
to_chat(user, "<span class='notice'>[target?target.p_their() : "Your" ] [attacker.name] is in combat.</span>")
target?.to_chat(target, "<span class='notice'>Your [attacker.name] is in combat.</span>")
to_chat(target, "<span class='notice'>Your [attacker.name] is in combat.</span>")
return FALSE
if(in_combat)
to_chat(user, "<span class='notice'>Your [name] is in combat.</span>")
target?.to_chat(target, "<span class='notice'>[target.p_their()] [name] is in combat.</span>")
to_chat(target, "<span class='notice'>[user.p_their()] [name] is in combat.</span>")
return FALSE
if(attacker && attacker.timer > world.time)
to_chat(user, "<span class='notice'>[target?target.p_their() : "Your" ] [attacker.name] isn't ready for battle.</span>")
target?.to_chat(target, "<span class='notice'>Your [attacker.name] isn't ready for battle.</span>")
to_chat(target, "<span class='notice'>Your [attacker.name] isn't ready for battle.</span>")
return FALSE
if(timer > world.time)
to_chat(user, "<span class='notice'>Your [name] isn't ready for battle.</span>")
target?.to_chat(target, "<span class='notice'>[target.p_their()] [name] isn't ready for battle.</span>")
to_chat(target, "<span class='notice'>[user.p_their()] [name] isn't ready for battle.</span>")
return FALSE
return TRUE
code/modules/vehicles/mecha/equipment/weapons/weapons.dm
+4 -2
View File
@@ -472,10 +472,12 @@
..()
if(href_list["lethalPunch"])
harmful = !harmful
if(!chassis)
return
if(harmful)
chassis?.to_chat(usr, "[icon2html(src, usr)]<span class='warning'>Lethal Fisting Enabled.</span>")
to_chat(usr, "[icon2html(src, usr)]<span class='warning'>Lethal Fisting Enabled.</span>")
else
chassis?.to_chat(usr, "[icon2html(src, usr)]<span class='warning'>Lethal Fisting Disabled.</span>")
to_chat(usr, "[icon2html(src, usr)]<span class='warning'>Lethal Fisting Disabled.</span>")
/obj/item/mecha_parts/mecha_equipment/weapon/ballistic/launcher/punching_glove/action(mob/source, atom/target, params)
. = ..()