diff --git a/code/game/machinery/newscaster.dm b/code/game/machinery/newscaster.dm index 8bddbef8585..c5dd4ff48f2 100644 --- a/code/game/machinery/newscaster.dm +++ b/code/game/machinery/newscaster.dm @@ -755,7 +755,7 @@ var/list/obj/machinery/newscaster/allCasters = list() //Global list that will co photo_data.photo.forceMove(src.loc) if(!issilicon(user)) user.put_in_inactive_hand(photo_data.photo) - qdel(photo_data) + QDEL_NULL(photo_data) if(istype(user.get_active_hand(), /obj/item/weapon/photo)) var/obj/item/photo = user.get_active_hand() diff --git a/code/game/objects/structures/curtains.dm b/code/game/objects/structures/curtains.dm index 823e70e8e9a..79f3bd9a8ad 100644 --- a/code/game/objects/structures/curtains.dm +++ b/code/game/objects/structures/curtains.dm @@ -26,6 +26,10 @@ toggle() ..() +/obj/structure/curtain/attack_ai(mob/user) + if(istype(user, /mob/living/silicon/robot) && Adjacent(user)) // Robots can open/close it, but not the AI. + attack_hand(user) + /obj/structure/curtain/proc/toggle() src.set_opacity(!src.opacity) if(opacity) diff --git a/code/modules/client/preference_setup/loadout/loadout_uniform.dm b/code/modules/client/preference_setup/loadout/loadout_uniform.dm index 69273755247..d11ac75b793 100644 --- a/code/modules/client/preference_setup/loadout/loadout_uniform.dm +++ b/code/modules/client/preference_setup/loadout/loadout_uniform.dm @@ -177,7 +177,7 @@ pants["blue track pants"] = /obj/item/clothing/under/pants/track/blue pants["green track pants"] = /obj/item/clothing/under/pants/track/green pants["white track pants"] = /obj/item/clothing/under/pants/track/white - pants["red track pants"] = /obj/item/clothing/under/pants/track/blue + pants["red track pants"] = /obj/item/clothing/under/pants/track/red pants["camo pants"] = /obj/item/clothing/under/pants/camo pants["athletic shorts, black"] = /obj/item/clothing/under/shorts pants["athletic shorts, red"] = /obj/item/clothing/under/shorts/red diff --git a/code/modules/mob/living/bot/ed209bot.dm b/code/modules/mob/living/bot/ed209bot.dm index aabe2fd2160..8ff5ce85791 100644 --- a/code/modules/mob/living/bot/ed209bot.dm +++ b/code/modules/mob/living/bot/ed209bot.dm @@ -266,6 +266,9 @@ qdel(src) /mob/living/bot/secbot/ed209/RangedAttack(var/atom/A) + if(!(target in view(7, src))) + walk_to(src, target, 6, move_to_delay) + return if(last_shot + shot_delay > world.time) src << "You are not ready to fire yet!" return diff --git a/code/modules/mob/living/bot/secbot.dm b/code/modules/mob/living/bot/secbot.dm index 594a83223a2..817df888312 100644 --- a/code/modules/mob/living/bot/secbot.dm +++ b/code/modules/mob/living/bot/secbot.dm @@ -80,6 +80,7 @@ /mob/living/bot/secbot/turn_off() ..() + walk_to(src, src, 0, move_to_delay) target = null frustration = 0 mode = SECBOT_IDLE diff --git a/html/changelogs/Sindorman-fixes.yml b/html/changelogs/Sindorman-fixes.yml new file mode 100644 index 00000000000..8692b525a3a --- /dev/null +++ b/html/changelogs/Sindorman-fixes.yml @@ -0,0 +1,12 @@ +author: PoZe + +delete-after: True + +changes: + - bugfix: "Beepsky/ED209 no longer move around when turned off" + - bugfix: "Red track pants now spawn the right item(instead of blue)" + - bugfix: "Cybrogs can now interact with curtains to open and close them." + - bugfix: "Newscaster no longer keep photos after you remove it." + - maptweak: "Bar and kitchen have emergency O2 wall lockers." + - maptweak: "Bar theater and Kitchen Pantry now have security cameras" + - bugfix: "ED209 no longer shoots far away, but gets closer into shooting range distance with its target" diff --git a/maps/aurora/aurora-4_mainlevel.dmm b/maps/aurora/aurora-4_mainlevel.dmm index 680a71f9686..64ec07cd9e7 100644 --- a/maps/aurora/aurora-4_mainlevel.dmm +++ b/maps/aurora/aurora-4_mainlevel.dmm @@ -64231,6 +64231,12 @@ }, /obj/item/weapon/storage/box/kitchen, /obj/item/weapon/storage/box/gloves, +/obj/machinery/camera/network/civilian_east{ + c_tag = "Kitchen - Pantry"; + c_tag_order = 999; + dir = 8; + network = list("Service") + }, /turf/simulated/floor/tiled/white, /area/crew_quarters/kitchen) "gsR" = ( @@ -65255,6 +65261,13 @@ "gvD" = ( /turf/simulated/wall/r_wall, /area/maintenance/bar) +"jxb" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/closet/walllocker/emerglocker/north, +/turf/simulated/floor/tiled/white, +/area/crew_quarters/kitchen) "jNC" = ( /obj/structure/grille, /obj/structure/window/reinforced{ @@ -65320,6 +65333,23 @@ /obj/structure/reagent_dispensers/extinguisher, /turf/simulated/floor/plating, /area/maintenance/bar) +"pTv" = ( +/obj/machinery/camera/network/civilian_east{ + c_tag = "Bar - Theater Supplies"; + c_tag_order = 999; + dir = 4; + network = list("Service") + }, +/turf/simulated/floor/carpet, +/area/crew_quarters/bar) +"tdT" = ( +/obj/effect/floor_decal/spline/fancy/wood{ + icon_state = "spline_fancy"; + dir = 8 + }, +/obj/structure/closet/walllocker/emerglocker/west, +/turf/simulated/floor/wood, +/area/crew_quarters/bar) "tmB" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -95618,7 +95648,7 @@ bVa bVa bZw bVa -gtH +tdT guT bUz cbj @@ -98695,7 +98725,7 @@ bSv bUz bWC bWC -bWC +pTv bWC bWC bWC @@ -98938,7 +98968,7 @@ bGA bGA bOC bPI -bQQ +jxb grT jXF gss