diff --git a/code/game/machinery/doors/airlock.dm b/code/game/machinery/doors/airlock.dm index 406c95311ff..b80fed4c789 100644 --- a/code/game/machinery/doors/airlock.dm +++ b/code/game/machinery/doors/airlock.dm @@ -897,6 +897,9 @@ About the new airlock wires panel: /obj/machinery/door/blocks_airlock() return 0 +/obj/structure/window/blocks_airlock() + return 0 + /obj/machinery/mech_sensor/blocks_airlock() return 0 @@ -906,6 +909,9 @@ About the new airlock wires panel: /atom/movable/proc/airlock_crush(var/crush_damage) return 0 +/obj/structure/window/airlock_crush(var/crush_damage) + ex_act(2)//Smashin windows + /obj/machinery/portable_atmospherics/canister/airlock_crush(var/crush_damage) . = ..() health -= crush_damage @@ -962,12 +968,8 @@ About the new airlock wires panel: playsound(src.loc, open_sound_powered, 100, 1) else playsound(src.loc, open_sound_unpowered, 100, 1) - for(var/turf/turf in locs) - var/obj/structure/window/killthis = (locate(/obj/structure/window) in turf) - if(killthis) - killthis.ex_act(2)//Smashin windows + ..() - return /obj/machinery/door/airlock/proc/lock(var/forced=0) if(locked) diff --git a/code/game/objects/items/devices/multitool.dm b/code/game/objects/items/devices/multitool.dm index cc47b871661..54c659b0780 100644 --- a/code/game/objects/items/devices/multitool.dm +++ b/code/game/objects/items/devices/multitool.dm @@ -66,5 +66,6 @@ if(!MT) return ..(A, user) + user.AddTopicPrint(src) MT.interact(src, user) return 1 diff --git a/code/modules/reagents/reagent_containers/food/drinks/jar.dm b/code/modules/reagents/reagent_containers/food/drinks/jar.dm index 47abb8637a3..daebb0638c5 100644 --- a/code/modules/reagents/reagent_containers/food/drinks/jar.dm +++ b/code/modules/reagents/reagent_containers/food/drinks/jar.dm @@ -9,23 +9,14 @@ item_state = "beaker" center_of_mass = list("x"=15, "y"=8) unacidable = 1 - New() - ..() - reagents.add_reagent("slime", 50) - on_reagent_change() - if (reagents.reagent_list.len > 0) - switch(reagents.get_master_reagent_id()) - if("slime") - icon_state = "jar_slime" - name = "slime jam" - desc = "A jar of slime jam. Delicious!" - else - icon_state ="jar_what" - name = "jar of something" - desc = "You can't really tell what this is." - else - icon_state = "jar" - name = "empty jar" - desc = "A jar. You're not sure what it's supposed to hold." - return +/obj/item/weapon/reagent_containers/food/drinks/jar/on_reagent_change() + if (reagents.reagent_list.len > 0) + icon_state ="jar_what" + name = "jar of something" + desc = "You can't really tell what this is." + else + icon_state = "jar" + name = "empty jar" + desc = "A jar. You're not sure what it's supposed to hold." + return diff --git a/icons/obj/machines/turret_control.dmi b/icons/obj/machines/turret_control.dmi index b7c81cd923e..69cd4ccbb71 100644 Binary files a/icons/obj/machines/turret_control.dmi and b/icons/obj/machines/turret_control.dmi differ diff --git a/icons/obj/stationobjs.dmi b/icons/obj/stationobjs.dmi index b689ab961ce..dbe8997dbf4 100644 Binary files a/icons/obj/stationobjs.dmi and b/icons/obj/stationobjs.dmi differ