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.

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

[MDB IGNORE][IDB IGNORE] Slimy Maint #539

Merged
merged 846 commits into from
Apr 19, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
846 commits
Select commit Hold shift + click to select a range
0b02a88
defenestration: linters edition
ORCACommander Feb 19, 2024
90b1647
Merge pull request #528 from Sea-of-Lost-Souls/upstreammaint
ORCACommander Feb 19, 2024
cbeda31
Merge branch 'Sea-of-Lost-Souls:master' into FixLinters
ORCACommander Feb 19, 2024
25ea944
reset bird shot and north star
ORCACommander Feb 19, 2024
328edf4
Merge branch 'SkyRatMaster' into upstreammaint
RogueStationAI Feb 20, 2024
405a610
Merge pull request #530 from Sea-of-Lost-Souls/upstreammaint
ORCACommander Feb 20, 2024
5ffbef8
Merge branch 'Tannhauser-master' into FixLinters
ORCACommander Feb 20, 2024
a49251d
paper cut
ORCACommander Feb 20, 2024
6787627
Merge pull request #529 from ORCACommander/FixLinters
ORCACommander Feb 20, 2024
672cbb3
Fix Mining Office #531
Mortisduem Feb 24, 2024
9d5aeb1
Bit Runner fixxes
Mortisduem Feb 24, 2024
2458dcc
Sech Mech Bay Readded
Mortisduem Feb 24, 2024
e5339a2
Update PubbyStation.dmm
Mortisduem Feb 24, 2024
ef585df
Update PubbyStation.dmm
Mortisduem Feb 24, 2024
f2d3878
Atmos Rework, Disposals Mail routing helpers
Mortisduem Feb 24, 2024
c00f418
Fixxed Auto mapper for Manaforge
Mortisduem Feb 25, 2024
8afaeb3
Corrected Graphics Glitch
Mortisduem Feb 25, 2024
ad9a547
Merge pull request #534 from Sea-of-Lost-Souls/Centcom-Shuttle-Fixxes
ORCACommander Feb 25, 2024
5e671f5
Fixed 'hBn'
Mortisduem Feb 27, 2024
29ec0c0
Update PubbyStation.dmm
Mortisduem Feb 27, 2024
406b7ef
Update PubbyStation.dmm
Mortisduem Feb 27, 2024
024e806
Update PubbyStation.dmm
Mortisduem Feb 27, 2024
0428bce
Update PubbyStation.dmm
Mortisduem Feb 27, 2024
d966b4c
Update PubbyStation.dmm
Mortisduem Feb 27, 2024
8569bf3
Update PubbyStation.dmm
Mortisduem Feb 27, 2024
06838e3
Update PubbyStation.dmm
Mortisduem Feb 27, 2024
a852cfb
Carpet fix in Bit den
Mortisduem Mar 2, 2024
91a5db3
Update PubbyStation.dmm
Mortisduem Mar 2, 2024
ff749cc
Update PubbyStation.dmm
Mortisduem Mar 2, 2024
1b4b042
Update PubbyStation.dmm
Mortisduem Mar 2, 2024
e6ad6b8
Removed Duplicated pets
Mortisduem Mar 2, 2024
4b3c258
Update PubbyStation.dmm
Mortisduem Mar 2, 2024
08b836c
Update PubbyStation.dmm
Mortisduem Mar 2, 2024
92e4b92
Update PubbyStation.dmm
Mortisduem Mar 3, 2024
4e4ec52
Update PubbyStation.dmm
Mortisduem Mar 3, 2024
8800809
Merge pull request #533 from Sea-of-Lost-Souls/Pubby-Fixes
ORCACommander Mar 5, 2024
434422e
Merge branch 'SkyRatMaster' into upstreammaint
RogueStationAI Mar 5, 2024
6242ef8
type path update
RogueStationAI Mar 5, 2024
76586cc
Merge pull request #535 from Sea-of-Lost-Souls/upstreammaint
ORCACommander Mar 5, 2024
f4c55ba
Merge branch 'SkyRatMaster' into upstreammaint
RogueStationAI Mar 18, 2024
6719cbe
Automatic changelog for PR #27046 [ci skip]
SkyratBot Apr 4, 2024
e705312
Automatic changelog for PR #27093 [ci skip]
SkyratBot Apr 4, 2024
d34271d
Automatic changelog for PR #27094 [ci skip]
SkyratBot Apr 4, 2024
744da08
Automatic changelog for PR #27100 [ci skip]
SkyratBot Apr 4, 2024
96549a5
Automatic changelog for PR #27102 [ci skip]
SkyratBot Apr 4, 2024
72aa5d8
Automatic changelog for PR #27103 [ci skip]
SkyratBot Apr 4, 2024
5edac83
Automatic changelog for PR #27105 [ci skip]
SkyratBot Apr 4, 2024
efa2e37
Automatic changelog for PR #27106 [ci skip]
SkyratBot Apr 4, 2024
2be4e45
Automatic changelog for PR #27118 [ci skip]
SkyratBot Apr 4, 2024
62c6b24
Automatic changelog for PR #27119 [ci skip]
SkyratBot Apr 4, 2024
a82b8ac
Automatic changelog for PR #27120 [ci skip]
SkyratBot Apr 4, 2024
8502c49
[MIRROR] `heal_and_revive` restarts hearts (#27178)
SkyratBot Apr 4, 2024
1b7393c
Automatic changelog for PR #27122 [ci skip]
SkyratBot Apr 4, 2024
395bdda
Automatic changelog for PR #27123 [ci skip]
SkyratBot Apr 4, 2024
4d32a3c
Automatic changelog for PR #27126 [ci skip]
SkyratBot Apr 4, 2024
31dbfd9
Automatic changelog for PR #27137 [ci skip]
SkyratBot Apr 4, 2024
4921677
Automatic changelog for PR #27139 [ci skip]
SkyratBot Apr 4, 2024
05dc928
[MIRROR] Destructive Analyzer input fixes and response (#27166)
SkyratBot Apr 4, 2024
acaab4c
[MIRROR] Fix lings spending double the chemicals for reviving stasis …
SkyratBot Apr 4, 2024
d9a2326
[MIRROR] Prevents npcs from making progress bars (#27170)
SkyratBot Apr 4, 2024
99d1fa8
[MIRROR] Clowns can no longer kill themselves with holographic esword…
SkyratBot Apr 4, 2024
0abbc88
[MIRROR] Allows faxing of paintings (#27152)
SkyratBot Apr 4, 2024
90fcd39
[MIRROR] Creates a node compatibility mode (#27130)
SkyratBot Apr 4, 2024
efd2002
Automatic changelog for PR #27099 [ci skip]
SkyratBot Apr 4, 2024
7261614
Automatic changelog for PR #26560 [ci skip]
SkyratBot Apr 4, 2024
b596db3
Automatic changelog for PR #27158 [ci skip]
SkyratBot Apr 4, 2024
8b60412
Automatic changelog for PR #27161 [ci skip]
SkyratBot Apr 4, 2024
60bd9a2
Automatic changelog for PR #27140 [ci skip]
SkyratBot Apr 4, 2024
1398d1b
Automatic changelog for PR #27146 [ci skip]
SkyratBot Apr 4, 2024
2618b05
Automatic changelog for PR #27145 [ci skip]
SkyratBot Apr 4, 2024
e21b647
Automatic changelog for PR #27160 [ci skip]
SkyratBot Apr 4, 2024
9234e3b
Automatic changelog for PR #27142 [ci skip]
SkyratBot Apr 4, 2024
2790fce
Automatic changelog for PR #27149 [ci skip]
SkyratBot Apr 4, 2024
c7eb47f
Automatic changelog for PR #27150 [ci skip]
SkyratBot Apr 4, 2024
112cd4e
Automatic changelog for PR #27178 [ci skip]
SkyratBot Apr 4, 2024
4b26aed
Automatic changelog for PR #27166 [ci skip]
SkyratBot Apr 4, 2024
b51b56a
Automatic changelog for PR #27169 [ci skip]
SkyratBot Apr 4, 2024
8b98b1e
Automatic changelog for PR #27172 [ci skip]
SkyratBot Apr 4, 2024
f54ff3f
Automatic changelog for PR #27152 [ci skip]
SkyratBot Apr 4, 2024
4557f4a
Changes list of headshot hosts (#27039)
YakumoChen Apr 5, 2024
0ec1860
[MIRROR] Removes extra light switch from tram janitor (#27041)
SkyratBot Apr 5, 2024
3f14e2f
Limb grower can now print nitrogen lungs (#27055)
projectkepler-ru Apr 5, 2024
a3acbcf
[MIRROR] Makes lua file upload work with bigger files and standardize…
SkyratBot Apr 5, 2024
7ee977b
Automatic changelog for PR #27039 [ci skip]
SkyratBot Apr 5, 2024
557e97d
Automatic changelog for PR #27041 [ci skip]
SkyratBot Apr 5, 2024
c022bca
Automatic changelog for PR #27055 [ci skip]
SkyratBot Apr 5, 2024
d396420
Automatic changelog compile [ci skip]
actions-user Apr 5, 2024
170e1da
Automatic changelog for PR #27053 [ci skip]
SkyratBot Apr 5, 2024
fe21999
lmao (Fixes guns having the wrong suit slot) (#27185)
Majkl-J Apr 5, 2024
feed241
[MIRROR] Gauge, knob, slider components -> typescript (#27136)
SkyratBot Apr 5, 2024
40b2abe
[MIRROR] Adds new obj var for damage feedback, modular shields now te…
SkyratBot Apr 5, 2024
cae7fe7
Automatic changelog for PR #27185 [ci skip]
SkyratBot Apr 5, 2024
d2ace67
Automatic changelog for PR #27141 [ci skip]
SkyratBot Apr 5, 2024
24ace94
Automatic changelog compile [ci skip]
actions-user Apr 6, 2024
64ae76f
[MIRROR] Inducer fixes for Syndie and Borg (#27191)
SkyratBot Apr 8, 2024
86bf5d9
Automatic changelog for PR #27191 [ci skip]
SkyratBot Apr 8, 2024
ff36632
Automatic changelog compile [ci skip]
actions-user Apr 9, 2024
c462c46
[MIRROR] Simple animal xenos are now basic animal xenos (#27051)
SkyratBot Apr 11, 2024
53cc336
Automatic changelog for PR #27051 [ci skip]
SkyratBot Apr 11, 2024
a78cea8
[MIRROR] atmospherics documentation update (#27250)
SkyratBot Apr 11, 2024
3cf4fe9
[MIRROR] You can no longer aggressive grab medbots (#27253)
SkyratBot Apr 11, 2024
f1e5c6e
Automatic changelog for PR #27253 [ci skip]
SkyratBot Apr 11, 2024
be3684c
[MIRROR] New GaGs clothing: Part 1 - 'Dress'ing up! (#26905)
SkyratBot Apr 11, 2024
caeeb08
Automatic changelog for PR #26905 [ci skip]
SkyratBot Apr 11, 2024
ca9edf0
[MIRROR] [NO GBP]Fixes some mapped SMES starting with low energy. (#2…
SkyratBot Apr 11, 2024
8b1b475
Automatic changelog for PR #27091 [ci skip]
SkyratBot Apr 11, 2024
6980806
Automatic changelog compile [ci skip]
actions-user Apr 12, 2024
59d7462
Upstream power stuff combined and shit (#27284)
Useroth Apr 12, 2024
892c947
Adding cap's spare safes to kilo and blueshift (#27301)
Useroth Apr 14, 2024
fc669f6
Fixes issues with tableflipping. (#27079)
Majkl-J Apr 15, 2024
f10054a
Automatic changelog for PR #27079 [ci skip]
SkyratBot Apr 15, 2024
2ca82e0
[MIRROR] Resprites Pinpointers (#27110)
SkyratBot Apr 15, 2024
f603194
Automatic changelog for PR #27110 [ci skip]
SkyratBot Apr 15, 2024
b4ffde1
[MIRROR] Converts some TGUI to typescript (#27098)
SkyratBot Apr 15, 2024
d949c3f
Automatic changelog compile [ci skip]
actions-user Apr 16, 2024
2b94bd4
Smooth the alcohol impairment curve because a bottle of vodka should …
lessthnthree Apr 16, 2024
c2b875d
Automatic changelog for PR #27183 [ci skip]
SkyratBot Apr 16, 2024
876106f
[MIRROR] fixes the strip menu being able to change locked sensors (#2…
SkyratBot Apr 16, 2024
dfef414
Automatic changelog for PR #27327 [ci skip]
SkyratBot Apr 16, 2024
3f547aa
[MIRROR] Removes redundant update_parallax_contents calls (#27323)
SkyratBot Apr 16, 2024
de7e359
[MIRROR] Makes TGchat General settings better (#27322)
SkyratBot Apr 16, 2024
754aad3
[MIRROR] cyborgs know door, APC, and other wires (not cyborg wires) (…
SkyratBot Apr 16, 2024
069d3a1
[MIRROR] [nogbp] fixes minebots bombing each other (#27320)
SkyratBot Apr 16, 2024
0829942
[MIRROR] Fixes a critical spelling mistake (#27319)
SkyratBot Apr 16, 2024
308c40e
[MIRROR] Updates some outdated malf AI/bot ability icons (#27313)
SkyratBot Apr 16, 2024
f1be320
[MIRROR] Minor sprite fix for old belt sprites (#27310)
SkyratBot Apr 16, 2024
5e2f400
[MIRROR] Blood cult: cleans up blood rites code, fixes a bug or two, …
SkyratBot Apr 16, 2024
7493336
[MIRROR] Operating computers clears its display procedures upon patie…
SkyratBot Apr 16, 2024
18b64e6
[MIRROR] Fixes to zombie regen (and incidentally behavior of TRAIT_NO…
SkyratBot Apr 16, 2024
75c5040
[MIRROR] Fix a few vendor restocking bugs (#27330)
SkyratBot Apr 16, 2024
954c061
Automatic changelog for PR #27322 [ci skip]
SkyratBot Apr 16, 2024
a67ba63
Automatic changelog for PR #27311 [ci skip]
SkyratBot Apr 16, 2024
c6e5c63
Automatic changelog for PR #27320 [ci skip]
SkyratBot Apr 16, 2024
80a251a
Automatic changelog for PR #27319 [ci skip]
SkyratBot Apr 16, 2024
f9c027b
Automatic changelog for PR #27313 [ci skip]
SkyratBot Apr 16, 2024
1a7bf65
[MIRROR] [READY] MASSIVE CRAYON BUFF (GAME-CHANGING) (MUST MERGE) (#2…
SkyratBot Apr 16, 2024
facb7bb
Automatic changelog for PR #27310 [ci skip]
SkyratBot Apr 16, 2024
8f50fc7
[MIRROR] Adds the proc we're overriding to RegisterSignals's override…
SkyratBot Apr 16, 2024
5e4e6c0
Automatic changelog for PR #27298 [ci skip]
SkyratBot Apr 16, 2024
5fb9483
[MIRROR] Improves banned antag replacement logs (#27292)
SkyratBot Apr 16, 2024
a667b6f
Automatic changelog for PR #27304 [ci skip]
SkyratBot Apr 16, 2024
65e5b22
Automatic changelog for PR #27299 [ci skip]
SkyratBot Apr 16, 2024
40beaad
[MIRROR] Moves the GPS component from the upload computers and commun…
SkyratBot Apr 16, 2024
e39865b
[MIRROR] Fixes a typo in the cargo console. (#27288)
SkyratBot Apr 16, 2024
8be2fd4
[MIRROR] Rephrases advisory level descriptions (#27281)
SkyratBot Apr 16, 2024
0b29278
[MIRROR] Fix invalid List.Join() in chemsmoke logging (#27277)
SkyratBot Apr 16, 2024
96d9ba4
[MIRROR] Coffee machines carry over reagents from the beans (#27267)
SkyratBot Apr 16, 2024
dcbfa8e
[MIRROR] Atmos resin can cool the floor down directly. (#27266)
SkyratBot Apr 16, 2024
80dae0b
[MIRROR] Fixes a very minor punctuation error (#27263)
SkyratBot Apr 16, 2024
f7c0493
Automatic changelog for PR #27330 [ci skip]
SkyratBot Apr 16, 2024
1224f1d
[MIRROR] Removes goliath rider reacharound (#27264)
SkyratBot Apr 16, 2024
e617437
[MIRROR] Atmos Tech Clothing QOL and Advanced Extinguisher Tweak (#27…
SkyratBot Apr 16, 2024
cffc958
[MIRROR] Baisc Bot "Commission Emote" Tweak (#27265)
SkyratBot Apr 16, 2024
9ea1d7f
Automatic changelog for PR #27317 [ci skip]
SkyratBot Apr 16, 2024
34666a0
Automatic changelog for PR #27291 [ci skip]
SkyratBot Apr 16, 2024
7abcbf9
Automatic changelog for PR #27288 [ci skip]
SkyratBot Apr 16, 2024
ab51755
Automatic changelog for PR #27281 [ci skip]
SkyratBot Apr 16, 2024
eadfffe
Automatic changelog for PR #27267 [ci skip]
SkyratBot Apr 16, 2024
e91633d
Automatic changelog for PR #27266 [ci skip]
SkyratBot Apr 16, 2024
678978d
Automatic changelog for PR #27263 [ci skip]
SkyratBot Apr 16, 2024
d04e89c
Automatic changelog for PR #27264 [ci skip]
SkyratBot Apr 16, 2024
0dbab9a
Automatic changelog for PR #27261 [ci skip]
SkyratBot Apr 16, 2024
4fd41b9
Automatic changelog for PR #27265 [ci skip]
SkyratBot Apr 16, 2024
2b60c77
Yet another mirror batch (#27314)
Useroth Apr 16, 2024
0080eea
[MIRROR] Maint Mania dust runtime fix (#27216)
SkyratBot Apr 16, 2024
1141f90
Automatic changelog for PR #27216 [ci skip]
SkyratBot Apr 16, 2024
4f60b57
Tries to fix birdshot CI (#27333)
Majkl-J Apr 16, 2024
902c834
Automatic changelog for PR #27333 [ci skip]
SkyratBot Apr 16, 2024
c72d1dc
[MIRROR] Replaces a number of deciseconds into SECONDS (#27188)
SkyratBot Apr 16, 2024
01ce818
[MIRROR] Fix captive xeno roundend report runtime (#27211)
SkyratBot Apr 16, 2024
e7178a1
Automatic changelog for PR #27211 [ci skip]
SkyratBot Apr 16, 2024
4f50d64
[MIRROR] `/datum/element/skill_reward` attempting to drop "itself" fi…
SkyratBot Apr 16, 2024
540e465
Automatic changelog for PR #27214 [ci skip]
SkyratBot Apr 16, 2024
42f6f57
[MIRROR] Replaces even more deciseconds with SECONDS (#27205)
SkyratBot Apr 16, 2024
cb986e9
[MIRROR] Fix `/datum/dimension_theme/fancy` never applying (#27213)
SkyratBot Apr 16, 2024
9670a2c
Automatic changelog for PR #27213 [ci skip]
SkyratBot Apr 16, 2024
7cee7b6
Replaces deciseconds in `do_after` and `add_timer` in modular files w…
Majkl-J Apr 16, 2024
30fd28a
Automatic changelog for PR #27335 [ci skip]
SkyratBot Apr 16, 2024
ca2caae
[MIRROR] makes broken chameleon kit items immune to being EMP'd to un…
SkyratBot Apr 16, 2024
ad4492e
Automatic changelog for PR #27217 [ci skip]
SkyratBot Apr 16, 2024
e839c3a
[MIRROR] Adds more medipens to the medipen refiller (#27247)
SkyratBot Apr 16, 2024
da0f474
Automatic changelog for PR #27247 [ci skip]
SkyratBot Apr 16, 2024
e20b8d9
Automatic changelog compile [ci skip]
actions-user Apr 17, 2024
4617453
[MIRROR] Throws gangtools into a bottomless pit (#26992)
SkyratBot Apr 17, 2024
07b00fd
Automatic changelog for PR #26992 [ci skip]
SkyratBot Apr 17, 2024
7093a6b
Fixes synth APC charging (#27356)
lessthnthree Apr 17, 2024
213cabe
Automatic changelog for PR #27356 [ci skip]
SkyratBot Apr 17, 2024
a277231
Power system updates 1 (#27358)
lessthnthree Apr 17, 2024
98121a2
Automatic changelog for PR #27358 [ci skip]
SkyratBot Apr 17, 2024
26b15a0
Fixes multi-cell chargers (#27357)
lessthnthree Apr 17, 2024
ee1f44a
Additional Emotes and Added Audio (#27359)
scrcr0 Apr 17, 2024
754d52b
Automatic changelog for PR #27357 [ci skip]
SkyratBot Apr 17, 2024
02056f1
Automatic changelog for PR #27359 [ci skip]
SkyratBot Apr 17, 2024
57c189b
Automatic changelog compile [ci skip]
actions-user Apr 18, 2024
f37a93f
Teshari Specific Ports from Nova Sector (#27223)
Nidvex250 Apr 18, 2024
a55eba4
Automatic changelog for PR #27223 [ci skip]
SkyratBot Apr 18, 2024
adcc15f
[MIRROR] Fixes lobby menu offset pixel (#27341)
SkyratBot Apr 18, 2024
b24198b
[MIRROR] Face scarf ui toggle button works again (#27340)
SkyratBot Apr 18, 2024
f44daf1
[MIRROR] Medipens cant be deepfried anymore (#27336)
SkyratBot Apr 18, 2024
391e31d
Scraps newbie green pin (#27228)
SpaceLoveSs13 Apr 18, 2024
28a1ca3
[MIRROR] Mech mob deletion fix (#27243)
SkyratBot Apr 18, 2024
a009ad2
[MIRROR] Adds a single brain damage line (#27351)
SkyratBot Apr 18, 2024
63edbff
[MIRROR] Small optimization for Aura Healing (#27346)
SkyratBot Apr 18, 2024
7d634c7
[MIRROR] Autolathe computes custom material item print amounts correc…
SkyratBot Apr 18, 2024
f42efee
[MIRROR] Ody sleeper new UI (#27254)
SkyratBot Apr 18, 2024
bdeae03
[MIRROR] Makes radiaton and bomb good helmets have the FOV effect....…
SkyratBot Apr 18, 2024
6bd5354
Fixes the dual inducers, opting to keep the tg one (#27227)
Majkl-J Apr 18, 2024
ae0b756
[MIRROR] Fixes some grammar on vorpal scythe execute (#27237)
SkyratBot Apr 18, 2024
ab91adf
[MIRROR] [no gbp] you may no longer get nullspaced by deathmatch (#27…
SkyratBot Apr 18, 2024
f9947d8
[MIRROR] Adds Healthdoll to Basic Dexterous Mobs (#27232)
SkyratBot Apr 18, 2024
4e3ae84
[MIRROR] slaughter/laughter demon roundend report consume count + you…
SkyratBot Apr 18, 2024
726c4e7
Automatic changelog for PR #27341 [ci skip]
SkyratBot Apr 18, 2024
6e6c021
Cafe areas now actually have inheritance (#27202)
Majkl-J Apr 18, 2024
a8e6fdb
Automatic changelog for PR #27340 [ci skip]
SkyratBot Apr 18, 2024
553e8f5
[MIRROR] [NO GBP] Post-round blob zombies no longer offer themselves …
SkyratBot Apr 18, 2024
fc7514e
[MIRROR] Added on_surgical_insertion() and signals, to match on_surgi…
SkyratBot Apr 18, 2024
05a4d82
Automatic changelog for PR #27336 [ci skip]
SkyratBot Apr 18, 2024
bbddbca
Automatic changelog for PR #27243 [ci skip]
SkyratBot Apr 18, 2024
4ffc0e6
Automatic changelog for PR #27346 [ci skip]
SkyratBot Apr 18, 2024
f66efb2
[MIRROR] Reverts 82333 (#27289)
SkyratBot Apr 18, 2024
0a0aa64
[MIRROR] Fixes netpod href exploit (#27365)
SkyratBot Apr 18, 2024
3bfb450
Automatic changelog for PR #27256 [ci skip]
SkyratBot Apr 18, 2024
7f34967
Automatic changelog for PR #27254 [ci skip]
SkyratBot Apr 18, 2024
75b5e48
[MIRROR] Removes avatar earpiece [no gbp] (#27360)
SkyratBot Apr 18, 2024
d6a3d3e
Automatic changelog for PR #27259 [ci skip]
SkyratBot Apr 18, 2024
66adfd4
Automatic changelog for PR #27227 [ci skip]
SkyratBot Apr 18, 2024
544cfd1
Automatic changelog for PR #27237 [ci skip]
SkyratBot Apr 18, 2024
c491d97
Automatic changelog for PR #27238 [ci skip]
SkyratBot Apr 18, 2024
730cf69
Automatic changelog for PR #27232 [ci skip]
SkyratBot Apr 18, 2024
229d90e
Automatic changelog for PR #27226 [ci skip]
SkyratBot Apr 18, 2024
7a30670
Automatic changelog for PR #27202 [ci skip]
SkyratBot Apr 18, 2024
d64d302
Automatic changelog for PR #27241 [ci skip]
SkyratBot Apr 18, 2024
fa175db
Automatic changelog for PR #27365 [ci skip]
SkyratBot Apr 18, 2024
20c0599
Some more mirrors again (#27366)
Useroth Apr 18, 2024
909dbec
Automatic changelog for PR #27360 [ci skip]
SkyratBot Apr 18, 2024
7d0d702
[MIRROR] Fixes SS13.register_signal throwing unclear errors when call…
SkyratBot Apr 18, 2024
d62c929
Automatic changelog for PR #27293 [ci skip]
SkyratBot Apr 18, 2024
b2a97d8
some primitive changes (#26730)
jjpark-kb Apr 18, 2024
8b02b83
simple research (#26806)
jjpark-kb Apr 18, 2024
5b20e3d
Automatic changelog for PR #26730 [ci skip]
SkyratBot Apr 18, 2024
c73b4cf
Automatic changelog for PR #26806 [ci skip]
SkyratBot Apr 18, 2024
fbf8779
Automatic changelog compile [ci skip]
actions-user Apr 19, 2024
07a7159
Merge branch 'ProductionMaster' into upstreammaint
RogueStationAI Apr 19, 2024
f8bccd3
Merge branch 'SkyRatMaster' into upstreammaint
RogueStationAI Apr 19, 2024
3ca7166
slime update
RogueStationAI Apr 19, 2024
a5b6155
pubby update
RogueStationAI Apr 19, 2024
8823856
mobs update
RogueStationAI Apr 19, 2024
201de0f
update ci test
RogueStationAI Apr 19, 2024
ebcdc73
plushy needs no breath
RogueStationAI Apr 19, 2024
a28bd9b
missing items
RogueStationAI Apr 19, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
22 changes: 22 additions & 0 deletions .editorconfig
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
# http://editorconfig.org
root = true

[*]
indent_style = tab
end_of_line = lf
charset = utf-8
trim_trailing_whitespace = true
insert_final_newline = true

[*.yml]
indent_style = space
indent_size = 2

[*.py]
indent_style = space

[*.md]
trim_trailing_whitespace = false

[Dockerfile]
indent_style = space
70 changes: 35 additions & 35 deletions .github/CODEOWNERS
Original file line number Diff line number Diff line change
Expand Up @@ -4,42 +4,42 @@
# In the event that multiple org members are to be informed of changes
# to the same file or dir, add them to the end under Multiple Owners

# Jake Park
/modular_skyrat/modules/apocolypse_of_scythes/ @jjpark-kb
/modular_skyrat/modules/ash_chemical_centrifuge/ @jjpark-kb
/modular_skyrat/modules/ash_farming/ @jjpark-kb
/modular_skyrat/modules/ashwalker_change/ @jjpark-kb
/modular_skyrat/modules/ashwalker_shaman/ @jjpark-kb
/modular_skyrat/modules/borg_buffs/ @jjpark-kb
/modular_skyrat/modules/cargo_teleporter/ @jjpark-kb
/modular_skyrat/modules/conveyor_sorter/ @jjpark-kb
/modular_skyrat/modules/cortical_borer/ @jjpark-kb
/modular_skyrat/modules/connecting_computer/ @jjpark-kb
/modular_skyrat/modules/fishing/ @jjpark-kb
/modular_skyrat/modules/positronic_alert_console/ @jjpark-kb
/modular_skyrat/modules/primitive_production/ @jjpark-kb
/modular_skyrat/modules/reagent_forging/ @jjpark-kb
/modular_skyrat/modules/xenoarch/ @jjpark-kb

# Jolly-66
/modular_skyrat/modules/mapping @Jolly-66
/tools/UpdatePaths @Jolly-66

# LT3
/code/modules/transport/ @lessthnthree
/modular_skyrat/master_files/code/controllers/subsystem/ @lessthnthree
/modular_skyrat/modules/advanced_engineering/ @lessthnthree
/modular_skyrat/modules/airlock_override/ @lessthnthree
/modular_skyrat/modules/alerts/ @lessthnthree
/modular_skyrat/modules/cme/ @lessthnthree
/modular_skyrat/modules/events/ @lessthnthree
/modular_skyrat/modules/ices_events/ @lessthnthree

#Shivurr



# Mortisduem



# Multiple Owners

# Maptainers
/_maps/ @Jolly-66 @KathrinBailey

# Expensive files that touching basically always cause performance problems
## Init times
**/*_EXPENSIVE.dm @Useroth

# ORCACommander
/.github/ @ORCACommander

## Map Maintainence
/_maps/ @ORCACommander
/tools/UpdatePaths @ORCACommander

## Map Owner

/_maps/pubbystation.json @Kittayecat
_maps/map_files/PubbyStation/ @Kittayecat


## Hosting Responsibilities
/code/_compile_options.dm @ORCACommander
/config/ @ORCACommander
/SQL/ @ORCACommander
/code/__DEFINES/subsystems.dm @ORCACommander
/code/__DEFINES/MC.dm @ORCACommander
/code/controllers/admin.dm @ORCACommander
/code/controllers/master.dm @ORCACommander
/code/controllers/failsafe.dm @ORCACommander
/code/controllers/subsystem.dm @ORCACommander
/code/controllers/subsystem/timer.dm @ORCACommander
/code/controllers/configuration/entries @ORCACommander
/tools/tgs_scripts/ @ORCACommander
6 changes: 3 additions & 3 deletions .github/CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -24,18 +24,18 @@ If you have difficulty, ask for help in the #coding-general channel on our disco

## Introduction

Hello and welcome to /tg/station's contributing page. You are here because you are curious or interested in contributing - thank you! Everyone is free to contribute to this project as long as they follow the simple guidelines and specifications below; at /tg/station, we strive to maintain code stability and maintainability, and to do that, we need all pull requests to hold up to those specifications. It's in everyone's best interests - including yours! - if the same bug doesn't have to be fixed twice because of duplicated code.
Hello and welcome to Tannhauser-Gate's contributing page. You are here because you are curious or interested in contributing - thank you! Everyone is free to contribute to this project as long as they follow the simple guidelines and specifications below; at Sea of Lost Souls, we strive to maintain code stability and maintainability, and to do that, we need all pull requests to hold up to those specifications. It's in everyone's best interests - including yours! - if the same bug doesn't have to be fixed twice because of duplicated code.

First things first, we want to make it clear how you can contribute (if you've never contributed before), as well as the kinds of powers the team has over your additions, to avoid any unpleasant surprises if your pull request is closed for a reason you didn't foresee.

## Getting Started

/tg/station doesn't have a list of goals and features to add; we instead allow freedom for contributors to suggest and create their ideas for the game. That doesn't mean we aren't determined to squash bugs, which unfortunately pop up a lot due to the deep complexity of the game. Here are some useful starting guides, if you want to contribute or if you want to know what challenges you can tackle with zero knowledge about the game's code structure.
Sea of Lost Souls doesn't have a list of goals and features to add; we instead allow freedom for contributors to suggest and create their ideas for the game. That doesn't mean we aren't determined to squash bugs, which unfortunately pop up a lot due to the deep complexity of the game. Here are some useful starting guides, if you want to contribute or if you want to know what challenges you can tackle with zero knowledge about the game's code structure.

If you want to contribute the first thing you'll need to do is [set up Git](https://hackmd.io/@tgstation/HJ8OdjNBc) so you can download the source code.
After setting it up, optionally navigate your git commandline to the project folder and run the command: `git config blame.ignoreRevsFile .git-blame-ignore-revs`.

We have a [list of guides on the wiki](http://www.tgstation13.org/wiki/Guides#Development_and_Contribution_Guides) that will help you get started contributing to /tg/station with Git and Dream Maker. For beginners, it is recommended you work on small projects like bugfixes at first. If you need help learning to program in BYOND, check out this [repository of resources](http://www.byond.com/developer/articles/resources).
We have a [list of guides on the wiki](http://www.tgstation13.org/wiki/Guides#Development_and_Contribution_Guides) that will help you get started contributing to Tannhauser Gate with Git and Dream Maker. For beginners, it is recommended you work on small projects like bugfixes at first. If you need help learning to program in BYOND, check out this [repository of resources](http://www.byond.com/developer/articles/resources).

There is an open list of approachable issues for [your inspiration here](https://github.com/tgstation/tgstation/issues?q=is%3Aopen+is%3Aissue+label%3A%22Good+First+Issue%22).

Expand Down
2 changes: 1 addition & 1 deletion .github/ISSUE_TEMPLATE/bug_report.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ about: Create a report to help reproduce and fix the issue

<!--- **INCLUDE THE ROUND ID**
If you discovered this issue from playing tgstation hosted servers:
[Round ID]: # (It can be found in the Status panel or retrieved from https://sb.atlantaned.space/rounds ! The round id let's us look up valuable information and logs for the round the bug happened.)-->
[Round ID]: # (It can be found in the Status panel! The round id let's us look up valuable information and logs for the round the bug happened.)-->

<!-- If you are reporting an issue found in another branch or codebase, you MUST link the branch or codebase repo in your issue report or it will be closed. For branches, If you have not pushed your code up, you must either reproduce it on master or push your code up before making an issue report. For other codebases, if you do not have a public code repo you will be refused help unless you can completely reproduce the issue on our code. -->

Expand Down
13 changes: 1 addition & 12 deletions .github/guides/DOWNLOADING.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,17 +5,6 @@ Option 1:
Follow this: https://www.tgstation13.org/wiki/Setting_up_git

Option 2: Download the source code as a zip by clicking the ZIP button in the
code tab of https://github.com/tgstation/tgstation
code tab of https://github.com/Sea-of-Lost-Souls/Tannhauser-Gate
(note: this will use a lot of bandwidth if you wish to update and is a lot of
hassle if you want to make any changes at all, so it's not recommended.)

Option 3: Download a pre-compiled nightly at https://tgstation13.download/nightlies/ (same caveats as option 2)

*Warning: option 4 is out of date, and not maintained, use at your own risk*

Option 4: Use our docker image that tracks the master branch (See commits for build status. Again, same caveats as option 2)

```
docker run -d -p <your port>:1337 -v /path/to/your/config:/tgstation/config -v /path/to/your/data:/tgstation/data tgstation/tgstation <dream daemon options i.e. -public or -params>
```

5 changes: 3 additions & 2 deletions .github/guides/MAPS_AND_AWAY_MISSIONS.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
## MAPS

/tg/station currently has six station maps in rotation.
Tannhauser Gate is currently comes equipped with six maps.

* [Birdshot](https://tgstation13.org/wiki/Birdshot)
* [DeltaStation](https://tgstation13.org/wiki/DeltaStation)
* [IceBoxStation](https://tgstation13.org/wiki/IceboxStation)
Expand Down Expand Up @@ -49,7 +50,7 @@ For a much more comprehensive guide on UpdatePaths, please see the documentation

## AWAY MISSIONS

/tg/station supports loading away missions however they are disabled by default.
Tannhauser Gate supports loading away missions however they are disabled by default.

Map files for away missions are located in the `_maps/RandomZLevels` directory. Each away mission includes it's own code definitions located in `/code/modules/awaymissions/mission_code`. These files must be included and compiled with the server beforehand otherwise the server will crash upon trying to load away missions that lack their code.

Expand Down
2 changes: 1 addition & 1 deletion .github/guides/POLICYCONFIG.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ Welcome to this short guide to the POLICY config mechanism.
You are probably reading this guide because you have been informed your antagonist or ghost role needs to support policy configuration.

## Requirements
It is a requirement of /tg/station development that all ghost roles, antags, minor antags and event mobs of any kind must support the policy system when implemented.
It is a requirement of Tannhauser Gate development that all ghost roles, antags, minor antags and event mobs of any kind must support the policy system when implemented.

## What is policy configuration
Policy configuration is a json file that the administrators of a server can edit, which contains a dictionary of keywords -> string message.
Expand Down
2 changes: 1 addition & 1 deletion .github/guides/STYLE.md
Original file line number Diff line number Diff line change
Expand Up @@ -474,7 +474,7 @@ deal_damage(10) // Fine! The proc name makes it obvious `10` is the damage...at
deal_damage(10, FIRE) // Also fine! `FIRE` makes it obvious the second parameter is damage type.
deal_damage(damage = 10) // Redundant, but not prohibited.

use_power(30) // Fine! `30` is obviously something like watts.
use_energy(30 JOULES) // Use energy in joules.
turn_on(30) // Not fine!
turn_on(power_usage = 30) // Fine!

Expand Down
17 changes: 4 additions & 13 deletions .github/workflows/automerge.yml
Original file line number Diff line number Diff line change
@@ -1,15 +1,5 @@
name: automerge
on:
pull_request:
types:
- labeled
- unlabeled
- synchronize
- opened
- edited
- ready_for_review
- reopened
- unlocked
pull_request_review:
types:
- submitted
Expand All @@ -25,10 +15,11 @@ jobs:
name: automerge
uses: "pascalgn/[email protected]"
env:
GITHUB_TOKEN: "${{ secrets.GITHUB_TOKEN }}"
GITHUB_TOKEN: "${{ secrets.AUTOMERGE }}"
MERGE_LABELS: "automerge"
MERGE_REMOVE_LABELS: ""
MERGE_METHOD: "squash"
MERGE_COMMIT_MESSAGE: "pull-request-description"
MERGE_METHOD: "merge"
MERGE_COMMIT_MESSAGE: "pull-request-title"
MERGE_FORKS: "false"
MERGE_RETRIES: "12"
MERGE_RETRY_SLEEP: "180000"
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/compile_changelogs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -51,4 +51,4 @@ jobs:
if: steps.value_holder.outputs.ACTIONS_ENABLED
uses: ad-m/github-push-action@master
with:
github_token: ${{ secrets.SKYRATBOT_TOKEN }}
github_token: ${{ secrets.WORKFLOWS }}
2 changes: 1 addition & 1 deletion .github/workflows/gbp.yml
Original file line number Diff line number Diff line change
Expand Up @@ -39,4 +39,4 @@ jobs:
with:
branch: "gbp-balances"
directory: ./gbp-balances
token: ${{ secrets.GITHUB_TOKEN }}
token: ${{ secrets.WORKFLOWS }}
2 changes: 1 addition & 1 deletion .github/workflows/gbp_collect.yml
Original file line number Diff line number Diff line change
Expand Up @@ -41,4 +41,4 @@ jobs:
with:
collect: "true"
directory: ./gbp-balances
token: ${{ secrets.GITHUB_TOKEN }}
token: ${{ secrets.WORKFLOWS }}
4 changes: 2 additions & 2 deletions .github/workflows/generate_documentation.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,12 +26,12 @@ jobs:
run: |
~/dmdoc
touch dmdoc/.nojekyll
echo codedocs.tgstation13.org > dmdoc/CNAME
echo sea-of-lost-souls.github.io/Tannhauser-Gate/ > dmdoc/CNAME
- name: Deploy
uses: JamesIves/[email protected]
with:
BRANCH: gh-pages
CLEAN: true
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
GITHUB_TOKEN: ${{ secrets.WORKFLOWS }}
SINGLE_COMMIT: true
FOLDER: dmdoc
2 changes: 1 addition & 1 deletion .github/workflows/pr_emoji.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ jobs:
steps:
- uses: Wayland-Smithy/emoji-stripper-action@de0c1d158edee50700583d6454aa5f5117337599
with:
repo-token: ${{ secrets.GITHUB_TOKEN }}
repo-token: ${{ secrets.WORKFLOWS }}
title: true
body: true
body-after: ":cl:"
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/round_id_linker.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,4 +9,4 @@ jobs:
steps:
- uses: tgstation/round_linker@master
with:
repo-token: ${{ secrets.GITHUB_TOKEN }}
repo-token: ${{ secrets.WORKFLOWS }}
7 changes: 3 additions & 4 deletions .github/workflows/stale.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,11 +18,10 @@ jobs:
steps:
- uses: actions/stale@v4
with:
repo-token: ${{ secrets.GITHUB_TOKEN }}
repo-token: ${{ secrets.WORKFLOWS }}
stale-pr-message: "This PR has been inactive for long enough to be automatically marked as stale. This means it is at risk of being auto closed in ~ 7 days, please address any outstanding review items and ensure your PR is finished, if these are all true and you are auto-staled anyway, you need to actively ask maintainers if your PR will be merged. Once you have done any of the previous actions then you should request a maintainer remove the stale label on your PR, to reset the stale timer. If you feel no maintainer will respond in that time, you may wish to close this PR youself, while you seek maintainer comment, as you will then be able to reopen the PR yourself."
days-before-stale: 7
days-before-close: 7
stale-pr-label: 'Stale'
days-before-stale: 14
days-before-close: 21
days-before-issue-stale: -1
stale-issue-label: 'Cleanup Flagged'
remove-issue-stale-when-updated: false
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/update_tgs_dmapi.yml
Original file line number Diff line number Diff line change
Expand Up @@ -44,4 +44,4 @@ jobs:
pr_body: "This pull request updates the TGS DMAPI to the latest version. Please note any changes that may be breaking or unimplemented in your codebase by checking what changes are in the definitions file: code/__DEFINES/tgs.dm before merging."
pr_label: "Tools"
pr_allow_empty: false
github_token: ${{ secrets.COMFY_ORANGE_PAT }}
github_token: ${{ secrets.WORKFLOWS }}
2 changes: 1 addition & 1 deletion .tgs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
version: 1
# The BYOND version to use (kept in sync with dependencies.sh by the "TGS Test Suite" CI job)
# Must be interpreted as a string, keep quoted
byond: "515.1630"
byond: "515.1633"
# Folders to create in "<instance_path>/Configuration/GameStaticFiles/"
static_files:
# Config directory should be static
Expand Down
1 change: 1 addition & 0 deletions .vscode/extensions.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
{
"recommendations": [
"platymuus.dm-langclient",
"EditorConfig.EditorConfig",
"arcanis.vscode-zipfs",
"dbaeumer.vscode-eslint",
"stylemistake.auto-comment-blocks",
Expand Down
13 changes: 5 additions & 8 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,9 +1,6 @@
## Skyrat 13 (/tg/station Downstream)
## Tannhauser Gate by Sea of Lost Souls (Skyrat 13 Downstream)

[![CI Suite](https://github.com/Skyrat-SS13/Skyrat-tg/workflows/CI%20Suite/badge.svg)](https://github.com/Skyrat-SS13/Skyrat-tg/actions?query=workflow%3A%22CI+Suite%22)
[![Percentage of issues still open](https://isitmaintained.com/badge/open/Skyrat-SS13/Skyrat-tg.svg)](https://isitmaintained.com/project/Skyrat-SS13/Skyrat-tg "Percentage of issues still open")
[![Average time to resolve an issue](https://isitmaintained.com/badge/resolution/Skyrat-SS13/Skyrat-tg.svg)](https://isitmaintained.com/project/Skyrat-SS13/Skyrat-tg "Average time to resolve an issue")
![Coverage](https://img.shields.io/codecov/c/github/Skyrat-SS13/Skyrat-tg)
[![CI Suite](https://github.com/Sea-of-Lost-Souls/Tannhauser-Gate/actions/workflows/ci_suite.yml/badge.svg)](https://github.com/Sea-of-Lost-Souls/Tannhauser-Gate/actions/workflows/ci_suite.yml)

[![resentment](.github/images/badges/built-with-resentment.svg)](.github/images/comics/131-bug-free.png) [![technical debt](.github/images/badges/contains-technical-debt.svg)](.github/images/comics/106-tech-debt-modified.png) [![forinfinityandbyond](.github/images/badges/made-in-byond.gif)](https://www.reddit.com/r/SS13/comments/5oplxp/what_is_the_main_problem_with_byond_as_an_engine/dclbu1a)

Expand All @@ -12,13 +9,13 @@
| Git / GitHub cheatsheet | [https://www.notion.so/Git-GitHub-61bc81766b2e4c7d9a346db3078ce833](https://www.notion.so/Git-GitHub-61bc81766b2e4c7d9a346db3078ce833) |
| Guide to Modularization | [./modular_skyrat/readme.md](./modular_skyrat/readme.md) |
| Website | [https://www.tgstation13.org](https://www.tgstation13.org) |
| Code | [https://github.com/Skyrat-SS13/Skyrat-tg](https://github.com/Skyrat-SS13/Skyrat-tg) |
| Code | [https://github.com/Sea-of-Lost-Souls/Tannhauser-Gate](https://github.com/Sea-of-Lost-Souls/Tannhauser-Gate) |
| Wiki | [https://wiki.skyrat13.space/index.php/Main_Page](https://wiki.skyrat13.space/index.php/Main_Page) |
| Codedocs | [https://skyrat-ss13.github.io/Skyrat-tg/](https://skyrat-ss13.github.io/Skyrat-tg/) |
| Codedocs | [https://sea-of-lost-souls.github.io/Tannhauser-Gate/](https://sea-of-lost-souls.github.io/Tannhauser-Gate/) |
| Skyrat 13 Discord | [https://discord.com/invite/hGpZ4Z3](https://discord.com/invite/hGpZ4Z3) |
| Coderbus Discord | [https://discord.gg/Vh8TJp9](https://discord.gg/Vh8TJp9) |

This is Skyrat's downstream fork of /tg/station created in byond.
This is Sea of Lost Souls' downstream fork of Skyrat 13 created in byond.

**Please note that this repository contains sexually explicit content and is not suitable for those under the age of 18.**

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2601,9 +2601,7 @@
pixel_x = 15;
pixel_y = 14
},
/mob/living/basic/frog{
name = "Peter Jr."
},
/mob/living/basic/frog/icemoon_facility,
/turf/open/floor/plating/icemoon,
/area/ruin/plasma_facility/operations)
"TK" = (
Expand Down
6 changes: 3 additions & 3 deletions _maps/RandomRuins/IceRuins/icemoon_underground_library.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -145,7 +145,7 @@
},
/area/ruin/unpowered/buried_library)
"aO" = (
/mob/living/basic/pet/fox,
/mob/living/basic/pet/fox/icemoon,
/turf/open/floor/wood{
initial_gas_mix = "ICEMOON_ATMOS"
},
Expand Down Expand Up @@ -327,7 +327,7 @@
/area/ruin/unpowered/buried_library)
"cA" = (
/obj/effect/decal/cleanable/dirt,
/mob/living/basic/pet/fox,
/mob/living/basic/pet/fox/icemoon,
/turf/open/floor/wood{
initial_gas_mix = "ICEMOON_ATMOS"
},
Expand Down Expand Up @@ -394,7 +394,7 @@
/obj/structure/fluff/paper{
dir = 1
},
/mob/living/basic/pet/fox,
/mob/living/basic/pet/fox/icemoon,
/turf/open/floor/wood{
initial_gas_mix = "ICEMOON_ATMOS"
},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -208,9 +208,7 @@
"nq" = (
/obj/effect/decal/cleanable/cobweb,
/obj/machinery/light/small/directional/north,
/mob/living/basic/pet/dog/bullterrier{
name = "Saint Nick's Helpful Associate"
},
/mob/living/basic/pet/dog/bullterrier/lavaland_party,
/turf/open/floor/carpet/blue/lavaland,
/area/ruin/unpowered)
"nI" = (
Expand Down
Loading
Loading