cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-11 10:43:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #10711 from Hatterhat/wasted-waste

Browse Source 
timers and whatnot are printable now, actually
This commit is contained in:
Novacat
2021-06-20 10:10:54 -04:00
committed by Chompstation Bot
parent b35d59cc5b
commit f2d035cec0
9 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
code/game/objects/items/devices/powersink.dm
View File

@@ -9,7 +9,7 @@
throw_speed = 1
throw_range = 2
matter = list(DEFAULT_WALL_MATERIAL = 750,"waste" = 750)
matter = list(DEFAULT_WALL_MATERIAL = 750)
origin_tech = list(TECH_POWER = 3, TECH_ILLEGAL = 5)
var/drain_rate = 1500000 // amount of power to drain per tick

2
code/modules/assembly/igniter.dm
View File

@@ -3,7 +3,7 @@
desc = "A small electronic device able to ignite combustable substances."
icon_state = "igniter"
origin_tech = list(TECH_MAGNET = 1)
matter = list(DEFAULT_WALL_MATERIAL = 500, "glass" = 50, "waste" = 10)
matter = list(DEFAULT_WALL_MATERIAL = 500, MAT_GLASS = 50)
secured = 1
wires = WIRE_RECEIVE

2
code/modules/assembly/infrared.dm
View File

@@ -5,7 +5,7 @@
desc = "Emits a visible or invisible beam and is triggered when the beam is interrupted."
icon_state = "infrared"
origin_tech = list(TECH_MAGNET = 2)
matter = list(DEFAULT_WALL_MATERIAL = 1000, "glass" = 500, "waste" = 100)
matter = list(DEFAULT_WALL_MATERIAL = 1000, MAT_GLASS = 500)
wires = WIRE_PULSE

2
code/modules/assembly/mousetrap.dm
View File

@@ -3,7 +3,7 @@
desc = "A handy little spring-loaded trap for catching pesty rodents."
icon_state = "mousetrap"
origin_tech = list(TECH_COMBAT = 1)
matter = list(DEFAULT_WALL_MATERIAL = 100, "waste" = 10)
matter = list(DEFAULT_WALL_MATERIAL = 100)
var/armed = 0

2
code/modules/assembly/proximity.dm
View File

@@ -3,7 +3,7 @@
desc = "Used for scanning and alerting when someone enters a certain proximity."
icon_state = "prox"
origin_tech = list(TECH_MAGNET = 1)
matter = list(DEFAULT_WALL_MATERIAL = 800, "glass" = 200, "waste" = 50)
matter = list(DEFAULT_WALL_MATERIAL = 800, MAT_GLASS = 200)
wires = WIRE_PULSE
secured = 0

2
code/modules/assembly/signaler.dm
View File

@@ -4,7 +4,7 @@
icon_state = "signaller"
item_state = "signaler"
origin_tech = list(TECH_MAGNET = 1)
matter = list(DEFAULT_WALL_MATERIAL = 1000, "glass" = 200, "waste" = 100)
matter = list(DEFAULT_WALL_MATERIAL = 1000, MAT_GLASS = 200)
wires = WIRE_RECEIVE | WIRE_PULSE | WIRE_RADIO_PULSE | WIRE_RADIO_RECEIVE
secured = TRUE

2
code/modules/assembly/timer.dm
View File

@@ -3,7 +3,7 @@
desc = "Used to time things. Works well with contraptions which has to count down. Tick tock."
icon_state = "timer"
origin_tech = list(TECH_MAGNET = 1)
matter = list(DEFAULT_WALL_MATERIAL = 500, "glass" = 50, "waste" = 10)
matter = list(DEFAULT_WALL_MATERIAL = 500, MAT_GLASS = 50)
wires = WIRE_PULSE

2
code/modules/assembly/voice.dm
View File

@@ -3,7 +3,7 @@
desc = "A small electronic device able to record a voice sample, and send a signal when that sample is repeated."
icon_state = "voice"
origin_tech = list(TECH_MAGNET = 1)
matter = list(DEFAULT_WALL_MATERIAL = 500, "glass" = 50, "waste" = 10)
matter = list(DEFAULT_WALL_MATERIAL = 500, MAT_GLASS = 50)
var/listening = 0
var/recorded //the activation message

2
code/modules/power/antimatter/shielding.dm
View File

@@ -194,7 +194,7 @@ proc/cardinalrange(var/center)
throwforce = 5
throw_speed = 1
throw_range = 2
matter = list(DEFAULT_WALL_MATERIAL = 100, "waste" = 2000)
matter = list(DEFAULT_WALL_MATERIAL = 100)
/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))