diff --git a/code/game/objects/door_assembly.dm b/code/game/objects/door_assembly.dm index 507f571158d..67cf74849be 100644 --- a/code/game/objects/door_assembly.dm +++ b/code/game/objects/door_assembly.dm @@ -87,14 +87,14 @@ obj/structure/door_assembly state = 1 glass = 0 -/* door_assembly_research + door_assembly_research name = "Research Airlock Assembly" icon_state = "door_as_res1" airlock_type = /obj/machinery/door/airlock/research anchored = 1 density = 1 state = 1 - glass = 0*/ + glass = 0 door_assembly_med name = "Medical Airlock Assembly" diff --git a/code/modules/chemical/Chemistry-Tools.dm b/code/modules/chemical/Chemistry-Tools.dm index 75235523c93..eefd1be47a6 100644 --- a/code/modules/chemical/Chemistry-Tools.dm +++ b/code/modules/chemical/Chemistry-Tools.dm @@ -598,6 +598,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/recycling/disposal.dm b/code/modules/recycling/disposal.dm index b48d3085572..c5fd01eacc1 100644 --- a/code/modules/recycling/disposal.dm +++ b/code/modules/recycling/disposal.dm @@ -478,6 +478,8 @@ CanPass(atom/movable/mover, turf/target, height=0, air_group=0) if (istype(mover,/obj/item)) var/obj/item/I = mover + if(istype(I, /obj/item/weapon/dummy) || istype(I, /obj/item/projectile)) + return if(!mover.throwing) return ..() if(prob(75)) diff --git a/code/modules/research/designs.dm b/code/modules/research/designs.dm index 80d0c99c90d..afb0b0c51de 100644 --- a/code/modules/research/designs.dm +++ b/code/modules/research/designs.dm @@ -1315,7 +1315,7 @@ datum materials = list("$gold" = 5000,"$uranium" = 10000, "mutagen" = 40) build_path = "/obj/item/weapon/gun/energy/decloner" locked = 1 - +/* chemsprayer name = "Chem Sprayer" desc = "An advanced chem spraying device." @@ -1325,7 +1325,7 @@ datum materials = list("$metal" = 5000, "$glass" = 1000) reliability_base = 100 build_path = "/obj/item/weapon/chemsprayer" - +*/ rapidsyringe name = "Rapid Syringe Gun" desc = "A gun that fires many syringes." @@ -1334,7 +1334,7 @@ datum build_type = PROTOLATHE materials = list("$metal" = 5000, "$glass" = 1000) build_path = "/obj/item/weapon/gun/syringe/rapidsyringe" - +/* largecrossbow name = "Energy Crossbow" desc = "A weapon favoured by syndicate infiltration teams." @@ -1343,7 +1343,7 @@ datum build_type = PROTOLATHE materials = list("$metal" = 5000, "$glass" = 1000, "$uranium" = 1000, "$silver" = 1000) build_path = "/obj/item/weapon/gun/energy/crossbow/largecrossbow" - +*/ temp_gun name = "Temperature Gun" desc = "A gun that shoots temperature bullet energythings to change temperature."//Change it if you want diff --git a/icons/obj/gun.dmi b/icons/obj/gun.dmi index fdaaa510399..092741f0ca7 100644 Binary files a/icons/obj/gun.dmi and b/icons/obj/gun.dmi differ