Merge commit '8dff7f07867d39f200619443d974adbba0a97737' of https://github.com/lolman360/Citadel-Station-13-RP into tgui4examinetake2

This commit is contained in:
lolman360
2021-02-15 11:46:22 +11:00
236 changed files with 1629 additions and 1713 deletions
@@ -1,9 +1,9 @@
/obj/item/modular_computer/examine(var/mob/user)
/obj/item/modular_computer/examine(mob/user)
. = ..()
if(damage > broken_damage)
to_chat(user, "<span class='danger'>It is heavily damaged!</span>")
. += "<span class='danger'>It is heavily damaged!</span>"
else if(damage)
to_chat(user, "It is damaged.")
. += "It is damaged."
/obj/item/modular_computer/proc/break_apart()
visible_message("\The [src] breaks apart!")
@@ -52,4 +52,4 @@
if(HALLOSS)
take_damage(Proj.damage, Proj.damage / 3, 0)
if(BURN)
take_damage(Proj.damage, Proj.damage / 1.5)
take_damage(Proj.damage, Proj.damage / 1.5)