Merge pull request #3021 from Neerti/2/23/2017_porting_map_datum_system

Ports a large chunk of the map datum system that europa/bay uses.
This commit is contained in:
Anewbe
2017-03-02 16:32:02 -06:00
committed by GitHub
128 changed files with 17236 additions and 16960 deletions
+1 -1
View File
@@ -518,7 +518,7 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp
return
var/turf/T = get_turf(src)
if(!T || (T.z in config.admin_levels))
if(!T || (T.z in using_map.admin_levels))
src << "<span class='warning'>You may not spawn as a mouse on this Z-level.</span>"
return
@@ -33,7 +33,7 @@
hud_list[HEALTH_HUD] = new /image/hud_overlay('icons/mob/hud_med.dmi', src, "100")
hud_list[STATUS_HUD] = new /image/hud_overlay('icons/mob/hud.dmi', src, "hudhealthy")
hud_list[LIFE_HUD] = new /image/hud_overlay('icons/mob/hud.dmi', src, "hudhealthy")
hud_list[ID_HUD] = new /image/hud_overlay('icons/mob/hud.dmi', src, "hudunknown")
hud_list[ID_HUD] = new /image/hud_overlay(using_map.id_hud_icons, src, "hudunknown")
hud_list[WANTED_HUD] = new /image/hud_overlay('icons/mob/hud.dmi', src, "hudblank")
hud_list[IMPLOYAL_HUD] = new /image/hud_overlay('icons/mob/hud.dmi', src, "hudblank")
hud_list[IMPCHEM_HUD] = new /image/hud_overlay('icons/mob/hud.dmi', src, "hudblank")
+4 -4
View File
@@ -52,7 +52,7 @@ var/list/ai_verbs_hidden = list( // For why this exists, refer to https://xkcd.c
density = 1
status_flags = CANSTUN|CANPARALYSE|CANPUSH
shouldnt_see = list(/obj/effect/rune)
var/list/network = list(station_short)
var/list/network = list(NETWORK_DEFAULT)
var/obj/machinery/camera/camera = null
var/list/connected_robots = list()
var/aiRestorePowerRoutine = 0
@@ -132,7 +132,7 @@ var/list/ai_verbs_hidden = list( // For why this exists, refer to https://xkcd.c
if (istype(L, /datum/ai_laws))
laws = L
else
laws = new base_law_type
laws = new using_map.default_law_type
aiMulti = new(src)
aiRadio = new(src)
@@ -398,12 +398,12 @@ var/list/ai_verbs_hidden = list( // For why this exists, refer to https://xkcd.c
if(emergency_message_cooldown)
usr << "<span class='warning'>Arrays recycling. Please stand by.</span>"
return
var/input = sanitize(input(usr, "Please choose a message to transmit to [boss_short] via quantum entanglement. Please be aware that this process is very expensive, and abuse will lead to... termination. Transmission does not guarantee a response. There is a 30 second delay before you may send another message, be clear, full and concise.", "To abort, send an empty message.", ""))
var/input = sanitize(input(usr, "Please choose a message to transmit to [using_map.boss_short] via quantum entanglement. Please be aware that this process is very expensive, and abuse will lead to... termination. Transmission does not guarantee a response. There is a 30 second delay before you may send another message, be clear, full and concise.", "To abort, send an empty message.", ""))
if(!input)
return
CentCom_announce(input, usr)
usr << "<span class='notice'>Message transmitted.</span>"
log_say("[key_name(usr)] has made an IA [boss_short] announcement: [input]")
log_say("[key_name(usr)] has made an IA [using_map.boss_short] announcement: [input]")
emergency_message_cooldown = 1
spawn(300)
emergency_message_cooldown = 0
+1 -1
View File
@@ -62,7 +62,7 @@
// Off-Station APCs should not count towards CPU generation.
for(var/obj/machinery/power/apc/A in hacked_apcs)
if(A.z in config.station_levels)
if(A.z in using_map.station_levels)
cpu_gain += 0.004
cpu_storage += 10
+1 -1
View File
@@ -4,7 +4,7 @@
/mob/living/silicon/proc/laws_sanity_check()
if (!src.laws)
laws = new base_law_type
laws = new using_map.default_law_type
/mob/living/silicon/proc/has_zeroth_law()
return laws.zeroth_law != null
@@ -102,7 +102,7 @@ var/list/mob_hat_cache = list()
if(!laws) laws = new law_type
if(!module) module = new module_type(src)
flavor_text = "It's a tiny little repair drone. The casing is stamped with an corporate logo and the subscript: '[company_name] Recursive Repair Systems: Fixing Tomorrow's Problem, Today!'"
flavor_text = "It's a tiny little repair drone. The casing is stamped with an corporate logo and the subscript: '[using_map.company_name] Recursive Repair Systems: Fixing Tomorrow's Problem, Today!'"
playsound(src.loc, 'sound/machines/twobeep.ogg', 50, 0)
//Redefining some robot procs...
@@ -16,7 +16,7 @@
idle_power_usage = 20
active_power_usage = 5000
var/fabricator_tag = station_short+" Upper Level"
var/fabricator_tag = "Upper Level"
var/drone_progress = 0
var/produce_drones = 1
var/time_last_drone = 500
@@ -27,7 +27,7 @@
/obj/machinery/drone_fabricator/derelict
name = "construction drone fabricator"
fabricator_tag = station_short+" Depths"
fabricator_tag = "Depths"
drone_type = /mob/living/silicon/robot/drone/construction
/obj/machinery/drone_fabricator/New()
@@ -120,7 +120,7 @@
if(!scrambledcodes && !camera)
camera = new /obj/machinery/camera(src)
camera.c_tag = real_name
camera.replace_networks(list(NETWORK_EXODUS,NETWORK_ROBOTS))
camera.replace_networks(list(NETWORK_DEFAULT,NETWORK_ROBOTS))
if(wires.IsIndexCut(BORG_WIRE_CAMERA))
camera.status = 0
+12 -5
View File
@@ -5,13 +5,20 @@ var/obj/effect/lobby_image = new /obj/effect/lobby_image
/obj/effect/lobby_image
name = "Polaris"
desc = "How are you reading this?"
icon = 'icons/misc/title.dmi'
icon_state = null //determined randomly later on.
screen_loc = "1,1"
var/list/lobby_images = list("mockingjay00")
/obj/effect/lobby_image/New()
icon_state = pick(lobby_images)
/obj/effect/lobby_image/initialize()
icon = using_map.lobby_icon
var/known_icon_states = icon_states(icon)
for(var/lobby_screen in using_map.lobby_screens)
if(!(lobby_screen in known_icon_states))
error("Lobby screen '[lobby_screen]' did not exist in the icon set [icon].")
using_map.lobby_screens -= lobby_screen
if(using_map.lobby_screens.len)
icon_state = pick(using_map.lobby_screens)
else
icon_state = known_icon_states[1]
/mob/new_player
var/client/my_client // Need to keep track of this ourselves, since by the time Logout() is called the client has already been nulled
+1 -1
View File
@@ -67,7 +67,7 @@
/mob/proc/AIize(move=1)
if(client)
src << sound(null, repeat = 0, wait = 0, volume = 85, channel = 1) // stop the jams for AIs
var/mob/living/silicon/ai/O = new (loc, base_law_type,,1)//No MMI but safety is in effect.
var/mob/living/silicon/ai/O = new (loc, using_map.default_law_type,,1)//No MMI but safety is in effect.
O.invisibility = 0
O.aiRestorePowerRoutine = 0