Commit Graph
3133 Commits
Author SHA1 Message Date
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
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
QuoteFoxandGitHub a9c9045a77 Merge pull request #1019 from DragonTrance/antag-preferences-stuff
More antag preference options
2021-03-09 12:12:02 +00:00
DahlularandGitHub cda6cfb448 Merge pull request #1022 from Chemlight/Centcom-but-with-more-room
Update Centcom
2021-03-08 21:06:51 -07:00
Chemlight 0f0b81101c Update Centcom
Gave Centcom an office area, with a admin room along with some dorms for visitors (staff members).  Along with a new docking area to CC instead of the recovery boat.
2021-03-08 20:00:12 -08: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
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
DragonTrance a1c64cba48 quickly change antag prefs across characters 2021-03-07 16:58:59 -07:00
DahlularandGitHub 0ae6fa6924 Merge pull request #1018 from CapnMachaddish/noodle-science
An actual fucking cobra hood
2021-03-06 18:10:23 -07:00
CapnMachaddish 35c47d3f84 Some tiny fixes to my synth parts.
I should have done this in a separate PR but fuck it.
2021-03-06 19:04:53 -06: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
ChloeandGitHub f50d91c59f Merge pull request #7 from quotefox/master
update
2021-03-02 09:05:37 +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
QuoteFoxandGitHub 8438500122 screen res fix, testing something my end 2021-03-02 05:47:01 +00:00
QuoteFox f8b40ed8e3 stat panel, no longer locks movement, and fixed some icon issues 2021-03-02 05:44:49 +00:00
QuoteFoxandGitHub 0d3011e17a Merge pull request #1009 from DragonTrance/disease
Sentient Disease Buff
2021-03-02 05:10:30 +00:00
QuoteFoxandGitHub a4e5fc9c20 Merge pull request #1008 from DragonTrance/plant-adding
Modular Chemical Reactions for Hydroponics Trays
2021-03-02 05:10:21 +00:00
QuoteFoxandGitHub 2f4664c1f6 Merge pull request #1011 from DragonTrance/say-fix
Fixes species tongues changing speech in emotes
2021-03-02 05:10:09 +00:00
QuoteFoxandGitHub 7a8471fd75 Merge pull request #1010 from DragonTrance/thirst-fixing
Thorsty + Nutrition Code
2021-03-02 05:09:54 +00:00