From 6b4579d0597984f7e5da3bf35b88646941214631 Mon Sep 17 00:00:00 2001 From: shellspeed1 <46614774+shellspeed1@users.noreply.github.com> Date: Mon, 9 Nov 2020 19:32:14 -0800 Subject: [PATCH 1/2] Update json_verifier.py --- tools/json_verifier.py | 40 ++++++++++++++++++++-------------------- 1 file changed, 20 insertions(+), 20 deletions(-) diff --git a/tools/json_verifier.py b/tools/json_verifier.py index dbba811205..aa74620667 100644 --- a/tools/json_verifier.py +++ b/tools/json_verifier.py @@ -1,20 +1,20 @@ -import sys -import json - -if len(sys.argv) <= 1: - exit(1) - -status = 0 - -for file in sys.argv[1:]: - with open(file, encoding="ISO-8859-1") as f: - try: - json.load(f) - except ValueError as exception: - print("JSON error in {}".format(file)) - print(exception) - status = 1 - else: - print("Valid {}".format(file)) - -exit(status) +import sys +import json + +if len(sys.argv) <= 1: + exit(1) + +status = 0 + +for file in sys.argv[1:]: + with open(file, encoding="ISO-8859-1") as f: + try: + json.load(f) + except ValueError as exception: + print("JSON error in {}".format(file)) + print(exception) + status = 1 + else: + print("Valid {}".format(file)) + +exit(status) From 7a0c0a0e04c057f1e370f5016b4cdbfcb9504c94 Mon Sep 17 00:00:00 2001 From: shellspeed1 <46614774+shellspeed1@users.noreply.github.com> Date: Mon, 9 Nov 2020 21:24:45 -0800 Subject: [PATCH 2/2] You can now build floor bots with any toolbox --- code/datums/components/crafting/recipes/recipes_robot.dm | 2 +- code/modules/mob/living/simple_animal/bot/construction.dm | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/code/datums/components/crafting/recipes/recipes_robot.dm b/code/datums/components/crafting/recipes/recipes_robot.dm index 2b8ee0fe3a..28fa4ae2e4 100644 --- a/code/datums/components/crafting/recipes/recipes_robot.dm +++ b/code/datums/components/crafting/recipes/recipes_robot.dm @@ -40,7 +40,7 @@ /datum/crafting_recipe/floorbot name = "Floorbot" result = /mob/living/simple_animal/bot/floorbot - reqs = list(/obj/item/storage/toolbox/mechanical = 1, + reqs = list(/obj/item/storage/toolbox = 1, /obj/item/stack/tile/plasteel = 1, /obj/item/assembly/prox_sensor = 1, /obj/item/bodypart/r_arm/robot = 1) diff --git a/code/modules/mob/living/simple_animal/bot/construction.dm b/code/modules/mob/living/simple_animal/bot/construction.dm index 08fffc2cf8..5102c02ecf 100644 --- a/code/modules/mob/living/simple_animal/bot/construction.dm +++ b/code/modules/mob/living/simple_animal/bot/construction.dm @@ -206,7 +206,7 @@ icon_state = "toolbox_tiles" throwforce = 10 created_name = "Floorbot" - var/toolbox = /obj/item/storage/toolbox/mechanical + var/toolbox = /obj/item/storage/toolbox /obj/item/bot_assembly/floorbot/Initialize() . = ..() @@ -225,7 +225,7 @@ name = "incomplete floorbot assembly" icon_state = "toolbox_tiles_sensor" -/obj/item/storage/toolbox/mechanical/attackby(obj/item/stack/tile/plasteel/T, mob/user, params) +/obj/item/storage/toolbox/attackby(obj/item/stack/tile/plasteel/T, mob/user, params) if(!istype(T, /obj/item/stack/tile/plasteel)) ..() return