Commit Graph

1424 Commits

Author SHA1 Message Date
Nadyr 680cffa88a Merge pull request #3211 from CHOMPStation2/upstream-merge-11928
[MIRROR] Offmap Tweaks
2021-12-05 14:04:20 -05:00
Nadyr 5b4b80fcd4 Merge pull request #3218 from CHOMPStation2/upstream-merge-11920
[MIRROR] Probably fixes xenowear loadout reset bug
2021-12-05 13:10:10 -05:00
Nadyr 1dc06fd9e6 Merge branch 'master' into upstream-merge-11928 2021-12-05 12:50:21 -05:00
Nadyr 7399798406 Merge pull request #3222 from CHOMPStation2/upstream-merge-11931
[MIRROR] Adds Amaryll's claws fluff item
2021-12-05 12:40:51 -05:00
Nadyr d9774a0ca2 Merge pull request #3233 from CHOMPStation2/upstream-merge-11909
[MIRROR] Fixes loadout items with apostrophes not being adjustible
2021-12-05 12:17:29 -05:00
Nadyr aab7b6c936 powder that makes you say yes 2021-12-05 10:09:55 -05:00
Casey 3dfe2ff266 Merge pull request #11909 from Heroman3003/deencode
Fixes loadout items with apostrophes not being adjustible
2021-12-03 07:18:17 +00:00
Aronai Sieyes a0cd42922e Adds Amaryll's claws fluff item 2021-12-03 07:16:14 +00:00
Casey e8ef109999 Merge pull request #11920 from Verkister/patch-103
Probably fixes xenowear loadout reset bug
2021-12-03 07:15:35 +00:00
Casey fe8c4753eb Offmap Tweaks 2021-12-03 07:14:17 +00:00
Nadyr 91a38b7532 Merge branch 'master' into upstream-merge-11716 2021-10-27 20:49:37 -04:00
Nadyr b8e4821cb8 Merge pull request #3150 from CHOMPStationBot/upstream-merge-11715
[MIRROR] neck gaiters, take two
2021-10-27 20:47:26 -04:00
Nadyr 5623c20563 Merge pull request #3151 from CHOMPStationBot/upstream-merge-11712
[MIRROR] Customverb tweak
2021-10-27 20:30:04 -04:00
Nadyr 7f5305920d Merge branch 'master' into upstream-merge-11715 2021-10-27 20:25:43 -04:00
Nadyr 0a973e2ddd Merge pull request #3138 from CHOMPStationBot/upstream-merge-11698
[MIRROR] Tool Time (Fixed)
2021-10-27 19:14:36 -04:00
Nadyr 244db219b4 Merge pull request #3111 from CHOMPStationBot/upstream-merge-11643
[MIRROR] Fixes the language reset bug
2021-10-27 18:40:40 -04:00
Nadyr 4da0341c9b powder that makes you say yes 2021-10-27 18:28:54 -04:00
Chompstation Bot 04835a42c6 Straw Stuff + Fixes 2 2021-10-27 21:53:50 +00:00
Aronai Sieyes 891650aeea Merge pull request #11712 from KillianKirilenko/kk-misc2
Customverb tweak
2021-10-27 18:17:48 +00:00
Chompstation Bot a4efe1b256 neck gaiters, take two 2021-10-27 17:40:59 +00:00
Chompstation Bot 0fc8ba9656 Tool Time (Fixed) 2021-10-27 16:02:47 +00:00
Casey 660f89f864 Merge pull request #11642 from PastelPrinceDan/mask
paper masks, emotional mask
2021-10-27 15:23:53 +00:00
Chompstation Bot a14698561a Fixes the language reset bug 2021-10-27 15:23:46 +00:00
Chompstation Bot 001a1b25c4 [MIRROR] By-species age restrictions 2021-10-25 00:37:49 +00:00
Aronai Sieyes dfd327faf3 Merge pull request #11572 from VOREStation/upstream-merge-8272
[MIRROR] Expands the ring selection
2021-10-22 18:40:13 +00:00
Verkister dda2406b71 Update 02_language.dm 2021-09-30 23:57:01 +03:00
Verkister 33e116be3e Update 02_language.dm 2021-09-30 23:47:35 +03:00
Verkister 12ed1567aa Yet another language loading hunch attempt
This time my hunch is pretty solid because the language part of the character settings comes before the species part does in load order, and the additions here kinda do rely on character species being present prior loading, so jamming a species load up here would at least fix that problem.
2021-09-30 22:15:37 +03:00
Nadyr a268fc233d powder that makes you say yes 2021-09-27 18:00:49 -04:00
Nadyr 842c76a9c1 powder that makes you say yes 2021-09-27 17:59:35 -04:00
Chompstation Bot ad57dfbb92 Adds more clothing from Polaris and various sources 2021-09-27 18:31:54 +00:00
Nadyr c2a195a6c6 powder that makes you say yes 2021-09-26 20:37:00 -04:00
Nadyr 38c9174a42 powder that makes you say yes 2021-09-26 20:34:38 -04:00
Chompstation Bot 42f18c41da Adds audible belching preference toggle, makes belch emote respect it 2021-09-25 00:34:56 +00:00
Nadyr 5ab51812da Merge pull request #3027 from CHOMPStationBot/upstream-merge-11610
[MIRROR] adds audible belch emote
2021-09-24 18:56:54 -04:00
Rykka b75c306318 Reformats preferences to take a list, adds belch pref to emote
Preferences can now take a list instead of a singular datum (but will still accept a singular datum for legacy compat), and any arguments that check is_preference_enabled must return true on all prefs from the list, not just one.
2021-09-24 15:14:13 -07:00
Nadyr 55e91dd6a1 powder that makes you say yes 2021-09-24 17:16:54 -04:00
Chompstation Bot b2cbd3b06f PastelPrinceDan fluff item 2021-09-24 04:10:14 +00:00
Cadyn Bombaci b90e084138 Make max languages properly update 2021-09-21 14:07:53 -07:00
Razgriz 362caffe59 Merge pull request #2798 from Rykka-Stormheart/shep-dev-compile-errors
Misc DMLang/VSCode Compiler Fixes + Some Actual Compiler Fixes
2021-09-17 03:15:52 -07:00
Razgriz 493557451b Update loadout_fluffitems_yw.dm 2021-09-16 03:43:38 -07:00
Razgriz 5fb74fd497 powder that makes you say yes 2021-09-16 03:39:19 -07:00
Razgriz a2c505e941 Merge pull request #2892 from Raeschen/digitigrade
Ports Digitigrade legs
2021-09-14 18:22:54 -07:00
Raeschen 9b6603e7aa Fix digitigrade vars being set to null, made some comments as to type int over bool 2021-09-12 19:08:58 +02:00
Raeschen 444a9557bc fix bad html order, update come comments 2021-09-05 14:31:45 +02:00
Raeschen 2506263c71 fix resleever/bioprinter behavior
added digitigrade data to dna datum, make organ creation/resleever pull data from said DNA datum regarding digitigrade usage
2021-09-05 12:03:45 +02:00
Raeschen 5803b07300 fix round-start-spawning not setting digitigrade properly
also changes methodology for identifying digitigrade yes or no from preferences --> species to preferences --> copy to mob
2021-09-03 19:08:46 +02:00
Darlantan f9f8889991 cargo shorts and icon organizing 2021-08-29 01:46:06 -04:00
Nadyr 1cf77b9051 Merge pull request #2925 from CHOMPStationBot/upstream-merge-11514
[MIRROR] Fixes unresetable loadout name/desc gear tweaks
2021-08-27 18:29:37 -04:00
Aronai Sieyes 6b9f3a059e Merge pull request #11514 from Verkister/patch-80
Fixes unresetable loadout name/desc gear tweaks
2021-08-27 14:24:19 +00:00