Merge pull request #1024 from tigercat2000/OtherSomeFixes

Fix: Space turf depressure, admin del is now admin qdel, event manager runtime
This commit is contained in:
ZomgPonies
2015-05-12 22:49:46 -04:00
3 changed files with 18 additions and 3 deletions
+1 -1
View File
@@ -244,7 +244,7 @@
S.update_starlight()
W.levelupdate()
W.CalculateAdjacentTurfs()
W.air_update_turf(1)
. = W
affecting_lights = old_affecting_lights
+5 -1
View File
@@ -687,7 +687,11 @@ Traitors and the like can also be revived with the previous role mostly intact.
log_admin("[key_name(usr)] deleted [O] at ([O.x],[O.y],[O.z])")
message_admins("[key_name_admin(usr)] deleted [O] at ([O.x],[O.y],[O.z])", 1)
feedback_add_details("admin_verb","DEL") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
del(O)
if(istype(O, /turf))
var/turf/T = O
T.ChangeTurf(/turf/space)
return
qdel(O)
/client/proc/cmd_admin_list_open_jobs()
set category = "Admin"
+12 -1
View File
@@ -39,8 +39,19 @@
finished_events += E
var/theseverity
if(!E.severity)
theseverity = EVENT_LEVEL_MODERATE
if(!E.severity == EVENT_LEVEL_MUNDANE && !E.severity == EVENT_LEVEL_MODERATE && !E.severity == EVENT_LEVEL_MAJOR)
theseverity = EVENT_LEVEL_MODERATE //just to be careful
if(E.severity)
theseverity = E.severity
// Add the event back to the list of available events
var/datum/event_container/EC = event_containers[E.severity]
var/datum/event_container/EC = event_containers[theseverity]
var/datum/event_meta/EM = E.event_meta
EC.available_events += EM