Skip to content

Commit

Permalink
remaps the bar and moves the cafe (#6657)
Browse files Browse the repository at this point in the history 
<!-- Write **BELOW** The Headers and **ABOVE** The comments else it may
not be viewable. -->
<!-- You can view Contributing.MD for a detailed description of the pull
request process. -->

## About The Pull Request
top

![dreamseeker_EvQsNVCoRA](https://github.com/user-attachments/assets/ca2fe549-accd-44d9-9ae6-816cfa4287ec)
bottom

![dreamseeker_EdfQDr3XkY](https://github.com/user-attachments/assets/9a0fd30c-9b5d-4052-84fd-38cf571d3a4e)
the cafe

![dreamseeker_HSGqgsRKkh](https://github.com/user-attachments/assets/1d27ec87-70ef-4b8c-b2aa-e7480c6fda33)

<!-- Describe The Pull Request. Please be sure every change is
documented or this can delay review and even discourage maintainers from
merging your PR! -->

## Why It's Good For The Game
- Cafe and bar are now in distinct, separate areas
- Turns a weird semi-quasi-bar into an actual cafe location
- Distinguishes the top / bottom floor of the bar
- Private rooms!
<!-- Argue for the merits of your changes and how they benefit the game,
especially if they are controversial and/or far reaching. If you can't
actually explain WHY what you are doing will improve the game, then it
probably isn't good for the game in the first place. -->

## Changelog

<!-- If your PR modifies aspects of the game that can be concretely
observed by players or admins you should add a changelog. If your change
does NOT meet this description, remove this section. Be sure to properly
mark your PRs to prevent unnecessary GBP loss. You can read up on GBP
and it's effects on PRs in the tgstation guides for contributors. Please
note that maintainers freely reserve the right to remove and add tags
should they deem it appropriate. You can attempt to finagle the system
all you want, but it's best to shoot for clear communication right off
the bat. -->

:cl:
tweak:the bar and cafe were changed
/:cl:

<!-- Both :cl:'s are required for the changelog to work! You can put
your name to the right of the first :cl: if you want to overwrite your
GitHub username as author ingame. -->
<!-- You can use multiple of the same prefix (they're only used for the
icon ingame) and delete the unneeded ones. Despite some of the tags,
changelogs should generally represent how a player might be affected by
the changes rather than a summary of the PR's contents. -->
  • Loading branch information
@FreeStylaLT
FreeStylaLT committed Sep 8, 2024
1 parent faa9eab commit 89ff78c
Show file tree
Hide file tree
Showing 6 changed files with 4,513 additions and 3,822 deletions.
5 changes: 5 additions & 0 deletions code/game/area/Space Station 13 areas.dm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1715,6 +1715,11 @@ NOTE: there are two lists of areas in the end of this file: centcom and station
icon_state = "bar"
sound_env = LARGE_SOFTFLOOR

/area/crew_quarters/bar/lounge
name = "\improper Bar Lounge"
icon_state = "bar"
sound_env = LARGE_SOFTFLOOR

/area/crew_quarters/barrestroom
name = "\improper Cafeteria Restroom"
icon_state = "bar"
Expand Down
6 changes: 5 additions & 1 deletion code/modules/power/lighting/lighting.dm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -259,6 +259,8 @@ var/global/list/light_type_cache = list()
* This is used to calc the probability the light burns out
*/
var/switchcount = 0
///Does not reset pixel adjustments (best used in mapmaker only)
var/custom_placement = FALSE


/// TRUE if rigged to explode.
Expand Down Expand Up @@ -384,6 +386,7 @@ var/global/list/light_type_cache = list()
light_type = /obj/item/light/bulb/strong
construct_type = /obj/machinery/light_construct/flamp
shows_alerts = FALSE
custom_placement = TRUE
var/lamp_shade = 1

/obj/machinery/light/flamp/update_icon()
Expand Down Expand Up @@ -521,7 +524,8 @@ var/global/list/light_type_cache = list()
base_pixel_x = 10
if(WEST)
base_pixel_x = -10
reset_pixel_offsets()
if(!custom_placement)
reset_pixel_offsets()

/obj/machinery/light/flamp/update_icon()
if(lamp_shade)
Expand Down
115 changes: 70 additions & 45 deletions maps/rift/levels/rift-03-underground1.dmm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1289,6 +1289,11 @@
},
/turf/simulated/floor/tiled/steel,
/area/hallway/primary/underone)
"cT" = (
/turf/simulated/floor/water/beach{
dir = 4
},
/area/rift/surfacebase/underground/under1)
"cU" = (
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 8
Expand Down Expand Up @@ -7098,6 +7103,9 @@
},
/turf/simulated/floor/concrete/rng/indoors,
/area/rift/station/fighter_bay/transport_tunnel_garage)
"vM" = (
/turf/simulated/floor/water/beach/corner,
/area/rift/surfacebase/underground/under1)
"vP" = (
/obj/item/stack/tile/floor,
/obj/machinery/light/small{
Expand Down Expand Up @@ -13301,6 +13309,9 @@
/obj/structure/snowman,
/turf/simulated/floor/outdoors/snow/lythios43c,
/area/rift/surfacebase/underground/under1)
"PA" = (
/turf/simulated/floor/outdoors/beach/sand/desert/indoors,
/area/rift/surfacebase/underground/under1)
"PC" = (
/obj/machinery/air_alarm{
dir = 4;
Expand Down Expand Up @@ -13535,6 +13546,10 @@
/obj/structure/flora/ausbushes/lavendergrass,
/turf/simulated/floor/outdoors/snow/lythios43c,
/area/rift/surfacebase/underground/under1)
"Qy" = (
/obj/structure/closet/crate/mimic,
/turf/simulated/floor/holofloor/beach/water,
/area/rift/surfacebase/underground/under1)
"Qz" = (
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/turf/simulated/floor/tiled,
Expand Down Expand Up @@ -14700,6 +14715,9 @@
/obj/machinery/atmospherics/component/unary/vent_pump/on,
/turf/simulated/floor/plating,
/area/rift/station/fighter_bay/hangar)
"UM" = (
/turf/simulated/floor/water/beach,
/area/rift/surfacebase/underground/under1)
"UN" = (
/obj/effect/floor_decal/rust,
/obj/structure/sink{
Expand Down Expand Up @@ -15046,6 +15064,10 @@
},
/turf/simulated/floor/tiled,
/area/engineering/atmos)
"VI" = (
/obj/item/beach_ball,
/turf/simulated/floor/water/beach,
/area/rift/surfacebase/underground/under1)
"VJ" = (
/obj/effect/floor_decal/rust,
/obj/structure/railing{
Expand Down Expand Up @@ -15538,6 +15560,9 @@
/obj/machinery/nanite_chamber,
/turf/simulated/floor/tiled/techfloor/grid,
/area/station/protean_nanite_room)
"Xo" = (
/turf/simulated/floor/holofloor/beach/water,
/area/rift/surfacebase/underground/under1)
"Xp" = (
/turf/simulated/wall/prepainted/engineering/atmos,
/area/engineering/atmos/hallway)
Expand Down Expand Up @@ -41739,12 +41764,12 @@ aa
aa
aa
aa
aa
aa
aa
aa
aa
aa
PA
vM
cT
cT
cT
cT
aa
aa
aa
Expand Down Expand Up @@ -41933,12 +41958,12 @@ aa
aa
aa
aa
aa
aa
aa
aa
aa
aa
PA
UM
Xo
Xo
Xo
Xo
aa
aa
aa
Expand Down Expand Up @@ -42126,13 +42151,13 @@ aa
aa
aa
aa
aa
aa
aa
aa
aa
aa
aa
PA
PA
UM
Xo
Xo
Xo
Xo
aa
aa
aa
Expand Down Expand Up @@ -42320,13 +42345,13 @@ aa
aa
aa
aa
aa
aa
aa
aa
aa
aa
aa
PA
PA
VI
Qy
Xo
Xo
Xo
aa
aa
aa
Expand Down Expand Up @@ -42514,13 +42539,13 @@ aa
aa
aa
aa
aa
aa
aa
aa
aa
aa
aa
PA
PA
UM
Xo
Xo
Xo
Xo
aa
aa
aa
Expand Down Expand Up @@ -42709,12 +42734,12 @@ aa
aa
aa
aa
aa
aa
aa
aa
aa
aa
PA
UM
Xo
Xo
Xo
Xo
aa
aa
aa
Expand Down Expand Up @@ -42903,12 +42928,12 @@ aa
aa
aa
aa
aa
aa
aa
aa
aa
aa
PA
UM
Xo
Xo
Xo
Xo
aa
aa
aa
Expand Down
Loading

0 comments on commit 89ff78c

Please sign in to comment.