| [Bot.hacked ? "(!) [Bot.name]" : Bot.name] ([Bot.model]) | "
//If the bot is on, it will display the bot's current mode status. If the bot is not mode, it will just report "Idle". "Inactive if it is not on at all.
@@ -959,6 +949,10 @@ var/list/ai_verbs_default = list(
to_chat(src, "Camera lights activated.")
+/mob/living/silicon/ai/proc/set_syndie_radio()
+ if(aiRadio)
+ aiRadio.make_syndie()
+
/mob/living/silicon/ai/proc/sensor_mode()
set name = "Set Sensor Augmentation"
set desc = "Augment visual feed with internal sensor overlays."
@@ -1104,11 +1098,6 @@ var/list/ai_verbs_default = list(
if(interaction == AI_TRANS_TO_CARD)//The only possible interaction. Upload AI mob to a card.
if(!mind)
to_chat(user, "No intelligence patterns detected.")//No more magical carding of empty cores, AI RETURN TO BODY!!!11
-
- return
- if(mind.special_role == "malfunction") //AI MALF!!
- to_chat(user, "ERROR: Remote transfer interface disabled.")//Do ho ho ho~
-
return
new /obj/structure/AIcore/deactivated(loc)//Spawns a deactivated terminal at AI location.
aiRestorePowerRoutine = 0//So the AI initially has power.
@@ -1149,4 +1138,33 @@ var/list/ai_verbs_default = list(
rendered = "Relayed Speech: [name_used] [speaking.format_message(text, verb)]"
else
rendered = "Relayed Speech: [name_used] [verb], \"[text]\""
- show_message(rendered, 2)
\ No newline at end of file
+ show_message(rendered, 2)
+
+/mob/living/silicon/ai/proc/malfhacked(obj/machinery/power/apc/apc)
+ malfhack = null
+ malfhacking = 0
+ clear_alert("hackingapc")
+
+ if(!istype(apc) || qdeleted(apc) || apc.stat & BROKEN)
+ to_chat(src, "Hack aborted. The designated APC no longer exists on the power network.")
+ playsound(get_turf(src), 'sound/machines/buzz-two.ogg', 50, 1)
+ else if(apc.aidisabled)
+ to_chat(src, "Hack aborted. [apc] is no longer responding to our systems.")
+ playsound(get_turf(src), 'sound/machines/buzz-sigh.ogg', 50, 1)
+ else
+ malf_picker.processing_time += 10
+
+ apc.malfai = parent || src
+ apc.malfhack = TRUE
+ apc.locked = TRUE
+
+ playsound(get_turf(src), 'sound/machines/ding.ogg', 50, 1)
+ to_chat(src, "Hack complete. [apc] is now under your exclusive control.")
+ apc.update_icon()
+
+/mob/living/silicon/ai/proc/add_malf_picker()
+ to_chat(src, "In the top right corner of the screen you will find the Malfunctions tab, where you can purchase various abilities, from upgraded surveillance to station ending doomsday devices.")
+ to_chat(src, "You are also capable of hacking APCs, which grants you more points to spend on your Malfunction powers. The drawback is that a hacked APC will give you away if spotted by the crew. Hacking an APC takes 60 seconds.")
+ view_core() //A BYOND bug requires you to be viewing your core before your verbs update
+ verbs += /mob/living/silicon/ai/proc/choose_modules
+ malf_picker = new /datum/module_picker
\ No newline at end of file
diff --git a/code/modules/mob/living/silicon/ai/death.dm b/code/modules/mob/living/silicon/ai/death.dm
index d0293d7f50b..4d2cb361b41 100644
--- a/code/modules/mob/living/silicon/ai/death.dm
+++ b/code/modules/mob/living/silicon/ai/death.dm
@@ -14,6 +14,21 @@
shuttle_caller_list -= src
shuttle_master.autoEvac()
+ if(nuking)
+ set_security_level("red")
+ nuking = 0
+ for(var/obj/item/weapon/pinpointer/point in pinpointer_list)
+ point.the_disk = null //Point back to the disk.
+
+ if(doomsday_device)
+ doomsday_device.timing = 0
+ shuttle_master.emergencyNoEscape = 0
+ if(shuttle_master.emergency.mode == SHUTTLE_STRANDED)
+ shuttle_master.emergency.mode = SHUTTLE_DOCKED
+ shuttle_master.emergency.timer = world.time
+ priority_announcement.Announce("Hostile environment resolved. You have 3 minutes to board the Emergency Shuttle.", "Priority Announcement", 'sound/AI/shuttledock.ogg')
+ qdel(doomsday_device)
+
if(explosive)
spawn(10)
explosion(src.loc, 3, 6, 12, 15)
diff --git a/code/modules/mob/living/silicon/ai/examine.dm b/code/modules/mob/living/silicon/ai/examine.dm
index c2358c9b237..c519ba0846a 100644
--- a/code/modules/mob/living/silicon/ai/examine.dm
+++ b/code/modules/mob/living/silicon/ai/examine.dm
@@ -19,9 +19,10 @@
msg += "It looks slightly charred.\n"
else
msg += "Its casing is melted and heat-warped!\n"
-
if(src.stat == UNCONSCIOUS)
msg += "It is non-responsive and displaying the text: \"RUNTIME: Sensory Overload, stack 26/3\".\n"
+ if(!shunted && !client)
+ msg += "[src]Core.exe has stopped responding! NTOS is searching for a solution to the problem...\n"
msg += ""
msg += "*---------*"
diff --git a/code/modules/mob/living/silicon/ai/latejoin.dm b/code/modules/mob/living/silicon/ai/latejoin.dm
index 0859acc1cb2..d869b72eff3 100644
--- a/code/modules/mob/living/silicon/ai/latejoin.dm
+++ b/code/modules/mob/living/silicon/ai/latejoin.dm
@@ -15,10 +15,6 @@ var/global/list/empty_playable_ai_cores = list()
set category = "OOC"
set desc = "Wipe your core. This is functionally equivalent to cryo or robotic storage, freeing up your job slot."
- if(ticker && ticker.mode && ticker.mode.name == "AI malfunction")
- to_chat(usr, "You cannot use this verb in malfunction. If you need to leave, please adminhelp.")
- return
-
// Guard against misclicks, this isn't the sort of thing we want happening accidentally
if(alert("WARNING: This will immediately wipe your core and ghost you, removing your character from the round permanently (similar to cryo and robotic storage). Are you entirely sure you want to do this?",
"Wipe Core", "No", "No", "Yes") != "Yes")
diff --git a/code/modules/mob/living/silicon/pai/pai.dm b/code/modules/mob/living/silicon/pai/pai.dm
index 5f38114a518..90f39288736 100644
--- a/code/modules/mob/living/silicon/pai/pai.dm
+++ b/code/modules/mob/living/silicon/pai/pai.dm
@@ -215,7 +215,7 @@
if(M.attack_sound)
playsound(loc, M.attack_sound, 50, 1, 1)
for(var/mob/O in viewers(src, null))
- O.show_message("\red [M] [M.attacktext] [src]!", 1)
+ O.show_message("[M] [M.attacktext] [src]!", 1)
M.attack_log += text("\[[time_stamp()]\] attacked [src.name] ([src.ckey])")
src.attack_log += text("\[[time_stamp()]\] was attacked by [M.name] ([M.ckey])")
var/damage = rand(M.melee_damage_lower, M.melee_damage_upper)
@@ -245,7 +245,7 @@
playsound(src.loc, 'sound/weapons/slash.ogg', 25, 1, -1)
for(var/mob/O in viewers(src, null))
if((O.client && !( O.blinded )))
- O.show_message(text("\red [] has slashed at []!", M, src), 1)
+ O.show_message(text("[] has slashed at []!", M, src), 1)
if(prob(8))
flash_eyes(affect_silicon = 1)
src.adjustBruteLoss(damage)
@@ -254,7 +254,7 @@
playsound(src.loc, 'sound/weapons/slashmiss.ogg', 25, 1, -1)
for(var/mob/O in viewers(src, null))
if((O.client && !( O.blinded )))
- O.show_message(text("\red [] took a swipe at []!", M, src), 1)
+ O.show_message(text("[] took a swipe at []!", M, src), 1)
return
/mob/living/silicon/pai/proc/switchCamera(var/obj/machinery/camera/C)
diff --git a/code/modules/mob/living/silicon/pai/recruit.dm b/code/modules/mob/living/silicon/pai/recruit.dm
index 2e6548ef2c4..1e985071dc7 100644
--- a/code/modules/mob/living/silicon/pai/recruit.dm
+++ b/code/modules/mob/living/silicon/pai/recruit.dm
@@ -351,7 +351,7 @@ var/datum/paiController/paiController // Global handler for pAI candidates
if(O.client && (ROLE_PAI in O.client.prefs.be_special))
if(player_old_enough_antag(O.client,ROLE_PAI))
if(check_recruit(O))
- to_chat(O, "\blue A pAI card activated by [user.real_name] is looking for personalities. (Teleport | Sign Up)")
+ to_chat(O, "A pAI card activated by [user.real_name] is looking for personalities. (Teleport | Sign Up)")
//question(O.client)
proc/check_recruit(var/mob/dead/observer/O)
diff --git a/code/modules/mob/living/silicon/pai/software_modules.dm b/code/modules/mob/living/silicon/pai/software_modules.dm
index 6d4c3a45150..adc0e54e661 100644
--- a/code/modules/mob/living/silicon/pai/software_modules.dm
+++ b/code/modules/mob/living/silicon/pai/software_modules.dm
@@ -123,6 +123,7 @@
on_ui_interact(mob/living/silicon/pai/user, datum/nanoui/ui=null, force_open=1)
var/data[0]
+ data_core.get_manifest_json()
data["manifest"] = PDA_Manifest
ui = nanomanager.try_update_ui(user, user, id, ui, data, force_open)
@@ -499,8 +500,7 @@
/mob/living/silicon/pai/proc/hackloop()
var/turf/T = get_turf_or_move(src.loc)
for(var/mob/living/silicon/ai/AI in player_list)
- // TODO: Tie into space manager
- if(!T || !(T.z in config.contact_levels))
+ if(!T || !is_station_contact(T.z))
break
if(T.loc)
to_chat(AI, "Network Alert: Brute-force encryption crack in progress in [T.loc].")
diff --git a/code/modules/mob/living/silicon/robot/laws.dm b/code/modules/mob/living/silicon/robot/laws.dm
index 2a62a0b1cc4..0398172023c 100644
--- a/code/modules/mob/living/silicon/robot/laws.dm
+++ b/code/modules/mob/living/silicon/robot/laws.dm
@@ -21,7 +21,7 @@
photosync()
to_chat(src, "Laws synced with AI, be sure to note any changes.")
// TODO: Update to new antagonist system.
- if(mind && mind.special_role == "traitor" && mind.original == src)
+ if(mind && mind.special_role == SPECIAL_ROLE_TRAITOR && mind.original == src)
to_chat(src, "Remember, your AI does NOT share or know about your law 0.")
else
to_chat(src, "No AI selected to sync laws with, disabling lawsync protocol.")
@@ -30,7 +30,7 @@
to_chat(who, "Obey these laws:")
laws.show_laws(who)
// TODO: Update to new antagonist system.
- if(mind && (mind.special_role == "traitor" && mind.original == src) && connected_ai)
+ if(mind && (mind.special_role == SPECIAL_ROLE_TRAITOR && mind.original == src) && connected_ai)
to_chat(who, "Remember, [connected_ai.name] is technically your master, but your objective comes first.")
else if(connected_ai)
to_chat(who, "Remember, [connected_ai.name] is your master, other AIs can be ignored.")
diff --git a/code/modules/mob/living/silicon/robot/robot.dm b/code/modules/mob/living/silicon/robot/robot.dm
index 8cb7fde6ffc..ad325c6a674 100644
--- a/code/modules/mob/living/silicon/robot/robot.dm
+++ b/code/modules/mob/living/silicon/robot/robot.dm
@@ -507,20 +507,6 @@ var/list/robot_verbs_default = list(
return 1
return 0
-// this function shows information about the malf_ai gameplay type in the status screen
-/mob/living/silicon/robot/show_malf_ai()
- ..()
- if(ticker && ticker.mode.name == "AI malfunction")
- var/datum/game_mode/malfunction/malf = ticker.mode
- for(var/datum/mind/malfai in malf.malf_ai)
- if(connected_ai)
- if(connected_ai.mind == malfai)
- if(malf.apcs >= 3)
- stat(null, "Time until station control secured: [max(malf.AI_win_timeleft/(malf.apcs/3), 0)] seconds")
- else if(ticker.mode:malf_mode_declared)
- stat(null, "Time left: [max(ticker.mode:AI_win_timeleft/(ticker.mode:apcs/3), 0)]")
- return 0
-
// this function displays the cyborgs current cell charge in the stat panel
/mob/living/silicon/robot/proc/show_cell_power()
if(cell)
@@ -571,7 +557,7 @@ var/list/robot_verbs_default = list(
var/mob/tmob = AM
if(istype(tmob, /mob/living/carbon/human) && (FAT in tmob.mutations))
if(prob(20))
- to_chat(usr, "\red You fail to push [tmob]'s fat ass out of the way.")
+ to_chat(usr, "You fail to push [tmob]'s fat ass out of the way.")
now_pushing = 0
return
if(!(tmob.status_flags & CANPUSH))
@@ -1380,7 +1366,7 @@ var/list/robot_verbs_default = list(
var/mob/M = pick(borg_candidates)
M.mind.transfer_to(src)
M.mind.assigned_role = "MODE"
- M.mind.special_role = "Death Commando"
+ M.mind.special_role = SPECIAL_ROLE_DEATHSQUAD
ticker.mode.traitors |= M.mind // Adds them to current traitor list. Which is really the extra antagonist list.
key = M.key
else
diff --git a/code/modules/mob/living/silicon/silicon.dm b/code/modules/mob/living/silicon/silicon.dm
index f467925d309..5dd9ea3b09e 100644
--- a/code/modules/mob/living/silicon/silicon.dm
+++ b/code/modules/mob/living/silicon/silicon.dm
@@ -75,7 +75,7 @@
src.take_organ_damage(10)
Stun(3)
flash_eyes(affect_silicon = 1)
- to_chat(src, "\red *BZZZT*")
+ to_chat(src, "*BZZZT*")
to_chat(src, "\red Warning: Electromagnetic pulse detected.")
..()
@@ -143,18 +143,12 @@
stat(null, text("Systems nonfunctional"))
-// This is a pure virtual function, it should be overwritten by all subclasses
-/mob/living/silicon/proc/show_malf_ai()
- return 0
-
-
// This adds the basic clock, shuttle recall timer, and malf_ai info to all silicon lifeforms
/mob/living/silicon/Stat()
if(statpanel("Status"))
show_stat_station_time()
show_stat_emergency_shuttle_eta()
show_system_integrity()
- show_malf_ai()
..()
//Silicon mob language procs
diff --git a/code/modules/mob/living/simple_animal/friendly/corgi.dm b/code/modules/mob/living/simple_animal/friendly/corgi.dm
index 8fa770d371b..85eb7d10f4c 100644
--- a/code/modules/mob/living/simple_animal/friendly/corgi.dm
+++ b/code/modules/mob/living/simple_animal/friendly/corgi.dm
@@ -480,7 +480,7 @@
var/mob/tmob = AM
if(istype(tmob, /mob/living/carbon/human) && (FAT in tmob.mutations))
if(prob(70))
- to_chat(src, "\red You fail to push [tmob]'s fat ass out of the way.")
+ to_chat(src, "You fail to push [tmob]'s fat ass out of the way.")
now_pushing = 0
return
if(!(tmob.status_flags & CANPUSH))
diff --git a/code/modules/mob/living/simple_animal/friendly/slime.dm b/code/modules/mob/living/simple_animal/friendly/slime.dm
index a76fe47cdba..bebe9be7628 100644
--- a/code/modules/mob/living/simple_animal/friendly/slime.dm
+++ b/code/modules/mob/living/simple_animal/friendly/slime.dm
@@ -25,7 +25,7 @@
var/mob/tmob = AM
if(istype(tmob, /mob/living/carbon/human) && (FAT in tmob.mutations))
if(prob(70))
- to_chat(src, "\red You fail to push [tmob]'s fat ass out of the way.")
+ to_chat(src, "You fail to push [tmob]'s fat ass out of the way.")
now_pushing = 0
return
if(!(tmob.status_flags & CANPUSH))
diff --git a/code/modules/mob/living/simple_animal/hostile/hivebot.dm b/code/modules/mob/living/simple_animal/hostile/hivebot.dm
index b3ea7f442fa..5b76f3a633c 100644
--- a/code/modules/mob/living/simple_animal/hostile/hivebot.dm
+++ b/code/modules/mob/living/simple_animal/hostile/hivebot.dm
@@ -78,7 +78,7 @@
var/datum/effect/system/harmless_smoke_spread/smoke = new /datum/effect/system/harmless_smoke_spread()
smoke.set_up(5, 0, src.loc)
smoke.start()
- visible_message("\red The [src] warps in!")
+ visible_message("The [src] warps in!")
playsound(src.loc, 'sound/effects/EMPulse.ogg', 25, 1)
/mob/living/simple_animal/hostile/hivebot/tele/warpbots()
diff --git a/code/modules/mob/living/simple_animal/hostile/syndicate.dm b/code/modules/mob/living/simple_animal/hostile/syndicate.dm
index d3f63450fe6..145b908ec56 100644
--- a/code/modules/mob/living/simple_animal/hostile/syndicate.dm
+++ b/code/modules/mob/living/simple_animal/hostile/syndicate.dm
@@ -61,7 +61,7 @@
if((Proj.damage_type == BRUTE || Proj.damage_type == BURN))
adjustHealth(Proj.damage)
else
- visible_message("\red [src] blocks [Proj] with its shield!")
+ visible_message("[src] blocks [Proj] with its shield!")
return 0
diff --git a/code/modules/mob/mob_helpers.dm b/code/modules/mob/mob_helpers.dm
index 1e9f3d8add5..be8f617d942 100644
--- a/code/modules/mob/mob_helpers.dm
+++ b/code/modules/mob/mob_helpers.dm
@@ -50,8 +50,20 @@ proc/isNonCrewAntag(A)
var/mob/living/carbon/C = A
var/special_role = C.mind.special_role
- var/list/crew_roles = list("traitor", "Changeling", "Vampire", "Cultist", "Head Revolutionary", "Revolutionary", "malfunctioning AI", "Shadowling", "loyalist", "mutineer", "Response Team")
- if((special_role in crew_roles))
+ var/list/crew_roles = list(
+ SPECIAL_ROLE_BLOB,
+ SPECIAL_ROLE_CULTIST,
+ SPECIAL_ROLE_CHANGELING,
+ SPECIAL_ROLE_ERT,
+ SPECIAL_ROLE_HEAD_REV,
+ SPECIAL_ROLE_REV,
+ SPECIAL_ROLE_SHADOWLING,
+ SPECIAL_ROLE_SHADOWLING_THRALL,
+ SPECIAL_ROLE_TRAITOR,
+ SPECIAL_ROLE_VAMPIRE,
+ SPECIAL_ROLE_VAMPIRE_THRALL
+ )
+ if(special_role in crew_roles)
return 0
return 1
@@ -340,23 +352,24 @@ var/list/intents = list(I_HELP,I_DISARM,I_GRAB,I_HARM)
hud_used.action_intent.icon_state = "help"
-/mob/living/carbon/verb/mob_sleep()
+/mob/living/verb/mob_sleep()
set name = "Sleep"
set category = "IC"
- if(usr.sleeping)
- to_chat(usr, "\red You are already sleeping")
+ if(sleeping)
+ to_chat(src, "You are already sleeping.")
return
else
- if(alert(src,"You sure you want to sleep for a while?","Sleep","Yes","No") == "Yes")
- usr.sleeping = 20 //Short nap
+ if(alert(src, "You sure you want to sleep for a while?", "Sleep", "Yes", "No") == "Yes")
+ SetSleeping(20) //Short nap
/mob/living/verb/lay_down()
set name = "Rest"
set category = "IC"
resting = !resting
- to_chat(src, "\blue You are now [resting ? "resting" : "getting up"]")
+ update_canmove()
+ to_chat(src, "You are now [resting ? "resting" : "getting up"].")
/proc/is_blind(A)
if(iscarbon(A))
diff --git a/code/modules/mob/new_player/preferences_setup.dm b/code/modules/mob/new_player/preferences_setup.dm
index c72db051191..d91d7eb097c 100644
--- a/code/modules/mob/new_player/preferences_setup.dm
+++ b/code/modules/mob/new_player/preferences_setup.dm
@@ -244,6 +244,7 @@
icobase = H.species.icobase
if(H.species.bodyflags & HAS_TAIL)
coloured_tail = H.species.tail
+ qdel(H)
else
icobase = current_species.icobase
else
diff --git a/code/modules/nano/interaction/default.dm b/code/modules/nano/interaction/default.dm
index 50c2bd79143..cb00e6a12b3 100644
--- a/code/modules/nano/interaction/default.dm
+++ b/code/modules/nano/interaction/default.dm
@@ -41,8 +41,7 @@
// Prevents the AI from using Topic on admin levels (by for example viewing through the court/thunderdome cameras)
// unless it's on the same level as the object it's interacting with.
var/turf/T = get_turf(src_object)
- // TODO: Tie into space manager
- if(!T || !(z == T.z || (T.z in config.player_levels)))
+ if(!T || !(atoms_share_level(src,T) || is_level_reachable(T.z)))
return STATUS_CLOSE
// If an object is in view then we can interact with it
diff --git a/code/modules/nano/modules/crew_monitor.dm b/code/modules/nano/modules/crew_monitor.dm
index 65f5a9299ee..ce89f59947b 100644
--- a/code/modules/nano/modules/crew_monitor.dm
+++ b/code/modules/nano/modules/crew_monitor.dm
@@ -5,8 +5,7 @@
if(..())
return 1
var/turf/T = get_turf(nano_host())
- // TODO: Tie into space manager
- if(!T || !(T.z in config.player_levels))
+ if(!T || !is_level_reachable(T.z))
to_chat(usr, "Unable to establish a connection: You're too far away from the station!")
return 0
if(href_list["track"])
diff --git a/code/modules/paperwork/faxmachine.dm b/code/modules/paperwork/faxmachine.dm
index d10e8c9f3f6..0126cd3b362 100644
--- a/code/modules/paperwork/faxmachine.dm
+++ b/code/modules/paperwork/faxmachine.dm
@@ -261,7 +261,7 @@ var/list/alldepartments = list()
/obj/machinery/photocopier/faxmachine/proc/message_admins(var/mob/sender, var/faxname, var/faxtype, var/obj/item/sent, font_colour="#9A04D1")
- var/msg = "\blue [faxname]: [key_name(sender, 1)] (PP) (VV) (CA) ([admin_jump_link(sender, "holder")]) | REPLY: (RADIO) (FAX) (SM) | REJECT: (TEMPLATE) (BSA) (EVILFAX) : Receiving '[sent.name]' via secure connection... view message"
+ var/msg = "[faxname]: [key_name(sender, 1)] (PP) (VV) (CA) ([admin_jump_link(sender, "holder")]) | REPLY: (RADIO) (FAX) (SM) | REJECT: (TEMPLATE) (BSA) (EVILFAX) : Receiving '[sent.name]' via secure connection... view message"
for(var/client/C in admins)
if(R_EVENT & C.holder.rights)
to_chat(C, msg)
diff --git a/code/modules/pda/cart_apps.dm b/code/modules/pda/cart_apps.dm
index 1c407bd223c..30f732f48ae 100644
--- a/code/modules/pda/cart_apps.dm
+++ b/code/modules/pda/cart_apps.dm
@@ -316,8 +316,7 @@
if(shuttle_master.supply.mode == SHUTTLE_CALL)
supplyData["shuttle_moving"] = 1
- // TODO: Tie into space manager
- if(shuttle_master.supply.z != ZLEVEL_STATION)
+ if(!is_station_level(shuttle_master.supply.z))
supplyData["shuttle_loc"] = "station"
else
supplyData["shuttle_loc"] = "centcom"
diff --git a/code/modules/pda/messenger.dm b/code/modules/pda/messenger.dm
index 2a8ca83b218..6d7bbc90bd3 100644
--- a/code/modules/pda/messenger.dm
+++ b/code/modules/pda/messenger.dm
@@ -158,7 +158,7 @@
if(signal.data["done"])
useTC = 1
var/turf/pos = get_turf(P)
- // TODO: Tie into space manager
+ // TODO: Make the radio system cooperate with the space manager
if(pos.z in signal.data["level"])
useTC = 2
//Let's make this barely readable
diff --git a/code/modules/persistence/persistence.dm b/code/modules/persistence/persistence.dm
index 4c1b40eaa98..3c2123d4c71 100644
--- a/code/modules/persistence/persistence.dm
+++ b/code/modules/persistence/persistence.dm
@@ -15,7 +15,7 @@
* This will be called after `New` but before `initialize`, so linking and stuff
* would probably be handled in `initialize`
*
-* Also, this should only be called by `json_to_object` in persistence.dm - at least
+* Also, this should only be called by `list_to_object` in persistence.dm - at least
* with current plans - that way it can actually initialize the type from the list
*/
/datum/proc/deserialize(var/list/data)
@@ -57,6 +57,19 @@
..()
+/*
+Whoops, forgot to put documentation here.
+What this does, is take a JSON string produced by running
+BYOND's native `json_encode` on a list from `serialize` above, and
+turns that string into a new instance of that object.
+
+You can also easily get an instance of this string by calling "Serialize Marked Datum"
+in the "Debug" tab.
+
+If you're clever, you can do neat things with SDQL and this, though be careful -
+some objects, like humans, are dependent that certain extra things are defined
+in their list
+*/
/proc/json_to_object(var/json_data, var/loc)
var/data = json_decode(json_data)
return list_to_object(data, loc)
diff --git a/code/modules/power/apc.dm b/code/modules/power/apc.dm
index b6eb99eb958..b8ee00a9a5d 100644
--- a/code/modules/power/apc.dm
+++ b/code/modules/power/apc.dm
@@ -169,10 +169,7 @@
/obj/machinery/power/apc/Destroy()
apcs -= src
if(malfai && operating)
- if(ticker.mode.config_tag == "malfunction")
- // TODO: Tie into space manager
- if(src.z == ZLEVEL_STATION)
- ticker.mode:apcs--
+ malfai.malf_picker.processing_time = Clamp(malfai.malf_picker.processing_time - 10,0,1000)
area.power_light = 0
area.power_equip = 0
area.power_environ = 0
@@ -763,12 +760,12 @@
return ui_interact(user)
-/obj/machinery/power/apc/proc/get_malf_status(mob/user)
- if(ticker && ticker.mode && (user.mind in ticker.mode.malf_ai) && istype(user, /mob/living/silicon/ai))
- if(src.malfai == (user:parent ? user:parent : user))
- if(src.occupier == user)
+/obj/machinery/power/apc/proc/get_malf_status(mob/living/silicon/ai/malf)
+ if(istype(malf) && malf.malf_picker)
+ if(malfai == (malf.parent || malf))
+ if(occupier == malf)
return 3 // 3 = User is shunted in this APC
- else if(istype(user.loc, /obj/machinery/power/apc))
+ else if(istype(malf.loc, /obj/machinery/power/apc))
return 4 // 4 = User is shunted in another APC
else
return 2 // 2 = APC hacked by user, and user is in its core.
@@ -981,30 +978,8 @@
overload_lighting()
else if(href_list["malfhack"])
- var/mob/living/silicon/ai/malfai = usr
- if(get_malf_status(malfai)==1)
- if(malfai.malfhacking)
- to_chat(malfai, "You are already hacking an APC.")
- return 0
- to_chat(malfai, "Beginning override of APC systems. This takes some time, and you cannot perform other actions during the process.")
- malfai.malfhack = src
- malfai.malfhacking = 1
- sleep(600)
- if(src)
- if(!src.aidisabled)
- malfai.malfhack = null
- malfai.malfhacking = 0
- locked = 1
- if(ticker.mode.config_tag == "malfunction")
- // TODO: Tie into space manager
- if((src.z in config.station_levels)) //if(is_type_in_list(get_area(src), the_station_areas))
- ticker.mode:apcs++
- if(usr:parent)
- src.malfai = usr:parent
- else
- src.malfai = usr
- to_chat(malfai, "Hack complete. The APC is now under your exclusive control.")
- update_icon()
+ if(get_malf_status(usr))
+ malfhack(usr)
else if(href_list["occupyapc"])
if(get_malf_status(usr))
@@ -1026,77 +1001,81 @@
/obj/machinery/power/apc/proc/toggle_breaker()
operating = !operating
-
- if(malfai)
- if(ticker.mode.config_tag == "malfunction")
- // TODO: Tie into space manager
- if((src.z in config.station_levels)) //if(is_type_in_list(get_area(src), the_station_areas))
- operating ? ticker.mode:apcs++ : ticker.mode:apcs--
-
- src.update()
+ update()
update_icon()
-/obj/machinery/power/apc/proc/malfoccupy(var/mob/living/silicon/ai/malf)
+/obj/machinery/power/apc/proc/malfhack(mob/living/silicon/ai/malf)
+ if(!istype(malf))
+ return
+ if(get_malf_status(malf) != 1)
+ return
+ if(malf.malfhacking)
+ to_chat(malf, "You are already hacking an APC.")
+ return
+ to_chat(malf, "Beginning override of APC systems. This takes some time, and you cannot perform other actions during the process.")
+ malf.malfhack = src
+ malf.malfhacking = addtimer(malf, "malfhacked", 600, FALSE, src)
+
+ var/obj/screen/alert/hackingapc/A
+ A = malf.throw_alert("hackingapc", /obj/screen/alert/hackingapc)
+ A.target = src
+
+/obj/machinery/power/apc/proc/malfoccupy(mob/living/silicon/ai/malf)
if(!istype(malf))
return
if(istype(malf.loc, /obj/machinery/power/apc)) // Already in an APC
- to_chat(malf, "You must evacuate your current apc first.")
+ to_chat(malf, "You must evacuate your current APC first!")
return
if(!malf.can_shunt)
- to_chat(malf, "You cannot shunt.")
+ to_chat(malf, "You cannot shunt!")
return
- // TODO: Tie into space manager
- if(!(src.z in config.station_levels))
+ if(!is_station_level(src.z))
return
- src.occupier = new /mob/living/silicon/ai(src,malf.laws,null,1)
- src.occupier.adjustOxyLoss(malf.getOxyLoss())
- if(!findtext(src.occupier.name,"APC Copy"))
- src.occupier.name = "[malf.name] APC Copy"
+ occupier = new /mob/living/silicon/ai(src,malf.laws,null,1)
+ occupier.adjustOxyLoss(malf.getOxyLoss())
+ if(!findtext(occupier.name, "APC Copy"))
+ occupier.name = "[malf.name] APC Copy"
if(malf.parent)
- src.occupier.parent = malf.parent
+ occupier.parent = malf.parent
else
- src.occupier.parent = malf
- malf.mind.transfer_to(src.occupier)
- src.occupier.eyeobj.name = "[src.occupier.name] (AI Eye)"
+ occupier.parent = malf
+ malf.shunted = 1
+ malf.mind.transfer_to(occupier)
+ occupier.eyeobj.name = "[occupier.name] (AI Eye)"
if(malf.parent)
qdel(malf)
- src.occupier.verbs += /mob/living/silicon/ai/proc/corereturn
- src.occupier.verbs += /datum/game_mode/malfunction/proc/takeover
- src.occupier.cancel_camera()
- if(seclevel2num(get_security_level()) == SEC_LEVEL_DELTA)
- for(var/obj/item/weapon/pinpointer/point in world)
+ occupier.verbs += /mob/living/silicon/ai/proc/corereturn
+ occupier.cancel_camera()
+ if((seclevel2num(get_security_level()) == SEC_LEVEL_DELTA) && malf.nuking)
+ for(var/obj/item/weapon/pinpointer/point in pinpointer_list)
point.the_disk = src //the pinpointer will detect the shunted AI
-
-/obj/machinery/power/apc/proc/malfvacate(var/forced)
- if(!src.occupier)
+/obj/machinery/power/apc/proc/malfvacate(forced)
+ if(!occupier)
return
- if(src.occupier.parent && src.occupier.parent.stat != 2)
- src.occupier.mind.transfer_to(src.occupier.parent)
- src.occupier.parent.adjustOxyLoss(src.occupier.getOxyLoss())
- src.occupier.parent.cancel_camera()
- qdel(src.occupier) // qdel
+ if(occupier.parent && occupier.parent.stat != DEAD)
+ occupier.mind.transfer_to(occupier.parent)
+ occupier.parent.shunted = 0
+ occupier.parent.adjustOxyLoss(occupier.getOxyLoss())
+ occupier.parent.cancel_camera()
+ qdel(occupier)
if(seclevel2num(get_security_level()) == SEC_LEVEL_DELTA)
- for(var/obj/item/weapon/pinpointer/point in world)
- for(var/datum/mind/AI_mind in ticker.mode.malf_ai)
- var/mob/living/silicon/ai/A = AI_mind.current // the current mob the mind owns
- if(A.stat != DEAD)
+ for(var/obj/item/weapon/pinpointer/point in pinpointer_list)
+ for(var/mob/living/silicon/ai/A in ai_list)
+ if((A.stat != DEAD) && A.nuking)
point.the_disk = A //The pinpointer tracks the AI back into its core.
-
else
- to_chat(src.occupier, "Primary core damaged, unable to return core processes.")
+ to_chat(occupier, "Primary core damaged, unable to return core processes.")
if(forced)
- src.occupier.loc = src.loc
- src.occupier.death()
- src.occupier.gib()
- for(var/obj/item/weapon/pinpointer/point in world)
- point.the_disk = null //the pinpointer will go back to pointing at the nuke disc.
-
+ occupier.loc = loc
+ occupier.death()
+ occupier.gib()
+ for(var/obj/item/weapon/pinpointer/point in pinpointer_list)
+ point.the_disk = null //Pinpointers go back to tracking the nuke disk
/obj/machinery/power/apc/proc/ion_act()
//intended to be exactly the same as an AI malf attack
- // TODO: Tie into space manager
- if(!src.malfhack && (src.z in config.station_levels))
+ if(!src.malfhack && is_station_level(src.z))
if(prob(3))
src.locked = 1
if(src.cell.charge > 0)
@@ -1370,10 +1349,7 @@
/obj/machinery/power/apc/proc/set_broken()
if(malfai && operating)
- if(ticker.mode.config_tag == "malfunction")
- // TODO: Tie into space manager
- if((src.z in config.station_levels)) //if(is_type_in_list(get_area(src), the_station_areas))
- ticker.mode:apcs--
+ malfai.malf_picker.processing_time = Clamp(malfai.malf_picker.processing_time - 10,0,1000)
stat |= BROKEN
operating = 0
if(occupier)
diff --git a/code/modules/power/gravitygenerator.dm b/code/modules/power/gravitygenerator.dm
index ea633c7e78f..6468f813fa6 100644
--- a/code/modules/power/gravitygenerator.dm
+++ b/code/modules/power/gravitygenerator.dm
@@ -124,8 +124,7 @@ var/const/GRAV_NEEDS_WRENCH = 3
O.main_part = null
qdel(O)
for(var/area/A in world)
- // TODO: Tie into space manager
- if(!(A.z in config.station_levels)) continue
+ if(!is_station_level(A.z)) continue
A.gravitychange(0,A)
shake_everyone()
return ..()
@@ -302,8 +301,7 @@ var/const/GRAV_NEEDS_WRENCH = 3
investigate_log("was brought online and is now producing gravity for this level.", "gravity")
message_admins("The gravity generator was brought online. ([area.name])")
for(var/area/A in world)
- // TODO: Tie into space manager
- if(!(A.z in config.station_levels)) continue
+ if(!is_station_level(A.z)) continue
A.gravitychange(1,A)
else
if(gravity_in_level() == 1)
@@ -311,8 +309,7 @@ var/const/GRAV_NEEDS_WRENCH = 3
investigate_log("was brought offline and there is now no gravity for this level.", "gravity")
message_admins("The gravity generator was brought offline with no backup generator. ([area.name])")
for(var/area/A in world)
- // TODO: Tie into space manager
- if(!(A.z in config.station_levels)) continue
+ if(!is_station_level(A.z)) continue
A.gravitychange(0,A)
update_icon()
@@ -380,7 +377,7 @@ var/const/GRAV_NEEDS_WRENCH = 3
shake_camera(M, 15, 1)
M.playsound_local(our_turf, 'sound/effects/alert.ogg', 100, 1, 0.5)
-// TODO: Tie into space manager
+// TODO: Make the gravity generator cooperate with the space manager
/obj/machinery/gravity_generator/main/proc/gravity_in_level()
var/turf/T = get_turf(src)
if(!T)
@@ -389,7 +386,6 @@ var/const/GRAV_NEEDS_WRENCH = 3
return length(gravity_generators["[T.z]"])
return 0
-// TODO: Tie into space manager
/obj/machinery/gravity_generator/main/proc/update_list()
var/turf/T = get_turf(src.loc)
if(T)
diff --git a/code/modules/power/smes.dm b/code/modules/power/smes.dm
index 75f88f9b751..4af4ccaeee4 100644
--- a/code/modules/power/smes.dm
+++ b/code/modules/power/smes.dm
@@ -433,8 +433,7 @@
return 1
/obj/machinery/power/smes/proc/ion_act()
- // TODO: Tie into space manager
- if(src.z in config.station_levels)
+ if(is_station_level(src.z))
if(prob(1)) //explosion
for(var/mob/M in viewers(src))
M.show_message("\red The [src.name] is making strange noises!", 3, "\red You hear sizzling electronics.", 2)
diff --git a/code/modules/power/supermatter/sm_shard.dm b/code/modules/power/supermatter/sm_shard.dm
index e95b51cf828..690aeac6fce 100644
--- a/code/modules/power/supermatter/sm_shard.dm
+++ b/code/modules/power/supermatter/sm_shard.dm
@@ -44,7 +44,7 @@
/obj/item/weapon/shard/supermatter/Crossed(AM as mob|obj)
if(ismob(AM))
var/mob/M = AM
- to_chat(M, "\red You step on \the [src]!")
+ to_chat(M, "You step on \the [src]!")
playsound(src.loc, 'sound/effects/glass_step_sm.ogg', 70, 1) // not sure how to handle metal shards with sounds
if(ishuman(M))
var/mob/living/carbon/human/H = M
diff --git a/code/modules/projectiles/guns/energy/telegun.dm b/code/modules/projectiles/guns/energy/telegun.dm
index c280fe59903..7b94698f0e9 100644
--- a/code/modules/projectiles/guns/energy/telegun.dm
+++ b/code/modules/projectiles/guns/energy/telegun.dm
@@ -23,8 +23,7 @@
var/turf/T = get_turf(R)
if(!T)
continue
- // TODO: Tie into space manager
- if((T.z in config.admin_levels) || T.z > ZLEVEL_EMPTY)
+ if(!is_teleport_allowed(T.z))
continue
if(R.syndicate == 1)
continue
diff --git a/code/modules/projectiles/projectile/special.dm b/code/modules/projectiles/projectile/special.dm
index cd562e00a48..0e1b7478cc8 100644
--- a/code/modules/projectiles/projectile/special.dm
+++ b/code/modules/projectiles/projectile/special.dm
@@ -276,17 +276,9 @@ obj/item/projectile/kinetic/New()
/obj/item/projectile/beam/wormhole/on_hit(atom/target)
if(ismob(target))
- var/turf/portal_destination = pick(orange(6, src))
- do_teleport(target, portal_destination)
- return ..()
- if(!gun)
- qdel(src)
- gun.create_portal(src)
-
-/obj/item/projectile/beam/wormhole/on_hit(atom/target)
- if(ismob(target))
- var/turf/portal_destination = pick(orange(6, src))
- do_teleport(target, portal_destination)
+ if(is_teleport_allowed(target.z))
+ var/turf/portal_destination = pick(orange(6, src))
+ do_teleport(target, portal_destination)
return ..()
if(!gun)
qdel(src)
diff --git a/code/modules/reagents/newchem/drinks.dm b/code/modules/reagents/newchem/drinks.dm
index 5f4dc5b0018..b1f789b7f22 100644
--- a/code/modules/reagents/newchem/drinks.dm
+++ b/code/modules/reagents/newchem/drinks.dm
@@ -201,6 +201,7 @@
result = "uplink"
required_reagents = list("rum" = 1, "vodka" = 1, "tequila" = 1, "whiskey" = 1, "synthanol" = 1)
result_amount = 5
+ mix_message = "The chemicals mix to create a shiny, orange substance."
/datum/reagent/ethanol/synthanol/synthnsoda
name = "Synth 'n Soda"
@@ -216,6 +217,7 @@
result = "synthnsoda"
required_reagents = list("synthanol" = 1, "cola" = 1)
result_amount = 2
+ mix_message = "The chemicals mix to create a smooth, fizzy substance."
/datum/reagent/ethanol/synthanol/synthignon
name = "Synthignon"
@@ -231,5 +233,6 @@
result = "synthignon"
required_reagents = list("synthanol" = 1, "wine" = 1)
result_amount = 2
+ mix_message = "The chemicals mix to create a fine, red substance."
// ROBOT ALCOHOL ENDS
diff --git a/code/modules/reagents/newchem/food.dm b/code/modules/reagents/newchem/food.dm
index 6909a60e2e5..7f529b6b815 100644
--- a/code/modules/reagents/newchem/food.dm
+++ b/code/modules/reagents/newchem/food.dm
@@ -142,7 +142,7 @@
/datum/reagent/mugwort/on_mob_life(mob/living/M)
if(ishuman(M) && M.mind)
- if(M.mind.special_role == "Wizard")
+ if(M.mind.special_role == SPECIAL_ROLE_WIZARD)
M.adjustToxLoss(-1*REM)
M.adjustOxyLoss(-1*REM)
M.adjustBruteLoss(-1*REM)
diff --git a/code/modules/reagents/reagent_containers/syringes.dm b/code/modules/reagents/reagent_containers/syringes.dm
index 772eef4d0f9..bb84295a22d 100644
--- a/code/modules/reagents/reagent_containers/syringes.dm
+++ b/code/modules/reagents/reagent_containers/syringes.dm
@@ -105,7 +105,7 @@
time = 0
else
for(var/mob/O in viewers(world.view, user))
- O.show_message(text("\red [] is trying to take a blood sample from []!", user, target), 1)
+ O.show_message(text("[] is trying to take a blood sample from []!", user, target), 1)
if(!do_mob(user, target, time))
return
@@ -183,7 +183,7 @@
if(ismob(target) && target != user)
for(var/mob/O in viewers(world.view, user))
- O.show_message(text("\red [] is trying to inject []!", user, target), 1)
+ O.show_message(text("[] is trying to inject []!", user, target), 1)
if(!do_mob(user, target, 30)) return
@@ -338,7 +338,7 @@
if(ismob(target) && target != user)
for(var/mob/O in viewers(world.view, user))
- O.show_message(text("\red [] is trying to inject [] with a giant syringe!", user, target), 1)
+ O.show_message(text("[] is trying to inject [] with a giant syringe!", user, target), 1)
if(!do_mob(user, target, 300)) return
for(var/mob/O in viewers(world.view, user))
O.show_message(text("\red [] injects [] with a giant syringe!", user, target), 1)
diff --git a/code/modules/recycling/conveyor2.dm b/code/modules/recycling/conveyor2.dm
index b093048d5e5..6ff39d21b0d 100644
--- a/code/modules/recycling/conveyor2.dm
+++ b/code/modules/recycling/conveyor2.dm
@@ -17,6 +17,7 @@
var/list/affecting // the list of all items that will be moved this ptick
var/id = "" // the control ID - must match controller ID
var/verted = 1 // set to -1 to have the conveyour belt be inverted, so you can use the other corner icons
+ speed_process = 1
/obj/machinery/conveyor/centcom_auto
id = "round_end_belt"
@@ -105,15 +106,12 @@
use_power(100)
affecting = loc.contents - src // moved items will be all in loc
- spawn(1) // slight delay to prevent infinite propagation due to map order //TODO: please no spawn() in process(). It's a very bad idea
- var/items_moved = 0
- for(var/atom/movable/A in affecting)
- if(!A.anchored)
- if(A.loc == src.loc) // prevents the object from being affected if it's not currently here.
- step(A,movedir)
- items_moved++
- if(items_moved >= 10)
- break
+ sleep(1)
+ for(var/atom/movable/A in affecting)
+ if(!A.anchored)
+ if(A.loc == loc) // prevents the object from being affected if it's not currently here.
+ step(A,movedir)
+ CHECK_TICK
// attack with item, place item on conveyor
/obj/machinery/conveyor/attackby(var/obj/item/I, mob/user, params)
@@ -183,7 +181,7 @@
var/list/conveyors // the list of converyors that are controlled by this switch
anchored = 1
-
+ speed_process = 1
/obj/machinery/conveyor_switch/New()
@@ -218,6 +216,7 @@
for(var/obj/machinery/conveyor/C in conveyors)
C.operating = position
C.setmove()
+ CHECK_TICK
// attack with hand, switch position
/obj/machinery/conveyor_switch/attack_hand(mob/user)
@@ -241,10 +240,11 @@
update()
// find any switches with same id as this one, and set their positions to match us
- for(var/obj/machinery/conveyor_switch/S in world)
+ for(var/obj/machinery/conveyor_switch/S in machines)
if(S.id == src.id)
S.position = position
S.update()
+ CHECK_TICK
/obj/machinery/conveyor_switch/oneway
var/convdir = 1 //Set to 1 or -1 depending on which way you want the convayor to go. (In other words keep at 1 and set the proper dir on the belts.)
diff --git a/code/modules/research/experimentor.dm b/code/modules/research/experimentor.dm
index 262820990c2..a0f1aecb520 100644
--- a/code/modules/research/experimentor.dm
+++ b/code/modules/research/experimentor.dm
@@ -729,7 +729,7 @@
to_chat(user, "The [src] begins to vibrate!")
spawn(rand(10,30))
var/turf/userturf = get_turf(user)
- if(src.loc == user && userturf.z != ZLEVEL_CENTCOMM) //Because Nuke Ops bringing this back on their shuttle, then looting the ERT area is 2fun4you!
+ if(src.loc == user && is_teleport_allowed(userturf.z)) //Because Nuke Ops bringing this back on their shuttle, then looting the ERT area is 2fun4you!
visible_message("The [src] twists and bends, relocating itself!")
throwSmoke(userturf)
do_teleport(user, userturf, 8, asoundin = 'sound/effects/phasein.ogg')
diff --git a/code/modules/research/xenoarchaeology/artifact/artifact_gigadrill.dm b/code/modules/research/xenoarchaeology/artifact/artifact_gigadrill.dm
index d93b8f3573f..4073b0bd74c 100644
--- a/code/modules/research/xenoarchaeology/artifact/artifact_gigadrill.dm
+++ b/code/modules/research/xenoarchaeology/artifact/artifact_gigadrill.dm
@@ -25,7 +25,7 @@
if(istype(A,/turf/simulated/mineral))
var/turf/simulated/mineral/M = A
drilling_turf = get_turf(src)
- src.visible_message("\red [src] begins to drill into [M]!")
+ src.visible_message("[src] begins to drill into [M]!")
anchored = 1
spawn(drill_time)
if(get_turf(src) == drilling_turf && active)
diff --git a/code/modules/research/xenobiology/xenobiology.dm b/code/modules/research/xenobiology/xenobiology.dm
index 19065faad8c..ff6da57e526 100644
--- a/code/modules/research/xenobiology/xenobiology.dm
+++ b/code/modules/research/xenobiology/xenobiology.dm
@@ -384,6 +384,7 @@
G.change_gender(pick(MALE,FEMALE))
G.loc = src.loc
G.key = ghost.key
+ add_logs(G, user, "summoned", null, "as a golem")
to_chat(G, "You are an adamantine golem. You move slowly, but are highly resistant to heat and cold as well as blunt trauma. You are unable to wear clothes, but can still use most tools. Serve [user], and assist them in completing their goals at any cost.")
qdel(src)
diff --git a/code/modules/security_levels/security levels.dm b/code/modules/security_levels/security levels.dm
index 328a19ac034..a7a5162c231 100644
--- a/code/modules/security_levels/security levels.dm
+++ b/code/modules/security_levels/security levels.dm
@@ -37,8 +37,7 @@
CC.post_status("alert", "outline")
for(var/obj/machinery/firealarm/FA in world)
- // TODO: Tie into space manager
- if((FA.z in config.contact_levels))
+ if(is_station_contact(FA.z))
FA.overlays = list()
FA.overlays += image('icons/obj/monitors.dmi', "overlay_green")
@@ -54,8 +53,7 @@
CC.post_status("alert", "outline")
for(var/obj/machinery/firealarm/FA in world)
- // TODO: Tie into space manager
- if((FA.z in config.contact_levels))
+ if(is_station_contact(FA.z))
FA.overlays = list()
FA.overlays += image('icons/obj/monitors.dmi', "overlay_blue")
@@ -67,8 +65,7 @@
security_level = SEC_LEVEL_RED
var/obj/machinery/door/airlock/highsecurity/red/R = locate(/obj/machinery/door/airlock/highsecurity/red) in world
- // TODO: Tie into space manager
- if(R && (R.z in config.station_levels))
+ if(R && is_station_level(R.z))
R.locked = 0
R.update_icon()
@@ -77,8 +74,7 @@
CC.post_status("alert", "redalert")
for(var/obj/machinery/firealarm/FA in world)
- // TODO: Tie into space manager
- if((FA.z in config.contact_levels))
+ if(is_station_contact(FA.z))
FA.overlays = list()
FA.overlays += image('icons/obj/monitors.dmi', "overlay_red")
@@ -90,14 +86,12 @@
if(security_level < SEC_LEVEL_RED)
for(var/obj/machinery/door/airlock/highsecurity/red/R in airlocks)
- // TODO: Tie into space manager
- if((R.z in config.station_levels))
+ if(is_station_level(R.z))
R.locked = 0
R.update_icon()
for(var/obj/machinery/door/airlock/hatch/gamma/H in airlocks)
- // TODO: Tie into space manager
- if((H.z in config.station_levels))
+ if(is_station_level(H.z))
H.locked = 0
H.update_icon()
@@ -106,8 +100,7 @@
CC.post_status("alert", "gammaalert")
for(var/obj/machinery/firealarm/FA in world)
- // TODO: Tie into space manager
- if((FA.z in config.contact_levels))
+ if(is_station_contact(FA.z))
FA.overlays = list()
FA.overlays += image('icons/obj/monitors.dmi', "overlay_gamma")
FA.update_icon()
@@ -121,8 +114,7 @@
CC.post_status("alert", "epsilonalert")
for(var/obj/machinery/firealarm/FA in world)
- // TODO: Tie into space manager
- if((FA.z in config.contact_levels))
+ if(is_station_contact(FA.z))
FA.overlays = list()
FA.overlays += image('icons/obj/monitors.dmi', "overlay_epsilon")
@@ -135,8 +127,7 @@
CC.post_status("alert", "deltaalert")
for(var/obj/machinery/firealarm/FA in world)
- // TODO: Tie into space manager
- if((FA.z in config.contact_levels))
+ if(is_station_contact(FA.z))
FA.overlays = list()
FA.overlays += image('icons/obj/monitors.dmi', "overlay_delta")
diff --git a/code/modules/shuttle/assault_pod.dm b/code/modules/shuttle/assault_pod.dm
index 40e7aa05aa0..fe3d059a08a 100644
--- a/code/modules/shuttle/assault_pod.dm
+++ b/code/modules/shuttle/assault_pod.dm
@@ -6,7 +6,6 @@
height = 7
/obj/docking_port/mobile/assault_pod/request()
- // TODO: Tie into space manager
if(z == initial(src.z)) //No launching pods that have already launched
return ..()
diff --git a/code/modules/shuttle/emergency.dm b/code/modules/shuttle/emergency.dm
index 1224f5719b9..89aeb978cdf 100644
--- a/code/modules/shuttle/emergency.dm
+++ b/code/modules/shuttle/emergency.dm
@@ -202,8 +202,7 @@
if(time_left <= 0 && !shuttle_master.emergencyNoEscape)
//move each escape pod to its corresponding transit dock
for(var/obj/docking_port/mobile/pod/M in shuttle_master.mobile)
- // TODO: Tie into space manager
- if(M.z == ZLEVEL_STATION) //Will not launch from the mine/planet
+ if(is_station_level(M.z)) //Will not launch from the mine/planet
M.enterTransit()
//now move the actual emergency shuttle to its transit dock
for(var/area/shuttle/escape/E in world)
diff --git a/code/modules/shuttle/shuttle.dm b/code/modules/shuttle/shuttle.dm
index 5d35eff842e..9122c9983eb 100644
--- a/code/modules/shuttle/shuttle.dm
+++ b/code/modules/shuttle/shuttle.dm
@@ -737,7 +737,8 @@
return
cooldown = 1
to_chat(usr, "Your request has been recieved by Centcom.")
- to_chat(admins, "FERRY: [key_name_admin(usr)] (?) (FLW) (Move Ferry) is requesting to move the transport ferry to Centcom.")
+ log_admin("[key_name(usr)] requested to move the transport ferry to Centcom.")
+ message_admins("FERRY: [key_name_admin(usr)] (Move Ferry) is requesting to move the transport ferry to Centcom.")
spawn(600) //One minute cooldown
cooldown = 0
diff --git a/code/modules/shuttle/supply.dm b/code/modules/shuttle/supply.dm
index f076c7ee977..3451f7fbe08 100644
--- a/code/modules/shuttle/supply.dm
+++ b/code/modules/shuttle/supply.dm
@@ -28,7 +28,7 @@
return 1
/obj/docking_port/mobile/supply/canMove()
- if(z == ZLEVEL_STATION)
+ if(is_station_level(z))
return forbidden_atoms_check(areaInstance)
return ..()
@@ -45,7 +45,7 @@
sell()
/obj/docking_port/mobile/supply/proc/buy()
- if(z != ZLEVEL_STATION) //we only buy when we are -at- the station
+ if(!is_station_level(z)) //we only buy when we are -at- the station
return 1
if(!shuttle_master.shoppinglist.len)
@@ -93,7 +93,7 @@
shuttle_master.shoppinglist.Cut()
/obj/docking_port/mobile/supply/proc/sell()
- if(z != ZLEVEL_CENTCOMM) //we only sell when we are -at- centcomm
+ if(z != level_name_to_num(CENTCOMM)) //we only sell when we are -at- centcomm
return 1
var/plasma_count = 0
diff --git a/code/modules/shuttle/syndicate.dm b/code/modules/shuttle/syndicate.dm
index b1afd14bcf5..1c03c3f7039 100644
--- a/code/modules/shuttle/syndicate.dm
+++ b/code/modules/shuttle/syndicate.dm
@@ -30,9 +30,9 @@
/obj/machinery/computer/shuttle/syndicate/drop_pod/Topic(href, href_list)
if(href_list["move"])
- if(z != ZLEVEL_CENTCOMM)
+ if(z != level_name_to_num(CENTCOMM))
to_chat(usr, "Pods are one way!")
return 0
..()
-#undef SYNDICATE_CHALLENGE_TIMER
\ No newline at end of file
+#undef SYNDICATE_CHALLENGE_TIMER
diff --git a/code/modules/space_management/level_check.dm b/code/modules/space_management/level_check.dm
new file mode 100644
index 00000000000..391f5968c22
--- /dev/null
+++ b/code/modules/space_management/level_check.dm
@@ -0,0 +1,7 @@
+/proc/is_on_level_name(atom/A,name)
+ var/datum/space_level/S = space_manager.get_zlev_by_name(name)
+ return A.z == S.zpos
+
+// For expansion later
+/proc/atoms_share_level(atom/A, atom/B)
+ return A.z == B.z
diff --git a/code/modules/space_management/level_traits.dm b/code/modules/space_management/level_traits.dm
new file mode 100644
index 00000000000..83309c3764f
--- /dev/null
+++ b/code/modules/space_management/level_traits.dm
@@ -0,0 +1,62 @@
+/proc/is_level_reachable(z)
+ return check_level_trait(z, REACHABLE)
+
+/proc/is_station_level(z)
+ return check_level_trait(z, STATION_LEVEL)
+
+/proc/is_station_contact(z)
+ return check_level_trait(z, STATION_CONTACT)
+
+/proc/is_teleport_allowed(z)
+ return !check_level_trait(z, BLOCK_TELEPORT)
+
+/proc/is_admin_level(z)
+ return check_level_trait(z, ADMIN_LEVEL)
+
+/proc/is_away_level(z)
+ return check_level_trait(z, AWAY_LEVEL)
+
+/proc/is_mining_level(z)
+ return check_level_trait(z, ORE_LEVEL)
+
+/proc/is_ai_allowed(z)
+ return check_level_trait(z, AI_OK)
+
+/proc/level_blocks_magic(z)
+ return check_level_trait(z, IMPEDES_MAGIC)
+
+/proc/level_boosts_signal(z)
+ return check_level_trait(z, BOOSTS_SIGNAL)
+
+// Used for the nuke disk, or for checking if players survived through xenos
+/proc/is_secure_level(z)
+ var/secure = check_level_trait(z, STATION_LEVEL)
+ if(!secure)
+ // This is to allow further admin levels later, other than centcomm
+ secure = (z == level_name_to_num(CENTCOMM))
+ return secure
+
+var/list/default_map_traits = MAP_TRANSITION_CONFIG
+/proc/check_level_trait(z, trait)
+ if(z == 0)
+ return 0 // If you're nowhere, you have no traits
+ var/list/trait_list
+ if(space_manager.initialized)
+ var/datum/space_level/S = space_manager.get_zlev(z)
+ trait_list = S.flags
+ else
+ trait_list = default_map_traits[z]
+ trait_list = trait_list["attributes"]
+ return (trait in trait_list)
+
+/proc/levels_by_trait(trait)
+ var/list/result = list()
+ for(var/A in space_manager.z_list)
+ var/datum/space_level/S = space_manager.z_list[A]
+ if(trait in S.flags)
+ result |= S
+ return result
+
+/proc/level_name_to_num(name)
+ var/datum/space_level/S = space_manager.get_zlev_by_name(name)
+ return S.zpos
diff --git a/code/modules/space_management/space_level.dm b/code/modules/space_management/space_level.dm
index 6b7654cd504..02c16552c12 100644
--- a/code/modules/space_management/space_level.dm
+++ b/code/modules/space_management/space_level.dm
@@ -1,12 +1,14 @@
/datum/space_level
var/name = "Your config settings failed, you need to fix this for the datum space levels to work"
var/zpos = 1
- var/flags = 0 // We'll use this to keep track of whether you can teleport/etc
+ var/flags = list() // We'll use this to keep track of whether you can teleport/etc
// Map transition stuff
var/list/neighbors = list()
// # How this level connects with others. See __MAP_DEFINES.dm for defines
- var/linkage = SELFLOOPING
+ // It's UNAFFECTED by default because none of the space turfs are normally linked up
+ // so we don't need to rebuild transitions if an UNAFFECTED level is requested
+ var/linkage = UNAFFECTED
// # imaginary placements on the grid - these reflect the point it is linked to
var/xi
var/yi
@@ -19,45 +21,117 @@
var/dirt_count = 0
var/list/init_list = list()
-/datum/space_level/New(z, name, transition_type = SELFLOOPING)
+/datum/space_level/New(z, name, transition_type = SELFLOOPING, traits = list(BLOCK_TELEPORT))
zpos = z
- set_linkage(transition_type)
+ flags = traits
build_space_destination_arrays()
+ set_linkage(transition_type)
+
+/datum/space_level/Destroy()
+ if(linkage == CROSSLINKED)
+ if(space_manager.linkage_map)
+ remove_from_space_network(space_manager.linkage_map)
+
+ space_manager.unbuilt_space_transitions -= src
+ space_manager.z_list -= "[zpos]"
+ return ..()
/datum/space_level/proc/build_space_destination_arrays()
- var/timer = start_watch()
- log_debug("Starting to build space destination arrays for z level '[zpos]'...")
- for(var/turf/space/S in get_turfs())
+ // We skip `add_to_transit` here because we want to skip the checks in order to save time
+ // Bottom border
+ for(var/turf/space/S in block(locate(1,1,zpos),locate(world.maxx,TRANSITIONEDGE+1,zpos)))
+ transit_south |= S
- // Bottom border
- if(S.y <= TRANSITIONEDGE)
- transit_south |= S
- continue
+ // Top border
+ for(var/turf/space/S in block(locate(1,world.maxy,zpos),locate(world.maxx,world.maxy - TRANSITIONEDGE - 1,zpos)))
+ transit_north |= S
- // Top border
- if(S.y >= (world.maxy - TRANSITIONEDGE - 1))
- transit_north |= S
- continue
+ // Left border
+ for(var/turf/space/S in block(locate(1,TRANSITIONEDGE+1,zpos),locate(TRANSITIONEDGE+1,world.maxy - TRANSITIONEDGE - 2,zpos)))
+ transit_west |= S
- // Left border
- if(S.x <= TRANSITIONEDGE)
- transit_west |= S
- continue
+ // Right border
+ for(var/turf/space/S in block(locate(world.maxx - TRANSITIONEDGE - 1,TRANSITIONEDGE+1,zpos),locate(world.maxx,world.maxy - TRANSITIONEDGE - 2,zpos)))
+ transit_east |= S
+
+/datum/space_level/proc/add_to_transit(turf/space/S)
+ if(S.y <= TRANSITIONEDGE)
+ transit_south |= S
+ return
+
+ // Top border
+ if(S.y >= (world.maxy - TRANSITIONEDGE - 1))
+ transit_north |= S
+ return
+
+ // Left border
+ if(S.x <= TRANSITIONEDGE)
+ transit_west |= S
+ return
+
+ // Right border
+ if(S.x >= (world.maxx - TRANSITIONEDGE - 1))
+ transit_east |= S
+
+/datum/space_level/proc/remove_from_transit(turf/space/S)
+ if(S.y <= TRANSITIONEDGE)
+ transit_south -= S
+ return
+
+ // Top border
+ if(S.y >= (world.maxy - TRANSITIONEDGE - 1))
+ transit_north -= S
+ return
+
+ // Left border
+ if(S.x <= TRANSITIONEDGE)
+ transit_west -= S
+ return
+
+ // Right border
+ if(S.x >= (world.maxx - TRANSITIONEDGE - 1))
+ transit_east -= S
+
+/datum/space_level/proc/apply_transition(turf/space/S)
+ if(src in space_manager.unbuilt_space_transitions)
+ return // Let the space manager handle this one
+ switch(linkage)
+ if(UNAFFECTED)
+ S.remove_transitions()
+ if(SELFLOOPING,CROSSLINKED)
+ var/datum/space_level/E = get_connection()
+ if(S in transit_north)
+ E = get_connection("[NORTH]")
+ S.set_transition_north(E.zpos)
+ if(S in transit_south)
+ E = get_connection("[SOUTH]")
+ S.set_transition_south(E.zpos)
+ if(S in transit_east)
+ E = get_connection("[EAST]")
+ S.set_transition_east(E.zpos)
+ if(S in transit_west)
+ E = get_connection("[WEST]")
+ S.set_transition_west(E.zpos)
- // Right border
- if(S.x >= (world.maxx - TRANSITIONEDGE - 1))
- transit_east |= S
- continue
- log_debug("Building space destination arrays complete, took [stop_watch(timer)]s.")
/datum/space_level/proc/get_turfs()
return block(locate(1, 1, zpos), locate(world.maxx, world.maxy, zpos))
/datum/space_level/proc/set_linkage(transition_type)
- linkage = transition_type
- if(transition_type == SELFLOOPING)
- link_to_self() // `link_to_self` is defined in space_transitions.dm
+ if(linkage == transition_type)
+ return
+ // Remove ourselves from the linkage map if we were cross-linked
+ if(linkage == CROSSLINKED)
+ if(space_manager.linkage_map)
+ remove_from_space_network(space_manager.linkage_map)
+ space_manager.unbuilt_space_transitions |= src
+ linkage = transition_type
+ switch(transition_type)
+ if(UNAFFECTED)
+ reset_connections()
+ if(SELFLOOPING)
+ link_to_self() // `link_to_self` is defined in space_transitions.dm
/datum/space_level/proc/resume_init()
if(dirt_count > 0)
diff --git a/code/modules/space_management/space_transition.dm b/code/modules/space_management/space_transition.dm
index 469365e4023..b7691ce6601 100644
--- a/code/modules/space_management/space_transition.dm
+++ b/code/modules/space_management/space_transition.dm
@@ -16,15 +16,36 @@
if(Z_LEVEL_WEST)
return Z_LEVEL_EAST
-/datum/space_level
- var/list/direction_cache = list()
+
+// Do this before setting up new connections, or the old ones will haunt you
+/datum/space_level/proc/reset_connections()
+ neighbors.Cut()
/datum/space_level/proc/link_to_self()
+ reset_connections()
neighbors = list()
var/list/L = list(Z_LEVEL_NORTH,Z_LEVEL_SOUTH,Z_LEVEL_EAST,Z_LEVEL_WEST)
for(var/A in L)
neighbors[A] = src
+// Only call this when the `linkage_map` is already built
+/datum/space_level/proc/add_to_space_network(datum/spacewalk_grid/SW)
+ // Make sure we don't bring any noise data into the network
+ reset_connections()
+ xi = initial(xi)
+ yi = initial(yi)
+ var/datum/point/P = SW.get_empty_node()
+ P.set_space_level(src)
+
+/datum/space_level/proc/remove_from_space_network(datum/spacewalk_grid/SW)
+ var/datum/point/P = SW.get(xi,yi)
+ SW.release_node(P)
+ // Only do this when we're done, or we'll trample vars needed for releasing
+ // the level
+ xi = initial(xi)
+ yi = initial(yi)
+ reset_connections()
+
// This proc takes another space level, and establishes a connection between the
// two depending on how the `xi` and the `yi` values compare
/datum/space_level/proc/link_levels(datum/space_level/S)
@@ -41,26 +62,18 @@
else // yell about evil wizards, this shouldn't happen
log_debug("Two z levels attempted to link, but were not adjacent! Our z:([xi],[yi]). Other z:([S.xi],[S.yi])")
-// Do this before setting up new connections, or the old ones will haunt you
-/datum/space_level/proc/reset_connections()
- neighbors.Cut()
- direction_cache.Cut()
-
// `direction` here is the direction from `src` to `S`
/datum/space_level/proc/add_connection(datum/space_level/S, direction)
var/oppose = get_opposite_direction(direction)
neighbors[direction] = S
S.neighbors[oppose] = src
+ space_manager.unbuilt_space_transitions |= src
+ space_manager.unbuilt_space_transitions |= S
-// The "direction cache" will need updating if a
/datum/space_level/proc/get_connection(direction)
if(direction in neighbors)
return neighbors[direction]
- var/use_direction_cache = 0
- if(use_direction_cache)
- if(direction in direction_cache)
- return direction_cache[direction]
// It's in a direction that loops - so we step as far in the opposite direction to get where to wrap to
var/datum/space_level/S = src
@@ -70,9 +83,6 @@
if(S.neighbors[oppose] == src) // we've got a tesseract, boys
CRASH("Tesseract formed when routing connections between z levels. Culprit: z level '[S.zpos]' to '[src.zpos]', direction [oppose]")
S = S.neighbors[oppose]
-
- if(use_direction_cache)
- direction_cache[direction] = S
return S
@@ -145,8 +155,6 @@
// This looks around itself to see if it has any active nodes within the cardinal directions
/datum/point/proc/has_no_neighbors(datum/spacewalk_grid/SW)
var/result = 1
- if(spl)
- return 1
if(!isnull(SW.get(x+1,y)))
result = 0
if(!isnull(SW.get(x-1,y)))
@@ -165,6 +173,7 @@
var/datum/space_level/S = spl.neighbors[direction]
var/oppose = get_opposite_direction(direction)
S.neighbors.Remove(oppose)
+ space_manager.unbuilt_space_transitions |= S
spl.reset_connections()
spl = initial(spl)
@@ -191,6 +200,14 @@
var/datum/point/P = new(0,0)
add_available_node(P)
+/datum/spacewalk_grid/Destroy()
+ for(var/datum/point/P in filled_nodes)
+ release_node(P)
+ if(available_nodes.len > 1)
+ log_debug("Multiple nodes left behind after SW grid qdel: [available_nodes.len]")
+ for(var/datum/point/P in available_nodes)
+ log_debug("([P.x],[P.y])")
+
/datum/spacewalk_grid/proc/add_available_node(datum/point/P)
var/hash = P.hash()
if(hash in all_nodes)
@@ -225,9 +242,12 @@
for(var/datum/point/P2 in P.neighbors)
var/isolated = P2.has_no_neighbors(src)
if(isolated)
- available_nodes -= P2
- all_nodes -= P2.hash()
- qdel(P)
+ if(!P2.spl)
+ available_nodes -= P2
+ all_nodes -= P2.hash()
+ qdel(P)
+ else
+ log_debug("Isolated z level at ([P2.x],[P2.y]): [P2.spl.zpos]")
P.deactivate()
P.neighbors.Cut()
@@ -279,7 +299,7 @@
/datum/spacewalk_grid/proc/get_height()
return 1 + max_y - min_y
-// This function is called repeatedly to build the map
+// This function chooses an available point next to any node in the grid
/datum/spacewalk_grid/proc/get_empty_node()
var/datum/point/P = pick(available_nodes)
if(isnull(P))
@@ -287,6 +307,12 @@
consume_node(P)
return P
+// This function is called repeatedly to build the map
+/datum/spacewalk_grid/proc/add_level(datum/space_level/S)
+ var/datum/point/P = get_empty_node()
+ P.set_space_level(S)
+
+
// This proc substantiates the grid of points used to determine routes between levels
// Separating this from initialization gives us time in which we can add more crosslink z levels
// before we bake in all our connections
@@ -307,75 +333,75 @@
// `grid` is a flat list of these same above points
// Each point represents a possible z level position
- var/datum/spacewalk_grid/point_grid = new
- // We do this so we can display the way the levels connect later
- linkage_map = point_grid
- var/datum/point/P
+ if(linkage_map)
+ qdel(linkage_map)
+ linkage_map = new
// Now, we pop entries in a random order from our list of space levels
// and assign its connections based on the grid
while(crosslinks.len)
D = pick(crosslinks)
crosslinks.Remove(D)
- // We now choose a point in our imaginary grid adjacent to our current location
- P = point_grid.get_empty_node()
- // Let our z level know where in the imaginary grid it is
- // This will also handle establishing neighborship with other z levels
- P.set_space_level(D)
+ // Add it to our space grid
+ D.add_to_space_network(linkage_map)
-// A heavy proc - loops through all space turfs and sets its destination
-// based on its space level's linkage
-// Takes 0.6 seconds per call on my machine - could have each z level
-// have its own space turf cache, but I don't want to complicate this more
-// than is necessary
-/datum/zlev_manager/proc/setup_space_destinations()
+// Used to loop through turfs in world, now just goes through each level's
+// transit turf cache
+/datum/zlev_manager/proc/setup_space_destinations(force_all_rebuilds = FALSE)
var/timer = start_watch()
log_debug("Assigning space turf destinations...")
var/datum/space_level/D
var/datum/space_level/E
var/turf/space/S
- for(var/A in z_list) //Define the transistions of the z levels
- D = z_list[A]
- if(!D.neighbors.len)
- continue
- // Left border
- for(var/B in D.transit_west)
- S = B
- E = D.get_connection(Z_LEVEL_WEST)
- S.destination_z = E.zpos
- S.destination_x = world.maxx - TRANSITIONEDGE - 2
- S.destination_y = S.y
+ var/list/levels_to_rebuild = unbuilt_space_transitions
- // Right border
- for(var/B in D.transit_east)
- S = B
- E = D.get_connection(Z_LEVEL_EAST)
- S.destination_x = TRANSITIONEDGE + 2
- S.destination_y = S.y
- S.destination_z = E.zpos
+ if(force_all_rebuilds)
+ // Assuming we don't have like 9000 zlevels this shouldn't hurt
+ levels_to_rebuild = list()
+ for(var/A in z_list)
+ levels_to_rebuild.Add(z_list[A])
- // Bottom border
- for(var/B in D.transit_south)
- S = B
- E = D.get_connection(Z_LEVEL_SOUTH)
- S.destination_x = S.x
- S.destination_y = world.maxy - TRANSITIONEDGE - 2
- S.destination_z = E.zpos
- // Top border
- for(var/B in D.transit_north)
- S = B
- E = D.get_connection(Z_LEVEL_NORTH)
- S.destination_x = S.x
- S.destination_y = TRANSITIONEDGE + 2
- S.destination_z = E.zpos
+ for(var/foo in levels_to_rebuild) //Define the transitions of the z levels
+ D = foo
+ log_debug("Z level [D.zpos]")
+ switch(D.linkage)
+ if(UNAFFECTED)
+ for(var/B in D.transit_west | D.transit_east | D.transit_south | D.transit_north)
+ S = B
+ S.remove_transitions()
+ if(SELFLOOPING,CROSSLINKED)
+ // Left border
+ for(var/B in D.transit_west)
+ S = B
+ E = D.get_connection(Z_LEVEL_WEST)
+ S.set_transition_west(E.zpos)
+
+ // Right border
+ for(var/B in D.transit_east)
+ S = B
+ E = D.get_connection(Z_LEVEL_EAST)
+ S.set_transition_east(E.zpos)
+
+ // Bottom border
+ for(var/B in D.transit_south)
+ S = B
+ E = D.get_connection(Z_LEVEL_SOUTH)
+ S.set_transition_south(E.zpos)
+
+ // Top border
+ for(var/B in D.transit_north)
+ S = B
+ E = D.get_connection(Z_LEVEL_NORTH)
+ S.set_transition_north(E.zpos)
+ unbuilt_space_transitions -= D
log_debug("Assigning space turf destinations complete. Took [stop_watch(timer)]s.")
// Nothing fancy, just does it all at once
/datum/zlev_manager/proc/do_transition_setup()
route_linkage()
- setup_space_destinations()
+ setup_space_destinations(force_all_rebuilds = TRUE)
// A debugging proc that expresses the map's shape as a bunch of turfs
/datum/zlev_manager/proc/map_as_turfs(turf/center)
diff --git a/code/modules/space_management/zlevel_manager.dm b/code/modules/space_management/zlevel_manager.dm
index 8f83c0ab5e4..d0bb9455eb8 100644
--- a/code/modules/space_management/zlevel_manager.dm
+++ b/code/modules/space_management/zlevel_manager.dm
@@ -3,9 +3,14 @@ var/global/datum/zlev_manager/space_manager = new
/datum/zlev_manager
// A list of z-levels
var/list/z_list = list()
+ var/list/levels_by_name = list()
var/list/heaps = list()
+ // Levels that need their transitions rebuilt
+ var/list/unbuilt_space_transitions = list()
+
var/datum/spacewalk_grid/linkage_map
+ var/initialized = 0
// Populate our space level list
// and prepare space transitions
@@ -14,18 +19,24 @@ var/global/datum/zlev_manager/space_manager = new
var/k = 1
// First take care of "Official" z levels, without visiting levels outside of the list
- for(var/A in map_transition_config)
- // `A` is the name
- // `map_transition_config[A]` is the transition type
- z_list["[k]"] = new /datum/space_level(k, A, transition_type = map_transition_config[A])
+ for(var/list/features in map_transition_config)
if(k > world.maxz)
- CRASH("More map transitions defined than existent z levels - [num_official_z_levels]")
+ CRASH("More map attributes pre-defined than existent z levels - [num_official_z_levels]")
+ var/name = features["name"]
+ var/linking = features["linkage"]
+ var/list/attributes = features["attributes"]
+ attributes = attributes.Copy() // Clone the list so it can't be changed on accident
+
+ var/datum/space_level/S = new /datum/space_level(k, name, transition_type = linking, traits = attributes)
+ z_list["[k]"] = S
+ levels_by_name[name] = S
k++
// Then, we take care of unmanaged z levels
// They get the default linkage of SELFLOOPING
for(var/i = k, i <= world.maxz, i++)
z_list["[i]"] = new /datum/space_level(i)
+ initialized = 1
/datum/zlev_manager/proc/get_zlev(z)
@@ -34,6 +45,11 @@ var/global/datum/zlev_manager/space_manager = new
else
return z_list["[z]"]
+/datum/zlev_manager/proc/get_zlev_by_name(A)
+ if(!(A in levels_by_name))
+ throw EXCEPTION("Non-existent z level: '[A]'")
+ return levels_by_name[A]
+
/*
* "Dirt" management
* "Dirt" is used to keep track of whether a z level should automatically have
@@ -88,10 +104,14 @@ var/global/datum/zlev_manager/space_manager = new
// Increments the max z-level by one
// For convenience's sake returns the z-level added
-/datum/zlev_manager/proc/add_new_zlevel(name, linkage = SELFLOOPING)
+/datum/zlev_manager/proc/add_new_zlevel(name, linkage = SELFLOOPING, traits = list(BLOCK_TELEPORT))
+ if(name in levels_by_name)
+ throw EXCEPTION("Name already in use: [name]")
world.maxz++
var/our_z = world.maxz
- z_list["[our_z]"] = new /datum/space_level(our_z,name, transition_type = linkage)
+ var/datum/space_level/S = new /datum/space_level(our_z, name, transition_type = linkage, traits = traits)
+ levels_by_name[name] = S
+ z_list["[our_z]"] = S
return our_z
/datum/zlev_manager/proc/cut_levels_downto(new_maxz)
diff --git a/code/modules/spacepods/spacepod.dm b/code/modules/spacepods/spacepod.dm
index 0a89272f1bb..b17eb9940ea 100644
--- a/code/modules/spacepods/spacepod.dm
+++ b/code/modules/spacepods/spacepod.dm
@@ -1,5 +1,15 @@
#define DAMAGE 1
#define FIRE 2
+#define LIGHT 1
+#define WINDOW 2
+#define RIM 3
+#define PAINT 4
+
+/obj/item/weapon/pod_paint_bucket
+ name = "space pod paintkit"
+ desc = "Pimp your ride"
+ icon = 'icons/obj/items.dmi'
+ icon_state = "paint_red"
/obj/spacepod
name = "\improper space pod"
@@ -36,7 +46,11 @@
var/next_firetime = 0
+ var/has_paint = 0
+
var/list/pod_overlays
+ var/list/pod_paint_effect
+ var/list/colors = new/list(4)
var/health = 250
var/empcounter = 0 //Used for disabling movement when hit by an EMP
@@ -54,12 +68,38 @@
var/move_delay = 2
var/next_move = 0
+/obj/spacepod/proc/apply_paint(mob/user as mob)
+ var/part_type
+ var/part = input(user, "Choose part", null) as null|anything in list("Lights","Rim","Paint","Windows")
+ switch(part)
+ if("Lights")
+ part_type = LIGHT
+ if("Rim")
+ part_type = RIM
+ if("Paint")
+ part_type = PAINT
+ if("Windows")
+ part_type = WINDOW
+ else
+ var/coloradd = input(user, "Choose a color", "Color") as color
+ colors[part_type] = coloradd
+ if(!has_paint)
+ has_paint = 1
+ update_icons()
+
+
/obj/spacepod/New()
. = ..()
if(!pod_overlays)
pod_overlays = new/list(2)
pod_overlays[DAMAGE] = image(icon, icon_state="pod_damage")
pod_overlays[FIRE] = image(icon, icon_state="pod_fire")
+ if(!pod_paint_effect)
+ pod_paint_effect = new/list(4)
+ pod_paint_effect[LIGHT] = image(icon,icon_state = "LIGHTS")
+ pod_paint_effect[WINDOW] = image(icon,icon_state = "Windows")
+ pod_paint_effect[RIM] = image(icon,icon_state = "RIM")
+ pod_paint_effect[PAINT] = image(icon,icon_state = "PAINT")
bound_width = 64
bound_height = 64
dir = EAST
@@ -120,13 +160,38 @@
pod_overlays[DAMAGE] = image(icon, icon_state="pod_damage")
pod_overlays[FIRE] = image(icon, icon_state="pod_fire")
+ if(!pod_paint_effect)
+ pod_paint_effect = new/list(4)
+ pod_paint_effect[LIGHT] = image(icon,icon_state = "LIGHTS")
+ pod_paint_effect[WINDOW] = image(icon,icon_state = "Windows")
+ pod_paint_effect[RIM] = image(icon,icon_state = "RIM")
+ pod_paint_effect[PAINT] = image(icon,icon_state = "PAINT")
overlays.Cut()
+ if(has_paint)
+ var/image/to_add
+ if(!isnull(pod_paint_effect[LIGHT]))
+ to_add = pod_paint_effect[LIGHT]
+ to_add.color = colors[LIGHT]
+ overlays += to_add
+ if(!isnull(pod_paint_effect[WINDOW]))
+ to_add = pod_paint_effect[WINDOW]
+ to_add.color = colors[WINDOW]
+ overlays += to_add
+ if(!isnull(pod_paint_effect[RIM]))
+ to_add = pod_paint_effect[RIM]
+ to_add.color = colors[RIM]
+ overlays += to_add
+ if(!isnull(pod_paint_effect[PAINT]))
+ to_add = pod_paint_effect[PAINT]
+ to_add.color = colors[PAINT]
+ overlays += to_add
if(health <= round(initial(health)/2))
overlays += pod_overlays[DAMAGE]
if(health <= round(initial(health)/4))
overlays += pod_overlays[FIRE]
+
light_color = icon_light_color[src.icon_state]
/obj/spacepod/bullet_act(var/obj/item/projectile/P)
@@ -145,7 +210,7 @@
else
var/damage = rand(user.melee_damage_lower, user.melee_damage_upper)
deal_damage(damage)
- visible_message("\red [user] [user.attacktext] [src]!")
+ visible_message("[user] [user.attacktext] [src]!")
user.attack_log += text("\[[time_stamp()]\] attacked [src.name]")
return
@@ -321,7 +386,7 @@
repair_damage(10)
to_chat(user, "\blue You mend some [pick("dents","bumps","damage")] with \the [WT]")
return
- to_chat(user, "\blue \The [src] is fully repaired!")
+ to_chat(user, "\The [src] is fully repaired!")
return
if(istype(W, /obj/item/device/lock_buster))
@@ -483,6 +548,12 @@ obj/spacepod/proc/add_equipment(mob/user, var/obj/item/device/spacepod_equipment
icon_state = "pod_civ"
desc = "A sleek civilian space pod."
+/obj/spacepod/civilian/attackby(obj/item/W as obj, mob/user as mob, params)
+ ..()
+ if(istype(W, /obj/item/weapon/pod_paint_bucket))
+ apply_paint(user)
+ return
+
/obj/spacepod/random
icon_state = "pod_civ"
// placeholder
@@ -976,4 +1047,8 @@ obj/spacepod/proc/add_equipment(mob/user, var/obj/item/device/spacepod_equipment
..()
#undef DAMAGE
-#undef FIRE
\ No newline at end of file
+#undef FIRE
+#undef WINDOW
+#undef LIGHT
+#undef RIM
+#undef PAINT
diff --git a/code/modules/store/store.dm b/code/modules/store/store.dm
index 7d5fc1e527d..d93d56acc41 100644
--- a/code/modules/store/store.dm
+++ b/code/modules/store/store.dm
@@ -48,8 +48,7 @@ var/global/datum/store/centcomm_store=new
/datum/store/proc/reconnect_database()
for(var/obj/machinery/computer/account_database/DB in world)
- // TODO: Tie into space manager
- if((DB.z in config.station_levels))
+ if(is_station_level(DB.z))
linked_db = DB
break
diff --git a/code/modules/surgery/organs/organ_external.dm b/code/modules/surgery/organs/organ_external.dm
index 9e1e1d70b79..43a8a4ee43c 100644
--- a/code/modules/surgery/organs/organ_external.dm
+++ b/code/modules/surgery/organs/organ_external.dm
@@ -799,7 +799,7 @@ Note that amputating the affected organ does in fact remove the infection from t
if(owner)
owner.visible_message(\
"\red You hear a loud cracking sound coming from \the [owner].",\
- "\red Something feels like it shattered in your [name]!",\
+ "Something feels like it shattered in your [name]!",\
"You hear a sickening crack.")
if(owner.species && !(owner.species.flags & NO_PAIN))
owner.emote("scream")
@@ -949,11 +949,11 @@ Note that amputating the affected organ does in fact remove the infection from t
if(owner)
if(type == "brute")
owner.visible_message("\red You hear a sickening cracking sound coming from \the [owner]'s [name].", \
- "\red Your [name] becomes a mangled mess!", \
+ "Your [name] becomes a mangled mess!", \
"\red You hear a sickening crack.")
else
owner.visible_message("\red \The [owner]'s [name] melts away, turning into mangled mess!", \
- "\red Your [name] melts away!", \
+ "Your [name] melts away!", \
"\red You hear a sickening sizzle.")
disfigured = 1
diff --git a/code/modules/surgery/organs/pain.dm b/code/modules/surgery/organs/pain.dm
index 0bd2d138948..23d2af69bf3 100644
--- a/code/modules/surgery/organs/pain.dm
+++ b/code/modules/surgery/organs/pain.dm
@@ -23,11 +23,11 @@ mob/living/carbon/proc/pain(var/partname, var/amount, var/force, var/burning = 0
if(burning)
switch(amount)
if(1 to 10)
- msg = "\red Your [partname] burns."
+ msg = "Your [partname] burns."
if(11 to 90)
- msg = "\red Your [partname] burns badly!"
+ msg = "Your [partname] burns badly!"
if(91 to 10000)
- msg = "\red OH GOD! Your [partname] is on fire!"
+ msg = "OH GOD! Your [partname] is on fire!"
else
switch(amount)
if(1 to 10)
@@ -53,7 +53,7 @@ mob/living/carbon/human/proc/custom_pain(var/message, var/flash_strength)
return
if(reagents.has_reagent("hydrocodone"))
return
- var/msg = "\red [message]"
+ var/msg = "[message]"
if(flash_strength >= 1)
msg = "\red [message]"
diff --git a/code/modules/telesci/bscrystal.dm b/code/modules/telesci/bscrystal.dm
index 8b86a3082d8..a2ee8cc85ca 100644
--- a/code/modules/telesci/bscrystal.dm
+++ b/code/modules/telesci/bscrystal.dm
@@ -22,8 +22,7 @@
qdel(src)
/obj/item/weapon/ore/bluespace_crystal/proc/blink_mob(var/mob/living/L)
- // TODO: Tie into space manager
- if(L.z in config.admin_levels)
+ if(!is_teleport_allowed(L.z))
src.visible_message("[src]'s fragments begin rapidly vibrating and blink out of existence.")
qdel(src)
return
diff --git a/code/modules/tram/tram.dm b/code/modules/tram/tram.dm
index f36e467b88f..42b219bb92d 100644
--- a/code/modules/tram/tram.dm
+++ b/code/modules/tram/tram.dm
@@ -254,7 +254,7 @@
if(M.melee_damage_upper == 0) return
if(prob(M.melee_damage_upper))
qdel(src)
- src.visible_message("\red [M] has [M.attacktext] [src]!")
+ src.visible_message("[M] has [M.attacktext] [src]!")
M.attack_log += text("\[[time_stamp()]\] attacked [src.name]")
/obj/tram/bullet_act(var/obj/item/projectile/proj)
diff --git a/config/example/config.txt b/config/example/config.txt
index eb44c6d828a..a3066e3d234 100644
--- a/config/example/config.txt
+++ b/config/example/config.txt
@@ -71,7 +71,6 @@ KICK_INACTIVE
## default probablity is 1, increase to make that mode more likely to be picked
## set to 0 to disable that mode
PROBABILITY EXTENDED 2
-PROBABILITY MALFUNCTION 2
PROBABILITY NUCLEAR 3
PROBABILITY ABDUCTION 2
PROBABILITY CHANGELING 3
@@ -260,18 +259,6 @@ GHOST_INTERACTION
## Default is "python" on Windows, "/usr/bin/env python2" on UNIX.
#PYTHON_PATH pythonw
-## Defines which Z-levels the station exists on.
-STATION_LEVELS 1
-
-## Defines which Z-levels are used for admin functionality, such as Central Command and the Syndicate Shuttle
-ADMIN_LEVELS 2
-
-## Defines which Z-levels which, for example, a Code Red announcement may affect
-CONTACT_LEVELS 1;5
-
-## Defines all Z-levels a character can typically reach
-PLAYER_LEVELS 1;3;4;5;6;7
-
## Expected round length in minutes
EXPECTED_ROUND_LENGTH 120
diff --git a/config/example/space_levels.txt b/config/example/space_levels.txt
deleted file mode 100644
index d40624bb64d..00000000000
--- a/config/example/space_levels.txt
+++ /dev/null
@@ -1,13 +0,0 @@
-Main Station;1;linked
-
-Central Command;2;unlinked
-
-Telecommunications Satellite;3;linked
-
-Engineering Outpost;4;linked
-
-Mining Asteroid;5;linked
-
-Derelicted Station;6;linked
-
-Empty Area;7;linked
\ No newline at end of file
diff --git a/html/changelogs/AutoChangeLog-pr-5268.yml b/html/changelogs/AutoChangeLog-pr-5268.yml
new file mode 100644
index 00000000000..776b50c2bd3
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-5268.yml
@@ -0,0 +1,5 @@
+author: Crazylemon64
+delete-after: True
+changes:
+ - bugfix: "Makes teleportation checks more consistent, which will ensure that teleporting in the away mission no longer works."
+ - bugfix: "People on the space ruins level no longer count as dead for assassinate objectives."
diff --git a/html/changelogs/AutoChangeLog-pr-5325.yml b/html/changelogs/AutoChangeLog-pr-5325.yml
new file mode 100644
index 00000000000..e7c5b3292b4
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-5325.yml
@@ -0,0 +1,4 @@
+author: DaveTheHeadcrab
+delete-after: True
+changes:
+ - tweak: "ERT gloves reverted to how they used to be."
diff --git a/html/changelogs/AutoChangeLog-pr-5333.yml b/html/changelogs/AutoChangeLog-pr-5333.yml
new file mode 100644
index 00000000000..77b3fd45922
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-5333.yml
@@ -0,0 +1,4 @@
+author: Chakishreds
+delete-after: True
+changes:
+ - tweak: "You can now click on objects in a gassy room at the expense of ninja floors."
diff --git a/html/changelogs/AutoChangeLog-pr-5339.yml b/html/changelogs/AutoChangeLog-pr-5339.yml
new file mode 100644
index 00000000000..9385c58a970
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-5339.yml
@@ -0,0 +1,4 @@
+author: IcyV
+delete-after: True
+changes:
+ - rscadd: "Adds an exploding chameleon flag for traitors."
diff --git a/html/changelogs/AutoChangeLog-pr-5345.yml b/html/changelogs/AutoChangeLog-pr-5345.yml
new file mode 100644
index 00000000000..f809a61c26a
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-5345.yml
@@ -0,0 +1,5 @@
+author: FlattestGuitar
+delete-after: True
+changes:
+ - tweak: "Detective's coolness variable cranked up to 14.5, they will no longer vomit over corpses."
+ - tweak: "Now you're less likely to vomit over a corpse if you're a normal human being."
diff --git a/html/changelogs/AutoChangeLog-pr-5352.yml b/html/changelogs/AutoChangeLog-pr-5352.yml
new file mode 100644
index 00000000000..6146477db0d
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-5352.yml
@@ -0,0 +1,5 @@
+author: Crazylemon64
+delete-after: True
+changes:
+ - bugfix: "Space border turfs will now regain their destination when over-written and replaced on the edge of the map"
+ - bugfix: "The space manager will no longer runtime if a space ruin writes on the edge of the map"
diff --git a/html/changelogs/AutoChangeLog-pr-5365.yml b/html/changelogs/AutoChangeLog-pr-5365.yml
new file mode 100644
index 00000000000..202f8ba0253
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-5365.yml
@@ -0,0 +1,4 @@
+author: LittleBigKid2000
+delete-after: True
+changes:
+ - bugfix: "The arrivals checkpoint camera monitor is now connected to some camera networks by default."
diff --git a/html/changelogs/AutoChangeLog-pr-5375.yml b/html/changelogs/AutoChangeLog-pr-5375.yml
new file mode 100644
index 00000000000..9aec43e7821
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-5375.yml
@@ -0,0 +1,7 @@
+author: Fox McCloud
+delete-after: True
+changes:
+ - rscadd: "Adds in formal captain's uniform and armor"
+ - rscadd: "Adds rapier to captain's locker"
+ - rscadd: "Adds lace up shoes to captain's locker"
+ - rscadd: "Adds crown to captain's locker"
diff --git a/html/changelogs/AutoChangeLog-pr-5387.yml b/html/changelogs/AutoChangeLog-pr-5387.yml
new file mode 100644
index 00000000000..c7f5aeeea9d
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-5387.yml
@@ -0,0 +1,4 @@
+author: Alexshreds
+delete-after: True
+changes:
+ - tweak: "pAIs can see the crew manifest again."
diff --git a/html/changelogs/AutoChangeLog-pr-5391.yml b/html/changelogs/AutoChangeLog-pr-5391.yml
new file mode 100644
index 00000000000..6328dae9b58
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-5391.yml
@@ -0,0 +1,4 @@
+author: tristan1333
+delete-after: True
+changes:
+ - rscadd: "Spacepod paint"
diff --git a/html/changelogs/AutoChangeLog-pr-5393.yml b/html/changelogs/AutoChangeLog-pr-5393.yml
new file mode 100644
index 00000000000..fc84fbdd85f
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-5393.yml
@@ -0,0 +1,4 @@
+author: Fox McCloud
+delete-after: True
+changes:
+ - tweak: "Dramatically speeds up conveyor belts"
diff --git a/html/changelogs/AutoChangeLog-pr-5394.yml b/html/changelogs/AutoChangeLog-pr-5394.yml
new file mode 100644
index 00000000000..173b18cd44d
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-5394.yml
@@ -0,0 +1,4 @@
+author: Fox McCloud
+delete-after: True
+changes:
+ - bugfix: "Appendicitis and Disease Outbreak events will no longer impact clientless mobs"
diff --git a/html/changelogs/AutoChangeLog-pr-5397.yml b/html/changelogs/AutoChangeLog-pr-5397.yml
new file mode 100644
index 00000000000..a3b2ece9c89
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-5397.yml
@@ -0,0 +1,5 @@
+author: Krausus
+delete-after: True
+changes:
+ - tweak: "Karma spending is now slightly more straightforward and sanity-checked."
+ - tweak: "Ghosts can now see non-crew antagonists in the Award Karma listing."
diff --git a/html/changelogs/AutoChangeLog-pr-5398.yml b/html/changelogs/AutoChangeLog-pr-5398.yml
new file mode 100644
index 00000000000..69843bddaea
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-5398.yml
@@ -0,0 +1,4 @@
+author: FlattestGuitar
+delete-after: True
+changes:
+ - tweak: "golems now have their master saved in attack logs"
diff --git a/html/changelogs/AutoChangeLog-pr-5399.yml b/html/changelogs/AutoChangeLog-pr-5399.yml
new file mode 100644
index 00000000000..a1c8ac36b2c
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-5399.yml
@@ -0,0 +1,4 @@
+author: taukausanake
+delete-after: True
+changes:
+ - bugfix: "Gives proper mix_messages for Uplink, Synthignon, and Synth 'n Soda drinks"
diff --git a/html/changelogs/AutoChangeLog-pr-5405.yml b/html/changelogs/AutoChangeLog-pr-5405.yml
new file mode 100644
index 00000000000..7a71aa7179e
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-5405.yml
@@ -0,0 +1,4 @@
+author: Fethas
+delete-after: True
+changes:
+ - bugfix: "The whitelist will respect addons better, didn't even have to make a ban appeal.."
diff --git a/html/changelogs/AutoChangeLog-pr-5408.yml b/html/changelogs/AutoChangeLog-pr-5408.yml
new file mode 100644
index 00000000000..eb10c4ea9f9
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-5408.yml
@@ -0,0 +1,4 @@
+author: Fox McCloud
+delete-after: True
+changes:
+ - bugfix: "Fixes bandolier being invisible on spawn"
diff --git a/html/changelogs/AutoChangeLog-pr-5409.yml b/html/changelogs/AutoChangeLog-pr-5409.yml
new file mode 100644
index 00000000000..9ef06e196a7
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-5409.yml
@@ -0,0 +1,5 @@
+author: FreeStylaLT
+delete-after: True
+changes:
+ - bugfix: "Fixed missing space transition tiles in emergency shuttle transit"
+ - bugfix: "Fixed lack of prisoner access to lower part of labor camp shuttle"
diff --git a/html/changelogs/AutoChangeLog-pr-5418.yml b/html/changelogs/AutoChangeLog-pr-5418.yml
new file mode 100644
index 00000000000..034bd777228
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-5418.yml
@@ -0,0 +1,10 @@
+author: KorPhaeron and Fox McCloud
+delete-after: True
+changes:
+ - tweak: "Merges Malf AI into traitor AI"
+ - tweak: "Malf AI's starting CPU reduced from 100 to 50"
+ - tweak: "Hacking APCs gives 10 additional CPU"
+ - rscadd: "Hacking APCs throws an alert to the AI when it's hacking that automatically clears when hacking is complete (sounds too)"
+ - rscadd: "Traitor AI's start off with a syndicate headset"
+ - rscadd: "Adds doomsday device module for AI's for 130 CPU; when activated, it will purge the station of all life if the AI is not destroyed after 7.5 minutes"
+ - rscadd: "Adds in AI upgrade modules which allows you to giving hacking abilities to the AI or allow it to have increase surveillance capabilities"
diff --git a/html/changelogs/AutoChangeLog-pr-5422.yml b/html/changelogs/AutoChangeLog-pr-5422.yml
new file mode 100644
index 00000000000..75a3c515e44
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-5422.yml
@@ -0,0 +1,5 @@
+author: FreeStylaLT
+delete-after: True
+changes:
+ - tweak: "Changed UO45's and MO19's away missions' external tiles to just airless ones."
+ - tweak: "Changed MO19's exterior to be more rock than ground, this is to make Linda cry less when this mission is passed."
diff --git a/html/changelogs/AutoChangeLog-pr-5426.yml b/html/changelogs/AutoChangeLog-pr-5426.yml
new file mode 100644
index 00000000000..2e647fc2aa4
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-5426.yml
@@ -0,0 +1,4 @@
+author: Norgad
+delete-after: True
+changes:
+ - rscadd: "Coated Reinforced Walls now have unique sprites"
diff --git a/icons/goonstation/48x48/pods.dmi b/icons/goonstation/48x48/pods.dmi
index b67f978fa4f..de04ba75a57 100644
Binary files a/icons/goonstation/48x48/pods.dmi and b/icons/goonstation/48x48/pods.dmi differ
diff --git a/icons/mob/belt.dmi b/icons/mob/belt.dmi
index 70aa813cbb8..68a273305a8 100644
Binary files a/icons/mob/belt.dmi and b/icons/mob/belt.dmi differ
diff --git a/icons/mob/head.dmi b/icons/mob/head.dmi
index fec4fdce7a1..57405bbe137 100644
Binary files a/icons/mob/head.dmi and b/icons/mob/head.dmi differ
diff --git a/icons/mob/inhands/items_lefthand.dmi b/icons/mob/inhands/items_lefthand.dmi
index 2e73e0e955a..bb624309542 100644
Binary files a/icons/mob/inhands/items_lefthand.dmi and b/icons/mob/inhands/items_lefthand.dmi differ
diff --git a/icons/mob/inhands/items_righthand.dmi b/icons/mob/inhands/items_righthand.dmi
index c576412d5b9..f4f7455ebd2 100644
Binary files a/icons/mob/inhands/items_righthand.dmi and b/icons/mob/inhands/items_righthand.dmi differ
diff --git a/icons/mob/mask.dmi b/icons/mob/mask.dmi
index ceedd8011b9..23b8c76b7c2 100644
Binary files a/icons/mob/mask.dmi and b/icons/mob/mask.dmi differ
diff --git a/icons/mob/screen_alert.dmi b/icons/mob/screen_alert.dmi
index 7dd4c6561e4..9cadad8834f 100644
Binary files a/icons/mob/screen_alert.dmi and b/icons/mob/screen_alert.dmi differ
diff --git a/icons/mob/species/drask/uniform.dmi b/icons/mob/species/drask/uniform.dmi
index 2e58f6918bf..66c5851122e 100644
Binary files a/icons/mob/species/drask/uniform.dmi and b/icons/mob/species/drask/uniform.dmi differ
diff --git a/icons/mob/species/tajaran/mask.dmi b/icons/mob/species/tajaran/mask.dmi
index be155741185..ea17113a2fc 100644
Binary files a/icons/mob/species/tajaran/mask.dmi and b/icons/mob/species/tajaran/mask.dmi differ
diff --git a/icons/mob/species/unathi/mask.dmi b/icons/mob/species/unathi/mask.dmi
index db8c09807ef..a211a035012 100644
Binary files a/icons/mob/species/unathi/mask.dmi and b/icons/mob/species/unathi/mask.dmi differ
diff --git a/icons/mob/species/vox/mask.dmi b/icons/mob/species/vox/mask.dmi
index dcf01b87eb5..b39ee5577a6 100644
Binary files a/icons/mob/species/vox/mask.dmi and b/icons/mob/species/vox/mask.dmi differ
diff --git a/icons/mob/species/vox/suit.dmi b/icons/mob/species/vox/suit.dmi
index bea5f5904ae..486b70d9c29 100644
Binary files a/icons/mob/species/vox/suit.dmi and b/icons/mob/species/vox/suit.dmi differ
diff --git a/icons/mob/species/vox/uniform.dmi b/icons/mob/species/vox/uniform.dmi
index 16ae9885800..05550c74c56 100644
Binary files a/icons/mob/species/vox/uniform.dmi and b/icons/mob/species/vox/uniform.dmi differ
diff --git a/icons/mob/species/vulpkanin/mask.dmi b/icons/mob/species/vulpkanin/mask.dmi
index d6baae8ab67..f0353c1766d 100644
Binary files a/icons/mob/species/vulpkanin/mask.dmi and b/icons/mob/species/vulpkanin/mask.dmi differ
diff --git a/icons/mob/suit.dmi b/icons/mob/suit.dmi
index 9e263f8eb5a..f37dbcd617c 100644
Binary files a/icons/mob/suit.dmi and b/icons/mob/suit.dmi differ
diff --git a/icons/mob/uniform.dmi b/icons/mob/uniform.dmi
index 7b0cd8dd62d..3000849be6b 100644
Binary files a/icons/mob/uniform.dmi and b/icons/mob/uniform.dmi differ
diff --git a/icons/obj/cloning.dmi b/icons/obj/cloning.dmi
index 179ce985814..8699f6edca8 100644
Binary files a/icons/obj/cloning.dmi and b/icons/obj/cloning.dmi differ
diff --git a/icons/obj/clothing/belts.dmi b/icons/obj/clothing/belts.dmi
index f747338a5a7..ae8fa296794 100644
Binary files a/icons/obj/clothing/belts.dmi and b/icons/obj/clothing/belts.dmi differ
diff --git a/icons/obj/clothing/gloves.dmi b/icons/obj/clothing/gloves.dmi
index 4a41556989a..48d253c16cb 100644
Binary files a/icons/obj/clothing/gloves.dmi and b/icons/obj/clothing/gloves.dmi differ
diff --git a/icons/obj/clothing/hats.dmi b/icons/obj/clothing/hats.dmi
index 25ec0162866..958926788d7 100644
Binary files a/icons/obj/clothing/hats.dmi and b/icons/obj/clothing/hats.dmi differ
diff --git a/icons/obj/clothing/masks.dmi b/icons/obj/clothing/masks.dmi
index ff0fc2384c0..84f4e2b4b70 100644
Binary files a/icons/obj/clothing/masks.dmi and b/icons/obj/clothing/masks.dmi differ
diff --git a/icons/obj/clothing/suits.dmi b/icons/obj/clothing/suits.dmi
index 70d6ced3311..80ae5b9a503 100644
Binary files a/icons/obj/clothing/suits.dmi and b/icons/obj/clothing/suits.dmi differ
diff --git a/icons/obj/clothing/uniforms.dmi b/icons/obj/clothing/uniforms.dmi
index fae0ff82715..6b14e9f5265 100644
Binary files a/icons/obj/clothing/uniforms.dmi and b/icons/obj/clothing/uniforms.dmi differ
diff --git a/icons/obj/machines/nuke_terminal.dmi b/icons/obj/machines/nuke_terminal.dmi
new file mode 100644
index 00000000000..298e01c77cf
Binary files /dev/null and b/icons/obj/machines/nuke_terminal.dmi differ
diff --git a/icons/obj/weapons.dmi b/icons/obj/weapons.dmi
index 3cdea651719..89db9fa1c27 100644
Binary files a/icons/obj/weapons.dmi and b/icons/obj/weapons.dmi differ
diff --git a/icons/turf/walls/coated_reinforced_wall.dmi b/icons/turf/walls/coated_reinforced_wall.dmi
new file mode 100644
index 00000000000..ad721037f22
Binary files /dev/null and b/icons/turf/walls/coated_reinforced_wall.dmi differ
diff --git a/nano/templates/pai_manifest.tmpl b/nano/templates/pai_manifest.tmpl
index 447f7ede7c5..d6827594e35 100644
--- a/nano/templates/pai_manifest.tmpl
+++ b/nano/templates/pai_manifest.tmpl
@@ -4,95 +4,95 @@ code/modules/mob/living/silicon/pai/software_modules.dm
Copy-pasted from pda.tmpl
-->
-
-
- {{if data.manifest.heads}}
- | Command |
|---|
- {{for data.manifest["heads"]}}
- {{if value.rank == "Captain"}}
- | {{:value.name}} | {{:value.rank}} | {{:value.active}} |
- {{else}}
- | {{:value.name}} | {{:value.rank}} | {{:value.active}} |
- {{/if}}
- {{/for}}
- {{/if}}
- {{if data.manifest.sec}}
- | Security |
|---|
- {{for data.manifest["sec"]}}
- {{if value.rank == "Head of Security"}}
- | {{:value.name}} | {{:value.rank}} | {{:value.active}} |
- {{else}}
- | {{:value.name}} | {{:value.rank}} | {{:value.active}} |
- {{/if}}
- {{/for}}
- {{/if}}
- {{if data.manifest.eng}}
- | Engineering |
|---|
- {{for data.manifest["eng"]}}
- {{if value.rank == "Chief Engineer"}}
- | {{:value.name}} | {{:value.rank}} | {{:value.active}} |
- {{else}}
- | {{:value.name}} | {{:value.rank}} | {{:value.active}} |
- {{/if}}
- {{/for}}
- {{/if}}
- {{if data.manifest.med}}
- | Medical |
|---|
- {{for data.manifest["med"]}}
- {{if value.rank == "Chief Medical Officer"}}
- | {{:value.name}} | {{:value.rank}} | {{:value.active}} |
- {{else}}
- | {{:value.name}} | {{:value.rank}} | {{:value.active}} |
- {{/if}}
- {{/for}}
- {{/if}}
- {{if data.manifest.sci}}
- | Science |
|---|
- {{for data.manifest["sci"]}}
- {{if value.rank == "Research Director"}}
- | {{:value.name}} | {{:value.rank}} | {{:value.active}} |
- {{else}}
- | {{:value.name}} | {{:value.rank}} | {{:value.active}} |
- {{/if}}
- {{/for}}
- {{/if}}
- {{if data.manifest.ser}}
- | Service |
|---|
- {{for data.manifest["ser"]}}
- {{if value.rank == "Head of Personnel"}}
- | {{:value.name}} | {{:value.rank}} | {{:value.active}} |
- {{else}}
- | {{:value.name}} | {{:value.rank}} | {{:value.active}} |
- {{/if}}
- {{/for}}
- {{/if}}
- {{if data.manifest.sup}}
- | Supply |
|---|
- {{for data.manifest["sup"]}}
- {{if value.rank == "Head of Personnel"}}
- | {{:value.name}} | {{:value.rank}} | {{:value.active}} |
- {{else value.rank == "Quartermaster"}}
- | {{:value.name}} | {{:value.rank}} | {{:value.active}} |
- {{else}}
- | {{:value.name}} | {{:value.rank}} | {{:value.active}} |
- {{/if}}
- {{/for}}
- {{/if}}
- {{if data.manifest.civ}}
- | Civilian |
|---|
- {{for data.manifest["civ"]}}
- {{if value.rank == "Head of Personnel"}}
- | {{:value.name}} | {{:value.rank}} | {{:value.active}} |
- {{else}}
- | {{:value.name}} | {{:value.rank}} | {{:value.active}} |
- {{/if}}
- {{/for}}
- {{/if}}
- {{if data.manifest.misc}}
- | Misc |
|---|
- {{for data.manifest["misc"]}}
- | {{:value.name}} | {{:value.rank}} | {{:value.active}} |
- {{/for}}
- {{/if}}
-
-
+
+ {{if data.manifest.heads}}
+ | Command |
|---|
+ {{for data.manifest["heads"]}}
+ {{if value.rank == "Captain"}}
+ | {{:value.name}} | {{:value.rank}} | {{:value.active}} |
+ {{else}}
+ | {{:value.name}} | {{:value.rank}} | {{:value.active}} |
+ {{/if}}
+ {{/for}}
+ {{/if}}
+ {{if data.manifest.sec}}
+ | Security |
|---|
+ {{for data.manifest["sec"]}}
+ {{if value.rank == "Head of Security"}}
+ | {{:value.name}} | {{:value.rank}} | {{:value.active}} |
+ {{else}}
+ | {{:value.name}} | {{:value.rank}} | {{:value.active}} |
+ {{/if}}
+ {{/for}}
+ {{/if}}
+ {{if data.manifest.eng}}
+ | Engineering |
|---|
+ {{for data.manifest["eng"]}}
+ {{if value.rank == "Chief Engineer"}}
+ | {{:value.name}} | {{:value.rank}} | {{:value.active}} |
+ {{else}}
+ | {{:value.name}} | {{:value.rank}} | {{:value.active}} |
+ {{/if}}
+ {{/for}}
+ {{/if}}
+ {{if data.manifest.med}}
+ | Medical |
|---|
+ {{for data.manifest["med"]}}
+ {{if value.rank == "Chief Medical Officer"}}
+ | {{:value.name}} | {{:value.rank}} | {{:value.active}} |
+ {{else}}
+ | {{:value.name}} | {{:value.rank}} | {{:value.active}} |
+ {{/if}}
+ {{/for}}
+ {{/if}}
+ {{if data.manifest.sci}}
+ | Science |
|---|
+ {{for data.manifest["sci"]}}
+ {{if value.rank == "Research Director"}}
+ | {{:value.name}} | {{:value.rank}} | {{:value.active}} |
+ {{else}}
+ | {{:value.name}} | {{:value.rank}} | {{:value.active}} |
+ {{/if}}
+ {{/for}}
+ {{/if}}
+ {{if data.manifest.ser}}
+ | Service |
|---|
+ {{for data.manifest["ser"]}}
+ {{if value.rank == "Head of Personnel"}}
+ | {{:value.name}} | {{:value.rank}} | {{:value.active}} |
+ {{else}}
+ | {{:value.name}} | {{:value.rank}} | {{:value.active}} |
+ {{/if}}
+ {{/for}}
+ {{/if}}
+ {{if data.manifest.sup}}
+ | Supply |
|---|
+ {{for data.manifest["sup"]}}
+ {{if value.rank == "Head of Personnel"}}
+ | {{:value.name}} | {{:value.rank}} | {{:value.active}} |
+ {{else value.rank == "Quartermaster"}}
+ | {{:value.name}} | {{:value.rank}} | {{:value.active}} |
+ {{else}}
+ | {{:value.name}} | {{:value.rank}} | {{:value.active}} |
+ {{/if}}
+ {{/for}}
+ {{/if}}
+ {{if data.manifest.civ}}
+ | Civilian |
|---|
+ {{for data.manifest["civ"]}}
+ {{if value.rank == "Head of Personnel"}}
+ | {{:value.name}} | {{:value.rank}} | {{:value.active}} |
+ {{else}}
+ | {{:value.name}} | {{:value.rank}} | {{:value.active}} |
+ {{/if}}
+ {{/for}}
+ {{/if}}
+ {{if data.manifest.misc}}
+ | Misc |
|---|
+ {{for data.manifest["misc"]}}
+ | {{:value.name}} | {{:value.rank}} | {{:value.active}} |
+ {{/for}}
+ {{/if}}
+
+