Refactor machinery to default to being anchored

This commit is contained in:
Jordan Brown
2018-06-01 12:27:38 -04:00
committed by letterjay
parent 340c6d2e83
commit 5e15a988f6
142 changed files with 269 additions and 175 deletions
+2 -7
View File
@@ -8,7 +8,6 @@ GLOBAL_LIST_EMPTY(conveyors_by_id)
icon_state = "conveyor_map"
name = "conveyor belt"
desc = "A conveyor belt."
anchored = TRUE
layer = BELOW_OPEN_DOOR_LAYER
var/operating = 0 // 1 if running forward, -1 if backwards, 0 if off
var/operable = 1 // true if can operate (no broken segments in this belt run)
@@ -215,11 +214,12 @@ GLOBAL_LIST_EMPTY(conveyors_by_id)
//
/obj/machinery/conveyor_switch
name = "conveyor switch"
desc = "A conveyor control switch."
icon = 'icons/obj/recycling.dmi'
icon_state = "switch-off"
speed_process = TRUE
var/position = 0 // 0 off, -1 reverse, 1 forward
var/last_pos = -1 // last direction setting
var/operated = 1 // true if just operated
@@ -228,11 +228,6 @@ GLOBAL_LIST_EMPTY(conveyors_by_id)
var/id = "" // must match conveyor IDs to control them
anchored = TRUE
speed_process = TRUE
/obj/machinery/conveyor_switch/Initialize(mapload, newid)
. = ..()
if (newid)
-1
View File
@@ -4,7 +4,6 @@
/obj/machinery/disposal
icon = 'icons/obj/atmospherics/pipes/disposal.dmi'
anchored = TRUE
density = TRUE
armor = list("melee" = 25, "bullet" = 10, "laser" = 10, "energy" = 100, "bomb" = 0, "bio" = 100, "rad" = 100, "fire" = 90, "acid" = 30)
max_integrity = 200