Convert bots to simple animals - Updated 7.0

This commit is contained in:
AnturK
2015-11-26 22:06:07 +01:00
parent f3c1ca6cde
commit e36853d7c9
38 changed files with 1389 additions and 1291 deletions
+5 -5
View File
@@ -37,7 +37,7 @@
var/list/stored_data = list()
var/current_channel
var/obj/machinery/bot/active_bot
var/mob/living/simple_animal/bot/active_bot
var/list/botlist = list()
/obj/item/weapon/cartridge/engineering
@@ -549,7 +549,7 @@ Code:
menu += "<h4>Located Cleanbots:</h4>"
ldat = null
for (var/obj/machinery/bot/cleanbot/B in SSbot.processing)
for (var/mob/living/simple_animal/bot/cleanbot/B in living_mob_list)
var/turf/bl = get_turf(B)
if(bl)
@@ -710,7 +710,7 @@ Code:
/obj/item/weapon/cartridge/proc/bot_control()
var/obj/machinery/bot/Bot
var/mob/living/simple_animal/bot/Bot
// if(!SC)
// menu = "Interlink Error - Please reinsert cartridge."
@@ -723,7 +723,7 @@ Code:
//MULEs!
if(active_bot.bot_type == MULE_BOT)
var/obj/machinery/bot/mulebot/MULE = active_bot
var/mob/living/simple_animal/bot/mulebot/MULE = active_bot
var/atom/Load = MULE.load
menu += "<BR>Current Load: [ !Load ? "<i>none</i>" : "[Load.name] (<A href='byond://?src=\ref[src];mule=unload'><i>unload</i></A>)" ]<BR>"
menu += "Destination: [MULE.destination ? MULE.destination : "<i>None</i>"] (<A href='byond://?src=\ref[src];mule=destination'><i>set</i></A>)<BR>"
@@ -750,7 +750,7 @@ Code:
var/turf/current_turf = get_turf(src)
var/zlevel = current_turf.z
var/botcount = 0
for(Bot in SSbot.processing) //Git da botz
for(Bot in living_mob_list) //Git da botz
if(!Bot.on || Bot.z != zlevel || Bot.remote_disabled || !(bot_access_flags & Bot.bot_type)) //Only non-emagged bots on the same Z-level are detected!
continue //Also, the PDA must have access to the bot type.
menu += "<A href='byond://?src=\ref[src];op=control;bot=\ref[Bot]'><b>[Bot.name]</b> ([Bot.get_mode()])<BR>"
@@ -47,7 +47,7 @@
new /obj/item/weapon/storage/firstaid/brute(src)
new /obj/item/weapon/storage/firstaid/regular(src)
new /obj/item/weapon/defibrillator/compact/combat/loaded(src)
new /obj/machinery/bot/medbot(src)
new /mob/living/simple_animal/bot/medbot(src)
/obj/structure/closet/secure_closet/ertEngi
name = "engineer closet"
+3 -1
View File
@@ -22,7 +22,9 @@
else if(istype(A, /mob/living)) // You Shall Not Pass!
var/mob/living/M = A
if(M.buckled && istype(M.buckled, /obj/machinery/bot/mulebot)) // mulebot passenger gets a free pass.
if(istype(A,/mob/living/simple_animal/bot/mulebot)) //mulebots can pass
return 1
if(M.buckled && istype(M.buckled, /mob/living/simple_animal/bot/mulebot)) // mulebot passenger gets a free pass.
return 1
if(!M.lying && !M.ventcrawler && M.mob_size != MOB_SIZE_TINY) //If your not laying down, or a ventcrawler or a small creature, no pass.
return 0