From 37f6af089dcadde9780a67f481e27394d6003d53 Mon Sep 17 00:00:00 2001 From: Geeves Date: Mon, 29 Jun 2020 17:16:31 +0200 Subject: [PATCH] Burglar Fixes (#9237) --- code/datums/uplink/uplink_categories.dm | 11 +-- code/modules/paperwork/photography.dm | 8 +- html/changelogs/geeves-burglar_fixes.yml | 7 ++ maps/aurora/aurora-1_centcomm.dmm | 93 +++++++++++++----------- 4 files changed, 71 insertions(+), 48 deletions(-) create mode 100644 html/changelogs/geeves-burglar_fixes.yml diff --git a/code/datums/uplink/uplink_categories.dm b/code/datums/uplink/uplink_categories.dm index 1c003f43ba3..a721024ae11 100644 --- a/code/datums/uplink/uplink_categories.dm +++ b/code/datums/uplink/uplink_categories.dm @@ -9,17 +9,18 @@ items = list() /datum/uplink_category/proc/can_view(obj/item/device/uplink/U) + if(LAZYLEN(restricted_antags)) + for(var/antag_role in restricted_antags) + var/datum/antagonist/antag = all_antag_types[antag_role] + if(antag.is_antagonist(U.uplink_owner)) + return FALSE + if(!LAZYLEN(antag_roles)) for(var/datum/uplink_item/item in items) if(item.can_view(U)) return TRUE return FALSE - for(var/antag_role in restricted_antags) - var/datum/antagonist/antag = all_antag_types[antag_role] - if(antag.is_antagonist(U.uplink_owner)) - return FALSE - for(var/antag_role in antag_roles) var/datum/antagonist/antag = all_antag_types[antag_role] if(antag.is_antagonist(U.uplink_owner)) diff --git a/code/modules/paperwork/photography.dm b/code/modules/paperwork/photography.dm index 19c71239d5c..db8ecdc6778 100644 --- a/code/modules/paperwork/photography.dm +++ b/code/modules/paperwork/photography.dm @@ -120,7 +120,7 @@ var/global/photo_count = 0 /obj/item/device/camera name = "camera" icon = 'icons/obj/bureaucracy.dmi' - desc = "A polaroid camera. 10 photos left." + desc = "A polaroid camera." icon_state = "camera" item_state = "electropack" w_class = 2.0 @@ -134,6 +134,11 @@ var/global/photo_count = 0 var/icon_off = "camera_off" var/size = 3 +/obj/item/device/camera/examine(mob/user, distance) + ..() + if(Adjacent(user)) + to_chat(user, SPAN_NOTICE("It has [pictures_left] photos left.")) + /obj/item/device/camera/verb/change_size() set name = "Set Photo Focus" set category = "Object" @@ -193,7 +198,6 @@ var/global/photo_count = 0 playsound(loc, pick('sound/items/polaroid1.ogg', 'sound/items/polaroid2.ogg'), 75, 1, -3) pictures_left-- - desc = "A polaroid camera. It has [pictures_left] photos left." to_chat(user, "[pictures_left] photos left.") icon_state = icon_off on = 0 diff --git a/html/changelogs/geeves-burglar_fixes.yml b/html/changelogs/geeves-burglar_fixes.yml new file mode 100644 index 00000000000..b02bfec8139 --- /dev/null +++ b/html/changelogs/geeves-burglar_fixes.yml @@ -0,0 +1,7 @@ +author: Geeves + +delete-after: True + +changes: + - bugfix: "Replaced the non-functioning suit-cycler and voidsuit combo at the burglar base, with a simple black and red all-species syndicate softsuit." + - bugfix: "Burglars can properly no longer access some of the more robust uplinks, to keep up with the lowpop theme." \ No newline at end of file diff --git a/maps/aurora/aurora-1_centcomm.dmm b/maps/aurora/aurora-1_centcomm.dmm index a470a48f3ec..dc7583b8bf0 100644 --- a/maps/aurora/aurora-1_centcomm.dmm +++ b/maps/aurora/aurora-1_centcomm.dmm @@ -1019,9 +1019,6 @@ /turf/simulated/floor/shuttle/dark_blue, /area/supply/dock) "aeq" = ( -/turf/unsimulated/floor{ - icon_state = "gcircuit" - }, /obj/structure/artilleryplaceholder/decorative{ icon_state = "27" }, @@ -1030,14 +1027,14 @@ id = "battery3"; name = "Battery 3 Firing Control" }, +/turf/unsimulated/floor{ + icon_state = "gcircuit" + }, /turf/unsimulated/floor{ icon_state = "wood_siding10" }, /area/centcom/control) "aer" = ( -/turf/unsimulated/floor{ - icon_state = "gcircuit" - }, /obj/structure/artilleryplaceholder/decorative{ icon_state = "28" }, @@ -1045,27 +1042,27 @@ desc = "Bluespace Artillery; the thinking man's solution." }, /obj/effect/decal/warning_stripes, +/turf/unsimulated/floor{ + icon_state = "gcircuit" + }, /turf/unsimulated/floor{ icon_state = "wood_siding2"; dir = 6 }, /area/centcom/control) "aes" = ( -/turf/unsimulated/floor{ - icon_state = "gcircuit" - }, /obj/structure/artilleryplaceholder/decorative{ icon_state = "29" }, /obj/machinery/porta_turret/crescent, +/turf/unsimulated/floor{ + icon_state = "gcircuit" + }, /turf/unsimulated/floor{ icon_state = "wood_siding6" }, /area/centcom/control) "aet" = ( -/turf/unsimulated/floor{ - icon_state = "engine" - }, /obj/structure/window/phoronreinforced, /obj/structure/window/phoronreinforced{ dir = 1 @@ -1073,14 +1070,14 @@ /obj/structure/window/phoronreinforced{ dir = 8 }, +/turf/unsimulated/floor{ + icon_state = "engine" + }, /turf/unsimulated/floor{ icon_state = "wood_siding9" }, /area/centcom/control) "aeu" = ( -/turf/unsimulated/floor{ - icon_state = "gcircuit" - }, /obj/structure/artilleryplaceholder/decorative{ icon_state = "27" }, @@ -1089,14 +1086,14 @@ id = "battery2"; name = "Battery 2 Firing Control" }, +/turf/unsimulated/floor{ + icon_state = "gcircuit" + }, /turf/unsimulated/floor{ icon_state = "wood_siding10" }, /area/centcom/control) "aev" = ( -/turf/unsimulated/floor{ - icon_state = "gcircuit" - }, /obj/structure/artilleryplaceholder/decorative{ icon_state = "27" }, @@ -1107,37 +1104,40 @@ }, /obj/effect/decal/cleanable/cobweb, /obj/item/reagent_containers/glass/rag, +/turf/unsimulated/floor{ + icon_state = "gcircuit" + }, /turf/unsimulated/floor{ icon_state = "wood_siding10" }, /area/centcom/control) "aew" = ( +/obj/effect/decal/cleanable/dirt, /turf/unsimulated/floor{ icon_state = "engine" }, -/obj/effect/decal/cleanable/dirt, /turf/unsimulated/floor{ icon_state = "wood_siding1"; dir = 6 }, /area/centcom/control) "aex" = ( +/obj/effect/decal/cleanable/dirt, +/obj/item/stool, /turf/unsimulated/floor{ icon_state = "engine" }, -/obj/effect/decal/cleanable/dirt, -/obj/item/stool, /turf/unsimulated/floor{ icon_state = "wood_siding1"; dir = 6 }, /area/centcom/control) "aey" = ( +/obj/effect/decal/cleanable/dirt, +/obj/item/storage/toolbox/electrical, /turf/unsimulated/floor{ icon_state = "engine" }, -/obj/effect/decal/cleanable/dirt, -/obj/item/storage/toolbox/electrical, /turf/unsimulated/floor{ icon_state = "wood_siding1"; dir = 6 @@ -1257,9 +1257,6 @@ /turf/unsimulated/wall/riveted, /area/template_noop) "aeS" = ( -/turf/unsimulated/floor{ - icon_state = "engine" - }, /obj/structure/window/phoronreinforced{ dir = 8 }, @@ -1268,6 +1265,9 @@ }, /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/generic, +/turf/unsimulated/floor{ + icon_state = "engine" + }, /turf/unsimulated/floor{ icon_state = "wood_siding9" }, @@ -2038,18 +2038,18 @@ /turf/unsimulated/floor/plating, /area/centcom) "ahx" = ( +/obj/item/stool/padded, /turf/unsimulated/floor{ icon_state = "wood" }, -/obj/item/stool/padded, /turf/unsimulated/floor{ name = "plating"; icon_state = "siding2" }, /area/centcom/holding) "ahy" = ( -/turf/template_noop, /obj/effect/decal/cleanable/dirt, +/turf/template_noop, /turf/simulated/wall/shuttle/dark/cardinal{ icon_state = "swall_c" }, @@ -2081,16 +2081,16 @@ /turf/space/transit, /area/space) "ahD" = ( -/turf/template_noop, /obj/effect/decal/cleanable/dirt, +/turf/template_noop, /turf/simulated/wall/shuttle/dark/cardinal{ icon_state = "swall_c"; dir = 8 }, /area/template_noop) "ahE" = ( -/turf/template_noop, /obj/effect/decal/cleanable/dirt, +/turf/template_noop, /turf/simulated/wall/shuttle/dark/cardinal{ icon_state = "swall_c"; dir = 4 @@ -21425,6 +21425,16 @@ dir = 8 }, /area/centcom/living) +"fQl" = ( +/obj/structure/table/rack, +/obj/item/device/camera{ + desc = "A polaroid camera. This one has 'Petr' scribbled into the casing." + }, +/turf/unsimulated/floor{ + name = "plating"; + icon_state = "cult" + }, +/area/burglar_base) "fQE" = ( /turf/simulated/wall/shuttle/unique/raider{ desc = "A quick, agile and sturdy shuttle. Perfect for smugglers and pirates, but recently proliferated in civilian hands."; @@ -25655,7 +25665,10 @@ }, /area/shuttle/administration/centcom) "kXY" = ( -/obj/machinery/suit_cycler/syndicate, +/obj/structure/table/rack, +/obj/item/device/camera{ + desc = "A polaroid camera. This one has 'Kismet' scribled into the casing." + }, /turf/unsimulated/floor{ name = "plating"; icon_state = "cult" @@ -25759,13 +25772,12 @@ /area/syndicate_station/start) "lfi" = ( /obj/structure/table/rack, -/obj/item/clothing/head/helmet/space/void, -/obj/item/clothing/suit/space/void, /obj/item/tank/oxygen/red, -/obj/item/clothing/shoes/magboots, /obj/machinery/light{ dir = 1 }, +/obj/item/clothing/suit/space/syndicate/black/red, +/obj/item/clothing/head/helmet/space/syndicate/black/red, /turf/unsimulated/floor{ name = "plating"; icon_state = "cult" @@ -25964,11 +25976,10 @@ /area/shuttle/distress/centcom) "lsh" = ( /obj/structure/table/rack, -/obj/item/clothing/head/helmet/space/void, -/obj/item/clothing/suit/space/void, /obj/item/tank/oxygen/red, -/obj/item/clothing/shoes/magboots, /obj/machinery/light, +/obj/item/clothing/suit/space/syndicate/black/red, +/obj/item/clothing/head/helmet/space/syndicate/black/red, /turf/unsimulated/floor{ name = "plating"; icon_state = "cult" @@ -31778,7 +31789,7 @@ /area/centcom/legion/hangar5) "sOh" = ( /obj/machinery/vending/cigarette{ - name = "hacked cigarette machine"; + name = "Syndicate-Sponsored cigarette machine"; prices = list(); products = list(/obj/item/storage/fancy/cigarettes = 10, /obj/item/storage/box/matches = 10, /obj/item/flame/lighter/zippo = 4, /obj/item/clothing/mask/smokable/cigarette/cigar/havana = 2) }, @@ -32364,7 +32375,7 @@ /area/merchant_station/warehouse) "twB" = ( /obj/machinery/vending/cola{ - name = "hacked Robust Softdrinks"; + name = "Syndicate-Sponsored Robust Softdrinks"; prices = list() }, /turf/unsimulated/floor{ @@ -33584,10 +33595,10 @@ }, /area/centcom/legion) "vdb" = ( -/turf/unsimulated/floor/plating, /obj/machinery/atmospherics/pipe/simple/visible{ dir = 6 }, +/turf/unsimulated/floor/plating, /turf/simulated/wall/shuttle/unique/tcfl{ icon_state = "1,5" }, @@ -61102,7 +61113,7 @@ kXY viy lPu viy -kXY +fQl glm aaM aaM