Commit Graph

12450 Commits

Author SHA1 Message Date
Nadyr 1930a85c2c Merge pull request #1854 from CHOMPStationBot/upstream-merge-10208
[MIRROR] Makes Protean blobform less robust
2021-04-30 00:54:38 -04:00
Nadyr cb415c440c Merge pull request #1850 from CHOMPStationBot/upstream-merge-10202
[MIRROR] Fixes voremob icon updates messing with scaling
2021-04-30 00:41:13 -04:00
Novacat ba3c3e7031 Merge pull request #10208 from Novacat/nova-basicfixes
Makes Protean blobform less robust
2021-04-26 15:02:57 +00:00
Novacat 4f56cc5b9d Merge pull request #10202 from Verkister/patch-48
Fixes voremob icon updates messing with scaling
2021-04-25 04:41:11 +00:00
Chompstation Bot f8055f9674 [MIRROR] Updates all bots to use TGUI, and adds mute button for certain bots 2021-04-23 04:30:04 -04:00
Nadyr bf2caae1b1 Merge pull request #1819 from CHOMPStationBot/upstream-merge-10165
[MIRROR] TGUI Fix Compilation
2021-04-23 03:34:53 -04:00
Novacat 40535241c9 Merge pull request #10186 from VOREStation/upstream-merge-8038
[MIRROR] Lying on the ground can be left or right
2021-04-21 06:48:13 +00:00
Chompstation Bot 1bc56b471f TGUI Fix Compilation 2021-04-19 18:13:08 +00:00
Nadyr d15ddded40 fix icon via inheritence 2021-04-18 03:30:52 -04:00
Razgriz 1f05b0e1cf Merge pull request #1807 from ZVB334/BorerTweak
Hides Borers from Health HUDs
2021-04-13 20:30:43 -07:00
Razgriz d8537574c0 Merge pull request #1809 from Darlantanis/RacoonsAndImplants
Backup Implanter, Raccoons
2021-04-13 20:30:28 -07:00
Razgriz 54da2e9f6a Merge pull request #1812 from CHOMPStationBot/upstream-merge-10153
[MIRROR] Fixes Xenochimera Custom Traits
2021-04-13 12:05:59 -07:00
Novacat 2ec3f25ba9 Merge pull request #10153 from Novacat/nova-ert
Fixes Xenochimera Custom Traits
2021-04-13 18:17:32 +00:00
Novacat 373dd4ff8e Merge pull request #10150 from Nyksia/final-species-fix
Final species fix (don't jinx it)
2021-04-13 12:22:34 +00:00
Darlantan 6806e7d9b5 Implanter, raccoons 2021-04-13 04:31:10 -04:00
ZVB334 ea5ed6f1fa Update life.dm 2021-04-12 15:39:32 -05:00
Razgriz dcc9332d84 Update blank_vr.dm 2021-04-12 12:13:32 -07:00
Chompstation Bot 36db9dad68 Fixes traits not getting applied properly. 2021-04-12 14:34:01 +00:00
Verkister 528aa98d95 Earlyports traits fix
ascian went to sleep
2021-04-12 11:10:35 +03:00
Razgriz 72ad3bf1fb spelling 2021-04-11 23:44:06 -07:00
Nadyr e0c61bacf5 Merge pull request #1795 from CHOMPStationBot/upstream-merge-10129
[MIRROR] Miscellaneous Sundries
2021-04-11 23:11:43 -04:00
Nadyr 341f981d20 Merge pull request #1800 from CHOMPStationBot/upstream-merge-10136
[MIRROR] Extra hot species fix or how not to forget things
2021-04-11 23:00:57 -04:00
Razgriz 294a04e775 Merge pull request #1765 from CHOMPStationBot/upstream-merge-10097
[MIRROR] Fixes protean blobs using the wrong list of edible materials
2021-04-11 19:57:58 -07:00
Nadyr 2b021722f3 Merge branch 'master' into upstream-merge-10136 2021-04-11 22:51:30 -04:00
Razgriz f31187f8a1 Undo some trait rebalancing (#1801)
* Undo some balance changes

Undone some from #1759

* Oh god why

Why does security take this trait

* Revert darksight changes

* Chomp edit comment
2021-04-11 19:50:00 -07:00
Chompstation Bot 0d264df1f3 Extra hot species fix or how not to forget things 2021-04-12 01:57:19 +00:00
Novacat 2025bf69ad Merge pull request #10132 from Nyksia/species-moar-fix
Fixing few oversights and more optimization for species
2021-04-11 22:58:16 +00:00
Chompstation Bot e26ff2e5cb Miscellaneous Sundries 2021-04-11 17:54:34 +00:00
Nadyr b6579a00ff Merge pull request #1771 from CHOMPStationBot/upstream-merge-10105
[MIRROR] Fixes Traits
2021-04-11 06:42:53 -04:00
Nadyr e9b7cd62ec Update protean_powers.dm 2021-04-11 06:40:59 -04:00
Nadyr 6e96cc13f9 Update protean_blob.dm 2021-04-11 06:39:09 -04:00
Nadyr 592fbf91a9 Update _protean_defines.dm 2021-04-11 06:37:17 -04:00
Nadyr 123442c3a5 Merge pull request #1783 from CHOMPStationBot/upstream-merge-10123
[MIRROR] Ports Chomp fix for Burn/brute nifsoft
2021-04-11 06:32:11 -04:00
Nadyr b29050d476 Merge branch 'master' into upstream-merge-10105 2021-04-11 06:29:26 -04:00
Nadyr 8e224e1410 Merge pull request #1759 from CHOMPStationBot/upstream-merge-10033
[MIRROR] Trait Rebalance and Refactor
2021-04-11 06:24:56 -04:00
Nadyr 3aed4dee02 Merge branch 'master' into upstream-merge-10123 2021-04-11 06:22:53 -04:00
Nadyr f1f22c1c22 Merge pull request #1772 from KeRSedChaplain/fats
adds three new fat synth taurs, fat synthlizards, fat synthfelines, and fat synthwolfs, to the customization menu
2021-04-11 06:14:42 -04:00
Nadyr e7de62051c Update positive.dm 2021-04-11 06:11:27 -04:00
Nadyr ea32aa1a19 Update neutral.dm 2021-04-11 06:11:04 -04:00
Nadyr 693b630d1f Merge pull request #1757 from CHOMPStationBot/upstream-merge-10083
[MIRROR] Fixup things for dm-langserver
2021-04-11 06:09:08 -04:00
Nadyr b6439c618c Update negative_ch.dm 2021-04-11 06:06:24 -04:00
Nadyr baaafde609 Update positive_ch.dm 2021-04-11 06:04:28 -04:00
Nadyr 3d2cd87f28 Update neutral_ch.dm 2021-04-11 05:59:12 -04:00
Nadyr ec3917412b Update negative_ch.dm 2021-04-11 05:58:29 -04:00
Nadyr eed5d6cc89 Update neutral.dm 2021-04-11 05:54:42 -04:00
Nadyr 002beed05b Update positive.dm 2021-04-11 05:48:58 -04:00
Nadyr 91d5487e29 Update neutral.dm 2021-04-11 05:46:50 -04:00
Nadyr 5e56a5e4f7 Update neutral.dm 2021-04-11 05:25:29 -04:00
Nadyr bc3b83516e Update negative.dm 2021-04-11 05:05:52 -04:00
Nadyr 4b94ce8701 Update negative.dm 2021-04-11 05:03:01 -04:00