mirror of
https://github.com/ParadiseSS13/Paradise.git
synced 2026-08-22 11:37:40 +01:00
Merge pull request #453 from SkyMarshal/master
Map update, fixed more disposal problems, and missing power line to AI core.
This commit is contained in:
@@ -21,7 +21,6 @@
|
||||
|
||||
var/list/replacechars = list("'" = "","\"" = "",">" = "","<" = "","(" = "",")" = "")
|
||||
msg = sanitize_simple(msg, replacechars)
|
||||
world << msg
|
||||
send2adminirc("#bs12admin","HELP: \"[src.key]: [msg]\"")
|
||||
if(tension_master)
|
||||
tension_master.new_adminhelp()
|
||||
|
||||
@@ -274,7 +274,7 @@
|
||||
proc/AnnounceArrival(var/mob/living/carbon/human/character, var/rank)
|
||||
if (ticker.current_state == GAME_STATE_PLAYING)
|
||||
var/obj/item/device/radio/intercom/a = new /obj/item/device/radio/intercom(null)
|
||||
a.autosay("[character.real_name],[character.wear_id.assignment ? " [character.wear_id.assignment]," : "" ] has arrived on the station.", "Arrivals Announcement Computer")
|
||||
a.autosay("\"[character.real_name],[character.wear_id.assignment ? " [character.wear_id.assignment]," : "" ] has arrived on the station.\"", "Arrivals Announcement Computer")
|
||||
del(a)
|
||||
|
||||
|
||||
|
||||
@@ -334,7 +334,7 @@ field_generator power level display
|
||||
containment_fail_announced = 1
|
||||
var/obj/item/device/radio/a = new /obj/item/device/radio(null)
|
||||
a.config(list("Engineering" = 0))
|
||||
a.autosay("DANGER! Field failure detected! Immediate response advised!", "Singularity Monitoring Computer", "department")
|
||||
a.autosay("\"DANGER! Field failure detected! Immediate response advised!\"", "Singularity Monitoring Computer", "department")
|
||||
del(a)
|
||||
spawn(6000) //10 minutes.
|
||||
containment_fail_announced = 0
|
||||
|
||||
Reference in New Issue
Block a user