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

You can no longer use mech ranged weapons if you have a melee-only martial arts (#17659)

Browse Source 
* You can no longer use mech ranged weapons if you have a melee-only martial arts

* Update code/game/mecha/mecha.dm

Co-authored-by: Charlie <69320440+hal9000PR@users.noreply.github.com>

* Update code/game/mecha/mecha.dm

Co-authored-by: Charlie <69320440+hal9000PR@users.noreply.github.com>

Co-authored-by: Charlie <69320440+hal9000PR@users.noreply.github.com>
This commit is contained in:
Regen
2022-04-30 15:54:32 +01:00
committed by GitHub
co-authored by Charlie
parent b8b6356150
commit 35fe448b38
1 changed files with 3 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/mecha/mecha.dm
+3
View File
@@ -211,6 +211,9 @@
if(HAS_TRAIT(L, TRAIT_PACIFISM) && selected.harmful)
to_chat(L, "<span class='warning'>You don't want to harm other living beings!</span>")
return
if(user.mind?.martial_art?.no_guns)
to_chat(L, "<span class='warning'>[L.mind.martial_art.no_guns_message]</span>")
return
selected.action(target, params)
else if(selected && selected.is_melee())
if(isliving(target) && selected.harmful && HAS_TRAIT(L, TRAIT_PACIFISM))