fixes linter issues, removes acid degrading armor (#13399)

* fix

* more

* Update brawn.dm

* Update ticketmachine.dm
This commit is contained in:
Ghom
2020-09-19 15:04:48 +02:00
committed by GitHub
8 changed files with 10 additions and 34 deletions
@@ -113,8 +113,7 @@
if (loc != user)
return ..()
if(SEND_SIGNAL(src, COMSIG_IS_STORAGE_LOCKED))
ui_interact(user)
return
INVOKE_ASYNC(src, /datum.proc/ui_interact, user)
/obj/item/storage/portable_chem_mixer/attack_self(mob/user)
if(loc == user)
-3
View File
@@ -204,9 +204,6 @@ GLOBAL_DATUM_INIT(acid_overlay, /mutable_appearance, mutable_appearance('icons/e
/obj/proc/acid_processing()
. = 1
if(!(resistance_flags & ACID_PROOF))
for(var/armour_value in armor)
if(armour_value != "acid" && armour_value != "fire")
armor = armor.modifyAllRatings(0 - round(sqrt(acid_level)*0.1))
if(prob(33))
playsound(loc, 'sound/items/welder.ogg', 150, 1)
take_damage(min(1 + round(sqrt(acid_level)*0.3), 300), BURN, "acid", 0)