cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2026-07-20 04:17:33 +01:00
Code Issues Packages Projects Releases Wiki Activity

BayMerge Bugfix; Fixing guns, update computers. (#1263)

Browse Source 
Fixes all the snowflake guns unique to our codebase with multiple firemodes so that they now actually behave correctly. Fixes a few bugs relating to computers, and updates modular_computers to use holoscreens.
This commit is contained in:
LordFowl
2016-12-21 14:48:04 -05:00
committed by skull132
parent 3a89d01ea0
commit 5ccb627531
53 changed files with 106 additions and 96 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/modular_computers/computers/machinery/modular_computer.dm
+3 -1
View File
@@ -15,7 +15,7 @@
icon = null
icon_state = null
var/icon_state_unpowered = null // Icon state when the computer is turned off
var/icon_state_unpowered = "nopower" // Icon state when the computer is turned off
var/screen_icon_state_menu = "menu" // Icon state overlay when the computer is turned on, but no program is loaded that would override the screen.
var/screen_icon_screensaver = "standby" // Icon state overlay when the computer is powered, but not 'switched on'.
var/max_hardware_size = 0 // Maximal hardware size. Currently, tablets have 1, laptops 2 and consoles 3. Limits what hardware types can be installed.
@@ -42,6 +42,8 @@
if(!cpu || !cpu.enabled)
if (!(stat & NOPOWER) || battery_powered)
overlays.Add(screen_icon_screensaver)
else
icon_state = icon_state_unpowered
return
if(cpu.active_program)
overlays.Add(cpu.active_program.program_icon_state ? cpu.active_program.program_icon_state : screen_icon_state_menu)