diff --git a/code/defines/obj/weapon.dm b/code/defines/obj/weapon.dm index a067a3c5c86..2bba22a914d 100644 --- a/code/defines/obj/weapon.dm +++ b/code/defines/obj/weapon.dm @@ -486,6 +486,12 @@ var/assignment = null var/dorm = 0 // determines if this ID has claimed a dorm already +/obj/item/weapon/card/id/silver + name = "identification card" + desc = "A silver card which shows honour and dedication." + icon_state = "silver" + item_state = "silver_id" + /obj/item/weapon/card/id/gold name = "identification card" desc = "A golden card which shows power and might." diff --git a/code/game/jobs/job_controller.dm b/code/game/jobs/job_controller.dm index 41c67410023..6f7330c54b8 100644 --- a/code/game/jobs/job_controller.dm +++ b/code/game/jobs/job_controller.dm @@ -254,7 +254,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 d221781e863..31e39efef7a 100644 --- a/code/game/machinery/doors/airlock.dm +++ b/code/game/machinery/doors/airlock.dm @@ -997,7 +997,7 @@ About the new airlock wires panel: 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) @@ -1009,6 +1009,10 @@ About the new airlock wires panel: 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/chemical/Chemistry-Tools.dm b/code/modules/chemical/Chemistry-Tools.dm index 48192be0713..6566996b58b 100644 --- a/code/modules/chemical/Chemistry-Tools.dm +++ b/code/modules/chemical/Chemistry-Tools.dm @@ -533,6 +533,8 @@ var/turf/trg = get_turf(target) var/obj/effect/syringe_gun_dummy/D = new/obj/effect/syringe_gun_dummy(get_turf(src)) var/obj/item/weapon/reagent_containers/syringe/S = syringes[1] + if((!S) || (!S.reagents)) //ho boy! wot runtimes! + return S.reagents.trans_to(D, S.reagents.total_volume) syringes -= S del(S) diff --git a/code/modules/mining/mine_turfs.dm b/code/modules/mining/mine_turfs.dm index 3874633d573..0e7d305fb86 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 a179b48f93c..12d17263d82 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 a831eda33ff..f6709ee718a 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 b49faa386b7..89731ab0c90 100644 Binary files a/icons/obj/card.dmi and b/icons/obj/card.dmi differ diff --git a/icons/turf/floors.dmi b/icons/turf/floors.dmi index d58b4c23cef..02454f667ec 100644 Binary files a/icons/turf/floors.dmi and b/icons/turf/floors.dmi differ