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

Merge pull request #9931 from Jordie0608/tfwyougetsocarriedawayyoudontevenachievewhatyousetoutforandhavetomakeasecondprforit

Browse Source 
Overlays for computers
This commit is contained in:
Cheridan
2015-06-14 10:25:27 -05:00
parent 8294ef79cf db087e493d
commit 565e4dda5a
43 changed files with 138 additions and 208 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
code/game/dna.dm
View File

@@ -497,8 +497,8 @@
/obj/machinery/computer/scan_consolenew /obj/machinery/computer/scan_consolenew
name = "\improper DNA scanner access console" name = "\improper DNA scanner access console"
desc = "Scan DNA." desc = "Scan DNA."
icon = 'icons/obj/computer.dmi' icon_screen = "dna"
icon_state = "scanner" icon_keyboard = "med_key"
density = 1 density = 1
circuit = /obj/item/weapon/circuitboard/scan_consolenew circuit = /obj/item/weapon/circuitboard/scan_consolenew
var/radduration = 2 var/radduration = 2

11
code/game/machinery/atmo_control.dm
View File

@@ -88,11 +88,10 @@
///////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////
/obj/machinery/computer/general_air_control /obj/machinery/computer/general_air_control
icon = 'icons/obj/computer.dmi' icon_screen = "tank"
icon_state = "tank" icon_keyboard = "atmos_key"
circuit = /obj/item/weapon/circuitboard/air_management circuit = /obj/item/weapon/circuitboard/air_management
name = "computer"
var/frequency = 1439 var/frequency = 1439
var/list/sensors = list() var/list/sensors = list()
@@ -211,9 +210,6 @@
///////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////
/obj/machinery/computer/general_air_control/large_tank_control /obj/machinery/computer/general_air_control/large_tank_control
icon = 'icons/obj/computer.dmi'
icon_state = "tank"
var/input_tag var/input_tag
var/output_tag var/output_tag
frequency = 1441 frequency = 1441
@@ -354,8 +350,7 @@ Rate: [volume_rate] L/sec<BR>"}
///////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////
/obj/machinery/computer/general_air_control/fuel_injection /obj/machinery/computer/general_air_control/fuel_injection
icon = 'icons/obj/computer.dmi' icon_screen = "atmos"
icon_state = "atmos"
var/device_tag var/device_tag
var/list/device_info var/list/device_info

3
code/game/machinery/atmoalter/area_atmos_computer.dm
View File

@@ -1,7 +1,8 @@
/obj/machinery/computer/area_atmos /obj/machinery/computer/area_atmos
name = "area air control computer" name = "area air control computer"
desc = "A computer used to control the stationary scrubbers and pumps in the area." desc = "A computer used to control the stationary scrubbers and pumps in the area."
icon_state = "area_atmos" icon_screen = "area_atmos"
icon_keyboard = "atmos_key"
circuit = "/obj/item/weapon/circuitboard/area_atmos" circuit = "/obj/item/weapon/circuitboard/area_atmos"
var/list/connectedscrubbers = new() var/list/connectedscrubbers = new()

3
code/game/machinery/computer/HolodeckControl.dm
View File

@@ -1,7 +1,8 @@
/obj/machinery/computer/HolodeckControl /obj/machinery/computer/HolodeckControl
name = "holodeck control console" name = "holodeck control console"
desc = "A computer used to control a nearby holodeck." desc = "A computer used to control a nearby holodeck."
icon_state = "holocontrol" icon_screen = "holocontrol"
icon_keyboard = "tech_key"
var/area/linkedholodeck = null var/area/linkedholodeck = null
var/area/target = null var/area/target = null
var/active = 0 var/active = 0

5
code/game/machinery/computer/Operating.dm
View File

@@ -1,9 +1,8 @@
/obj/machinery/computer/operating /obj/machinery/computer/operating
name = "operating computer" name = "operating computer"
desc = "Used to monitor the vitals of a patient during surgery." desc = "Used to monitor the vitals of a patient during surgery."
icon_state = "operating" icon_screen = "crew"
density = 1 icon_keyboard = "med_key"
anchored = 1.0
circuit = /obj/item/weapon/circuitboard/operating circuit = /obj/item/weapon/circuitboard/operating
var/mob/living/carbon/human/patient = null var/mob/living/carbon/human/patient = null
var/obj/structure/optable/table = null var/obj/structure/optable/table = null

30
code/game/machinery/computer/aifixer.dm
View File

@@ -1,17 +1,12 @@
/obj/machinery/computer/aifixer /obj/machinery/computer/aifixer
name = "\improper AI system integrity restorer" name = "\improper AI system integrity restorer"
desc = "Used with intelliCards containing nonfunctioning AIs to restore them to working order." desc = "Used with intelliCards containing nonfunctioning AIs to restore them to working order."
icon = 'icons/obj/computer.dmi'
icon_state = "ai-fixer"
req_access = list(access_captain, access_robotics, access_heads) req_access = list(access_captain, access_robotics, access_heads)
var/mob/living/silicon/ai/occupier = null var/mob/living/silicon/ai/occupier = null
var/active = 0 var/active = 0
circuit = /obj/item/weapon/circuitboard/aifixer circuit = /obj/item/weapon/circuitboard/aifixer
icon_keyboard = "tech_key"
/obj/machinery/computer/aifixer/New() icon_screen = "ai-fixer"
src.overlays += image('icons/obj/computer.dmi', "ai-fixer-empty")
..()
/obj/machinery/computer/aifixer/attackby(I as obj, user as mob, params) /obj/machinery/computer/aifixer/attackby(I as obj, user as mob, params)
if(occupier && istype(I, /obj/item/weapon/screwdriver)) if(occupier && istype(I, /obj/item/weapon/screwdriver))
@@ -101,7 +96,6 @@
return return
if (href_list["fix"]) if (href_list["fix"])
src.active = 1 src.active = 1
src.overlays += image('icons/obj/computer.dmi', "ai-fixer-on")
while (src.occupier.health < 100) while (src.occupier.health < 100)
src.occupier.adjustOxyLoss(-1) src.occupier.adjustOxyLoss(-1)
src.occupier.adjustFireLoss(-1) src.occupier.adjustFireLoss(-1)
@@ -113,32 +107,28 @@
src.occupier.lying = 0 src.occupier.lying = 0
dead_mob_list -= src.occupier dead_mob_list -= src.occupier
living_mob_list += src.occupier living_mob_list += src.occupier
src.overlays -= image('icons/obj/computer.dmi', "ai-fixer-404")
src.overlays += image('icons/obj/computer.dmi', "ai-fixer-full")
src.updateUsrDialog() src.updateUsrDialog()
update_icon()
sleep(10) sleep(10)
src.active = 0 src.active = 0
src.overlays -= image('icons/obj/computer.dmi', "ai-fixer-on")
src.add_fingerprint(usr) src.add_fingerprint(usr)
src.updateUsrDialog() src.updateUsrDialog()
update_icon()
return return
/obj/machinery/computer/aifixer/update_icon() /obj/machinery/computer/aifixer/update_icon()
..() ..()
// Broken / Unpowered
if((stat & BROKEN) || (stat & NOPOWER)) if((stat & BROKEN) || (stat & NOPOWER))
overlays.Cut() return
// Working / Powered
else else
if(active)
overlays += "ai-fixer-on"
if (occupier) if (occupier)
switch (occupier.stat) switch (occupier.stat)
if (0) if (0)
overlays += image('icons/obj/computer.dmi', "ai-fixer-full") overlays += "ai-fixer-full"
if (2) if (2)
overlays += image('icons/obj/computer.dmi', "ai-fixer-404") overlays += "ai-fixer-404"
else else
overlays += image('icons/obj/computer.dmi', "ai-fixer-empty") overlays += "ai-fixer-empty"

5
code/game/machinery/computer/arcade.dm
View File

@@ -1,8 +1,9 @@
/obj/machinery/computer/arcade/ /obj/machinery/computer/arcade/
name = "random arcade" name = "random arcade"
desc = "random arcade machine" desc = "random arcade machine"
icon = 'icons/obj/computer.dmi'
icon_state = "arcade" icon_state = "arcade"
icon_keyboard = null
icon_screen = "invaders"
var/list/prizes = list( /obj/item/weapon/storage/box/snappops = 2, var/list/prizes = list( /obj/item/weapon/storage/box/snappops = 2,
/obj/item/toy/AI = 2, /obj/item/toy/AI = 2,
/obj/item/clothing/under/syndicate/tacticool = 2, /obj/item/clothing/under/syndicate/tacticool = 2,
@@ -82,7 +83,6 @@
/obj/machinery/computer/arcade/battle /obj/machinery/computer/arcade/battle
name = "arcade machine" name = "arcade machine"
desc = "Does not support Pinball." desc = "Does not support Pinball."
icon = 'icons/obj/computer.dmi'
icon_state = "arcade" icon_state = "arcade"
circuit = /obj/item/weapon/circuitboard/arcade/battle circuit = /obj/item/weapon/circuitboard/arcade/battle
var/enemy_name = "Space Villian" var/enemy_name = "Space Villian"
@@ -298,7 +298,6 @@
/obj/machinery/computer/arcade/orion_trail /obj/machinery/computer/arcade/orion_trail
name = "The Orion Trail" name = "The Orion Trail"
desc = "Learn how our ancestors got to Orion, and have fun in the process!" desc = "Learn how our ancestors got to Orion, and have fun in the process!"
icon = 'icons/obj/computer.dmi'
icon_state = "arcade" icon_state = "arcade"
circuit = /obj/item/weapon/circuitboard/arcade/orion_trail circuit = /obj/item/weapon/circuitboard/arcade/orion_trail
var/engine = 0 var/engine = 0

23
code/game/machinery/computer/atmos_alert.dm
View File

@@ -5,7 +5,8 @@
name = "atmospheric alert console" name = "atmospheric alert console"
desc = "Used to access the station's atmospheric sensors." desc = "Used to access the station's atmospheric sensors."
circuit = /obj/item/weapon/circuitboard/atmos_alert circuit = /obj/item/weapon/circuitboard/atmos_alert
icon_state = "alert:0" icon_screen = "alert:0"
icon_keyboard = "atmos_key"
var/list/priority_alarms = list() var/list/priority_alarms = list()
var/list/minor_alarms = list() var/list/minor_alarms = list()
var/receive_frequency = 1437 var/receive_frequency = 1437
@@ -61,23 +62,11 @@
src.updateDialog() src.updateDialog()
/obj/machinery/computer/atmos_alert/update_icon() /obj/machinery/computer/atmos_alert/update_icon()
SetLuminosity(brightness_on) ..()
if(stat & BROKEN) if(priority_alarms.len)
icon_state = "alert:b" overlays += "alert:2"
return
else if (stat & NOPOWER)
icon_state = "alert:O"
SetLuminosity(0)
return
else if(priority_alarms.len)
icon_state = "alert:2"
else if(minor_alarms.len) else if(minor_alarms.len)
icon_state = "alert:1" overlays += "alert:1"
else
icon_state = "alert:0"
return
/obj/machinery/computer/atmos_alert/proc/return_text() /obj/machinery/computer/atmos_alert/proc/return_text()

12
code/game/machinery/computer/camera.dm
View File

@@ -1,7 +1,8 @@
/obj/machinery/computer/security /obj/machinery/computer/security
name = "security camera console" name = "security camera console"
desc = "Used to access the various cameras on the station." desc = "Used to access the various cameras on the station."
icon_state = "cameras" icon_screen = "cameras"
icon_keyboard = "security_key"
circuit = /obj/item/weapon/circuitboard/security circuit = /obj/item/weapon/circuitboard/security
var/obj/machinery/camera/current = null var/obj/machinery/camera/current = null
var/last_pic = 1.0 var/last_pic = 1.0
@@ -94,7 +95,6 @@
/obj/machinery/computer/security/telescreen/update_icon() /obj/machinery/computer/security/telescreen/update_icon()
icon_state = initial(icon_state) icon_state = initial(icon_state)
SetLuminosity(brightness_on)
if(stat & BROKEN) if(stat & BROKEN)
icon_state += "b" icon_state += "b"
return return
@@ -108,16 +108,18 @@
density = 0 density = 0
circuit = null circuit = null
/obj/machinery/computer/security/wooden_tv /obj/machinery/computer/security/wooden_tv
name = "security camera monitor" name = "security camera monitor"
desc = "An old TV hooked into the stations camera network." desc = "An old TV hooked into the stations camera network."
icon_state = "security_det" icon_state = "television"
icon_keyboard = null
icon_screen = "detective_tv"
/obj/machinery/computer/security/mining /obj/machinery/computer/security/mining
name = "outpost camera console" name = "outpost camera console"
desc = "Used to access the various cameras on the outpost." desc = "Used to access the various cameras on the outpost."
icon_state = "miningcameras" icon_screen = "mining"
icon_keyboard = "mining_key"
network = list("MINE") network = list("MINE")
circuit = "/obj/item/weapon/circuitboard/mining" circuit = "/obj/item/weapon/circuitboard/mining"

4
code/game/machinery/computer/camera_advanced.dm
View File

@@ -1,8 +1,8 @@
/obj/machinery/computer/camera_advanced /obj/machinery/computer/camera_advanced
name = "advanced camera console" name = "advanced camera console"
desc = "Used to access the various cameras on the station." desc = "Used to access the various cameras on the station."
icon_state = "cameras" icon_screen = "cameras"
//circuit = /obj/item/weapon/circuitboard/security icon_keyboard = "security_key"
var/mob/camera/aiEye/remote/eyeobj var/mob/camera/aiEye/remote/eyeobj
var/mob/living/carbon/human/current_user = null var/mob/living/carbon/human/current_user = null
var/list/networks = list("SS13") var/list/networks = list("SS13")

3
code/game/machinery/computer/card.dm
View File

@@ -7,7 +7,8 @@ var/time_last_changed_position = 0
/obj/machinery/computer/card /obj/machinery/computer/card
name = "identification console" name = "identification console"
desc = "You can use this to change ID's." desc = "You can use this to change ID's."
icon_state = "id" icon_screen = "id"
icon_keyboard = "id_key"
req_one_access = list(access_heads, access_change_ids) req_one_access = list(access_heads, access_change_ids)
circuit = /obj/item/weapon/circuitboard/card circuit = /obj/item/weapon/circuitboard/card
var/obj/item/weapon/card/id/scan = null var/obj/item/weapon/card/id/scan = null

17
code/game/machinery/computer/cloning.dm
View File

@@ -2,8 +2,8 @@
/obj/machinery/computer/cloning /obj/machinery/computer/cloning
name = "cloning console" name = "cloning console"
desc = "Used to clone people and manage DNA." desc = "Used to clone people and manage DNA."
icon = 'icons/obj/computer.dmi' icon_screen = "dna"
icon_state = "dna" icon_keyboard = "med_key"
circuit = /obj/item/weapon/circuitboard/cloning circuit = /obj/item/weapon/circuitboard/cloning
req_access = list(access_heads) //Only used for record deletion right now. req_access = list(access_heads) //Only used for record deletion right now.
var/obj/machinery/dna_scannernew/scanner = null //Linked scanner. For scanning. var/obj/machinery/dna_scannernew/scanner = null //Linked scanner. For scanning.
@@ -397,16 +397,3 @@
src.records += R src.records += R
scantemp = "Subject successfully scanned." scantemp = "Subject successfully scanned."
/obj/machinery/computer/cloning/update_icon()
SetLuminosity(brightness_on)
if(stat & BROKEN)
icon_state = "commb"
else
if(stat & NOPOWER)
src.icon_state = "c_unpowered"
stat |= NOPOWER
SetLuminosity(0)
else
icon_state = initial(icon_state)
stat &= ~NOPOWER

3
code/game/machinery/computer/communications.dm
View File

@@ -6,7 +6,8 @@ var/const/CALL_SHUTTLE_REASON_LENGTH = 12
/obj/machinery/computer/communications /obj/machinery/computer/communications
name = "communications console" name = "communications console"
desc = "This can be used for various important functions. Still under developement." desc = "This can be used for various important functions. Still under developement."
icon_state = "comm" icon_screen = "comm"
icon_keyboard = "tech_key"
req_access = list(access_heads) req_access = list(access_heads)
circuit = /obj/item/weapon/circuitboard/communications circuit = /obj/item/weapon/circuitboard/communications
var/authenticated = 0 var/authenticated = 0

29
code/game/machinery/computer/computer.dm
View File

@@ -1,6 +1,7 @@
/obj/machinery/computer /obj/machinery/computer
name = "computer" name = "computer"
icon = 'icons/obj/computer.dmi' icon = 'icons/obj/computer.dmi'
icon_state = "computer"
density = 1 density = 1
anchored = 1.0 anchored = 1.0
use_power = 1 use_power = 1
@@ -9,6 +10,8 @@
var/obj/item/weapon/circuitboard/circuit = null //if circuit==null, computer can't disassembly var/obj/item/weapon/circuitboard/circuit = null //if circuit==null, computer can't disassembly
var/processing = 0 var/processing = 0
var/brightness_on = 2 var/brightness_on = 2
var/icon_keyboard = "generic_key"
var/icon_screen = "generic"
/obj/machinery/computer/New(location, obj/item/weapon/circuitboard/C) /obj/machinery/computer/New(location, obj/item/weapon/circuitboard/C)
..(location) ..(location)
@@ -18,6 +21,7 @@
if(circuit) if(circuit)
circuit = new circuit(null) circuit = new circuit(null)
power_change() power_change()
update_icon()
/obj/machinery/computer/initialize() /obj/machinery/computer/initialize()
power_change() power_change()
@@ -68,23 +72,22 @@
density = 0 density = 0
/obj/machinery/computer/update_icon() /obj/machinery/computer/update_icon()
..() overlays.Cut()
icon_state = initial(icon_state) if(stat & NOPOWER)
SetLuminosity(brightness_on) overlays += "[icon_keyboard]_off"
// Broken return
overlays += icon_keyboard
if(stat & BROKEN) if(stat & BROKEN)
icon_state += "b" overlays += "[icon_state]_broken"
else
// Unpowered overlays += icon_screen
else if(stat & NOPOWER)
icon_state = initial(icon_state)
icon_state += "0"
SetLuminosity(0)
/obj/machinery/computer/power_change() /obj/machinery/computer/power_change()
..() ..()
if(stat & NOPOWER)
SetLuminosity(0)
else
SetLuminosity(brightness_on)
update_icon() update_icon()
return return

3
code/game/machinery/computer/crew.dm
View File

@@ -1,7 +1,8 @@
/obj/machinery/computer/crew /obj/machinery/computer/crew
name = "crew monitoring console" name = "crew monitoring console"
desc = "Used to monitor active health sensors built into most of the crew's uniforms." desc = "Used to monitor active health sensors built into most of the crew's uniforms."
icon_state = "crew" icon_screen = "crew"
icon_keyboard = "med_key"
use_power = 1 use_power = 1
idle_power_usage = 250 idle_power_usage = 250
active_power_usage = 500 active_power_usage = 500

4
code/game/machinery/computer/law.dm
View File

@@ -2,7 +2,7 @@
/obj/machinery/computer/upload /obj/machinery/computer/upload
var/mob/living/silicon/current = null //The target of future law uploads var/mob/living/silicon/current = null //The target of future law uploads
icon_state = null //To make sure mappers understand THIS ISN'T A VALID TYPE icon_screen = "command"
/obj/machinery/computer/upload/attackby(obj/item/O as obj, mob/user as mob, params) /obj/machinery/computer/upload/attackby(obj/item/O as obj, mob/user as mob, params)
if(istype(O, /obj/item/weapon/aiModule)) if(istype(O, /obj/item/weapon/aiModule))
@@ -33,7 +33,6 @@
/obj/machinery/computer/upload/ai /obj/machinery/computer/upload/ai
name = "\improper AI upload console" name = "\improper AI upload console"
desc = "Used to upload laws to the AI." desc = "Used to upload laws to the AI."
icon_state = "command"
circuit = /obj/item/weapon/circuitboard/aiupload circuit = /obj/item/weapon/circuitboard/aiupload
/obj/machinery/computer/upload/ai/attack_hand(var/mob/user as mob) /obj/machinery/computer/upload/ai/attack_hand(var/mob/user as mob)
@@ -58,7 +57,6 @@
/obj/machinery/computer/upload/borg /obj/machinery/computer/upload/borg
name = "cyborg upload console" name = "cyborg upload console"
desc = "Used to upload laws to Cyborgs." desc = "Used to upload laws to Cyborgs."
icon_state = "command"
circuit = /obj/item/weapon/circuitboard/borgupload circuit = /obj/item/weapon/circuitboard/borgupload
/obj/machinery/computer/upload/borg/attack_hand(var/mob/user as mob) /obj/machinery/computer/upload/borg/attack_hand(var/mob/user as mob)

7
code/game/machinery/computer/medical.dm
View File

@@ -3,7 +3,8 @@
/obj/machinery/computer/med_data//TODO:SANITY /obj/machinery/computer/med_data//TODO:SANITY
name = "medical records console" name = "medical records console"
desc = "This can be used to check medical records." desc = "This can be used to check medical records."
icon_state = "medcomp" icon_screen = "medcomp"
icon_keyboard = "med_key"
req_one_access = list(access_medical, access_forensics_lockers) req_one_access = list(access_medical, access_forensics_lockers)
circuit = /obj/item/weapon/circuitboard/med_data circuit = /obj/item/weapon/circuitboard/med_data
var/obj/item/weapon/card/id/scan = null var/obj/item/weapon/card/id/scan = null
@@ -590,4 +591,6 @@
/obj/machinery/computer/med_data/laptop /obj/machinery/computer/med_data/laptop
name = "medical laptop" name = "medical laptop"
desc = "A cheap Nanotrasen medical laptop, it functions as a medical records computer. It's bolted to the table." desc = "A cheap Nanotrasen medical laptop, it functions as a medical records computer. It's bolted to the table."
icon_state = "medlaptop" icon_state = "laptop"
icon_screen = "medlaptop"
icon_keyboard = "laptop_key"

17
code/game/machinery/computer/message.dm
View File

@@ -7,9 +7,7 @@
/obj/machinery/computer/message_monitor /obj/machinery/computer/message_monitor
name = "message monitor console" name = "message monitor console"
desc = "Used to Monitor the crew's messages, that are sent via PDA. Can also be used to view Request Console messages." desc = "Used to Monitor the crew's messages, that are sent via PDA. Can also be used to view Request Console messages."
icon_state = "comm_logs" icon_screen = "comm_logs"
var/hack_icon = "comm_logsc"
var/normal_icon = "comm_logs"
circuit = /obj/item/weapon/circuitboard/message_monitor circuit = /obj/item/weapon/circuitboard/message_monitor
//Server linked to. //Server linked to.
var/obj/machinery/message_server/linkedServer = null var/obj/machinery/message_server/linkedServer = null
@@ -42,7 +40,6 @@
/obj/machinery/computer/message_monitor/emag_act(user as mob) /obj/machinery/computer/message_monitor/emag_act(user as mob)
if(!emagged) if(!emagged)
if(!isnull(src.linkedServer)) if(!isnull(src.linkedServer))
icon_state = hack_icon // An error screen I made in the computers.dmi
emagged = 1 emagged = 1
screen = 2 screen = 2
spark_system.set_up(5, 0, src) spark_system.set_up(5, 0, src)
@@ -56,15 +53,6 @@
else else
user << "<span class='notice'>A no server error appears on the screen.</span>" user << "<span class='notice'>A no server error appears on the screen.</span>"
/obj/machinery/computer/message_monitor/update_icon()
..()
if(stat & (NOPOWER|BROKEN))
return
if(emagged || hacking)
icon_state = hack_icon
else
icon_state = normal_icon
/obj/machinery/computer/message_monitor/initialize() /obj/machinery/computer/message_monitor/initialize()
//Is the server isn't linked to a server, and there's a server available, default it to the first one in the list. //Is the server isn't linked to a server, and there's a server available, default it to the first one in the list.
if(!linkedServer) if(!linkedServer)
@@ -263,11 +251,9 @@
var/currentKey = src.linkedServer.decryptkey var/currentKey = src.linkedServer.decryptkey
user << "<span class='warning'>Brute-force completed! The key is '[currentKey]'.</span>" user << "<span class='warning'>Brute-force completed! The key is '[currentKey]'.</span>"
src.hacking = 0 src.hacking = 0
src.icon_state = normal_icon
src.screen = 0 // Return the screen back to normal src.screen = 0 // Return the screen back to normal
/obj/machinery/computer/message_monitor/proc/UnmagConsole() /obj/machinery/computer/message_monitor/proc/UnmagConsole()
src.icon_state = normal_icon
src.emagged = 0 src.emagged = 0
/obj/machinery/computer/message_monitor/proc/ResetMessage() /obj/machinery/computer/message_monitor/proc/ResetMessage()
@@ -365,7 +351,6 @@
if(issilicon(usr) && is_special_character(usr)) if(issilicon(usr) && is_special_character(usr))
src.hacking = 1 src.hacking = 1
src.screen = 2 src.screen = 2
src.icon_state = hack_icon
//Time it takes to bruteforce is dependant on the password length. //Time it takes to bruteforce is dependant on the password length.
spawn(100*length(src.linkedServer.decryptkey)) spawn(100*length(src.linkedServer.decryptkey))
if(src && src.linkedServer && usr) if(src && src.linkedServer && usr)

1
code/game/machinery/computer/pod.dm
View File

@@ -1,7 +1,6 @@
/obj/machinery/computer/pod /obj/machinery/computer/pod
name = "mass driver launch control" name = "mass driver launch control"
desc = "A combined blastdoor and mass driver control unit." desc = "A combined blastdoor and mass driver control unit."
icon_state = "computer_generic"
var/obj/machinery/mass_driver/connected = null var/obj/machinery/mass_driver/connected = null
var/title = "Mass Driver Controls" var/title = "Mass Driver Controls"
var/id = 1 var/id = 1

6
code/game/machinery/computer/power.dm
View File

@@ -3,10 +3,8 @@
/obj/machinery/computer/monitor /obj/machinery/computer/monitor
name = "power monitoring console" name = "power monitoring console"
desc = "It monitors power levels across the station." desc = "It monitors power levels across the station."
icon = 'icons/obj/computer.dmi' icon_screen = "power"
icon_state = "power" icon_keyboard = "power_key"
density = 1
anchored = 1
use_power = 2 use_power = 2
idle_power_usage = 20 idle_power_usage = 20
active_power_usage = 80 active_power_usage = 80

4
code/game/machinery/computer/prisoner.dm
View File

@@ -1,8 +1,8 @@
/obj/machinery/computer/prisoner /obj/machinery/computer/prisoner
name = "prisoner management console" name = "prisoner management console"
desc = "Used to manage tracking implants placed inside criminals." desc = "Used to manage tracking implants placed inside criminals."
icon = 'icons/obj/computer.dmi' icon_screen = "explosive"
icon_state = "explosive" icon_keyboard = "security_key"
req_access = list(access_brig) req_access = list(access_brig)
circuit = "/obj/item/weapon/circuitboard/prisoner" circuit = "/obj/item/weapon/circuitboard/prisoner"
var/id = 0.0 var/id = 0.0

4
code/game/machinery/computer/robot.dm
View File

@@ -4,8 +4,8 @@
/obj/machinery/computer/robotics /obj/machinery/computer/robotics
name = "robotics control console" name = "robotics control console"
desc = "Used to remotely lockdown or detonate linked Cyborgs." desc = "Used to remotely lockdown or detonate linked Cyborgs."
icon = 'icons/obj/computer.dmi' icon_screen = "robot"
icon_state = "robot" icon_keyboard = "rd_key"
req_access = list(access_robotics) req_access = list(access_robotics)
circuit = /obj/item/weapon/circuitboard/robotics circuit = /obj/item/weapon/circuitboard/robotics
var/temp = null var/temp = null

7
code/game/machinery/computer/security.dm
View File

@@ -3,7 +3,8 @@
/obj/machinery/computer/secure_data//TODO:SANITY /obj/machinery/computer/secure_data//TODO:SANITY
name = "security records console" name = "security records console"
desc = "Used to view and edit personnel's security records" desc = "Used to view and edit personnel's security records"
icon_state = "security" icon_screen = "security"
icon_keyboard = "security_key"
req_one_access = list(access_security, access_forensics_lockers) req_one_access = list(access_security, access_forensics_lockers)
circuit = /obj/item/weapon/circuitboard/secure_data circuit = /obj/item/weapon/circuitboard/secure_data
var/obj/item/weapon/card/id/scan = null var/obj/item/weapon/card/id/scan = null
@@ -743,7 +744,3 @@ What a mess.*/
if(!record2 || record2 == active2) if(!record2 || record2 == active2)
return 1 return 1
return 0 return 0
/obj/machinery/computer/secure_data/detective_computer
icon = 'icons/obj/computer.dmi'
icon_state = "messyfiles"

9
code/game/machinery/computer/shuttle.dm
View File

@@ -1,7 +1,8 @@
/obj/machinery/computer/emergency_shuttle /obj/machinery/computer/emergency_shuttle
name = "emergency shuttle console" name = "emergency shuttle console"
desc = "For shuttle control." desc = "For shuttle control."
icon_state = "shuttle" icon_screen = "shuttle"
icon_keyboard = "tech_key"
var/auth_need = 3.0 var/auth_need = 3.0
var/list/authorized = list() var/list/authorized = list()
@@ -128,8 +129,7 @@
/obj/machinery/computer/supplycomp /obj/machinery/computer/supplycomp
name = "supply shuttle console" name = "supply shuttle console"
desc = "Used to order supplies." desc = "Used to order supplies."
icon = 'icons/obj/computer.dmi' icon_screen = "supply"
icon_state = "supply"
req_access = list(access_cargo) req_access = list(access_cargo)
circuit = /obj/item/weapon/circuitboard/supplycomp circuit = /obj/item/weapon/circuitboard/supplycomp
verb_say = "flashes" verb_say = "flashes"
@@ -150,8 +150,7 @@
/obj/machinery/computer/ordercomp /obj/machinery/computer/ordercomp
name = "supply ordering console" name = "supply ordering console"
desc = "Used to order supplies from cargo staff." desc = "Used to order supplies from cargo staff."
icon = 'icons/obj/computer.dmi' icon_screen = "request"
icon_state = "request"
circuit = /obj/item/weapon/circuitboard/ordercomp circuit = /obj/item/weapon/circuitboard/ordercomp
verb_say = "flashes" verb_say = "flashes"
verb_ask = "flashes" verb_ask = "flashes"

20
code/game/machinery/computer/station_alert.dm
View File

@@ -2,13 +2,11 @@
/obj/machinery/computer/station_alert /obj/machinery/computer/station_alert
name = "station alert console" name = "station alert console"
desc = "Used to access the station's automated alert system." desc = "Used to access the station's automated alert system."
icon_state = "alert:0" icon_screen = "alert:0"
icon_keyboard = "atmos_key"
circuit = /obj/item/weapon/circuitboard/stationalert circuit = /obj/item/weapon/circuitboard/stationalert
var/alarms = list("Fire"=list(), "Atmosphere"=list(), "Power"=list()) var/alarms = list("Fire"=list(), "Atmosphere"=list(), "Power"=list())
/obj/machinery/computer/station_alert/attack_hand(mob/user) /obj/machinery/computer/station_alert/attack_hand(mob/user)
if(..()) if(..())
return return
@@ -99,20 +97,12 @@
return return
/obj/machinery/computer/station_alert/update_icon() /obj/machinery/computer/station_alert/update_icon()
SetLuminosity(brightness_on) ..()
if(stat & BROKEN)
icon_state = "alert:b"
return
else if (stat & NOPOWER)
icon_state = "alert:O"
SetLuminosity(0)
return
var/active_alarms = 0 var/active_alarms = 0
for (var/cat in src.alarms) for (var/cat in src.alarms)
var/list/L = src.alarms[cat] var/list/L = src.alarms[cat]
if(L.len) active_alarms = 1 if(L.len) active_alarms = 1
if(active_alarms) if(active_alarms)
icon_state = "alert:2" overlays += "alert:2"
else else
icon_state = "alert:0" overlays += "alert:0"
return

7
code/game/machinery/computer/syndicate_shuttle.dm
View File

@@ -1,8 +1,8 @@
/obj/machinery/computer/shuttle/syndicate /obj/machinery/computer/shuttle/syndicate
name = "syndicate shuttle terminal" name = "syndicate shuttle terminal"
icon_state = "syndishuttle" icon_screen = "syndishuttle"
icon_keyboard = "syndie_key"
req_access = list(access_syndicate) req_access = list(access_syndicate)
shuttleId = "syndicate" shuttleId = "syndicate"
possible_destinations = "syndicate_away;syndicate_z5;syndicate_z3;syndicate_z4;syndicate_ne;syndicate_nw;syndicate_n;syndicate_se;syndicate_sw;syndicate_s" possible_destinations = "syndicate_away;syndicate_z5;syndicate_z3;syndicate_z4;syndicate_ne;syndicate_nw;syndicate_n;syndicate_se;syndicate_sw;syndicate_s"
@@ -12,7 +12,8 @@
/obj/machinery/computer/shuttle/syndicate/whiteship /obj/machinery/computer/shuttle/syndicate/whiteship
name = "ship control terminal" name = "ship control terminal"
icon_state = "shuttle" icon_screen = "shuttle"
icon_keyboard = "tech_key"
shuttleId = "whiteship" shuttleId = "whiteship"
req_access = list( ) req_access = list( )
possible_destinations = "whiteship_ss13;whiteship_home;whiteship_z4" possible_destinations = "whiteship_ss13;whiteship_home;whiteship_z4"

9
code/game/machinery/computer/telecrystalconsoles.dm
View File

@@ -7,13 +7,14 @@ var/list/possible_uplinker_IDs = list("Alfa","Bravo","Charlie","Delta","Echo","F
name = "\improper Telecrystal assignment station" name = "\improper Telecrystal assignment station"
desc = "A device used to manage telecrystals during group operations. You shouldn't be looking at this particular one..." desc = "A device used to manage telecrystals during group operations. You shouldn't be looking at this particular one..."
icon_state = "tcstation" icon_state = "tcstation"
icon_keyboard = "tcstation_key"
icon_screen = "syndie"
///////////////////////////////////////////// /////////////////////////////////////////////
/obj/machinery/computer/telecrystals/uplinker /obj/machinery/computer/telecrystals/uplinker
name = "\improper Telecrystal upload/receive station" name = "\improper Telecrystal upload/receive station"
desc = "A device used to manage telecrystals during group operations. To use, simply insert your uplink. With your uplink installed \ desc = "A device used to manage telecrystals during group operations. To use, simply insert your uplink. With your uplink installed \
you can upload your telecrystals to the group's pool using the console, or be assigned additional telecrystals by your lieutenant." you can upload your telecrystals to the group's pool using the console, or be assigned additional telecrystals by your lieutenant."
icon_state = "tcstation"
var/obj/item/uplinkholder = null var/obj/item/uplinkholder = null
var/obj/machinery/computer/telecrystals/boss/linkedboss = null var/obj/machinery/computer/telecrystals/boss/linkedboss = null
@@ -50,7 +51,7 @@ var/list/possible_uplinker_IDs = list("Alfa","Bravo","Charlie","Delta","Echo","F
/obj/machinery/computer/telecrystals/uplinker/update_icon() /obj/machinery/computer/telecrystals/uplinker/update_icon()
overlays.Cut() ..()
if(uplinkholder) if(uplinkholder)
overlays += "[initial(icon_state)]-closed" overlays += "[initial(icon_state)]-closed"
@@ -126,7 +127,9 @@ var/list/possible_uplinker_IDs = list("Alfa","Bravo","Charlie","Delta","Echo","F
desc = "A device used to manage telecrystals during group operations. To use, simply initialize the machine by scanning for nearby uplink stations. \ desc = "A device used to manage telecrystals during group operations. To use, simply initialize the machine by scanning for nearby uplink stations. \
Once the consoles are linked up, you can assign any telecrystals amongst your operatives; be they donated by your agents or rationed to the squad \ Once the consoles are linked up, you can assign any telecrystals amongst your operatives; be they donated by your agents or rationed to the squad \
based on the danger rating of the mission." based on the danger rating of the mission."
icon_state = "tcboss" icon_state = "computer"
icon_screen = "tcboss"
icon_keyboard = "syndie_key"
var/virgin = 1 var/virgin = 1
var/scanrange = 10 var/scanrange = 10
var/storedcrystals = 0 var/storedcrystals = 0

2
code/game/machinery/telecomms/computers/logbrowser.dm
View File

@@ -2,7 +2,7 @@
/obj/machinery/computer/telecomms/server /obj/machinery/computer/telecomms/server
name = "telecommunications server monitoring console" name = "telecommunications server monitoring console"
icon_state = "comm_logs" icon_screen = "comm_logs"
var/screen = 0 // the screen number: var/screen = 0 // the screen number:
var/list/servers = list() // the servers located by the computer var/list/servers = list() // the servers located by the computer

2
code/game/machinery/telecomms/computers/telemonitor.dm
View File

@@ -7,7 +7,7 @@
/obj/machinery/computer/telecomms/monitor /obj/machinery/computer/telecomms/monitor
name = "telecommunications monitoring console" name = "telecommunications monitoring console"
icon_state = "comm_monitor" icon_screen = "comm_monitor"
var/screen = 0 // the screen number: var/screen = 0 // the screen number:
var/list/machinelist = list() // the machines located by the computer var/list/machinelist = list() // the machines located by the computer

1
code/game/machinery/telecomms/computers/traffic_control.dm
View File

@@ -2,7 +2,6 @@
/obj/machinery/computer/telecomms/traffic /obj/machinery/computer/telecomms/traffic
name = "telecommunications traffic control console" name = "telecommunications traffic control console"
icon_state = "computer_generic"
var/screen = 0 // the screen number: var/screen = 0 // the screen number:
var/list/servers = list() // the servers located by the computer var/list/servers = list() // the servers located by the computer

3
code/game/machinery/teleporter.dm
View File

@@ -1,7 +1,8 @@
/obj/machinery/computer/teleporter /obj/machinery/computer/teleporter
name = "Teleporter Control Console" name = "Teleporter Control Console"
desc = "Used to control a linked teleportation Hub and Station." desc = "Used to control a linked teleportation Hub and Station."
icon_state = "teleport" icon_screen = "teleport"
icon_keyboard = "teleport_key"
circuit = "/obj/item/weapon/circuitboard/teleporter" circuit = "/obj/item/weapon/circuitboard/teleporter"
var/obj/item/device/gps/locked = null var/obj/item/device/gps/locked = null
var/regime_set = "Teleporter" var/regime_set = "Teleporter"

16
code/game/mecha/mech_bay.dm
View File

@@ -81,10 +81,8 @@
/obj/machinery/computer/mech_bay_power_console /obj/machinery/computer/mech_bay_power_console
name = "mech bay power control console" name = "mech bay power control console"
desc = "Used to control mechbay power ports." desc = "Used to control mechbay power ports."
density = 1 icon_screen = "recharge_comp"
anchored = 1 icon_keyboard = "rd_key"
icon = 'icons/obj/computer.dmi'
icon_state = "recharge_comp"
circuit = /obj/item/weapon/circuitboard/mech_bay_power_console circuit = /obj/item/weapon/circuitboard/mech_bay_power_console
var/obj/machinery/mech_bay_recharge_port/recharge_port var/obj/machinery/mech_bay_recharge_port/recharge_port
@@ -147,16 +145,10 @@
/obj/machinery/computer/mech_bay_power_console/update_icon() /obj/machinery/computer/mech_bay_power_console/update_icon()
if(stat & NOPOWER) ..()
icon_state = "recharge_comp0"
return
if(stat & BROKEN)
icon_state = "recharge_compb"
return
if(!recharge_port || !recharge_port.recharging_mech || !recharge_port.recharging_mech.cell || !(recharge_port.recharging_mech.cell.charge < recharge_port.recharging_mech.cell.maxcharge)) if(!recharge_port || !recharge_port.recharging_mech || !recharge_port.recharging_mech.cell || !(recharge_port.recharging_mech.cell.charge < recharge_port.recharging_mech.cell.maxcharge))
icon_state = "recharge_comp"
return return
icon_state = "recharge_comp_on" overlays += "recharge_comp_on"
/obj/machinery/computer/mech_bay_power_console/initialize() /obj/machinery/computer/mech_bay_power_console/initialize()
reconnect() reconnect()

14
code/game/mecha/mecha_control_console.dm
View File

@@ -1,8 +1,8 @@
/obj/machinery/computer/mecha /obj/machinery/computer/mecha
name = "exosuit control console" name = "exosuit control console"
desc = "Used to remotely locate or lockdown exosuits." desc = "Used to remotely locate or lockdown exosuits."
icon = 'icons/obj/computer.dmi' icon_screen = "mecha"
icon_state = "mecha" icon_keyboard = "tech_key"
req_access = list(access_robotics) req_access = list(access_robotics)
circuit = "/obj/item/weapon/circuitboard/mecha_control" circuit = "/obj/item/weapon/circuitboard/mecha_control"
var/list/located = list() var/list/located = list()
@@ -58,16 +58,6 @@
updateUsrDialog() updateUsrDialog()
return return
/obj/machinery/computer/mecha/update_icon()
if(stat & NOPOWER)
icon_state = "mecha0"
return
if(stat & BROKEN)
icon_state = "mechab"
return
icon_state = "mecha"
/obj/item/mecha_parts/mecha_tracking /obj/item/mecha_parts/mecha_tracking
name = "exosuit tracking beacon" name = "exosuit tracking beacon"
desc = "Device used to transmit exosuit data." desc = "Device used to transmit exosuit data."

0
code/game/machinery/computer/ai_core.dm → code/game/objects/structures/ai_core.dm
View File

12
code/game/objects/structures/showcase.dm
View File

@@ -11,10 +11,18 @@
name = "\improper Centcom identification console" name = "\improper Centcom identification console"
desc = "You can use this to change ID's." desc = "You can use this to change ID's."
icon = 'icons/obj/computer.dmi' icon = 'icons/obj/computer.dmi'
icon_state = "id" icon_state = "computer"
/obj/structure/showcase/fakeid/New()
overlays += "id"
overlays += "id_key"
/obj/structure/showcase/fakesec /obj/structure/showcase/fakesec
name = "\improper Centcom security records" name = "\improper Centcom security records"
desc = "Used to view and edit personnel's security records" desc = "Used to view and edit personnel's security records"
icon = 'icons/obj/computer.dmi' icon = 'icons/obj/computer.dmi'
icon_state = "security" icon_state = "computer"
/obj/structure/showcase/fakesec/New()
overlays += "security"
overlays += "security_key"

5
code/modules/library/lib_machines.dm
View File

@@ -16,8 +16,9 @@
*/ */
/obj/machinery/computer/libraryconsole /obj/machinery/computer/libraryconsole
name = "library visitor console" name = "library visitor console"
icon = 'icons/obj/computer.dmi' icon_state = "oldcomp"
icon_state = "library" icon_screen = "library"
icon_keyboard = null
circuit = /obj/item/weapon/circuitboard/libraryconsole circuit = /obj/item/weapon/circuitboard/libraryconsole
var/screenstate = 0 var/screenstate = 0
var/title var/title

2
code/modules/mining/laborcamp/laborshuttle.dm
View File

@@ -1,8 +1,6 @@
/obj/machinery/computer/shuttle/labor /obj/machinery/computer/shuttle/labor
name = "labor shuttle console" name = "labor shuttle console"
desc = "Used to call and send the labor camp shuttle." desc = "Used to call and send the labor camp shuttle."
icon = 'icons/obj/computer.dmi'
icon_state = "shuttle"
circuit = /obj/item/weapon/circuitboard/labor_shuttle circuit = /obj/item/weapon/circuitboard/labor_shuttle
shuttleId = "laborcamp" shuttleId = "laborcamp"
possible_destinations = "laborcamp_home;laborcamp_away" possible_destinations = "laborcamp_home;laborcamp_away"

18
code/modules/power/solar.dm
View File

@@ -274,11 +274,13 @@
name = "solar panel control" name = "solar panel control"
desc = "A controller for solar panel arrays." desc = "A controller for solar panel arrays."
icon = 'icons/obj/computer.dmi' icon = 'icons/obj/computer.dmi'
icon_state = "solar" icon_state = "computer"
anchored = 1 anchored = 1
density = 1 density = 1
use_power = 1 use_power = 1
idle_power_usage = 250 idle_power_usage = 250
var/icon_screen = "solar"
var/icon_keyboard = "power_key"
var/id = 0 var/id = 0
var/cdir = 0 var/cdir = 0
var/targetdir = 0 // target angle in manual tracking (since it updates every game minute) var/targetdir = 0 // target angle in manual tracking (since it updates every game minute)
@@ -351,19 +353,17 @@
set_panels(cdir) set_panels(cdir)
/obj/machinery/power/solar_control/update_icon() /obj/machinery/power/solar_control/update_icon()
if(stat & BROKEN)
icon_state = "broken"
overlays.Cut() overlays.Cut()
return
if(stat & NOPOWER) if(stat & NOPOWER)
icon_state = "c_unpowered" overlays += "[icon_keyboard]_off"
overlays.Cut()
return return
icon_state = "solar" overlays += icon_keyboard
overlays.Cut() if(stat & BROKEN)
overlays += "[icon_state]_broken"
else
overlays += icon_screen
if(cdir > -1) if(cdir > -1)
overlays += image('icons/obj/computer.dmi', "solcon-o", FLY_LAYER, angle2dir(cdir)) overlays += image('icons/obj/computer.dmi', "solcon-o", FLY_LAYER, angle2dir(cdir))
return
/obj/machinery/power/solar_control/attack_hand(mob/user) /obj/machinery/power/solar_control/attack_hand(mob/user)
if(!..()) if(!..())

6
code/modules/power/turbine.dm
View File

@@ -56,10 +56,8 @@
/obj/machinery/computer/turbine_computer /obj/machinery/computer/turbine_computer
name = "gas turbine control computer" name = "gas turbine control computer"
desc = "A computer to remotely control a gas turbine" desc = "A computer to remotely control a gas turbine"
icon = 'icons/obj/computer.dmi' icon_screen = "turbinecomp"
icon_state = "turbinecomp" icon_keyboard = "tech_key"
anchored = 1
density = 1
circuit = /obj/item/weapon/circuitboard/turbine_computer circuit = /obj/item/weapon/circuitboard/turbine_computer
var/obj/machinery/power/compressor/compressor var/obj/machinery/power/compressor/compressor
var/id = 0 var/id = 0

3
code/modules/research/rdconsole.dm
View File

@@ -31,7 +31,8 @@ won't update every console in existence) but it's more of a hassle to do. Also,
/obj/machinery/computer/rdconsole /obj/machinery/computer/rdconsole
name = "R&D Console" name = "R&D Console"
icon_state = "rdcomp" icon_screen = "rdcomp"
icon_keyboard = "rd_key"
circuit = /obj/item/weapon/circuitboard/rdconsole circuit = /obj/item/weapon/circuitboard/rdconsole
var/datum/research/files //Stores all the collected research data. var/datum/research/files //Stores all the collected research data.
var/obj/item/weapon/disk/tech_disk/t_disk = null //Stores the technology disk. var/obj/item/weapon/disk/tech_disk/t_disk = null //Stores the technology disk.

4
code/modules/shuttle/shuttle.dm
View File

@@ -482,8 +482,8 @@
/obj/machinery/computer/shuttle /obj/machinery/computer/shuttle
name = "Shuttle Console" name = "Shuttle Console"
icon = 'icons/obj/computer.dmi' icon_screen = "shuttle"
icon_state = "shuttle" icon_keyboard = "tech_key"
req_access = list( ) req_access = list( )
circuit = /obj/item/weapon/circuitboard/shuttle circuit = /obj/item/weapon/circuitboard/shuttle
var/shuttleId var/shuttleId

BIN
icons/obj/computer.dmi
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 69 KiB

After

Width:  |  Height:  |  Size: 29 KiB

2
tgstation.dme
View File

@@ -433,7 +433,6 @@
#include "code\game\machinery\camera\motion.dm" #include "code\game\machinery\camera\motion.dm"
#include "code\game\machinery\camera\presets.dm" #include "code\game\machinery\camera\presets.dm"
#include "code\game\machinery\camera\tracking.dm" #include "code\game\machinery\camera\tracking.dm"
#include "code\game\machinery\computer\ai_core.dm"
#include "code\game\machinery\computer\aifixer.dm" #include "code\game\machinery\computer\aifixer.dm"
#include "code\game\machinery\computer\arcade.dm" #include "code\game\machinery\computer\arcade.dm"
#include "code\game\machinery\computer\atmos_alert.dm" #include "code\game\machinery\computer\atmos_alert.dm"
@@ -686,6 +685,7 @@
#include "code\game\objects\items\weapons\tanks\tank_types.dm" #include "code\game\objects\items\weapons\tanks\tank_types.dm"
#include "code\game\objects\items\weapons\tanks\tanks.dm" #include "code\game\objects\items\weapons\tanks\tanks.dm"
#include "code\game\objects\items\weapons\tanks\watertank.dm" #include "code\game\objects\items\weapons\tanks\watertank.dm"
#include "code\game\objects\structures\ai_core.dm"
#include "code\game\objects\structures\artstuff.dm" #include "code\game\objects\structures\artstuff.dm"
#include "code\game\objects\structures\barsigns.dm" #include "code\game\objects\structures\barsigns.dm"
#include "code\game\objects\structures\bedsheet_bin.dm" #include "code\game\objects\structures\bedsheet_bin.dm"