shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Screw commit history.

Browse Source
This commit is contained in:
Ghommie
2020-02-02 01:26:04 +01:00
parent b1a571bf2d
commit 95db5084ab
267 changed files with 2201 additions and 1848 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/modular_computers/computers/item/computer.dm
+5 -5
View File
@@ -29,7 +29,7 @@
var/max_hardware_size = 0 // Maximal hardware w_class. Tablets/PDAs have 1, laptops 2, consoles 4.
var/steel_sheet_cost = 5 // Amount of steel sheets refunded when disassembling an empty frame of this computer.
integrity_failure = 50
integrity_failure = 0.5
max_integrity = 100
armor = list("melee" = 0, "bullet" = 20, "laser" = 20, "energy" = 100, "bomb" = 0, "bio" = 100, "rad" = 100, "fire" = 0, "acid" = 0)
@@ -203,7 +203,7 @@
/obj/item/modular_computer/examine(mob/user)
. = ..()
if(obj_integrity <= integrity_failure)
if(obj_integrity <= integrity_failure * max_integrity)
. += "<span class='danger'>It is heavily damaged!</span>"
else if(obj_integrity < max_integrity)
. += "<span class='warning'>It is damaged.</span>"
@@ -219,7 +219,7 @@
else
add_overlay(icon_state_menu)
if(obj_integrity <= integrity_failure)
if(obj_integrity <= integrity_failure * max_integrity)
add_overlay("bsod")
add_overlay("broken")
@@ -233,7 +233,7 @@
/obj/item/modular_computer/proc/turn_on(mob/user)
var/issynth = issilicon(user) // Robots and AIs get different activation messages.
if(obj_integrity <= integrity_failure)
if(obj_integrity <= integrity_failure * max_integrity)
if(issynth)
to_chat(user, "<span class='warning'>You send an activation signal to \the [src], but it responds with an error code. It must be damaged.</span>")
else
@@ -265,7 +265,7 @@
last_power_usage = 0
return 0
if(obj_integrity <= integrity_failure)
if(obj_integrity <= integrity_failure * max_integrity)
shutdown_computer()
return 0
code/modules/modular_computers/computers/machinery/modular_computer.dm
+1 -1
View File
@@ -65,7 +65,7 @@
else
add_overlay(screen_icon_state_menu)
if(cpu && cpu.obj_integrity <= cpu.integrity_failure)
if(cpu && cpu.obj_integrity <= cpu.integrity_failure * cpu.max_integrity)
add_overlay("bsod")
add_overlay("broken")
code/modules/modular_computers/computers/machinery/modular_console.dm
+1 -1
View File
@@ -15,7 +15,7 @@
steel_sheet_cost = 10
light_strength = 2
max_integrity = 300
integrity_failure = 150
integrity_failure = 0.5
var/console_department = "" // Used in New() to set network tag according to our area.
/obj/machinery/modular_computer/console/buildable/Initialize()