Skip to content
This repository was archived by the owner on May 22, 2025. It is now read-only.

Commit facbee1

Browse files
jupyterkatjupyterkat
committed
Merge remote-tracking branch 'origin/master' into luciee
2 parents 5876f0b + cce2086 commit facbee1

151 files changed

Lines changed: 7048 additions & 6160 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.github/PULL_REQUEST_TEMPLATE.md‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,30 +1,30 @@
1-
# If this is your first PR, or not, take the time to read our CONTRIBUTING.md file! You can see it here: https://github.com/yogstation13/Yogstation/blob/master/.github/CONTRIBUTING.md
2-
You can remove all headers (Document the changes, Spriting and Wiki documentation) if there is no wiki documentation required but you must still explain what the pr is and why it needs to be added to the game. Directors+ Are immune from this rule in exceptional circumstances.
1+
<!-- If this is your first PR, or not, take the time to read our CONTRIBUTING.md file! You can see it here: https://github.com/yogstation13/Yogstation/blob/master/.github/CONTRIBUTING.md
2+
You can remove all headers (Document the changes, Spriting and Wiki documentation) if there is no wiki documentation required but you must still explain what the pr is and why it needs to be added to the game. Directors+ Are immune from this rule in exceptional circumstances. -->
33

44
# Document the changes in your pull request
55

6-
Remove this text and explain what the purpose of your PR is.
6+
<!-- Remove this text and explain what the purpose of your PR is.
77
88
Mention if you have tested your changes. If you changed a map, make sure you used the mapmerge tool.
99
If this is an Issue Correction, you can type "Fixes Issue #169420" to link the PR to the corresponding Issue number #169420.
1010
1111
Prefix the PR title with [admin] if it involves something admin related.
1212
Prefix the PR title with [s] if you are fixing an exploit, so that it is not announced on the Yogstation Discord and the server.
1313
14-
Remember: something that is self-evident to you might not be to others. Explain your rationale fully, even if you feel it goes without saying.
14+
Remember: something that is self-evident to you might not be to others. Explain your rationale fully, even if you feel it goes without saying.-->
1515

1616
# Spriting
17-
If you are adding new sprites to the game please add a picture of the sprite in its relative context, ie. Clothing on a mob.
17+
<!-- If you are adding new sprites to the game please add a picture of the sprite in its relative context, ie. Clothing on a mob. -->
1818

1919
# Wiki Documentation
2020

21-
Remove this text and write all information regarding your changes that should be known and documented through the Yogstation Wiki.
22-
Important documentation information includes, but is not limited to: any numerical values that have been changed, any images that have to be updated, names of specific pages that will be impacted by your changes.
21+
<!-- Remove this text and write all information regarding your changes that should be known and documented through the Yogstation Wiki.
22+
Important documentation information includes, but is not limited to: any numerical values that have been changed, any images that have to be updated, names of specific pages that will be impacted by your changes. -->
2323

2424
# Changelog
2525

26-
Edit the changelog below to reflect the changes made by this PR, even if the changes are minor - required for every PR.
27-
If you add a name after the ':cl', that name will be used in the changelog. Leave it empty to use your GitHub name.
26+
<!-- Edit the changelog below to reflect the changes made by this PR, even if the changes are minor - required for every PR.
27+
If you add a name after the ':cl', that name will be used in the changelog. Leave it empty to use your GitHub name. -->
2828

2929
:cl:
3030
rscadd: Added new things

‎README.md‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,6 @@ Yogstation currently comes equipped with the following maps.
118118
* [MetaStation](https://wiki.yogstation.net/wiki/MetaStation)
119119
* [OmegaStation](https://wiki.yogstation.net/wiki/OmegaStation)
120120

121-
122121
All maps have their own code file that is in the base of the _maps directory. Maps are loaded dynamically when the game starts. Follow this guideline when adding your own map, to your fork, for easy compatibility.
123122

124123
The map that will be loaded for the upcoming round is determined by reading data/next_map.json, which is a copy of the json files found in the _maps tree. If this file does not exist, the default map from config/maps.txt will be loaded. Failing that, BoxStation will be loaded. If you want to set a specific map to load next round you can use the Change Map verb in game before restarting the server or copy a json from _maps to data/next_map.json before starting the server. Also, for debugging purposes, ticking a corresponding map's code file in Dream Maker will force that map to load every round.

‎_maps/RandomRuins/LavaRuins/lavaland_surface_golem_ship.dmm‎

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -455,6 +455,13 @@
455455
/obj/machinery/door/airlock/survival_pod/glass,
456456
/turf/open/floor/pod,
457457
/area/ruin/powered/golem_ship)
458+
"HB" = (
459+
/obj/effect/decal/cleanable/dirt,
460+
/obj/machinery/computer/rdconsole/nolock/ruin{
461+
dir = 1
462+
},
463+
/turf/open/floor/pod,
464+
/area/ruin/powered/golem_ship)
458465
"HQ" = (
459466
/obj/machinery/computer/shuttle{
460467
dir = 4
@@ -1020,7 +1027,7 @@ YP
10201027
xc
10211028
Hp
10221029
xc
1023-
xc
1030+
HB
10241031
Hp
10251032
YP
10261033
MQ

‎_maps/RandomRuins/SpaceRuins/oldstation.dmm‎

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -4216,7 +4216,7 @@
42164216
/turf/open/floor/plasteel,
42174217
/area/ruin/space/has_grav/ancientstation/deltacorridor)
42184218
"pK" = (
4219-
/obj/machinery/computer/rdconsole/core{
4219+
/obj/machinery/computer/rdconsole/nolock/ruin{
42204220
dir = 4
42214221
},
42224222
/obj/effect/turf_decal/stripes/line{
@@ -4652,6 +4652,14 @@
46524652
/obj/effect/spawner/lootdrop/maintenance/eight,
46534653
/turf/template_noop,
46544654
/area/space/nearstation)
4655+
"qU" = (
4656+
/obj/effect/decal/cleanable/dirt,
4657+
/obj/effect/turf_decal/stripes/line{
4658+
dir = 5
4659+
},
4660+
/obj/machinery/rnd/production/circuit_imprinter,
4661+
/turf/open/floor/plasteel/white,
4662+
/area/ruin/space/has_grav/ancientstation/rnd)
46554663
"qV" = (
46564664
/obj/effect/decal/cleanable/dirt,
46574665
/obj/effect/turf_decal/stripes/corner,
@@ -4731,14 +4739,6 @@
47314739
/obj/item/book/manual/wiki/cooking_to_serve_man,
47324740
/turf/open/floor/plasteel/cafeteria,
47334741
/area/ruin/space/has_grav/ancientstation/kitchen)
4734-
"rs" = (
4735-
/obj/machinery/rnd/production/circuit_imprinter/department/science,
4736-
/obj/effect/decal/cleanable/dirt,
4737-
/obj/effect/turf_decal/stripes/line{
4738-
dir = 5
4739-
},
4740-
/turf/open/floor/plasteel/white,
4741-
/area/ruin/space/has_grav/ancientstation/rnd)
47424742
"rD" = (
47434743
/obj/effect/decal/cleanable/dirt,
47444744
/obj/machinery/door/airlock/command,
@@ -6587,14 +6587,6 @@
65876587
/obj/effect/spawner/structure/window/hollow/reinforced/end,
65886588
/turf/open/floor/plating,
65896589
/area/ruin/space/has_grav/ancientstation/deltacorridor)
6590-
"GS" = (
6591-
/obj/machinery/rnd/production/protolathe/department/science,
6592-
/obj/effect/decal/cleanable/dirt,
6593-
/obj/effect/turf_decal/stripes/line{
6594-
dir = 6
6595-
},
6596-
/turf/open/floor/plasteel/white,
6597-
/area/ruin/space/has_grav/ancientstation/rnd)
65986590
"GV" = (
65996591
/obj/effect/decal/cleanable/dirt,
66006592
/obj/structure/particle_accelerator/end_cap,
@@ -7106,6 +7098,14 @@
71067098
/obj/machinery/hydroponics/constructable,
71077099
/turf/open/floor/plasteel,
71087100
/area/ruin/space/has_grav/ancientstation/hydroponics)
7101+
"Lr" = (
7102+
/obj/effect/decal/cleanable/dirt,
7103+
/obj/effect/turf_decal/stripes/line{
7104+
dir = 6
7105+
},
7106+
/obj/machinery/rnd/production/protolathe,
7107+
/turf/open/floor/plasteel/white,
7108+
/area/ruin/space/has_grav/ancientstation/rnd)
71097109
"Lt" = (
71107110
/obj/structure/closet/crate/bin,
71117111
/obj/machinery/atmospherics/components/unary/vent_pump/on{
@@ -12038,8 +12038,8 @@ eY
1203812038
gD
1203912039
hC
1204012040
oF
12041-
rs
12042-
GS
12041+
qU
12042+
Lr
1204312043
eY
1204412044
Ac
1204512045
Ia

‎_maps/RandomRuins/StationRuins/MetaStation/meta_singulo_tesla.dmm‎

Lines changed: 38 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -273,20 +273,6 @@
273273
},
274274
/turf/open/floor/plasteel,
275275
/area/engine/engineering)
276-
"of" = (
277-
/obj/structure/cable{
278-
icon_state = "1-2"
279-
},
280-
/obj/machinery/button/door{
281-
dir = 4;
282-
id = "engsm";
283-
name = "Radiation Shutters Control";
284-
pixel_x = 24;
285-
pixel_y = 0;
286-
req_access_txt = "10"
287-
},
288-
/turf/open/floor/plasteel,
289-
/area/engine/engineering)
290276
"oj" = (
291277
/turf/open/floor/engine,
292278
/area/engine/engineering)
@@ -336,6 +322,16 @@
336322
},
337323
/turf/open/floor/engine,
338324
/area/engine/engineering)
325+
"sb" = (
326+
/obj/structure/cable{
327+
icon_state = "4-8"
328+
},
329+
/obj/structure/table,
330+
/obj/item/clothing/glasses/meson/engine,
331+
/obj/item/clothing/glasses/meson/engine,
332+
/obj/item/clothing/glasses/meson/engine,
333+
/turf/open/floor/plasteel,
334+
/area/engine/engineering)
339335
"sm" = (
340336
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
341337
dir = 8
@@ -464,6 +460,20 @@
464460
/obj/machinery/power/rad_collector,
465461
/turf/open/floor/plating/airless,
466462
/area/engine/engineering)
463+
"wr" = (
464+
/obj/structure/cable{
465+
icon_state = "1-2"
466+
},
467+
/obj/machinery/button/door{
468+
dir = 4;
469+
id = "engsm";
470+
name = "Radiation Shutters Control";
471+
pixel_x = 24;
472+
pixel_y = 0;
473+
req_access_txt = "10"
474+
},
475+
/turf/open/floor/plasteel,
476+
/area/engine/engineering)
467477
"xa" = (
468478
/obj/machinery/door/airlock/external{
469479
name = "Engineering External Access";
@@ -661,6 +671,17 @@
661671
},
662672
/turf/open/floor/engine,
663673
/area/engine/engineering)
674+
"Kb" = (
675+
/obj/structure/cable{
676+
icon_state = "4-8"
677+
},
678+
/obj/structure/table,
679+
/obj/item/clothing/gloves/color/yellow,
680+
/obj/item/clothing/gloves/color/yellow,
681+
/obj/item/clothing/gloves/color/yellow,
682+
/obj/item/clothing/gloves/color/yellow,
683+
/turf/open/floor/plasteel,
684+
/area/engine/engineering)
664685
"Ks" = (
665686
/obj/machinery/button/door{
666687
dir = 8;
@@ -1029,7 +1050,7 @@ aO
10291050
Lj
10301051
ul
10311052
Lj
1032-
of
1053+
wr
10331054
Lj
10341055
zG
10351056
Lj
@@ -1061,7 +1082,7 @@ vP
10611082
sZ
10621083
Gp
10631084
Xa
1064-
Uj
1085+
sb
10651086
pN
10661087
RA
10671088
SN
@@ -1087,7 +1108,7 @@ cR
10871108
vP
10881109
tW
10891110
Xa
1090-
Uj
1111+
Kb
10911112
pN
10921113
gD
10931114
SN

0 commit comments

Comments
 (0)