Commit Graph
2601 Commits
Author SHA1 Message Date
Dahlular fee9f8347f okay lets get rid of this now 2021-03-13 00:39:08 -07:00
ToonClyde c2508d9c26 Gecko tail and markings 2021-03-13 00:10:15 -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
Dahlular 365b540f3f unpropernouns your crimson rock 2021-03-11 05:56:30 -07:00
Dahlular 4e8326f758 concrete 2021-03-11 05:28:03 -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
Dahlular a936acf6ce crystal fixes 2021-03-10 04:45:19 -07:00
Dahlular 1003b04929 medium crystals 2021-03-10 04:30:38 -07:00
Dahlular 79f00a10b8 random small crystals 2021-03-10 03:29:40 -07:00
Dahlular da1aadde4f Merge remote-tracking branch 'upstream/master' 2021-03-10 01:08:21 -07:00
Dahlular 71301d02ef rock walls 2021-03-09 22:47:35 -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
DragonTrance 5461e54191 felinids have liked and disliked foods now 2021-03-09 10:21:27 -07:00
DragonTrance ae9b09a118 more loadout preferences 2021-03-09 09:50:07 -07:00
QuoteFoxandGitHub 9e9664e7a3 Merge pull request #1021 from DragonTrance/loadout-equip
Loadout equipment override job outfit
2021-03-09 12:12:34 +00:00
QuoteFoxandGitHub b11f446be0 Merge pull request #1020 from DragonTrance/loadout-appears-in-character-setup
the thing we never knew we needed so badly
2021-03-09 12:12:18 +00:00
Dahlular b8f601203e More progress 2021-03-09 03:12:30 -07:00
DragonTrance 49bbcefba8 try this again 2021-03-08 15:20:23 -07:00
DragonTrance a2a11ce30b Revert "loadouts override job outfits"
This reverts commit 6d9c5213fe.
2021-03-08 14:14:53 -07:00
Dahlular c72cde0fab fixes 2021-03-08 12:31:19 -07:00
DragonTrance 6d9c5213fe loadouts override job outfits 2021-03-08 11:22:07 -07:00
DragonTrance 893b5e1af4 Update preferences_setup.dm 2021-03-08 10:19:44 -07:00
Dahlular dce06b6121 LayeniaStation Baseline 2021-03-08 08:18:00 -07:00
DragonTrance a1c64cba48 quickly change antag prefs across characters 2021-03-07 16:58:59 -07:00
CapnMachaddish 69570fe511 Snek
I totally don't have a cobra fetish, of course not!
2021-03-06 19:04:24 -06:00
QuoteFoxandGitHub 54666600f6 Merge pull request #1015 from DragonTrance/traitor-preferences
Separate Antagonist Preferences for Characters
2021-03-05 13:23:38 +00:00
QuoteFoxandGitHub 17cfc0f5a3 Merge pull request #1016 from DragonTrance/separate-dragon-blood-abilities
Separates dragon's blood abilities and makes it more common
2021-03-05 13:23:28 +00:00
QuoteFoxandGitHub 389d83ba99 Merge pull request #1017 from DragonTrance/flags
Mob biotype optimization
2021-03-05 13:23:13 +00:00
QuoteFoxandGitHub 9d008add70 Merge pull request #1014 from lyricalpaws/master
Various lavaland related changes
2021-03-05 13:23:02 +00:00
QuoteFoxandGitHub a16c5652c9 Merge pull request #1013 from DragonTrance/food-tray
Food Trays hold more and fixes Donk Pocket Boxes
2021-03-05 13:22:36 +00:00
ChloeandGitHub a1d566f57d Update transformation.dm 2021-03-04 23:43:56 +00:00
DragonTranceandGitHub 301f829fe1 Update _disease.dm 2021-03-04 06:12:36 -07:00
DragonTrance 77eac2405a conflict 2021-03-03 11:18:30 -07:00
DragonTrance 063712017b Update nanites.dm 2021-03-03 11:10:38 -07:00
DragonTrance 4b931c5e92 mob_biotypes are now flags instead of lists 2021-03-03 11:08:36 -07:00
DragonTrance 87ea0bb72f dragon's blood tweaking 2021-03-02 20:30:26 -07:00
DragonTrance 0cf545a41f conflict 2021-03-02 19:08:48 -07:00
DragonTrance c69820d801 code optimization 2021-03-02 19:06:22 -07:00
DragonTranceandGitHub 610ae11827 Update preferences_savefile.dm 2021-03-02 15:07:41 -07:00
DragonTrance 0eee5afe68 Separate Antagonist Preferences for Characters 2021-03-02 14:21:06 -07:00
Chloe Carver-Brown d84d3ae2fd HE LIVES 2021-03-02 13:26:44 +00:00
Chloe Carver-Brown 2a05f81f12 Boil the hell in to it 2021-03-02 11:24:21 +00:00
Chloe Carver-Brown 7f7186dfd3 Unga weapons 2021-03-02 11:24:07 +00:00
Chloe Carver-Brown 0d5b5ebe0e Hisssss 2021-03-02 09:53:42 +00:00
QuoteFoxandGitHub 08e55a3f4f Merge pull request #1012 from DragonTrance/eye-lighting
Disables the ability to right-click eye lighting effects
2021-03-02 08:40:13 +00:00
DragonTrance a336b3086f trays hold more + donk pockets store correctly 2021-03-02 00:43:08 -07:00
DragonTrance c6d1cf209f Update eyes.dm 2021-03-01 23:06:55 -07:00