Skip to content

Commit

Permalink
[MIRROR] [NO GBP] Cargo-ordered bar signs don't come with access rest…
Browse files Browse the repository at this point in the history
…rictions [MDB IGNORE] (#25405) (#932)

* [NO GBP] Cargo-ordered bar signs don't come with access restrictions (#80070)

## About The Pull Request

Bar signs ordered from cargo will not have an access restriction
attached to them.

The barsign disassembly code has been slightly modified to accommodate
this.
## Why It's Good For The Game

It didn't even occur to me that bar signs had access locks on them.

Now you can establish Bargonia without begging the bartender/captain for
their ID.
## Changelog
:cl: Rhials
qol: Bar signs ordered from cargo will no longer be access-restricted.
/:cl:

* [NO GBP] Cargo-ordered bar signs don't come with access restrictions

---------

Co-authored-by: SkyratBot <[email protected]>
Co-authored-by: Rhials <[email protected]>
  • Loading branch information
3 people authored Dec 3, 2023
1 parent 6f6e9fc commit 11f43fb
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 3 deletions.
9 changes: 8 additions & 1 deletion code/game/machinery/barsigns.dm
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
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"

0 comments on commit 11f43fb

Please sign in to comment.