shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #12086 from Citadel-Station-13/Ghommie-patch-3

Browse Source 
Webedit bugfixes
This commit is contained in:
kevinz000
2020-05-02 15:56:22 -07:00
committed by GitHub
parent b68f1aaf72 8bad031979
commit 5bf5796fac
2 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/items/paint.dm
+1 -1
View File
@@ -112,7 +112,7 @@
. = ..() . = ..()
if(!proximity) if(!proximity)
return return
if(!isturf(target) || !isobj(target)) if(!isturf(target) && !isobj(target))
return return
if(target.color != initial(target.color)) if(target.color != initial(target.color))
target.remove_atom_colour(WASHABLE_COLOUR_PRIORITY) target.remove_atom_colour(WASHABLE_COLOUR_PRIORITY)
code/game/objects/items/shields.dm
+2
View File
@@ -107,6 +107,8 @@
return TRUE return TRUE
/obj/item/shield/proc/user_shieldbash(mob/living/user, atom/target, harmful) /obj/item/shield/proc/user_shieldbash(mob/living/user, atom/target, harmful)
if(!(user.combat_flags & COMBAT_FLAG_COMBAT_ACTIVE)) //Combat mode has to be enabled for shield bashing
return FALSE
if(!(shield_flags & SHIELD_CAN_BASH)) if(!(shield_flags & SHIELD_CAN_BASH))
to_chat(user, "<span class='warning'>[src] can't be used to shield bash!</span>") to_chat(user, "<span class='warning'>[src] can't be used to shield bash!</span>")
return FALSE return FALSE