Skip to content

Commit

Permalink
Merge pull request #543 from Sea-of-Lost-Souls/upstreammaint
Browse files Browse the repository at this point in the history 
[IDB IGNORE] [MDB IGNORE] Gold Pressed Maint
  • Loading branch information
@ORCACommander
ORCACommander authored Jul 26, 2024
2 parents a6adb80 + 5270f25 commit d420119
Show file tree
Hide file tree
Showing 1,262 changed files with 74,553 additions and 66,910 deletions.
2 changes: 1 addition & 1 deletion .github/PULL_REQUEST_TEMPLATE.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@

## 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. -->
<!-- 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 its 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:
add: Added new mechanics or gameplay changes
Expand Down
4 changes: 2 additions & 2 deletions .github/guides/AUTODOC.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ public functions rely on to implement logic
When documenting a proc, we give a short one line description (as this is shown
next to the proc definition in the list of all procs for a type or global
namespace), then a longer paragraph which will be shown when the user clicks on
the proc to jump to it's definition
the proc to jump to its definition
```
/**
* Short description of the proc
Expand All @@ -59,7 +59,7 @@ just going to be the typepath of the class, as dmdoc uses that by default

Then we give a short oneline description of the class

Finally we give a longer multi paragraph description of the class and it's details
Finally we give a longer multi paragraph description of the class and its details
```
/**
* # Classname (Can be omitted if it's just going to be the typepath)
Expand Down
18 changes: 9 additions & 9 deletions .github/guides/STANDARDS.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -100,11 +100,11 @@ While we normally encourage (and in some cases, even require) bringing out of da
### RegisterSignal()

#### PROC_REF Macros
When referencing procs in RegisterSignal, Callback and other procs you should use PROC_REF, TYPE_PROC_REF and GLOBAL_PROC_REF macros.
When referencing procs in RegisterSignal, Callback and other procs you should use PROC_REF, TYPE_PROC_REF and GLOBAL_PROC_REF macros.
They ensure compilation fails if the reffered to procs change names or get removed.
The macro to be used depends on how the proc you're in relates to the proc you want to use:

PROC_REF if the proc you want to use is defined on the current proc type or any of it's ancestor types.
PROC_REF if the proc you want to use is defined on the current proc type or any of its ancestor types.
Example:
```
/mob/proc/funny()
Expand All @@ -129,7 +129,7 @@ Example:
/mob/subtype/proc/do_something()
var/obj/thing/x = new()
// we're referring to /obj/thing proc inside /mob/subtype proc
RegisterSignal(x, COMSIG_FAKE, TYPE_PROC_REF(/obj/thing, funny))
RegisterSignal(x, COMSIG_FAKE, TYPE_PROC_REF(/obj/thing, funny))
```

GLOBAL_PROC_REF if the proc you want to use is a global proc.
Expand All @@ -154,7 +154,7 @@ All procs that are registered to listen for signals using `RegisterSignal()` mus
```
This is to ensure that it is clear the proc handles signals and turns on a lint to ensure it does not sleep.

Any sleeping behaviour that you need to perform inside a `SIGNAL_HANDLER` proc must be called asynchronously (e.g. with `INVOKE_ASYNC()`) or be redone to work asynchronously.
Any sleeping behaviour that you need to perform inside a `SIGNAL_HANDLER` proc must be called asynchronously (e.g. with `INVOKE_ASYNC()`) or be redone to work asynchronously.

#### `override`

Expand Down Expand Up @@ -280,7 +280,7 @@ Good:
off_overlay = iconstate2appearance(icon, "off")
broken_overlay = icon2appearance(broken_icon)
if (stat & broken)
add_overlay(broken_overlay)
add_overlay(broken_overlay)
return
if (is_on)
add_overlay(on_overlay)
Expand All @@ -304,7 +304,7 @@ Bad:
if (isnull(our_overlays))
our_overlays = list("on" = iconstate2appearance(overlay_icon, "on"), "off" = iconstate2appearance(overlay_icon, "off"), "broken" = iconstate2appearance(overlay_icon, "broken"))
if (stat & broken)
add_overlay(our_overlays["broken"])
add_overlay(our_overlays["broken"])
return
...
```
Expand Down Expand Up @@ -391,7 +391,7 @@ At its best, it can make some very common patterns easy to use, and harder to me
some_code()
if (do_something_else())
. = TRUE // Uh oh, what's going on!
// even
// more
// code
Expand Down Expand Up @@ -468,7 +468,7 @@ Meaning:
to_chat(world, uh_oh())
```

...will print `woah!`.
...will print `woah!`.

For this reason, it is acceptable for `.` to be used in places where consumers can reasonably continue in the event of a runtime.

Expand All @@ -494,7 +494,7 @@ If you are using `.` in this case (or for another case that might be acceptable,
. = ..()
if (. == BIGGER_SUPER_ATTACK)
return BIGGER_SUPER_ATTACK // More readable than `.`
// Due to how common it is, most uses of `. = ..()` do not need a trailing `return .`
```

Expand Down
3 changes: 3 additions & 0 deletions .github/guides/VISUALS.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -404,6 +404,9 @@ There are a few snowflake layers that can be used to accomplish niche goals, alo

Floating layers will float "up" the chain of things they're being drawn onto, until they find a real layer. They'll then offset off of that.

Adding `TOPDOWN_LAYER` (actual value `10000`) to another layer forces the appearance into topdown rendering, locally disabling [side map](#side_map-check-the-main-page-too).
We can think of this as applying to planes, since we don't want it interlaying with other non topdown objects.

This allows us to keep relative layer differences while not needing to make all sources static. Often very useful.

## Planes
Expand Down
11 changes: 8 additions & 3 deletions _maps/RandomRuins/IceRuins/skyrat/icemoon_underground_icewalker_lower.dmm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -504,7 +504,7 @@
/obj/effect/turf_decal/siding/wood{
dir = 8
},
/obj/machinery/smartfridge/drying_rack,
/obj/machinery/smartfridge/drying/rack,
/turf/open/floor/stone/icemoon,
/area/ruin/unpowered/primitive_catgirl_den)
"lZ" = (
Expand Down Expand Up @@ -1336,7 +1336,7 @@
/turf/open/misc/dirt/icemoon,
/area/ruin/unpowered/primitive_catgirl_den)
"Hi" = (
/obj/machinery/smartfridge/drying_rack,
/obj/machinery/smartfridge/drying/rack,
/turf/open/misc/dirt/icemoon,
/area/ruin/unpowered/primitive_catgirl_den)
"Hv" = (
Expand Down Expand Up @@ -1935,6 +1935,11 @@
/obj/item/ammo_casing/arrow,
/turf/open/misc/dirt/icemoon,
/area/ruin/unpowered/primitive_catgirl_den)
"VZ" = (
/obj/effect/turf_decal/weather/snow/corner,
/obj/machinery/smartfridge/drying/rack,
/turf/open/misc/dirt/icemoon,
/area/ruin/unpowered/primitive_catgirl_den)
"WM" = (
/obj/structure/mineral_door/wood/large_gate{
dir = 8
Expand Down Expand Up @@ -3614,7 +3619,7 @@ gY
wM
eS
pa
Ug
VZ
oJ
oJ
sS
Expand Down
2 changes: 1 addition & 1 deletion _maps/RandomRuins/IceRuins/skyrat/icemoon_underground_icewalker_upper.dmm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -831,7 +831,7 @@
/turf/open/floor/wood/icemoon,
/area/ruin/unpowered/primitive_catgirl_den)
"Ej" = (
/obj/machinery/smartfridge/drying_rack,
/obj/machinery/smartfridge/drying/rack,
/turf/open/floor/stone/icemoon,
/area/ruin/unpowered/primitive_catgirl_den)
"Ez" = (
Expand Down
129 changes: 66 additions & 63 deletions _maps/RandomRuins/LavaRuins/lavaland_surface_syndicate_base1.dmm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -806,16 +806,6 @@
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/iron/dark,
/area/ruin/syndicate_lava_base/bar)
"gK" = (
/obj/effect/turf_decal/stripes/line{
dir = 8
},
/obj/structure/table,
/obj/machinery/cell_charger,
/obj/item/stock_parts/power_store/cell/high,
/obj/structure/cable,
/turf/open/floor/mineral/plastitanium,
/area/ruin/syndicate_lava_base/cargo)
"gO" = (
/obj/structure/sign/departments/cargo,
/turf/closed/wall/mineral/plastitanium/nodiagonal,
Expand Down Expand Up @@ -1738,6 +1728,21 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/orange/visible,
/turf/closed/wall/mineral/plastitanium/nodiagonal,
/area/ruin/syndicate_lava_base/engineering)
"nI" = (
/obj/structure/table/wood,
/obj/machinery/light/small/directional/east,
/obj/structure/window/reinforced/spawner/directional/north{
pixel_y = 1
},
/obj/item/book/manual/chef_recipes{
pixel_x = 2;
pixel_y = 6
},
/obj/item/book/manual/wiki/barman_recipes,
/obj/item/reagent_containers/cup/glass/shaker,
/obj/machinery/computer/security/telescreen/entertainment/directional/east,
/turf/open/floor/wood,
/area/ruin/syndicate_lava_base/bar)
"nK" = (
/obj/machinery/door/airlock/public/glass{
name = "Bar"
Expand Down Expand Up @@ -3062,15 +3067,6 @@
/obj/effect/mapping_helpers/airlock/cyclelink_helper,
/turf/open/floor/plating,
/area/ruin/syndicate_lava_base/arrivals)
"Fq" = (
/obj/machinery/firealarm/directional/west,
/obj/structure/table,
/obj/machinery/cell_charger,
/obj/item/stock_parts/power_store/cell/high,
/obj/effect/decal/cleanable/dirt,
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/iron,
/area/ruin/syndicate_lava_base/engineering)
"Ft" = (
/obj/effect/turf_decal/delivery,
/obj/machinery/door/firedoor,
Expand Down Expand Up @@ -3159,6 +3155,15 @@
/obj/structure/table/reinforced,
/turf/open/floor/iron/dark,
/area/ruin/syndicate_lava_base/bar)
"GI" = (
/obj/machinery/firealarm/directional/west,
/obj/structure/table,
/obj/machinery/cell_charger,
/obj/item/stock_parts/power_store/cell/high,
/obj/effect/decal/cleanable/dirt,
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/iron,
/area/ruin/syndicate_lava_base/engineering)
"GV" = (
/obj/effect/decal/cleanable/dirt,
/obj/structure/cable,
Expand Down Expand Up @@ -3474,21 +3479,6 @@
/obj/effect/turf_decal/tile/neutral/fourcorners,
/turf/open/floor/iron/dark,
/area/ruin/syndicate_lava_base/cargo)
"Lk" = (
/obj/structure/table/wood,
/obj/machinery/light/small/directional/east,
/obj/structure/window/reinforced/spawner/directional/north{
pixel_y = 1
},
/obj/item/book/manual/chef_recipes{
pixel_x = 2;
pixel_y = 6
},
/obj/item/book/manual/wiki/barman_recipes,
/obj/item/reagent_containers/cup/glass/shaker,
/obj/machinery/computer/security/telescreen/entertainment/directional/east,
/turf/open/floor/wood,
/area/ruin/syndicate_lava_base/bar)
"Ll" = (
/obj/structure/cable,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
Expand Down Expand Up @@ -3822,6 +3812,16 @@
},
/turf/open/floor/iron,
/area/ruin/syndicate_lava_base/arrivals)
"QG" = (
/obj/effect/turf_decal/stripes/line{
dir = 8
},
/obj/structure/table,
/obj/machinery/cell_charger,
/obj/item/stock_parts/power_store/cell/high,
/obj/structure/cable,
/turf/open/floor/mineral/plastitanium,
/area/ruin/syndicate_lava_base/cargo)
"QN" = (
/obj/effect/turf_decal/stripes/line{
dir = 1
Expand Down Expand Up @@ -4034,6 +4034,34 @@
/obj/effect/mapping_helpers/airalarm/syndicate_access,
/turf/open/floor/iron,
/area/ruin/syndicate_lava_base/main)
"TM" = (
/obj/effect/turf_decal/bot,
/obj/effect/decal/cleanable/dirt,
/obj/effect/turf_decal/tile/red/half/contrasted{
dir = 4
},
/obj/item/turbine_parts/rotor{
current_tier = 3
},
/obj/item/turbine_parts/stator{
current_tier = 2
},
/obj/item/turbine_parts/compressor{
current_tier = 3
},
/obj/item/pipe_dispenser,
/obj/structure/closet/crate/engineering,
/obj/item/stack/sheet/mineral/plastitanium{
amount = 30
},
/obj/item/stack/sheet/plastitaniumglass{
amount = 15
},
/obj/item/holosign_creator/atmos,
/obj/item/circuitboard/machine/thermomachine,
/obj/item/circuitboard/machine/thermomachine,
/turf/open/floor/iron,
/area/ruin/syndicate_lava_base/engineering)
"TN" = (
/obj/structure/table/wood,
/obj/machinery/light/small/directional/east,
Expand Down Expand Up @@ -4403,31 +4431,6 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/turf/open/floor/iron,
/area/ruin/syndicate_lava_base/engineering)
"YJ" = (
/obj/effect/turf_decal/bot,
/obj/effect/decal/cleanable/dirt,
/obj/effect/turf_decal/tile/red/half/contrasted{
dir = 4
},
/obj/item/turbine_parts/rotor{
current_tier = 3
},
/obj/item/turbine_parts/stator{
current_tier = 2
},
/obj/item/turbine_parts/compressor{
current_tier = 3
},
/obj/item/pipe_dispenser,
/obj/structure/closet/crate/engineering,
/obj/item/stack/sheet/mineral/plastitanium{
amount = 30
},
/obj/item/stack/sheet/plastitaniumglass{
amount = 15
},
/turf/open/floor/iron,
/area/ruin/syndicate_lava_base/engineering)
"YP" = (
/obj/machinery/atmospherics/components/unary/portables_connector/visible{
dir = 1
Expand Down Expand Up @@ -5662,7 +5665,7 @@ jy
ka
ue
kM
Lk
nI
lC
To
TN
Expand Down Expand Up @@ -6314,7 +6317,7 @@ Bu
kV
lp
Dr
Fq
GI
mF
Cj
Lp
Expand Down Expand Up @@ -6494,7 +6497,7 @@ ab
dy
dy
eE
gK
QG
dy
gd
dy
Expand Down Expand Up @@ -6611,7 +6614,7 @@ ju
ju
TO
JE
YJ
TM
ta
vB
LW
Expand Down
2 changes: 2 additions & 0 deletions _maps/RandomRuins/LavaRuins/lavaland_surface_syndicate_base1/mistake_inevitable.dmm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -211,7 +211,9 @@
/obj/item/storage/toolbox/syndicate,
/obj/item/pipe_dispenser,
/obj/item/rpd_upgrade/unwrench,
/obj/item/circuitboard/machine/emitter,
/obj/structure/rack,
/obj/item/circuitboard/machine/emitter,
/turf/open/floor/iron/dark,
/area/ruin/syndicate_lava_base/testlab)
"uT" = (
Expand Down
2 changes: 1 addition & 1 deletion _maps/RandomRuins/LavaRuins/skyrat/lavaland_surface_ash_walker1_skyrat.dmm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1041,7 +1041,7 @@
/turf/open/misc/asteroid/basalt/lava_land_surface,
/area/ruin/unpowered/ash_walkers)
"MR" = (
/obj/machinery/smartfridge/drying_rack,
/obj/machinery/smartfridge/drying/rack,
/obj/structure/stone_tile/slab,
/turf/open/misc/asteroid/basalt/lava_land_surface,
/area/ruin/unpowered/ash_walkers)
Expand Down
Loading

0 comments on commit d420119

Please sign in to comment.