Ports event system from Bay

This commit is contained in:
Yoshax
2016-06-01 22:05:04 +01:00
parent 2c95126a00
commit f75d509e7f
51 changed files with 814 additions and 161 deletions
+2 -2
View File
@@ -86,10 +86,10 @@
/turf/get_alarm_origin()
return get_area(src)
/datum/alarm_handler/proc/register(var/object, var/procName)
/datum/alarm_handler/proc/register_alarm(var/object, var/procName)
listeners[object] = procName
/datum/alarm_handler/proc/unregister(var/object)
/datum/alarm_handler/proc/unregister_alarm(var/object)
listeners -= object
/datum/alarm_handler/proc/notify_listeners(var/alarm, var/was_raised)
+1 -1
View File
@@ -40,7 +40,7 @@
/mob/living/silicon/Destroy()
silicon_mob_list -= src
for(var/datum/alarm_handler/AH in alarm_manager.all_handlers)
AH.unregister(src)
AH.unregister_alarm(src)
..()
/mob/living/silicon/proc/init_id()
+1 -1
View File
@@ -39,7 +39,7 @@
return
for(var/datum/alarm_handler/AH in alarm_manager.all_handlers)
AH.register(src, /mob/living/silicon/proc/receive_alarm)
AH.register_alarm(src, /mob/living/silicon/proc/receive_alarm)
queued_alarms[AH] = list() // Makes sure alarms remain listed in consistent order
/********************
+4 -4
View File
@@ -15,13 +15,13 @@
..()
alarm_handlers = list(camera_alarm, motion_alarm)
/datum/nano_module/alarm_monitor/proc/register(var/object, var/procName)
/datum/nano_module/alarm_monitor/proc/register_alarm(var/object, var/procName)
for(var/datum/alarm_handler/AH in alarm_handlers)
AH.register(object, procName)
AH.register_alarm(object, procName)
/datum/nano_module/alarm_monitor/proc/unregister(var/object)
/datum/nano_module/alarm_monitor/proc/unregister_alarm(var/object)
for(var/datum/alarm_handler/AH in alarm_handlers)
AH.unregister(object)
AH.unregister_alarm(object)
/datum/nano_module/alarm_monitor/proc/all_alarms()
var/list/all_alarms = new()
+1
View File
@@ -88,6 +88,7 @@
var/list/ammo_states = list() //values
/obj/item/ammo_magazine/New()
..()
if(multiple_sprites)
initialize_magazine_icondata(src)
+7 -11
View File
@@ -726,17 +726,13 @@ CIRCUITS BELOW
/datum/design/circuit/AssembleDesignName()
..()
if(build_path)
var/obj/item/weapon/circuitboard/C = new build_path()
if(C && istype(C))
if(C.board_type == "machine")
name = "Machine circuit design ([item_name])"
qdel(C)
return
else if(C.board_type == "computer")
name = "Computer circuit design ([item_name])"
qdel(C)
return
name = "Circuit design ([item_name])"
var/obj/item/weapon/circuitboard/C = build_path
if(initial(C.board_type) == "machine")
name = "Machine circuit design ([item_name])"
else if(initial(C.board_type) == "computer")
name = "Computer circuit design ([item_name])"
else
name = "Circuit design ([item_name])"
/datum/design/circuit/AssembleDesignDesc()
if(!desc)
+2 -3
View File
@@ -51,8 +51,9 @@
visible_message("<span class='warning'>\The [src] breaks down!</span>")
return break_to_parts() // if we break and form shards, return them to the caller to do !FUN! things with
/obj/structure/table/New()
/obj/structure/table/initialize()
..()
// One table per turf.
for(var/obj/structure/table/T in loc)
if(T != src)
@@ -61,8 +62,6 @@
break_to_parts(full_return = 1)
return
/obj/structure/table/initialize()
..()
// reset color/alpha, since they're set for nice map previews
color = "#ffffff"
alpha = 255