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 #2874 from cadyn/upstream-merge-11421

Browse Source 
Merge Upstream Pull Request 11421
This commit is contained in:
Nadyr
2021-08-25 22:38:53 -04:00
committed by GitHub
parent 77083e9210 c908563dec
commit f19dc1b2eb
61 changed files with 700 additions and 630 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
code/modules/research/message_server.dm
View File

@@ -54,6 +54,7 @@ var/global/list/obj/machinery/message_server/message_servers = list()
desc = "Facilitates both PDA messages and request console functions."
density = TRUE
anchored = TRUE
unacidable = TRUE
use_power = USE_POWER_IDLE
idle_power_usage = 10
active_power_usage = 100
@@ -239,6 +240,7 @@ var/obj/machinery/blackbox_recorder/blackbox
desc = "Records all radio communications, as well as various other information in case of the worst."
density = TRUE
anchored = TRUE
unacidable = TRUE
use_power = USE_POWER_IDLE
idle_power_usage = 10
active_power_usage = 100