[MIRROR] Removes tripai landmark (#5280)

* Removes tripai landmark

* Update landmarks.dm
This commit is contained in:
CitadelStationBot
2018-02-05 04:44:31 -06:00
committed by Poojawa
parent 2e71661c47
commit 98d18ee7e3
6 changed files with 30 additions and 30 deletions
+2 -2
View File
@@ -49988,7 +49988,7 @@
/turf/open/floor/circuit,
/area/ai_monitored/turret_protected/aisat/hallway)
"cvx" = (
/obj/effect/landmark/tripai,
/obj/effect/landmark/start/ai/secondary,
/obj/item/device/radio/intercom{
anyai = 1;
freerange = 1;
@@ -50027,7 +50027,7 @@
/turf/open/floor/plasteel/dark,
/area/ai_monitored/turret_protected/aisat/hallway)
"cvA" = (
/obj/effect/landmark/tripai,
/obj/effect/landmark/start/ai/secondary,
/obj/item/device/radio/intercom{
anyai = 1;
freerange = 1;
@@ -40033,7 +40033,7 @@
pixel_x = 4;
req_access_txt = "16"
},
/obj/effect/landmark/tripai,
/obj/effect/landmark/start/ai/secondary,
/turf/open/floor/circuit/green,
/area/ai_monitored/turret_protected/ai)
"bEg" = (
@@ -40147,7 +40147,7 @@
pixel_x = -3;
req_access_txt = "16"
},
/obj/effect/landmark/tripai,
/obj/effect/landmark/start/ai/secondary,
/turf/open/floor/circuit/green,
/area/ai_monitored/turret_protected/ai)
"bEn" = (
+2 -2
View File
@@ -24400,7 +24400,7 @@
/turf/open/floor/wood,
/area/library)
"aZQ" = (
/obj/effect/landmark/tripai,
/obj/effect/landmark/start/ai/secondary,
/obj/item/device/radio/intercom{
anyai = 1;
freerange = 1;
@@ -24502,7 +24502,7 @@
},
/area/ai_monitored/turret_protected/ai)
"aZY" = (
/obj/effect/landmark/tripai,
/obj/effect/landmark/start/ai/secondary,
/obj/item/device/radio/intercom{
anyai = 1;
freerange = 1;
@@ -96,7 +96,7 @@
/obj/structure/cable/yellow{
icon_state = "2-4"
},
/obj/effect/landmark/tripai,
/obj/effect/landmark/start/ai/secondary,
/obj/item/device/radio/intercom{
anyai = 1;
broadcasting = 0;
@@ -145,7 +145,7 @@
areastring = "/area/ai_monitored/turret_protected/ai";
pixel_y = 24
},
/obj/effect/landmark/tripai,
/obj/effect/landmark/start/ai/secondary,
/obj/item/device/radio/intercom{
anyai = 1;
broadcasting = 0;
+6 -6
View File
@@ -186,6 +186,12 @@ INITIALIZE_IMMEDIATE(/obj/effect/landmark)
name = "AI"
icon_state = "AI"
delete_after_roundstart = FALSE
var/primary_ai = TRUE
/obj/effect/landmark/start/ai/secondary
icon = 'icons/effects/landmarks_static.dmi'
icon_state = "ai_spawn"
primary_ai = FALSE
//Department Security spawns
@@ -274,12 +280,6 @@ INITIALIZE_IMMEDIATE(/obj/effect/landmark/start/new_player)
name = "Observer-Start"
icon_state = "observer_start"
// triple ais.
/obj/effect/landmark/tripai
name = "tripai"
icon_state = "ai_spawn"
layer = MOB_LAYER
// xenos.
/obj/effect/landmark/xeno_spawn
name = "xeno_spawn"
+16 -16
View File
@@ -329,30 +329,30 @@
return ..()
/mob/proc/AIize(transfer_after = TRUE)
if(client)
stop_sound_channel(CHANNEL_LOBBYMUSIC)
var/turf/loc_landmark
for(var/obj/effect/landmark/start/sloc in GLOB.landmarks_list)
if(sloc.name != "AI")
continue
var/list/turf/landmark_loc = list()
for(var/obj/effect/landmark/start/ai/sloc in GLOB.landmarks_list)
if(locate(/mob/living/silicon/ai) in sloc.loc)
continue
loc_landmark = sloc.loc
if(!loc_landmark)
for(var/obj/effect/landmark/tripai/L in GLOB.landmarks_list)
if(locate(/mob/living/silicon/ai) in L.loc)
continue
loc_landmark = L.loc
if(!loc_landmark)
if(sloc.primary_ai)
landmark_loc += sloc.loc
break
landmark_loc += sloc.loc
if(!landmark_loc.len)
to_chat(src, "Oh god sorry we can't find an unoccupied AI spawn location, so we're spawning you on top of someone.")
for(var/obj/effect/landmark/start/ai/sloc in GLOB.landmarks_list)
loc_landmark = sloc.loc
landmark_loc += sloc.loc
if(!landmark_loc.len)
message_admins("[src] cannot be made an AI as there are no valid spawn points. Yell at a mapper!")
return
if(client)
stop_sound_channel(CHANNEL_LOBBYMUSIC)
if(!transfer_after)
mind.active = FALSE
. = new /mob/living/silicon/ai(loc_landmark, null, src)
. = new /mob/living/silicon/ai(pick(landmark_loc), null, src)
qdel(src)