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

Fixes laptops blocking people properly.

Browse Source
This commit is contained in:
Anewbe
2018-12-13 22:19:47 -06:00
committed by VirgoBot
parent e1de74a24e
commit 73924632b7
2 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -5,7 +5,6 @@
desc = "Used to view, edit and maintain medical records." desc = "Used to view, edit and maintain medical records."
icon_keyboard = "med_key" icon_keyboard = "med_key"
icon_screen = "medcomp" icon_screen = "medcomp"
density = 0 //Why does a laptop blocks peoples.
light_color = "#315ab4" light_color = "#315ab4"
req_one_access = list(access_medical, access_forensics_lockers, access_robotics) req_one_access = list(access_medical, access_forensics_lockers, access_robotics)
circuit = /obj/item/weapon/circuitboard/med_data circuit = /obj/item/weapon/circuitboard/med_data
@@ -554,4 +553,8 @@
icon_state = "laptop" icon_state = "laptop"
icon_keyboard = "laptop_key" icon_keyboard = "laptop_key"
icon_screen = "medlaptop" icon_screen = "medlaptop"
<<<<<<< HEAD
throwpass = 1 //VOREStation Edit - Really??? throwpass = 1 //VOREStation Edit - Really???
=======
density = 0
>>>>>>> d5b0840... Merge pull request #5777 from Heroman3003/laptop-refix

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

@@ -9,6 +9,7 @@
light_color = "#00b000" light_color = "#00b000"
req_one_access = list(access_heads) req_one_access = list(access_heads)
circuit = /obj/item/weapon/circuitboard/skills circuit = /obj/item/weapon/circuitboard/skills
density = 0
var/obj/item/weapon/card/id/scan = null var/obj/item/weapon/card/id/scan = null
var/authenticated = null var/authenticated = null
var/rank = null var/rank = null