diff --git a/code/game/jobs/job_controller.dm b/code/game/jobs/job_controller.dm index 865baeee72d..baddec7c9c1 100644 --- a/code/game/jobs/job_controller.dm +++ b/code/game/jobs/job_controller.dm @@ -288,7 +288,9 @@ var/global/datum/controller/occupations/job_master switch(rank) if("Cyborg") return - if("Captain") + if( "Head of Personnel" || "Head of Security" || "Chief Engineer" || "Research Director" || "Chief Medical Officer") + C = new /obj/item/weapon/card/id/silver(H) + else if("Captain") C = new /obj/item/weapon/card/id/gold(H) else C = new /obj/item/weapon/card/id(H) diff --git a/code/game/machinery/doors/airlock.dm b/code/game/machinery/doors/airlock.dm index 9d4dc815730..43efffddfd6 100644 --- a/code/game/machinery/doors/airlock.dm +++ b/code/game/machinery/doors/airlock.dm @@ -403,7 +403,7 @@ Airlock index -> wire color are { 9, 4, 6, 7, 5, 8, 1, 2, 3 }. beingcrowbarred = 0 if( beingcrowbarred && (density && welded && !operating && src.p_open && (!src.arePowerSystemsOn() || stat & NOPOWER) && !src.locked) ) playsound(src.loc, 'Crowbar.ogg', 100, 1) - user.visible_message("[user] removes the electronics from the airlock assembly.", "You start to remove electronics into the airlock assembly.") + user.visible_message("[user] removes the electronics from the airlock assembly.", "You start to remove electronics from the airlock assembly.") if(do_after(user,40)) user << "\blue You removed the airlock electronics!" switch(src.doortype) @@ -415,6 +415,10 @@ Airlock index -> wire color are { 9, 4, 6, 7, 5, 8, 1, 2, 3 }. if(5) new/obj/structure/door_assembly/door_assembly_mai( src.loc ) if(6) new/obj/structure/door_assembly/door_assembly_ext( src.loc ) if(7) new/obj/structure/door_assembly/door_assembly_g( src.loc ) + if(14) new/obj/structure/door_assembly/door_assembly_com/glass( src.loc ) + if(15) new/obj/structure/door_assembly/door_assembly_eng/glass( src.loc ) //issue 301 -mysthic + if(16) new/obj/structure/door_assembly/door_assembly_sec/glass( src.loc ) + if(17) new/obj/structure/door_assembly/door_assembly_med/glass( src.loc ) var/obj/item/weapon/airlock_electronics/ae if (!electronics) ae = new/obj/item/weapon/airlock_electronics( src.loc ) diff --git a/code/modules/mining/mine_turfs.dm b/code/modules/mining/mine_turfs.dm index 08755336fd5..c06fd1cd656 100644 --- a/code/modules/mining/mine_turfs.dm +++ b/code/modules/mining/mine_turfs.dm @@ -284,7 +284,7 @@ // seedName = pick(list("1","2","3","4")) // seedAmt = rand(1,4) if(prob(20)) - icon_state = "asteroid[rand(0,8)]" + icon_state = "asteroid[rand(0,12)]" spawn(2) updateMineralOverlays() diff --git a/icons/mob/items_lefthand.dmi b/icons/mob/items_lefthand.dmi index c6dc652a5c6..6752e147da9 100644 Binary files a/icons/mob/items_lefthand.dmi and b/icons/mob/items_lefthand.dmi differ diff --git a/icons/mob/items_righthand.dmi b/icons/mob/items_righthand.dmi index b1a1f0b1b60..56e46393124 100644 Binary files a/icons/mob/items_righthand.dmi and b/icons/mob/items_righthand.dmi differ diff --git a/icons/obj/card.dmi b/icons/obj/card.dmi index 7435036350c..8660aeb3414 100644 Binary files a/icons/obj/card.dmi and b/icons/obj/card.dmi differ