mirror of
https://github.com/ParadiseSS13/Paradise.git
synced 2025-12-30 12:13:02 +00:00
Shitton of bugfixes related to bryteloss/fireloss.
Note for coders: in order to help with seaching of health-related bugs I have moved many procs from /mob/ under /mob/living/. Also, done some clean up and rearranging. Results: -admin rejuvenating now works again; -people screams if getting creamated while still alive; -diseases actually loose your health; -monkeys wearing masks receive protection from acids as humans did; -and other minor fixes and improvements. Bugfix for imbuing a talisman. RD now spawns with only 2 pens instead of 3. Audible emotions can be heard by people outside of locker/other container. git-svn-id: http://tgstation13.googlecode.com/svn/trunk@1446 316c924e-a436-60f5-8080-3fe189b3f50e
This commit is contained in:
@@ -489,11 +489,8 @@ var/showadminmessages = 1
|
||||
|
||||
if (href_list["revive"])
|
||||
if ((src.rank in list( "Trial Admin", "Badmin", "Game Admin", "Game Master" )))
|
||||
var/mob/M = locate(href_list["revive"])
|
||||
var/mob/living/M = locate(href_list["revive"])
|
||||
if (ismob(M))
|
||||
if(istype(M, /mob/dead/observer))
|
||||
alert("Cannot revive a ghost")
|
||||
return
|
||||
if(config.allow_admin_rev)
|
||||
M.revive()
|
||||
message_admins("\red Admin [key_name_admin(usr)] healed / revived [key_name_admin(M)]!", 1)
|
||||
@@ -1961,7 +1958,7 @@ var/showadminmessages = 1
|
||||
else
|
||||
alert("[M.name] is not prisoned.")
|
||||
|
||||
/mob/proc/revive()
|
||||
/mob/living/proc/revive()
|
||||
//src.fireloss = 0
|
||||
src.toxloss = 0
|
||||
//src.bruteloss = 0
|
||||
|
||||
Reference in New Issue
Block a user