Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[MIRROR] Cargo-ordered bar signs don't come with access restrictions #932

Merged
merged 1 commit into from
Dec 3, 2023
Merged

[MIRROR] Cargo-ordered bar signs don't come with access restrictions #932

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 8 additions & 1 deletion code/game/machinery/barsigns.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,8 @@
var/datum/barsign/chosen_sign
/// Do we attempt to rename the area we occupy when the chosen sign is changed?
var/change_area_name = FALSE
/// What kind of sign do we drop upon being disassembled?
var/disassemble_result = /obj/item/wallframe/barsign

/datum/armor/sign_barsign
melee = 20
Expand Down Expand Up @@ -92,7 +94,7 @@ MAPPING_DIRECTIONAL_HELPERS(/obj/machinery/barsign, 32)
/obj/machinery/barsign/deconstruct(disassembled = TRUE)
if(!(flags_1 & NODECONSTRUCT_1))
if(disassembled)
new /obj/item/wallframe/barsign(loc)
new disassemble_result(drop_location())
else
new /obj/item/stack/sheet/iron(drop_location(), 2)
new /obj/item/stack/cable_coil(drop_location(), 2)
Expand Down Expand Up @@ -487,6 +489,7 @@ MAPPING_DIRECTIONAL_HELPERS(/obj/machinery/barsign, 32)
// For other locations that aren't in the main bar
/obj/machinery/barsign/all_access
req_access = null
disassemble_result = /obj/item/wallframe/barsign/all_access

MAPPING_DIRECTIONAL_HELPERS(/obj/machinery/barsign/all_access, 32)

Expand All @@ -513,3 +516,7 @@ MAPPING_DIRECTIONAL_HELPERS(/obj/machinery/barsign/all_access, 32)
if(isopenturf(get_step(on_wall, EAST))) //This takes up 2 tiles so we want to make sure we have two tiles to hang it from.
balloon_alert(user, "needs more support!")
return FALSE

/obj/item/wallframe/barsign/all_access
desc = "Used to help draw the rabble into your bar. Some assembly required. This one doesn't have an access lock."
result_path = /obj/machinery/barsign/all_access
4 changes: 2 additions & 2 deletions code/modules/cargo/packs/service.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -293,5 +293,5 @@
name = "Bar Sign Replacement Kit"
desc = "A replacement bar sign, perfect for drawing in customers to your bar, tavern, inn, nightclub, or even coffeehouse!"
cost = CARGO_CRATE_VALUE * 14
contains = list(/obj/item/wallframe/barsign)
crate_name = "bar sign replacement crate"
contains = list(/obj/item/wallframe/barsign/all_access)
crate_name = "bar sign crate"
Loading