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

Shitton of bugfixes related to bryteloss/fireloss.

Browse Source 
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:
rastaf.zero@gmail.com
2011-04-15 07:41:19 +00:00
parent 2a1818cc93
commit b58e465bbe
73 changed files with 1266 additions and 1210 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/admin/admin.dm
+2 -5
View File
@@ -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
code/modules/admin/verbs/randomverbs.dm
+3 -3
View File
@@ -394,7 +394,7 @@ TO DO: actually integrate random appearance and player preference save.
command_alert("Ion storm detected near the station. Please check all AI-controlled equipment for errors.", "Anomaly Alert")
world << sound('ionstorm.ogg')
/client/proc/cmd_admin_rejuvenate(mob/M as mob in world)
/client/proc/cmd_admin_rejuvenate(mob/living/M as mob in world)
set category = "Special Verbs"
set name = "Rejuvenate"
// All admins should be authenticated, but... what if?
@@ -403,7 +403,7 @@ TO DO: actually integrate random appearance and player preference save.
return
if(!src.mob)
return
if(istype(M, /mob/dead/observer))
if(!istype(M))
alert("Cannot revive a ghost")
return
if(config.allow_admin_rev)
@@ -614,7 +614,7 @@ TO DO: actually integrate random appearance and player preference save.
// I will both remove their SVN access and permanently ban them from my servers.
return
/client/proc/cmd_admin_check_contents(mob/M as mob in world)
/client/proc/cmd_admin_check_contents(mob/living/M as mob in world)
set category = "Special Verbs"
set name = "Check Contents"