From 0ae4dbefe56b363e2691abd64222be72f1a6b6bc Mon Sep 17 00:00:00 2001 From: SoundScopes Date: Sat, 21 Jun 2014 22:11:34 +0100 Subject: [PATCH] Hot Fix - Added security level presets to the ID Computer. - Fixed a bug where you could equip your offhand in an item slot. --- code/game/machinery/computer/card.dm | 9 +++++++++ code/modules/projectiles/guns/energy/erifles.dm | 3 +++ 2 files changed, 12 insertions(+) diff --git a/code/game/machinery/computer/card.dm b/code/game/machinery/computer/card.dm index fcf525cc..9e7a219e 100644 --- a/code/game/machinery/computer/card.dm +++ b/code/game/machinery/computer/card.dm @@ -124,6 +124,15 @@ counter = 0 jobs_all += "[replacetext(job, " ", " ")]" + counter = 0 + jobs_all += "Security"//Red + for(var/job in security_positions) + counter++ + if(counter >= 6) + jobs_all += "" + counter = 0 + jobs_all += "[replacetext(job, " ", " ")]" + counter = 0 jobs_all += "Medical"//Green for(var/job in medical_positions) diff --git a/code/modules/projectiles/guns/energy/erifles.dm b/code/modules/projectiles/guns/energy/erifles.dm index 2e9cda4c..46cbe0b3 100644 --- a/code/modules/projectiles/guns/energy/erifles.dm +++ b/code/modules/projectiles/guns/energy/erifles.dm @@ -119,6 +119,9 @@ wield() del(src) +/obj/item/weapon/gun/energy/rifle/offhand/mob_can_equip(M as mob, slot) + return 0 //Because you can't equip your hand yet somehow you can + ///////////LASER RIFLE////////////// /obj/item/weapon/gun/energy/rifle/laser name = "laser rifle"