From 2d594922aeaab64e12303fa67686f62b5d663386 Mon Sep 17 00:00:00 2001 From: SteelSlayer Date: Mon, 13 Apr 2020 16:10:49 -0500 Subject: [PATCH 1/3] Makes all types of silicon mobs get ignored for the AI's hijack objective issilicon --- code/game/gamemodes/objective.dm | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/code/game/gamemodes/objective.dm b/code/game/gamemodes/objective.dm index 9974ee8305a..de15f62d09d 100644 --- a/code/game/gamemodes/objective.dm +++ b/code/game/gamemodes/objective.dm @@ -231,7 +231,7 @@ GLOBAL_LIST_INIT(potential_theft_objectives, (subtypesof(/datum/theft_objective) return 0 /datum/objective/block - explanation_text = "Do not allow any lifeforms, be it organic or synthetic to escape on the shuttle alive. AIs, Cyborgs, and pAIs are not considered alive." + explanation_text = "Do not allow any lifeforms, be it organic or synthetic to escape on the shuttle alive. AIs, Cyborgs, Maintenance drones, and pAIs are not considered alive." martyr_compatible = 1 /datum/objective/block/check_completion() @@ -243,15 +243,14 @@ GLOBAL_LIST_INIT(potential_theft_objectives, (subtypesof(/datum/theft_objective) return 0 var/area/A = SSshuttle.emergency.areaInstance - var/list/protected_mobs = list(/mob/living/silicon/ai, /mob/living/silicon/pai, /mob/living/silicon/robot) for(var/mob/living/player in GLOB.player_list) - if(player.type in protected_mobs) - continue + if(issilicon(player)) + continue // If they're silicon, they're not considered alive, skip them. if(player.mind && player.stat != DEAD) if(get_area(player) == A) - return 0 + return 0 // If there are any other organic mobs on the shuttle, you failed the objective. return 1 From 5bbfa6d6c0450fe88a0235488c252d8f66375202 Mon Sep 17 00:00:00 2001 From: SteelSlayer Date: Mon, 13 Apr 2020 18:02:26 -0500 Subject: [PATCH 2/3] Monkeys can now gain nutrition from food --- code/modules/mob/living/carbon/human/species/monkey.dm | 1 + 1 file changed, 1 insertion(+) diff --git a/code/modules/mob/living/carbon/human/species/monkey.dm b/code/modules/mob/living/carbon/human/species/monkey.dm index 6a478c00f55..9c5b51b743b 100644 --- a/code/modules/mob/living/carbon/human/species/monkey.dm +++ b/code/modules/mob/living/carbon/human/species/monkey.dm @@ -18,6 +18,7 @@ is_small = 1 has_fine_manipulation = 0 ventcrawler = VENTCRAWLER_NUDE + dietflags = DIET_OMNI show_ssd = 0 eyes = "blank_eyes" death_message = "lets out a faint chimper as it collapses and stops moving..." From e1892a0cfb48232139361a3de83309d7443d447b Mon Sep 17 00:00:00 2001 From: AffectedArc07 Date: Sat, 18 Apr 2020 12:17:39 +0100 Subject: [PATCH 3/3] Fixes being unable to link tcomms machines --- .../machinery/telecomms/machine_interactions.dm | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/code/game/machinery/telecomms/machine_interactions.dm b/code/game/machinery/telecomms/machine_interactions.dm index 502bd331cac..452c7280e80 100644 --- a/code/game/machinery/telecomms/machine_interactions.dm +++ b/code/game/machinery/telecomms/machine_interactions.dm @@ -362,16 +362,15 @@ if(href_list["link"]) if(P) - if(P.buffer && P.buffer != src) - if(istype(P, /obj/machinery/telecomms)) - var/obj/machinery/telecomms/TCM = P.buffer - if(!(src in TCM.links)) - TCM.links.Add(src) + var/obj/machinery/telecomms/T = P.buffer + if(istype(T) && T != src) + if(!(src in T.links)) + T.links += src - if(!(P.buffer in src.links)) - src.links.Add(P.buffer) + if(!(T in links)) + links += T - temp = "-% Successfully linked with \ref[P.buffer] [P.buffer.name] %-" + temp = "-% Successfully linked with [(T.UID())] [T.name] %-" else temp = "-% Unable to acquire buffer %-"