Commit Graph
3176 Commits
Author SHA1 Message Date
CapnMachaddish b165c3c7a1 hehe 2021-03-23 05:41:05 -05:00
DahlularandGitHub 7b4e122ed5 Merge pull request #1043 from quotefox/revert-1041-revert-1039-fukin-vot
Revert "Revert "idk what to call this""
2021-03-22 11:25:50 -06:00
DahlularandGitHub 4b0c8a2d0e Revert "Revert "idk what to call this"" 2021-03-22 11:25:32 -06:00
DahlularandGitHub 4b7339086d Merge pull request #1042 from quotefox/revert-1036-Centcom-but-with-more-room
Revert "Centcom patch"
2021-03-22 11:25:03 -06:00
DahlularandGitHub 48515f31d4 Revert "Centcom patch" 2021-03-22 11:24:19 -06:00
DahlularandGitHub fffc518893 Merge pull request #1041 from quotefox/revert-1039-fukin-vot
Revert "idk what to call this"
2021-03-22 11:15:47 -06:00
DahlularandGitHub 99b6c9ad0a Revert "idk what to call this" 2021-03-22 11:15:31 -06:00
DahlularandGitHub ce4a0f158e Merge pull request #1039 from DragonTrance/fukin-vot
idk what to call this
2021-03-22 11:13:02 -06:00
QuoteFoxandGitHub 0f7d875949 Merge pull request #1040 from lukevale/master
Swimssuits, sweaters, and jackets! OH MY!
2021-03-22 16:02:35 +00:00
QuoteFoxandGitHub 5ed08c5b24 Merge pull request #1038 from ToonClyde/superheated-candle
stupid infinite candles superheating a room
2021-03-22 16:01:47 +00:00
QuoteFoxandGitHub efc28da971 Merge pull request #1036 from Chemlight/Centcom-but-with-more-room
Centcom patch
2021-03-22 16:01:40 +00:00
lukevale 2039aa1f10 finishing touches to the new clothing 2021-03-21 18:51:57 -05:00
QuoteFox acc67680a2 Fix Formatting in Examine window 2021-03-21 06:51:00 +00:00
lukevale cf48916d8d final touches on the sweater. 2021-03-20 16:28:38 -05:00
DragonTrance f2c2359c1c idk what to call this 2021-03-20 14:14:22 -07:00
lukevale ea20010c14 Winter labcoat and virgin killer! 2021-03-20 15:17:03 -05:00
QuoteFox 0d487e3eb9 Proper fixes and returning to monkey. 2021-03-20 19:16:50 +00:00
QuoteFox 9cf0ca814b Revert "some fixes!"
This reverts commit 0c5effbc7b.
2021-03-20 19:01:30 +00:00
QuoteFox 5dbf439e0b Revert "lets not rip a hole in space time."
This reverts commit 9d16326f34.
2021-03-20 19:00:47 +00:00
QuoteFox a9054be26f Revert "return to monkey"
This reverts commit 007ea1f7de.
2021-03-20 19:00:36 +00:00
QuoteFox 007ea1f7de return to monkey 2021-03-20 18:51:08 +00:00
QuoteFox 9d16326f34 lets not rip a hole in space time. 2021-03-20 16:35:46 +00:00
QuoteFox 0c5effbc7b some fixes!
some fixes!
2021-03-20 16:32:29 +00:00
QuoteFox 706ee6d3eb Hyperstation RP beta 0.1 and alot of bug fixes. 2021-03-20 12:36:02 +00:00
ToonClyde 80a6c4072b stupid infinite candles superheating a room 2021-03-19 02:31:06 -07:00
QuoteFox 42b1d15981 Revert "Merge pull request #1035 from DragonTrance/various-fixes"
This reverts commit 8436f16c54, reversing
changes made to f512b6d42e.
2021-03-17 23:45:38 +00:00
Chemlight 11c3440eda Centcom patch
missed a few things, fixed a floor tile and is no longer space, added some weapon chargers throughout CC, just some.
2021-03-17 16:10:17 -07:00
QuoteFoxandGitHub 8436f16c54 Merge pull request #1035 from DragonTrance/various-fixes
fixes various bugs and runtimes
2021-03-17 21:30:54 +00:00
DragonTrance 9860480e91 fixes various bugs and runtimes 2021-03-17 12:31:18 -07:00
QuoteFoxandGitHub f512b6d42e Merge pull request #1034 from CapnMachaddish/noodle-science-2.2
More snake parts
2021-03-15 06:36:11 +00:00
Ulysses MacHaddishandGitHub 61f20c4b7d tiny tweak 2021-03-15 00:39:14 -05:00
CapnMachaddish c335ade119 once more unto the breach 2021-03-15 00:36:50 -05:00
QuoteFoxandGitHub 2f7e61c472 Merge pull request #1032 from ToonClyde/gecko-tail
Gecko tail and markings
2021-03-15 01:53:11 +00:00
QuoteFoxandGitHub bfae4b49ca Merge pull request #1031 from DragonTrance/tibby
smol gentleman organs always hide under clothing
2021-03-15 01:52:55 +00:00
ToonClyde c2508d9c26 Gecko tail and markings 2021-03-13 00:10:15 -07:00
DragonTrance ef819d7bae comment 2021-03-11 22:07:51 -07:00
DragonTrance 2c781e48f1 size 4 => size 3 2021-03-11 22:06:56 -07:00
DragonTrance ed6bbed38f smol organs always hide under clothing 2021-03-11 21:59:02 -07:00
QuoteFoxandGitHub 322c33785b Merge pull request #1029 from DragonTrance/fix-circuit-examine
fixes circuit examining
2021-03-11 15:55:13 +00:00
QuoteFoxandGitHub d2e5ced155 Merge pull request #1025 from quotefox/dependabot/npm_and_yarn/tgui/elliptic-6.5.4
Bump elliptic from 6.5.3 to 6.5.4 in /tgui
2021-03-11 15:53:56 +00:00
DahlularandGitHub 99d5bdf985 Merge pull request #1028 from DragonTrance/blacklist-events
Events now have map blacklists
2021-03-11 06:28:07 -07:00
DragonTrance 4376ab5a5e fixes circuit examining 2021-03-10 18:05:36 -07:00
DragonTrance 4655b5c62d Update _event.dm 2021-03-10 13:32:21 -07:00
DahlularandGitHub c8d0be0778 Merge pull request #1027 from CapnMachaddish/FUCK
Removes 'bot (securitron and medibot) voice modules from Integrated Circuitry
2021-03-09 22:41:43 -07:00
CapnMachaddish 16110c2305 I never liked these anyway 2021-03-09 23:22:35 -06:00
QuoteFoxandGitHub 3347005847 Merge pull request #1023 from DragonTrance/loadout-stufffff
More loadout-related content
2021-03-09 23:31:38 +00:00
DragonTranceandGitHub a219de1042 Update uniform.dm 2021-03-09 16:28:45 -07:00
QuoteFoxandGitHub 741284dcf3 Merge pull request #1024 from DragonTrance/ree-mice
Gives felinids like and dislike foods
2021-03-09 21:22:02 +00:00
dependabot[bot]andGitHub c27a07ca3f Bump elliptic from 6.5.3 to 6.5.4 in /tgui
Bumps [elliptic](https://github.com/indutny/elliptic) from 6.5.3 to 6.5.4.
- [Release notes](https://github.com/indutny/elliptic/releases)
- [Commits](https://github.com/indutny/elliptic/compare/v6.5.3...v6.5.4)

Signed-off-by: dependabot[bot] <support@github.com>
2021-03-09 18:37:24 +00:00
DragonTrance 5461e54191 felinids have liked and disliked foods now 2021-03-09 10:21:27 -07:00