From 73924632b7e24372f9f63f118fb5e67f0d2ada5c Mon Sep 17 00:00:00 2001 From: Anewbe Date: Thu, 13 Dec 2018 22:19:47 -0600 Subject: [PATCH] Fixes laptops blocking people properly. --- code/game/machinery/computer/medical.dm | 5 ++++- code/game/machinery/computer/skills.dm | 1 + 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/code/game/machinery/computer/medical.dm b/code/game/machinery/computer/medical.dm index 0a90aef582..dccb87f6bc 100644 --- a/code/game/machinery/computer/medical.dm +++ b/code/game/machinery/computer/medical.dm @@ -5,7 +5,6 @@ desc = "Used to view, edit and maintain medical records." icon_keyboard = "med_key" icon_screen = "medcomp" - density = 0 //Why does a laptop blocks peoples. light_color = "#315ab4" req_one_access = list(access_medical, access_forensics_lockers, access_robotics) circuit = /obj/item/weapon/circuitboard/med_data @@ -554,4 +553,8 @@ icon_state = "laptop" icon_keyboard = "laptop_key" icon_screen = "medlaptop" +<<<<<<< HEAD throwpass = 1 //VOREStation Edit - Really??? +======= + density = 0 +>>>>>>> d5b0840... Merge pull request #5777 from Heroman3003/laptop-refix diff --git a/code/game/machinery/computer/skills.dm b/code/game/machinery/computer/skills.dm index fb92e700ff..a374d48c8c 100644 --- a/code/game/machinery/computer/skills.dm +++ b/code/game/machinery/computer/skills.dm @@ -9,6 +9,7 @@ light_color = "#00b000" req_one_access = list(access_heads) circuit = /obj/item/weapon/circuitboard/skills + density = 0 var/obj/item/weapon/card/id/scan = null var/authenticated = null var/rank = null