diff --git a/code/game/objects/items/devices/powersink.dm b/code/game/objects/items/devices/powersink.dm index fb4d9993387..e637426a541 100644 --- a/code/game/objects/items/devices/powersink.dm +++ b/code/game/objects/items/devices/powersink.dm @@ -11,7 +11,6 @@ throw_speed = 1 throw_range = 2 m_amt = 750 - w_amt = 750 origin_tech = "powerstorage=3;syndicate=5" var/drain_rate = 600000 // amount of power to drain per tick var/power_drained = 0 // has drained this much power diff --git a/code/game/objects/objs.dm b/code/game/objects/objs.dm index 4c9ab47e7e3..456eb186724 100644 --- a/code/game/objects/objs.dm +++ b/code/game/objects/objs.dm @@ -2,7 +2,6 @@ //var/datum/module/mod //not used var/m_amt = 0 // metal var/g_amt = 0 // glass - var/w_amt = 0 // waster amounts var/origin_tech = null //Used by R&D to determine what research bonuses it grants. var/reliability = 100 //Used by SOME devices to determine how reliable they are. var/crit_fail = 0 diff --git a/code/modules/assembly/assembly.dm b/code/modules/assembly/assembly.dm index ddcefd3eb5f..62efb6ea31c 100644 --- a/code/modules/assembly/assembly.dm +++ b/code/modules/assembly/assembly.dm @@ -7,7 +7,6 @@ w_class = 2.0 m_amt = 100 g_amt = 0 - w_amt = 0 throwforce = 2 throw_speed = 3 throw_range = 10 diff --git a/code/modules/assembly/igniter.dm b/code/modules/assembly/igniter.dm index eaf47f9626c..e61d2c50885 100644 --- a/code/modules/assembly/igniter.dm +++ b/code/modules/assembly/igniter.dm @@ -4,7 +4,6 @@ icon_state = "igniter" m_amt = 500 g_amt = 50 - w_amt = 10 origin_tech = "magnets=1" activate() diff --git a/code/modules/assembly/infrared.dm b/code/modules/assembly/infrared.dm index 1ed25776f24..d8ccc0d9ce5 100644 --- a/code/modules/assembly/infrared.dm +++ b/code/modules/assembly/infrared.dm @@ -6,7 +6,6 @@ icon_state = "infrared" m_amt = 1000 g_amt = 500 - w_amt = 100 origin_tech = "magnets=2" secured = 0 diff --git a/code/modules/assembly/mousetrap.dm b/code/modules/assembly/mousetrap.dm index 135dab88eda..e6a435a20e8 100644 --- a/code/modules/assembly/mousetrap.dm +++ b/code/modules/assembly/mousetrap.dm @@ -3,7 +3,6 @@ desc = "A handy little spring-loaded trap for catching pesty rodents." icon_state = "mousetrap" m_amt = 100 - w_amt = 10 origin_tech = "combat=1" var/armed = 0 diff --git a/code/modules/assembly/proximity.dm b/code/modules/assembly/proximity.dm index 25dac741735..644a41462b6 100644 --- a/code/modules/assembly/proximity.dm +++ b/code/modules/assembly/proximity.dm @@ -4,7 +4,6 @@ icon_state = "prox" m_amt = 800 g_amt = 200 - w_amt = 50 origin_tech = "magnets=1" secured = 0 diff --git a/code/modules/assembly/signaler.dm b/code/modules/assembly/signaler.dm index 2727fe6fe48..b8ab1b44c13 100644 --- a/code/modules/assembly/signaler.dm +++ b/code/modules/assembly/signaler.dm @@ -5,7 +5,6 @@ item_state = "signaler" m_amt = 1000 g_amt = 200 - w_amt = 100 origin_tech = "magnets=1" wires = WIRE_RECEIVE | WIRE_PULSE | WIRE_RADIO_PULSE | WIRE_RADIO_RECEIVE diff --git a/code/modules/assembly/timer.dm b/code/modules/assembly/timer.dm index 1e168329114..b7a1a5ef3f8 100644 --- a/code/modules/assembly/timer.dm +++ b/code/modules/assembly/timer.dm @@ -4,7 +4,6 @@ icon_state = "timer" m_amt = 500 g_amt = 50 - w_amt = 10 origin_tech = "magnets=1" secured = 0 diff --git a/code/modules/assembly/voice.dm b/code/modules/assembly/voice.dm index c1441dc4a88..0f2a0a73aa3 100644 --- a/code/modules/assembly/voice.dm +++ b/code/modules/assembly/voice.dm @@ -4,7 +4,6 @@ icon_state = "voice" m_amt = 500 g_amt = 50 - w_amt = 10 origin_tech = "magnets=1" var/listening = 0 var/recorded //the activation message diff --git a/code/modules/power/antimatter/shielding.dm b/code/modules/power/antimatter/shielding.dm index 59d49c39af4..2ab4d320218 100644 --- a/code/modules/power/antimatter/shielding.dm +++ b/code/modules/power/antimatter/shielding.dm @@ -211,7 +211,6 @@ proc/cardinalrange(var/center) throw_speed = 1 throw_range = 2 m_amt = 100 - w_amt = 2000 /obj/item/device/am_shielding_container/attackby(var/obj/item/I, var/mob/user) if(istype(I, /obj/item/device/multitool) && istype(src.loc,/turf))