From 7e3f7ae0d58d760b8b3d9622d330946e85bd9512 Mon Sep 17 00:00:00 2001 From: Desolate Date: Thu, 15 Mar 2018 05:24:48 -0500 Subject: [PATCH 1/8] ED-209 now correctly shown as a sec bot, just like the securitron. --- code/modules/mob/living/simple_animal/bot/ed209bot.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/mob/living/simple_animal/bot/ed209bot.dm b/code/modules/mob/living/simple_animal/bot/ed209bot.dm index 3cf6e92d5f1..7fc95c0c0c3 100644 --- a/code/modules/mob/living/simple_animal/bot/ed209bot.dm +++ b/code/modules/mob/living/simple_animal/bot/ed209bot.dm @@ -17,7 +17,7 @@ bot_filter = RADIO_SECBOT model = "ED-209" bot_purpose = "seek out criminals, handcuff them, and report their location to security" - bot_core = /obj/machinery/bot_core/secbot + bot_core_type = /obj/machinery/bot_core/secbot window_id = "autoed209" window_name = "Automatic Security Unit v2.6" path_image_color = "#FF0000" From 8970336f6c599a1bb7691e42e611d823e6d2aeba Mon Sep 17 00:00:00 2001 From: Desolate Date: Thu, 15 Mar 2018 05:56:34 -0500 Subject: [PATCH 2/8] Fixes code for floor bots as well. --- code/modules/mob/living/simple_animal/bot/floorbot.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/mob/living/simple_animal/bot/floorbot.dm b/code/modules/mob/living/simple_animal/bot/floorbot.dm index 8144cd84bd6..c812e97ec83 100644 --- a/code/modules/mob/living/simple_animal/bot/floorbot.dm +++ b/code/modules/mob/living/simple_animal/bot/floorbot.dm @@ -14,7 +14,7 @@ bot_filter = RADIO_FLOORBOT model = "Floorbot" bot_purpose = "seek out damaged or missing floor tiles, and repair or replace them as necessary" - bot_core = /obj/machinery/bot_core/floorbot + bot_core_type = /obj/machinery/bot_core/floorbot window_id = "autofloor" window_name = "Automatic Station Floor Repairer v1.1" path_image_color = "#FFA500" From c8fd0bf1e764e9165b3be7c925ea55edf7ec93e8 Mon Sep 17 00:00:00 2001 From: Birdtalon Date: Thu, 15 Mar 2018 16:47:01 +0000 Subject: [PATCH 3/8] ED209 fixes --- .../mob/living/simple_animal/bot/ed209bot.dm | 50 +++++++++++-------- 1 file changed, 30 insertions(+), 20 deletions(-) diff --git a/code/modules/mob/living/simple_animal/bot/ed209bot.dm b/code/modules/mob/living/simple_animal/bot/ed209bot.dm index 3cf6e92d5f1..ed01bcd4ae3 100644 --- a/code/modules/mob/living/simple_animal/bot/ed209bot.dm +++ b/code/modules/mob/living/simple_animal/bot/ed209bot.dm @@ -62,12 +62,20 @@ check_records = 0//Don't actively target people set to arrest arrest_type = 1//Don't even try to cuff bot_core.req_access = list(access_maint_tunnels, access_theatre) - arrest_type = 1 + + if(!created_name) + if(lasercolor == "b") + name = pick("BLUE BALLER","SANIC","BLUE KILLDEATH MURDERBOT") + else if (lasercolor == "r") + name = pick("RED RAMPAGE","RED ROVER","RED KILLDEATH MURDERBOT") + +/* Original Code + if((lasercolor == "b") && (name == "\improper ED-209 Security Robot"))//Picks a name if there isn't already a custome one name = pick("BLUE BALLER","SANIC","BLUE KILLDEATH MURDERBOT") if((lasercolor == "r") && (name == "\improper ED-209 Security Robot")) name = pick("RED RAMPAGE","RED ROVER","RED KILLDEATH MURDERBOT") - +*/ //SECHUD var/datum/atom_hud/secsensor = huds[DATA_HUD_SECURITY_ADVANCED] secsensor.add_hud_to(src) @@ -101,30 +109,32 @@ dat += hack(user) dat += showpai(user) dat += text({" -Security Unit v2.6 controls

-Status: []
-Behaviour controls are [locked ? "locked" : "unlocked"]
-Maintenance panel panel is [open ? "opened" : "closed"]
"}, + Security Unit v2.6 controls

+ Status: []
+ Behaviour controls are [locked ? "locked" : "unlocked"]
+ Maintenance panel panel is [open ? "opened" : "closed"]
"}, -"[on ? "On" : "Off"]" ) + "[on ? "On" : "Off"]" ) if(!locked || issilicon(user) || user.can_admin_interact()) + dat += text({"Auto Patrol[]
"}, + + "[auto_patrol ? "On" : "Off"]") + if(!lasercolor) dat += text({"
-Arrest Unidentifiable Persons: []
-Arrest for Unauthorized Weapons: []
-Arrest for Warrant: []
-
-Operating Mode: []
-Report Arrests[]
-Auto Patrol[]"}, + Arrest Unidentifiable Persons: []
+ Arrest for Unauthorized Weapons: []
+ Arrest for Warrant: []
+
+ Operating Mode: []
+ Report Arrests[]
"}, -"[idcheck ? "Yes" : "No"]", -"[weaponscheck ? "Yes" : "No"]", -"[check_records ? "Yes" : "No"]", -"[arrest_type ? "Detain" : "Arrest"]", -"[declare_arrests ? "Yes" : "No"]", -"[auto_patrol ? "On" : "Off"]" ) + "[idcheck ? "Yes" : "No"]", + "[weaponscheck ? "Yes" : "No"]", + "[check_records ? "Yes" : "No"]", + "[arrest_type ? "Detain" : "Arrest"]", + "[declare_arrests ? "Yes" : "No"]") return dat From 41d54790d5d19d66e8e50fe023d34590664e28c6 Mon Sep 17 00:00:00 2001 From: Desolate Date: Thu, 15 Mar 2018 21:31:11 -0500 Subject: [PATCH 4/8] Allows robotics to access behavior controls of laser tag ED-209 --- code/modules/mob/living/simple_animal/bot/ed209bot.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/mob/living/simple_animal/bot/ed209bot.dm b/code/modules/mob/living/simple_animal/bot/ed209bot.dm index 4cdb541213c..9137504d946 100644 --- a/code/modules/mob/living/simple_animal/bot/ed209bot.dm +++ b/code/modules/mob/living/simple_animal/bot/ed209bot.dm @@ -61,7 +61,7 @@ shot_delay = 6//Longer shot delay because JESUS CHRIST check_records = 0//Don't actively target people set to arrest arrest_type = 1//Don't even try to cuff - bot_core.req_access = list(access_maint_tunnels, access_theatre) + bot_core.req_access = list(access_maint_tunnels, access_theatre, access_robotics) if(created_name == "ED-209 Security Robot") if(lasercolor == "b") From 45a5dd03260b3a6e6169aadceaaa54bb34a8f91d Mon Sep 17 00:00:00 2001 From: Birdtalon Date: Fri, 16 Mar 2018 02:34:22 +0000 Subject: [PATCH 5/8] emagged lasertag bot now shoots disablers, lasertag bot won't stun people in melee range --- code/modules/mob/living/simple_animal/bot/ed209bot.dm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/code/modules/mob/living/simple_animal/bot/ed209bot.dm b/code/modules/mob/living/simple_animal/bot/ed209bot.dm index 4cdb541213c..f266ba26c70 100644 --- a/code/modules/mob/living/simple_animal/bot/ed209bot.dm +++ b/code/modules/mob/living/simple_animal/bot/ed209bot.dm @@ -240,7 +240,7 @@ back_to_idle() if(target) // make sure target exists - if(Adjacent(target) && isturf(target.loc)) // if right next to perp + if(Adjacent(target) && isturf(target.loc) && !lasercolor) // if right next to perp and we're not playing laser tag stun_attack(target) mode = BOT_PREP_ARREST @@ -409,7 +409,7 @@ shoot_sound = 'sound/weapons/laser.ogg' if(emagged == 2) if(lasercolor) - projectile = /obj/item/projectile/beam/lasertag + projectile = /obj/item/projectile/beam/disabler else projectile = /obj/item/projectile/beam else @@ -572,4 +572,4 @@ if(!C.handcuffed) C.handcuffed = new /obj/item/weapon/restraints/handcuffs/cable/zipties/used(C) C.update_handcuffed() - back_to_idle() + back_to_idle() \ No newline at end of file From eac0b67fe3a9ad388d236fcb4a2035dce03475c7 Mon Sep 17 00:00:00 2001 From: Birdtalon Date: Sat, 17 Mar 2018 02:07:13 +0000 Subject: [PATCH 6/8] alters stun behaviour --- .../mob/living/simple_animal/bot/ed209bot.dm | 34 ++++++++++++------- 1 file changed, 21 insertions(+), 13 deletions(-) diff --git a/code/modules/mob/living/simple_animal/bot/ed209bot.dm b/code/modules/mob/living/simple_animal/bot/ed209bot.dm index a9d6c1fe816..43cc26d93e5 100644 --- a/code/modules/mob/living/simple_animal/bot/ed209bot.dm +++ b/code/modules/mob/living/simple_animal/bot/ed209bot.dm @@ -61,9 +61,10 @@ shot_delay = 6//Longer shot delay because JESUS CHRIST check_records = 0//Don't actively target people set to arrest arrest_type = 1//Don't even try to cuff + declare_arrests = 0 // Don't spam sec bot_core.req_access = list(access_maint_tunnels, access_theatre, access_robotics) - if(created_name == "ED-209 Security Robot") + if(created_name == "ED-209 Security Robot" || !created_name) if(lasercolor == "b") name = pick("BLUE BALLER","SANIC","BLUE KILLDEATH MURDERBOT") else if (lasercolor == "r") @@ -240,21 +241,27 @@ back_to_idle() if(target) // make sure target exists - if(Adjacent(target) && isturf(target.loc) && !lasercolor) // if right next to perp and we're not playing laser tag + if(Adjacent(target) && isturf(target.loc)) // if right next to perp stun_attack(target) - - mode = BOT_PREP_ARREST - anchored = 1 - target_lastloc = target.loc - return + if(!lasercolor) + mode = BOT_PREP_ARREST + anchored = 1 + target_lastloc = target.loc + return + else + mode = BOT_HUNT + target = null + target_lastloc = null + return else // not next to perp - var/turf/olddist = get_dist(src, target) - walk_to(src, target,1,4) - if((get_dist(src, target)) >= (olddist)) - frustration++ - else - frustration = 0 + if(!disabled) + var/turf/olddist = get_dist(src, target) + walk_to(src, target,1,4) + if((get_dist(src, target)) >= (olddist)) + frustration++ + else + frustration = 0 else back_to_idle() @@ -504,6 +511,7 @@ if(lasertag_check) icon_state = "[lasercolor]ed2090" disabled = 1 + walk_to(src, 0) target = null spawn(100) disabled = 0 From d75db1c849863beacdc1420c672cfc4a5d857d55 Mon Sep 17 00:00:00 2001 From: Birdtalon Date: Mon, 23 Apr 2018 20:09:15 +0100 Subject: [PATCH 7/8] requested changes --- .../mob/living/simple_animal/bot/ed209bot.dm | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/code/modules/mob/living/simple_animal/bot/ed209bot.dm b/code/modules/mob/living/simple_animal/bot/ed209bot.dm index 43cc26d93e5..2049ef76ef3 100644 --- a/code/modules/mob/living/simple_animal/bot/ed209bot.dm +++ b/code/modules/mob/living/simple_animal/bot/ed209bot.dm @@ -64,7 +64,7 @@ declare_arrests = 0 // Don't spam sec bot_core.req_access = list(access_maint_tunnels, access_theatre, access_robotics) - if(created_name == "ED-209 Security Robot" || !created_name) + if(created_name == initial(name) || !created_name) if(lasercolor == "b") name = pick("BLUE BALLER","SANIC","BLUE KILLDEATH MURDERBOT") else if (lasercolor == "r") @@ -254,14 +254,13 @@ target_lastloc = null return - else // not next to perp - if(!disabled) - var/turf/olddist = get_dist(src, target) - walk_to(src, target,1,4) - if((get_dist(src, target)) >= (olddist)) - frustration++ - else - frustration = 0 + else if(!disabled) // not next to perp + var/turf/olddist = get_dist(src, target) + walk_to(src, target,1,4) + if((get_dist(src, target)) >= (olddist)) + frustration++ + else + frustration = 0 else back_to_idle() From 27d10fab0c67f6c7b6487c72e0a27935f000e9cd Mon Sep 17 00:00:00 2001 From: Desolate Date: Thu, 26 Apr 2018 14:44:56 -0500 Subject: [PATCH 8/8] requested changes --- code/modules/mob/living/simple_animal/bot/ed209bot.dm | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/code/modules/mob/living/simple_animal/bot/ed209bot.dm b/code/modules/mob/living/simple_animal/bot/ed209bot.dm index 2049ef76ef3..49a777d3a4c 100644 --- a/code/modules/mob/living/simple_animal/bot/ed209bot.dm +++ b/code/modules/mob/living/simple_animal/bot/ed209bot.dm @@ -111,9 +111,7 @@ "[on ? "On" : "Off"]" ) if(!locked || issilicon(user) || user.can_admin_interact()) - dat += text({"Auto Patrol[]
"}, - - "[auto_patrol ? "On" : "Off"]") + dat += "Auto Patrol [auto_patrol ? "On" : "Off"]
" if(!lasercolor) dat += text({"