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"