Skip to content
This repository was archived by the owner on May 22, 2025. It is now read-only.
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
267 commits
Select commit Hold shift + click to select a range
68790d2
iaa dust implant (#14402)
ynot01 Jun 14, 2022
29a2fca
Automatic changelog generation #14402 [ci skip]
Yogbot-13 Jun 14, 2022
981e0e9
yes plz (#14403)
ToasterBiome Jun 14, 2022
ce24ae6
Update crawl.dm (#14408)
ToasterBiome Jun 14, 2022
6aa67aa
Automatic changelog generation #14408 [ci skip]
Yogbot-13 Jun 14, 2022
22cdb9c
who could have guessed that you shouldn't check for empty AFTER IT'S …
Chubbygummibear Jun 14, 2022
a986a1e
Automatic changelog generation #14409 [ci skip]
Yogbot-13 Jun 14, 2022
1993143
glowshroom cancer (#14410)
Bibby0110 Jun 14, 2022
3758390
Automatic changelog generation #14410 [ci skip]
Yogbot-13 Jun 14, 2022
97b8201
Update spellbook.dm (#14394)
JamieD1 Jun 14, 2022
51f0b29
Automatic changelog generation #14394 [ci skip]
Yogbot-13 Jun 14, 2022
fb3605d
"This area feels nice" (#14401)
ChesterTheCheesy Jun 14, 2022
12d3fb8
Automatic changelog generation #14401 [ci skip]
Yogbot-13 Jun 14, 2022
cc1bc8f
Adds a user warning when someone tries to fry a brain with a deepfrye…
AlvCyktor Jun 14, 2022
00dfc2d
Automatic changelog generation #14416 [ci skip]
Yogbot-13 Jun 14, 2022
467937b
Automatic changelog compile [ci skip]
actions-user Jun 14, 2022
6bd31ff
Automatic changelog compile [ci skip]
actions-user Jun 15, 2022
42d2e5a
does sa thing that makes probably the miner gpses spawn with numbersa…
SomeguyManperson Jun 15, 2022
d367b9d
Automatic changelog generation #14435 [ci skip]
Yogbot-13 Jun 15, 2022
cadde0a
Automatic changelog compile [ci skip]
actions-user Jun 15, 2022
e7540ef
Adds a new 3x3 vendor-accident themed maint ruin & patches station.dm…
VaelophisNyx Jun 15, 2022
969b075
Automatic changelog generation #14406 [ci skip]
Yogbot-13 Jun 15, 2022
df26a2c
window fix (#14445)
ToasterBiome Jun 15, 2022
ce4f0ad
Automatic changelog generation #14445 [ci skip]
Yogbot-13 Jun 15, 2022
4baeb6e
Automatic changelog compile [ci skip]
actions-user Jun 16, 2022
f944c94
Adds root beer to the game (I FUCKING LOVE MUG!!!!!!!!) (#14439)
AlvCyktor Jun 16, 2022
d84db6d
Automatic changelog generation #14439 [ci skip]
Yogbot-13 Jun 16, 2022
5b55011
no more leftover assets (#14430)
nmajask Jun 16, 2022
3407836
Automatic changelog generation #14430 [ci skip]
Yogbot-13 Jun 16, 2022
72d0d37
Stops Admin Lagging the Game (#14426)
JamieD1 Jun 16, 2022
73884a4
Automatic changelog generation #14426 [ci skip]
Yogbot-13 Jun 16, 2022
0507ab3
Automatic changelog compile [ci skip]
actions-user Jun 17, 2022
625fabf
Automatic changelog compile [ci skip]
actions-user Jun 18, 2022
3ef2ed4
fixes bad capitalizeations (#14489)
ynot01 Jun 18, 2022
077f8b2
Automatic changelog generation #14489 [ci skip]
Yogbot-13 Jun 18, 2022
c7ddce7
rubber shot better? (#14438)
Skrem7 Jun 18, 2022
3217990
Automatic changelog generation #14438 [ci skip]
Yogbot-13 Jun 18, 2022
c264ea0
Ports "Give mood buff for defibbing someone" (#14423)
Jun 18, 2022
342f359
Automatic changelog generation #14423 [ci skip]
Yogbot-13 Jun 18, 2022
c954168
z (#14478)
tattax Jun 18, 2022
66ceded
Automatic changelog generation #14478 [ci skip]
Yogbot-13 Jun 18, 2022
e8be993
Automatic changelog compile [ci skip]
actions-user Jun 18, 2022
8c98b51
Updates tech web layout for AI techs (#14482)
Bibby0110 Jun 19, 2022
f45a145
Automatic changelog generation #14482 [ci skip]
Yogbot-13 Jun 19, 2022
376d6fc
Update ai.dm (#14483)
Bibby0110 Jun 19, 2022
751de9e
Automatic changelog generation #14483 [ci skip]
Yogbot-13 Jun 19, 2022
869de72
Automatic changelog compile [ci skip]
actions-user Jun 19, 2022
28a32a6
Bluespace Locker Nerf Proposal [2 of 2] (#14288)
ynot01 Jun 19, 2022
8cd89ca
Automatic changelog generation #14288 [ci skip]
Yogbot-13 Jun 19, 2022
747e8a1
Ports TG's stomach pumping surgery. A way to remove the 400u misc nar…
Chubbygummibear Jun 19, 2022
48fe0ff
Automatic changelog generation #14348 [ci skip]
Yogbot-13 Jun 19, 2022
964e77f
Basalt Katana fauna damage buff and new mechanic: A Dodge roll (#14405)
Chubbygummibear Jun 19, 2022
6224211
Automatic changelog generation #14405 [ci skip]
Yogbot-13 Jun 19, 2022
4d55cd8
Foolproofs vending machine being spawned tipped by mappers (#14415)
Hopekz Jun 19, 2022
a297304
makes some of the recent megafauna drops less shit (#14455)
LazennG Jun 19, 2022
c779026
Automatic changelog generation #14455 [ci skip]
Yogbot-13 Jun 19, 2022
e4fb25b
Fixes pacifism touch cooldown (#14417)
Jun 19, 2022
779da01
Automatic changelog generation #14417 [ci skip]
Yogbot-13 Jun 19, 2022
641086a
you can now shoot over people who are near you if they are resting (#…
SomeguyManperson Jun 19, 2022
4d30a32
Automatic changelog generation #14461 [ci skip]
Yogbot-13 Jun 19, 2022
cf7b7e0
Adds New 10x10 Maintenance Fishing Ruin (#14465)
VaelophisNyx Jun 19, 2022
95acc33
Automatic changelog generation #14465 [ci skip]
Yogbot-13 Jun 19, 2022
f2e9317
gangrel transform fix (#14412)
jachlompsky Jun 19, 2022
6692d7e
Automatic changelog generation #14412 [ci skip]
Yogbot-13 Jun 19, 2022
16b23cf
Slight arrow tweaks (#14431)
Skrem7 Jun 19, 2022
d6c42d9
Automatic changelog generation #14431 [ci skip]
Yogbot-13 Jun 19, 2022
6bf6a44
Secbelt + shotgun shell boxes rework, shoulder holster and bandolier …
Skrem7 Jun 19, 2022
8577f7d
Automatic changelog generation #14433 [ci skip]
Yogbot-13 Jun 19, 2022
15d91f3
Adds stored research and makes toxins bombs apply it instead of direc…
SomeguyManperson Jun 19, 2022
28559d4
Automatic changelog generation #14442 [ci skip]
Yogbot-13 Jun 19, 2022
07ef032
Makes fishing loot make sense + fishing icon fix + collapsible rod (#…
ToasterBiome Jun 19, 2022
1c25fae
Automatic changelog generation #14448 [ci skip]
Yogbot-13 Jun 19, 2022
465bf7b
WT Tweak/Buff (#14440)
Skrem7 Jun 19, 2022
738dbf3
Automatic changelog generation #14440 [ci skip]
Yogbot-13 Jun 19, 2022
77e2de8
admin v admin tickets (#14459)
ynot01 Jun 19, 2022
7cc4c78
Preternis.... buff?? Preternis eyes no longer delete themselves in no…
Chubbygummibear Jun 19, 2022
72d9cfa
Automatic changelog generation #14462 [ci skip]
Yogbot-13 Jun 19, 2022
7871afd
Ports "Podpeople inherit their blood chemical from the most abundant …
Jun 19, 2022
1f913f9
Automatic changelog generation #14425 [ci skip]
Yogbot-13 Jun 19, 2022
e62f2c3
pain (#14458)
nmajask Jun 19, 2022
c4d8880
Automatic changelog generation #14458 [ci skip]
Yogbot-13 Jun 19, 2022
9813e53
remove one space (#14472)
00ze-cyclone Jun 19, 2022
2642d72
Automatic changelog generation #14472 [ci skip]
Yogbot-13 Jun 19, 2022
e36016b
Ports holosigns from bay (#14479)
nmajask Jun 19, 2022
61115ab
Automatic changelog generation #14479 [ci skip]
Yogbot-13 Jun 19, 2022
ad7fcc2
frenzy now provides reduced damage slowdown since it also provides a …
SomeguyManperson Jun 19, 2022
e60488e
Automatic changelog generation #14480 [ci skip]
Yogbot-13 Jun 19, 2022
66928bc
Update ai_data_core.dm (#14504)
Bibby0110 Jun 19, 2022
fba9240
Automatic changelog generation #14504 [ci skip]
Yogbot-13 Jun 19, 2022
da46f5e
Adds new Chemical Analyzer implant (Science Goggle implant) (#14488)
VaelophisNyx Jun 19, 2022
4381891
Automatic changelog generation #14488 [ci skip]
Yogbot-13 Jun 19, 2022
e5adcaa
Automatic changelog compile [ci skip]
actions-user Jun 19, 2022
ebc35ec
Automatic changelog compile [ci skip]
actions-user Jun 20, 2022
4e3808d
Kilo roboticists get anesthesia (#14515)
GraveHat Jun 20, 2022
dc693a2
Automatic changelog generation #14515 [ci skip]
Yogbot-13 Jun 20, 2022
8a25074
Fixes improper secbelt/bandolier item storage (#14522)
Skrem7 Jun 20, 2022
8b469c7
Automatic changelog generation #14522 [ci skip]
Yogbot-13 Jun 20, 2022
2d2d10a
Update dependencies.sh
JamieD1 Jun 21, 2022
d4813e9
Update dependencies.sh
JamieD1 Jun 21, 2022
cf5adf1
Automatic changelog compile [ci skip]
actions-user Jun 21, 2022
81b1008
Batons are now Upgradeable - 1 Hit Stun - Minshield Firing Pin (#14306)
JamieD1 Jun 21, 2022
9d9b9d0
Automatic changelog generation #14306 [ci skip]
Yogbot-13 Jun 21, 2022
daa8963
Balances Stimulants (#14463)
JamieD1 Jun 21, 2022
383ba0d
Automatic changelog generation #14463 [ci skip]
Yogbot-13 Jun 21, 2022
acdf237
Fixes Baton Upgrade
JamieD1 Jun 21, 2022
260b3f8
nerf DU slugs, but make them cheaper (#14473)
VaelophisNyx Jun 21, 2022
3a4468b
Automatic changelog generation #14473 [ci skip]
Yogbot-13 Jun 21, 2022
144fe9b
buffs the bulldog shotgun because it kind of stinks (#14475)
TheRyeGuyWhoWillNowDie Jun 21, 2022
29e40d4
Automatic changelog generation #14475 [ci skip]
Yogbot-13 Jun 21, 2022
973d0ea
makes space bats holdable (#14484)
tattax Jun 21, 2022
b858ac8
Automatic changelog generation #14484 [ci skip]
Yogbot-13 Jun 21, 2022
5c5b1f2
Chemical Dispensers now have a reason to upgrade manipulators (#14495)
ynot01 Jun 21, 2022
867105a
Automatic changelog generation #14495 [ci skip]
Yogbot-13 Jun 21, 2022
fefc634
Adds Brain Damage Quirk (#14497)
Jun 21, 2022
f669565
Automatic changelog generation #14497 [ci skip]
Yogbot-13 Jun 21, 2022
f0b4c9c
Update overmind.dm (#14501)
Jun 21, 2022
77faf73
Automatic changelog generation #14501 [ci skip]
Yogbot-13 Jun 21, 2022
dd86d3f
fixes health doll being on top of stop pulling button for simplemob (…
stwordcitizen Jun 21, 2022
5e457fe
Automatic changelog generation #14502 [ci skip]
Yogbot-13 Jun 21, 2022
90a59e5
Adds FTL Theme to Lobby Music (#14505)
JamieD1 Jun 21, 2022
85b8808
Automatic changelog generation #14505 [ci skip]
Yogbot-13 Jun 21, 2022
2171639
Fixes (#14507)
nmajask Jun 21, 2022
3228fd9
Automatic changelog generation #14507 [ci skip]
Yogbot-13 Jun 21, 2022
3cf3a13
Rotate (#14510)
Jun 21, 2022
aff0b05
Automatic changelog generation #14510 [ci skip]
Yogbot-13 Jun 21, 2022
2507bf2
Adds the horror's host to check antags (#14511)
adamsong Jun 21, 2022
03ca8e1
Automatic changelog generation #14511 [ci skip]
Yogbot-13 Jun 21, 2022
b4f98c8
Update blazing_oil.dm (#14513)
Marmio64 Jun 21, 2022
8104fc9
Automatic changelog generation #14513 [ci skip]
Yogbot-13 Jun 21, 2022
6a2f14f
sabo borgs have emags now what (#14517)
TheRyeGuyWhoWillNowDie Jun 21, 2022
f7cc287
Automatic changelog generation #14517 [ci skip]
Yogbot-13 Jun 21, 2022
bd6dfb6
Adds FTL Advanced Edition Soundtrack: Lanius (Battle) (ABANDONED SECT…
JamieD1 Jun 21, 2022
d73d774
Automatic changelog generation #14506 [ci skip]
Yogbot-13 Jun 21, 2022
4e00e8b
Update items.dm (#14519)
alexkar598 Jun 21, 2022
c9bb750
Automatic changelog generation #14519 [ci skip]
Yogbot-13 Jun 21, 2022
40de7ce
Update ghost_role_spawners.dm (#14520)
SomeguyManperson Jun 21, 2022
e264b31
Automatic changelog generation #14520 [ci skip]
Yogbot-13 Jun 21, 2022
68b506b
z (#14494)
tattax Jun 21, 2022
fc0a70b
Automatic changelog generation #14494 [ci skip]
Yogbot-13 Jun 21, 2022
1a8fd07
Saboteur/Medical Syndicate Borg Tweaks (#14521)
Skrem7 Jun 21, 2022
91c921a
Automatic changelog generation #14521 [ci skip]
Yogbot-13 Jun 21, 2022
a9d0049
Revert "sabo borgs have emags now what (#14517)" (#14546)
JamieD1 Jun 21, 2022
e27b75d
Makes WT mags not be invisible anymore (#14529)
MajManatee Jun 21, 2022
d1c1b81
Automatic changelog generation #14529 [ci skip]
Yogbot-13 Jun 21, 2022
a9b481c
Automatic changelog compile [ci skip]
actions-user Jun 21, 2022
6d0f39b
capitialism is no longer 1m+ long (#14532)
ynot01 Jun 21, 2022
6253ea2
Automatic changelog generation #14532 [ci skip]
Yogbot-13 Jun 21, 2022
b4c812a
Automatic changelog compile [ci skip]
actions-user Jun 22, 2022
acac902
theos (#14564)
TheRyeGuyWhoWillNowDie Jun 23, 2022
c05ff00
Automatic changelog generation #14564 [ci skip]
Yogbot-13 Jun 23, 2022
6bca030
Automatic changelog compile [ci skip]
actions-user Jun 23, 2022
0c4c5c0
adds grounding rods to delta (#14557)
MajManatee Jun 24, 2022
04f3d8a
Automatic changelog generation #14557 [ci skip]
Yogbot-13 Jun 24, 2022
b61cdac
Automatic changelog compile [ci skip]
actions-user Jun 24, 2022
ffcbe80
fixes bloody knuckles not splashing when used by undead races and als…
LazennG Jun 24, 2022
29ed2f1
Automatic changelog generation #14575 [ci skip]
Yogbot-13 Jun 24, 2022
28cbbad
Automatic changelog compile [ci skip]
actions-user Jun 24, 2022
5a0adc8
Automatic changelog compile [ci skip]
actions-user Jun 25, 2022
c0e940d
Fixes box engineering wires and signage and light (#14567)
ToasterBiome Jun 25, 2022
3dedeb6
Automatic changelog generation #14567 [ci skip]
Yogbot-13 Jun 25, 2022
adb06bf
Automatic changelog compile [ci skip]
actions-user Jun 25, 2022
e9f3810
Automatic changelog compile [ci skip]
actions-user Jun 26, 2022
51ac065
print via RSF and also fixes designs (#14597)
AlvCyktor Jun 26, 2022
166e959
Automatic changelog generation #14597 [ci skip]
Yogbot-13 Jun 26, 2022
13b5ede
fixes new ticket being created every time admin pm (#14596)
ynot01 Jun 26, 2022
6d90d34
SHARPENS YE PIRATE BLADE (#14538)
Skrem7 Jun 26, 2022
55f3102
Automatic changelog generation #14538 [ci skip]
Yogbot-13 Jun 26, 2022
75cdd30
Ability to set beer code separate of real nuke (#14527)
Jun 26, 2022
be0f429
Automatic changelog generation #14527 [ci skip]
Yogbot-13 Jun 26, 2022
fc00bf5
Disabling Regal Rat till its fixed (#14437)
JamieD1 Jun 26, 2022
4d79374
Automatic changelog generation #14437 [ci skip]
Yogbot-13 Jun 26, 2022
73e7609
Nukies Minigun is now more... Minigun-like (#14446)
MajManatee Jun 26, 2022
d0b8fc4
Automatic changelog generation #14446 [ci skip]
Yogbot-13 Jun 26, 2022
0700aa5
Adds winter coats for department heads (#14468)
SapphicOverload Jun 26, 2022
306968b
Automatic changelog generation #14468 [ci skip]
Yogbot-13 Jun 26, 2022
9d9d1b7
Ports "bigger mobs have some special health bars" from TG (#14492)
Jun 26, 2022
e838938
Automatic changelog generation #14492 [ci skip]
Yogbot-13 Jun 26, 2022
146c9fc
Ports "Blobbernaut HUD improvements" (#14499)
Jun 26, 2022
8ebde39
Automatic changelog generation #14499 [ci skip]
Yogbot-13 Jun 26, 2022
90f81b0
Ports "Swarmer HUD improvements" (#14500)
Jun 26, 2022
0455c74
Automatic changelog generation #14500 [ci skip]
Yogbot-13 Jun 26, 2022
570cb6b
should stop resonator blasts from stacking during replication (#14526)
SomeguyManperson Jun 26, 2022
b999f18
Automatic changelog generation #14526 [ci skip]
Yogbot-13 Jun 26, 2022
86a452e
Update pen.dm (#14535)
Bibby0110 Jun 26, 2022
884f65d
money (#14539)
Skrem7 Jun 26, 2022
45da9f8
Automatic changelog generation #14539 [ci skip]
Yogbot-13 Jun 26, 2022
e872d4b
Stunn't (#14540)
Mqiib Jun 26, 2022
ef7db2b
Automatic changelog generation #14540 [ci skip]
Yogbot-13 Jun 26, 2022
683b066
guh?? (#14543)
Skrem7 Jun 26, 2022
b31695c
Automatic changelog generation #14543 [ci skip]
Yogbot-13 Jun 26, 2022
70e6f36
Rune Scimmy rework: Now with 100% more grinding and bonus loot (#14547)
Chubbygummibear Jun 26, 2022
d4eff24
Automatic changelog generation #14547 [ci skip]
Yogbot-13 Jun 26, 2022
ec0634b
Temperaraly reverts cryopod changes till I can find out whats wrong (…
nmajask Jun 26, 2022
bb8f80d
Automatic changelog generation #14548 [ci skip]
Yogbot-13 Jun 26, 2022
41b7666
Explody nanite changes (this wasn't my idea don't yell at me) (#14550)
Mqiib Jun 26, 2022
556992e
Automatic changelog generation #14550 [ci skip]
Yogbot-13 Jun 26, 2022
aecba2b
Adds stun immune and moves it lower (#14553)
Mqiib Jun 26, 2022
9e09231
Automatic changelog generation #14553 [ci skip]
Yogbot-13 Jun 26, 2022
566bf48
fake death 3.5 to 4.5 UR (#14554)
ynot01 Jun 26, 2022
163648a
Automatic changelog generation #14554 [ci skip]
Yogbot-13 Jun 26, 2022
5d71486
Krav Maga Nerfs (#14541)
Mqiib Jun 26, 2022
dff85ca
Automatic changelog generation #14541 [ci skip]
Yogbot-13 Jun 26, 2022
13091f2
SMES Visual Update (#14509)
Jun 26, 2022
6b470bb
Automatic changelog generation #14509 [ci skip]
Yogbot-13 Jun 26, 2022
a039dbf
Update uplink_items.dm (#14556)
Jun 26, 2022
0f61354
Automatic changelog generation #14556 [ci skip]
Yogbot-13 Jun 26, 2022
efcaaf4
mm bone sword... (#14561)
Skrem7 Jun 26, 2022
2408fc8
Automatic changelog generation #14561 [ci skip]
Yogbot-13 Jun 26, 2022
1108dfe
Adds new cargo loan event: PETA (#14562)
Jun 26, 2022
668d953
Automatic changelog generation #14562 [ci skip]
Yogbot-13 Jun 26, 2022
a77ad73
Two new ammo types for traitors/nukies(?) (#14563)
MajManatee Jun 26, 2022
5e060c7
Automatic changelog generation #14563 [ci skip]
Yogbot-13 Jun 26, 2022
c00d9ed
adds ventriloquist dummy to autodrobe (#14565)
SomeguyManperson Jun 26, 2022
6e92844
Automatic changelog generation #14565 [ci skip]
Yogbot-13 Jun 26, 2022
64d2a69
Update blood_magic.dm (#14566)
TheRyeGuyWhoWillNowDie Jun 26, 2022
7f0f169
Automatic changelog generation #14566 [ci skip]
Yogbot-13 Jun 26, 2022
c5831d8
Shows all chemicals in the chem machine you could dispense if fully u…
ToasterBiome Jun 26, 2022
e1dbaea
Automatic changelog generation #14574 [ci skip]
Yogbot-13 Jun 26, 2022
10169ab
Update utility_closets.dm (#14577)
TheRyeGuyWhoWillNowDie Jun 26, 2022
87c099d
Automatic changelog generation #14577 [ci skip]
Yogbot-13 Jun 26, 2022
006fcba
adds a sound when cooking finishes (#14580)
AlvCyktor Jun 26, 2022
7436063
Automatic changelog generation #14580 [ci skip]
Yogbot-13 Jun 26, 2022
677b440
The Golden Age of Piracy (#14583)
Skrem7 Jun 26, 2022
4e56fb0
Automatic changelog generation #14583 [ci skip]
Yogbot-13 Jun 26, 2022
5d7d56c
Update medical_designs.dm (#14586)
Sniblet Jun 26, 2022
9641def
Automatic changelog generation #14586 [ci skip]
Yogbot-13 Jun 26, 2022
0284727
Surgical tweaks (#14589)
nmajask Jun 26, 2022
2b76073
Automatic changelog generation #14589 [ci skip]
Yogbot-13 Jun 26, 2022
e0803d5
Automatic changelog compile [ci skip]
actions-user Jun 26, 2022
a635a64
gives the advanced hardsuit full rad protection (#14592)
SapphicOverload Jun 26, 2022
4e3fd1d
Automatic changelog generation #14592 [ci skip]
Yogbot-13 Jun 26, 2022
eba56b3
replaces ghostrole/vr dispensers with fullupgrade (#14593)
ynot01 Jun 26, 2022
89591a5
Automatic changelog generation #14593 [ci skip]
Yogbot-13 Jun 26, 2022
f04bc74
Blinking with bluespace crystals is 233% more unpleasant (#14579)
Mqiib Jun 26, 2022
4d49aff
Automatic changelog generation #14579 [ci skip]
Yogbot-13 Jun 26, 2022
a63835d
Shadowlings now cannot get mutations and nerfs speed (#14560)
JamieD1 Jun 26, 2022
c55e629
Automatic changelog generation #14560 [ci skip]
Yogbot-13 Jun 26, 2022
94292c5
Automatic changelog compile [ci skip]
actions-user Jun 26, 2022
79ec28f
Item_color removal and different mob handcuff sprites ports (#14395)
nmajask Jun 27, 2022
a1ee3e8
Automatic changelog generation #14395 [ci skip]
Yogbot-13 Jun 27, 2022
de6b8d3
Automatic changelog compile [ci skip]
actions-user Jun 27, 2022
ae23ce2
Fix whale (#14615)
adamsong Jun 27, 2022
e306b0a
Automatic changelog generation #14615 [ci skip]
Yogbot-13 Jun 27, 2022
c2b88f5
Automatic changelog compile [ci skip]
actions-user Jun 27, 2022
fc06a9c
Hand Drill in screwdriver mode is now pointy (#14609)
Jun 27, 2022
5c44304
Automatic changelog generation #14609 [ci skip]
Yogbot-13 Jun 27, 2022
21abb39
Automatic changelog compile [ci skip]
actions-user Jun 28, 2022
dd838ba
Research now requires Toxins/Robotics Access with Doors (#14559)
JamieD1 Jun 28, 2022
969b867
Automatic changelog generation #14559 [ci skip]
Yogbot-13 Jun 28, 2022
cd926c7
e
Bibby0110 Jun 28, 2022
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
  •  
  •  
  •  
3 changes: 2 additions & 1 deletion .vscode/extensions.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
"platymuus.dm-langclient",
"EditorConfig.EditorConfig",
"arcanis.vscode-zipfs",
"dbaeumer.vscode-eslint"
"dbaeumer.vscode-eslint",
"anturk.dmi-editor"
]
}
9 changes: 4 additions & 5 deletions .vscode/settings.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,8 @@
"tgui/.yarn": true,
"tgui/.pnp.*": true
},
"workbench.editorAssociations": {
"*.dmi": "imagePreview.previewEditor"
},
"files.eol": "\n",
"gitlens.advanced.blame.customArguments": ["-w"]
}
"gitlens.advanced.blame.customArguments": [
"-w"
]
}
2 changes: 1 addition & 1 deletion _maps/RandomRuins/LavaRuins/lavaland_surface_chemistry.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -350,7 +350,7 @@
/turf/open/floor/plating,
/area/ruin/powered)
"Q" = (
/obj/machinery/chem_dispenser,
/obj/machinery/chem_dispenser/fullupgrade,
/obj/structure/cable/yellow{
icon_state = "0-4"
},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@
/area/ruin/unpowered)
"an" = (
/obj/structure/closet/malf,
/obj/item/clothing/gloves/color/rainbow/clown,
/obj/item/clothing/gloves/color/rainbow,
/obj/item/clothing/mask/gas/clown_hat,
/obj/item/clothing/shoes/clown_shoes,
/obj/item/clothing/under/rank/clown,
Expand Down
8 changes: 4 additions & 4 deletions _maps/RandomRuins/LavaRuins/lavaland_surface_cugganscove.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -380,8 +380,8 @@
/obj/item/clothing/shoes/jackboots,
/obj/item/clothing/glasses/eyepatch,
/obj/item/clothing/glasses/eyepatch,
/obj/item/clothing/head/bandana,
/obj/item/clothing/head/bandana,
/obj/item/clothing/head/pirate/bandana,
/obj/item/clothing/head/pirate/bandana,
/turf/open/floor/wood,
/area/ruin/unpowered)
"bC" = (
Expand All @@ -407,8 +407,8 @@
/obj/item/clothing/shoes/jackboots,
/obj/item/clothing/glasses/eyepatch,
/obj/item/clothing/glasses/eyepatch,
/obj/item/clothing/head/bandana,
/obj/item/clothing/head/bandana,
/obj/item/clothing/head/pirate/bandana,
/obj/item/clothing/head/pirate/bandana,
/obj/item/toy/katana,
/turf/open/floor/wood,
/area/ruin/unpowered)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@
/obj/item/clothing/shoes/clown_shoes,
/obj/item/clothing/under/rank/clown,
/obj/item/storage/backpack/clown,
/obj/item/clothing/gloves/color/rainbow/clown,
/obj/item/clothing/gloves/color/rainbow,
/turf/open/floor/wood,
/area/ruin/powered)
"ak" = (
Expand Down
2 changes: 1 addition & 1 deletion _maps/RandomRuins/LavaRuins/lavaland_surface_gluttony.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
/turf/open/lava/smooth,
/area/ruin/powered/gluttony)
"f" = (
/obj/item/reagent_containers/syringe/gluttony,
/obj/item/organ/stomach/cursed,
/turf/open/floor/plasteel/freezer,
/area/ruin/powered/gluttony)
"g" = (
Expand Down
2 changes: 1 addition & 1 deletion _maps/RandomRuins/LavaRuins/lavaland_surface_medical.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -148,7 +148,7 @@
/turf/open/floor/plasteel/white,
/area/ruin/powered)
"aw" = (
/obj/machinery/chem_dispenser,
/obj/machinery/chem_dispenser/fullupgrade,
/turf/open/floor/plasteel/white,
/area/ruin/powered)
"ax" = (
Expand Down
2 changes: 1 addition & 1 deletion _maps/RandomRuins/SpaceRuins/spacebar.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@
/obj/machinery/light/small{
dir = 1
},
/obj/machinery/chem_dispenser,
/obj/machinery/chem_dispenser/fullupgrade,
/turf/open/floor/plasteel,
/area/ruin/space/has_grav/powered/spacebar)
"eC" = (
Expand Down
Loading