From 3cd0b17ed9a0763c7cfa58b93027cd9365b8518d Mon Sep 17 00:00:00 2001 From: Schnayy Date: Fri, 13 Aug 2021 17:39:18 -0500 Subject: [PATCH 1/2] Farmbot can be turned off, not just on --- code/modules/mob/living/bot/farmbot.dm | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/code/modules/mob/living/bot/farmbot.dm b/code/modules/mob/living/bot/farmbot.dm index 0bb9ed463c..7bad279bb7 100644 --- a/code/modules/mob/living/bot/farmbot.dm +++ b/code/modules/mob/living/bot/farmbot.dm @@ -89,6 +89,7 @@ switch(action) if("power") if(!access_scanner.allowed(usr)) +<<<<<<< HEAD return FALSE if(on) turn_off() @@ -99,6 +100,8 @@ switch(action) if("power") if(!access_scanner.allowed(src)) +======= +>>>>>>> 66683459664... Merge pull request #8207 from Cerebulon/offswitch2 return FALSE if(on) turn_off() @@ -108,6 +111,10 @@ if(locked) return TRUE +<<<<<<< HEAD +======= + +>>>>>>> 66683459664... Merge pull request #8207 from Cerebulon/offswitch2 switch(action) if("water") waters_trays = !waters_trays From 68043127c9d2368452eb9ed21b1e6f792c7b79b1 Mon Sep 17 00:00:00 2001 From: Aronai Sieyes Date: Fri, 13 Aug 2021 22:44:58 -0400 Subject: [PATCH 2/2] Mergey fixy merge --- code/modules/mob/living/bot/farmbot.dm | 16 ---------------- 1 file changed, 16 deletions(-) diff --git a/code/modules/mob/living/bot/farmbot.dm b/code/modules/mob/living/bot/farmbot.dm index 7bad279bb7..e6d86dcf0d 100644 --- a/code/modules/mob/living/bot/farmbot.dm +++ b/code/modules/mob/living/bot/farmbot.dm @@ -89,19 +89,6 @@ switch(action) if("power") if(!access_scanner.allowed(usr)) -<<<<<<< HEAD - return FALSE - if(on) - turn_off() - else - turn_on() - . = TRUE - - switch(action) - if("power") - if(!access_scanner.allowed(src)) -======= ->>>>>>> 66683459664... Merge pull request #8207 from Cerebulon/offswitch2 return FALSE if(on) turn_off() @@ -111,10 +98,7 @@ if(locked) return TRUE -<<<<<<< HEAD -======= ->>>>>>> 66683459664... Merge pull request #8207 from Cerebulon/offswitch2 switch(action) if("water") waters_trays = !waters_trays