Commit Graph

16804 Commits

Author SHA1 Message Date
silicons
f6bbfc2c88 Merge pull request #13513 from timothyteakettle/eye-sprites
adds selectable eye types to customization
2020-10-06 16:51:44 -07:00
silicons
8eac1cb939 Merge pull request #13511 from Hatterhat/hakitavolver
additional revolver sprites
2020-10-06 16:51:18 -07:00
silicons
03a47bda6d Merge pull request #13252 from timothyteakettle/loadout-loading
qol: looking at loadout equips your loadout items on you instead of job items
2020-10-06 16:50:08 -07:00
Hatterhat
5a517be5e7 thanks toriate 2020-10-06 12:47:00 -05:00
silicons
655d505316 Merge pull request #13507 from LetterN/subsystem-updoots
Ports the better statpannel design, fixes missing icons, and fixes statvoting [ready]
2020-10-06 00:46:13 -07:00
Hatterhat
2e7101fdc5 funny revolver sprites - squashed 2020-10-05 22:56:52 -05:00
silicons
915d2c726b Merge pull request #13518 from TheObserver-sys/spritefixmaybe
Plant Sprite Fixes II: The Mycus must grow! (And the grass should die)
2020-10-05 10:21:37 -07:00
Timothy Teakettle
05aef528d7 finishing touches 2020-10-04 17:33:46 +01:00
The0bserver
6304a4010b provisional chanterelle fix 2020-10-04 01:41:57 -04:00
The0bserver
16425912da fairygrass-dead -> grass-dead 2020-10-04 01:14:03 -04: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
Timothy Teakettle
46ebb72905 Merge branch 'master' into loadout-loading 2020-10-04 01:43:17 +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
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
Letter N
47845f2c30 suposed to be SSupdates but noo 2020-10-03 19:54:23 +08: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
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
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
silicons
f6dccd5ac5 Merge pull request #12439 from timothyteakettle/cool-ipcs
makes ipcs more like robots (a partial port from skyrat)
2020-10-01 14:15:04 -07:00
Timothy Teakettle
710ab0ffa6 Update eyes.dm 2020-10-01 22:06:03 +01:00
silicons
7e7fd351c1 Merge pull request #13475 from Detective-Google/clothing
Ports a few RP clothings and adds the detective clothing vendor
2020-10-01 14:04:52 -07:00
Timothy Teakettle
cd81cd4402 why 2020-10-01 21:19:40 +01:00
Timothy Teakettle
7726b0456c Merge branch 'master' into cool-ipcs 2020-10-01 21:06:16 +01:00
Timothy Teakettle
14e217082f compile 2020-10-01 20:51:53 +01:00
silicons
1f82e8985c Merge pull request #13314 from TheObserver-sys/ArcaneNutriMutaPort
No more chemspam: Ports portions of ArcaneMusic's botany rework from TG.
2020-10-01 12:15:49 -07:00
Detective Google
57132d0b32 Merge remote-tracking branch 'upstream/master' into clothing 2020-10-01 14:06:21 -05:00
Detective Google
98703e6ad6 Merge remote-tracking branch 'upstream/master' into arcade-carpets 2020-10-01 13:41:10 -05:00
Timothy Teakettle
e1123ad7fe color define 2020-10-01 18:55:32 +01:00
DeltaFire
173ecfaa6c prevents pacifists from performing harmful counter attacks 2020-10-01 17:58:14 +02:00
DeltaFire
d54a899695 fixes KA modkits being installed in borgs by others
These have been broken for so long holy fuck
2020-10-01 17:13:03 +02:00
CoreFlare
9d76f6af80 good cloaks
i like gooder cloaks
2020-10-01 15:08:39 +01:00
The0bserver
9e702c2ede No more self sufficiency. 2020-10-01 06:49:54 -04:00