Merge pull request #34161 from ShizCalev/bot_sssembly

Consolidates bot assemblies under one parent, fixes bot parts switching types when the bot is destroyed
This commit is contained in:
oranges
2018-01-13 04:23:03 -06:00
committed by CitadelStationBot
parent ef1c99ba92
commit 8c1c9f5cd7
17 changed files with 276 additions and 283 deletions
+1 -1
View File
@@ -2333,7 +2333,7 @@
/turf/open/floor/plasteel/airless/white,
/area/ruin/space/derelict/medical)
"hJ" = (
/obj/item/firstaid_arm_assembly,
/obj/item/bot_assembly/medbot,
/turf/open/floor/plasteel/airless/white,
/area/ruin/space/derelict/medical)
"hK" = (
+1 -1
View File
@@ -2615,7 +2615,7 @@
/area/awaymission/centcomAway/general)
"jr" = (
/obj/structure/table,
/obj/item/firstaid_arm_assembly,
/obj/item/bot_assembly/medbot,
/turf/open/floor/plasteel/vault,
/area/awaymission/centcomAway/hangar)
"js" = (
@@ -79413,7 +79413,7 @@
/turf/open/floor/plating,
/area/medical/medbay/central)
"dfM" = (
/obj/item/firstaid_arm_assembly,
/obj/item/bot_assembly/medbot,
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
/turf/open/floor/plasteel/neutral/side{
dir = 8
+4 -2
View File
@@ -5469,7 +5469,7 @@
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 9
},
/obj/item/bucket_sensor,
/obj/item/bot_assembly/cleanbot,
/turf/open/floor/plating,
/area/maintenance/port/fore)
"alI" = (
@@ -7899,7 +7899,9 @@
/area/maintenance/port)
"aqP" = (
/obj/structure/light_construct/small,
/obj/item/toolbox_tiles_sensor,
/obj/item/bot_assembly/floorbot{
build_step = 1
},
/turf/open/floor/plating,
/area/maintenance/port/fore)
"aqQ" = (