Commit Graph

17241 Commits

Author SHA1 Message Date
The0bserver
16425912da fairygrass-dead -> grass-dead 2020-10-04 01:14:03 -04:00
silicons
2bd7280fb1 Merge remote-tracking branch 'citadel/master' into lettern-git-updates 2020-10-03 20:52:49 -07:00
silicons
2e557b2f26 Update simple_animal.dm 2020-10-03 19:51:20 -07:00
yorii
42db9371de fixes rounding error in growthstages 2020-10-04 03:47:01 +02:00
silicons
9faff5ecb6 Merge pull request #13461 from Detective-Google/arcade-carpets
adds arcade carpets
2020-10-03 18:07:44 -07:00
silicons
7586c38d52 Merge pull request #13487 from DeltaFire15/borg-KA-upgrade-fix
Fixes borg KA upgrade installation
2020-10-03 18:03:11 -07:00
silicons
bbbdc57b2f Merge pull request #13483 from DeltaFire15/revenant-fix
Fixes Revenants reviving
2020-10-03 18:02:56 -07:00
silicons
7f7ba4caf8 Merge pull request #13481 from DeltaFire15/smithery-fixes
A bunch of blacksmithing fixes / tweaks
2020-10-03 18:02:42 -07:00
silicons
20f1e0818e Merge pull request #13479 from LetterN/another-update-mayhaps
Fixes minimap, and dmdocs other things
2020-10-03 18:02:29 -07:00
Fermi
8be0abaf33 Few more fixes 2020-10-04 01:52:10 +01:00
Timothy Teakettle
46ebb72905 Merge branch 'master' into loadout-loading 2020-10-04 01:43:17 +01:00
Fermi
0e21d9b4bc Songs are important 2020-10-04 01:24:55 +01:00
Timothy Teakettle
b48f4b91e6 Merge branch 'master' into eye-sprites 2020-10-04 01:23:03 +01:00
timothyteakettle
dc70d17a1e customizable eyes 2020-10-04 01:19:29 +01:00
Timothy Teakettle
0c99b53c05 eyes 2020-10-03 23:22:53 +01:00
silicons
6094cd7191 Merge pull request #13508 from DeltaFire15/robotic-fixes
bodypart fixes - robotic bodypart & digitigrade edition
2020-10-03 14:32:45 -07:00
silicons
d5ff552f3e Merge pull request #13494 from monster860/patch-4
Makes the slimeperson swap-body UI stay open when you switch bodies
2020-10-03 14:22:11 -07:00
silicons
6b7585ba54 Merge pull request #13493 from timothyteakettle/gender-bodypart-support
adds limb id support for gendered body parts
2020-10-03 14:21:49 -07:00
silicons
0393ffe0c3 Merge pull request #13489 from timothyteakettle/species-color-define
standardizes minimum brightness of mutant parts
2020-10-03 14:21:20 -07:00
silicons
73cebb3629 Merge pull request #13482 from DeltaFire15/heretic-husking-tweak
Tweaks heretic sacrifice husking
2020-10-03 14:20:58 -07:00
silicons
3e6428567a Merge pull request #13488 from DeltaFire15/pacifist-parry-fix
No harmful parry countering for pacifists.
2020-10-03 14:20:07 -07:00
silicons
21d3d8fcd9 sigh 2020-10-03 14:17:13 -07:00
DeltaFire
c2e6fcb172 modifies regenerate_limbs()
This allows it to work for people with the ROBOTIC_LIMBS trait, creating robotic (/ synthetic, or whatever the hell those are considering they're inbetween) limbs for them instead of organic ones
2020-10-03 22:46:01 +02:00
DeltaFire
79af981467 fixes some fun limb code 2020-10-03 21:51:49 +02:00
Hatterhat
4195f96876 glaive daggers squashed 2020-10-03 14:32:19 -05:00
Letter N
47845f2c30 suposed to be SSupdates but noo 2020-10-03 19:54:23 +08:00
zerothebigboy
0b8f311e65 a 2020-10-03 03:47:27 -04:00
Putnam
737257552a Fixes ghost funny + keeps SDGF view fix. 2020-10-02 23:17:12 -07:00
Letter N
09283ca485 beans 2020-10-03 13:49:20 +08:00
EmeraldSundisk
852bc21567 Update skelter.dm 2020-10-02 21:02:31 -07:00
Zandario
a90f932339 Update clothing.dm 2020-10-02 21:16:26 -05:00
Zandario
bdb7713de4 Update code/modules/clothing/clothing.dm
Co-authored-by: Letter N <24603524+LetterN@users.noreply.github.com>
2020-10-02 21:09:54 -05:00
Zandario
156deedd41 Update code/modules/clothing/clothing.dm
Co-authored-by: Letter N <24603524+LetterN@users.noreply.github.com>
2020-10-02 21:09:44 -05:00
Zandario
e9062f10ce Update code/modules/clothing/clothing.dm
Co-authored-by: Letter N <24603524+LetterN@users.noreply.github.com>
2020-10-02 21:09:19 -05:00
Zandario
bc75c12080 Update other_reagents.dm 2020-10-02 21:08:06 -05:00
deathride58
cbe6178a11 reworks ling blood - loudness is now calculated via the average of your loud abilities rather than the sum 2020-10-02 19:21:30 -04:00
Zandario
1620e3887c Merge branch 'master' into species-refactor 2020-10-02 17:19:48 -05:00
Zandario
bdd121cd81 Prep Work 2020-10-02 17:17:50 -05:00
EmeraldSundisk
fdb0293a50 cloner note 2020-10-02 13:34:10 -07:00
Maxim Nikitin
4b6870ed1b the fuck 2020-10-02 12:07:09 -04:00
Maxim Nikitin
64b4abca4b oopsie 2020-10-02 12:05:05 -04:00
Maxim Nikitin
96d46ca0e4 Makes the slimeperson swap-body UI stay open when you switch bodies 2020-10-02 12:03:24 -04:00
timothyteakettle
6533d850c2 compile 2020-10-02 16:42:06 +01:00
timothyteakettle
ab83185ffc oh no 2020-10-02 16:40:34 +01:00
timothyteakettle
418cd44bbe SQUISH 2020-10-02 16:31:33 +01:00
timothyteakettle
950cb05617 Merge remote-tracking branch 'upstream/master' into slime-puddle 2020-10-02 15:53:48 +01:00
timothyteakettle
158b1d584f woopsy 2020-10-02 14:54:57 +01:00
timothyteakettle
3ba9031fe2 Revert "gender part support"
This reverts commit 358041c2ef.
2020-10-02 14:54:05 +01:00
timothyteakettle
358041c2ef gender part support 2020-10-02 14:50:42 +01:00
timothyteakettle
32f32d7e62 compile 2020-10-02 02:33:33 +01:00