Commit Graph
4025 Commits
Author SHA1 Message Date
Archie 2faa28d6d2 Stops sock spam 2021-06-18 15:43:17 -03:00
DahlularandGitHub 99fe480904 Merge pull request #1293 from ArchieBeepBoop/sdstuff
Fixes Disease Codersocks
2021-06-17 20:03:15 -06:00
Archie 7aae73b0a3 attempt number 2 2021-06-17 22:54:37 -03:00
DahlularandGitHub 3162a88c14 Merge pull request #1289 from ArchieBeepBoop/carpspawn
Shuffles some land markers
2021-06-17 19:24:48 -06:00
DahlularandGitHub 0a2c64f6b1 Merge pull request #1291 from ToonClyde/no-more-asymmetrical-ship
fix a few little bugs for the white ship
2021-06-17 19:24:29 -06:00
DahlularandGitHub a0a99af69e Merge pull request #1292 from ArchieBeepBoop/sdstuff
Fixes some 'issues' with diseases
2021-06-17 19:22:52 -06:00
Archie b4dbd66683 remove debug 2021-06-17 22:21:43 -03:00
Archie 2ea38e941e a 2021-06-17 22:19:10 -03:00
Archie 561f43d69e Hmm yes today people will get codersocks 2021-06-17 22:18:51 -03:00
ToonClyde 506b5a90e2 fix a few little bugs for the white ship 2021-06-17 14:09:05 -07:00
Archie 00eb9102ce Shuffles some markers 2021-06-17 01:26:29 -03:00
DahlularandGitHub 8aa6294a06 Merge pull request #1286 from ToonClyde/white-ship-rework
White ship rework
2021-06-16 18:23:13 -06:00
ToonClyde cc138de106 map change fix now 2021-06-16 17:16:37 -07:00
ToonClyde d6ca1675ee Merge remote-tracking branch 'upstream/master' into white-ship-rework 2021-06-16 16:49:37 -07:00
ToonClyde 542261a7a1 White ship rework 2021-06-16 16:49:01 -07:00
DahlularandGitHub 6d6642e06a Merge pull request #1285 from ArchieBeepBoop/statustabfix
Fixes Status tab for Slimes and Sentient Disease
2021-06-16 17:33:46 -06:00
DahlularandGitHub 5f24f0e604 Merge pull request #1284 from ArchieBeepBoop/lore_entry
Adds more lore terms to Layenia + NDisk entry
2021-06-16 17:33:27 -06:00
Archie 7a932e8b01 Fixes a pipe 2021-06-16 20:28:38 -03:00
Archie 5793aeffa8 Minor status tab fixes 2021-06-16 17:13:58 -03:00
Archie f4b52e4c6d Adds more lore terms to Layenia + NDisk entry 2021-06-16 16:16:20 -03:00
quotefox 2e53798e05 *chirp and *caw for avians.
emotes.
2021-06-16 18:16:10 +01:00
DahlularandGitHub d42c8e09c0 Merge pull request #1283 from ArchieBeepBoop/tendril
Proposed crystalline tendril change
2021-06-15 23:32:47 -06:00
DahlularandGitHub 48b64b6ff2 Merge pull request #1282 from ArchieBeepBoop/Twochanges
Four small changes
2021-06-15 23:32:11 -06:00
DahlularandGitHub 92513cb1f3 Merge pull request #1281 from ArchieBeepBoop/vscode
Standard vscode settings file
2021-06-15 23:31:35 -06:00
Archie bac8718f71 Proposed tendril change 2021-06-16 02:23:48 -03:00
Archie ed1c980ca6 This too 2021-06-16 02:09:31 -03:00
Archie 351bb85785 Whoops, debug 2021-06-16 01:25:38 -03:00
Archie cfac2ee5e5 Reactor & mimic opti 2021-06-16 01:22:45 -03:00
Archie 69a9143a1e Standard vscode settings 2021-06-15 23:57:41 -03:00
DahlularandGitHub 41fa90f1de Merge pull request #1280 from ArchieBeepBoop/nobrakes
Adminbus Crystalline Asteroid Update - Aka - No brakes on this train
2021-06-15 19:28:41 -06:00
Archie 054241175f nope 2021-06-15 22:13:43 -03:00
Archie 7b0bab0760 We ain't got no brakes 2021-06-15 22:12:20 -03:00
DahlularandGitHub e8c1658802 Merge pull request #1279 from ArchieBeepBoop/ohgodwhy
[s] Why
2021-06-15 18:32:19 -06:00
Archie 869215dc98 DON'T ASK 2021-06-15 21:26:29 -03:00
Archie 2050198045 why have I done this 2021-06-15 21:24:06 -03:00
DahlularandGitHub 33602f0780 Merge pull request #1278 from ArchieBeepBoop/camerathings
Prevents Chasms from eating camera sights.
2021-06-15 18:15:35 -06:00
DahlularandGitHub 48b1ab604f Merge pull request #1276 from ArchieBeepBoop/ninjanothing
Fixes the nothing objective
2021-06-15 18:15:10 -06:00
DahlularandGitHub 126a6cf645 Merge pull request #1277 from ArchieBeepBoop/proposed-dynamic-change
Proposed change for Space Ninja rules
2021-06-15 18:14:05 -06:00
Archie f1b8938896 Chasms shouldn't eat camera vision 2021-06-15 21:01:56 -03:00
Archie f81dbe823c hmm yes today I will alter this 2021-06-15 20:52:15 -03:00
Archie 20b7ed80a1 Fixes the nothing objective 2021-06-15 20:41:52 -03:00
DahlularandGitHub c838602cf2 Merge pull request #1275 from ArchieBeepBoop/LoreTerm
Lore Terminal
2021-06-15 14:13:51 -06:00
Archie a234aa9cad Changes the directory 2021-06-15 14:50:03 -03:00
Archie 06a9586911 Remove unused 2021-06-15 14:46:53 -03:00
Archie 097b79446b Lore Terminal Initial 2021-06-15 14:33:44 -03:00
quotefox 8001a3ef1c New glitter animation 2021-06-15 09:18:29 +01:00
DahlularandGitHub e048658de0 Merge pull request #1274 from ToonClyde/protogen-body-marking-V1.1
protogen body marking V1.1
2021-06-15 02:07:06 -06:00
ToonClyde 175a15491e protogen body marking V1.1 2021-06-15 00:57:51 -07:00
DahlularandGitHub 9441c81973 Merge pull request #1273 from ArchieBeepBoop/rbmkupdates
Updates RBMK Reactor Code
2021-06-15 01:46:52 -06:00
DahlularandGitHub 6c3c2ccbdc Merge pull request #1272 from ArchieBeepBoop/titles
Two engineering alt job titles
2021-06-15 01:46:00 -06:00