Commit Graph

25272 Commits

Author SHA1 Message Date
Timothy Teakettle
dedfdf224d Revert "Revert "customizable eyes""
This reverts commit 9f3d745d80.
2020-10-11 16:54:53 +01:00
Timothy Teakettle
b76b97fbe9 Revert "Revert "eyes""
This reverts commit 4526fef297.
2020-10-11 16:54:50 +01:00
Timothy Teakettle
4526fef297 Revert "eyes"
This reverts commit 0c99b53c05.
2020-10-11 16:54:12 +01:00
Timothy Teakettle
9f3d745d80 Revert "customizable eyes"
This reverts commit dc70d17a1e.
2020-10-11 16:54:09 +01:00
Timothy Teakettle
d3a042deaa Revert "Merge branch 'master' into eye-sprites"
This reverts commit b48f4b91e6, reversing
changes made to dc70d17a1e.
2020-10-11 16:54:05 +01:00
Timothy Teakettle
b650fa1761 Revert "finishing touches"
This reverts commit 05aef528d7.
2020-10-11 16:54:01 +01:00
Timothy Teakettle
c770a90ccb Revert "cleanup"
This reverts commit 1fc7d9a21e.
2020-10-11 16:53:57 +01:00
Timothy Teakettle
1fc7d9a21e cleanup 2020-10-08 17:43:56 +01:00
Timothy Teakettle
05aef528d7 finishing touches 2020-10-04 17:33:46 +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
6a8814cd1e Merge pull request #13484 from DeltaFire15/plushling-fix
Fixes plushlings
2020-10-03 14:20:33 -07:00
silicons
051b81c574 Merge pull request #13485 from DeltaFire15/neovgre-oopsie
[s] Fixes a tiny Neovgre edge case
2020-10-03 14:20:24 -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
Putnam
737257552a Fixes ghost funny + keeps SDGF view fix. 2020-10-02 23:17:12 -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
318729031c newlines good for the soul 2020-10-02 14:55:39 +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
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
silicons
201134d15c Merge pull request #13471 from zeroisthebiggay/patch-2
adds "clicks" as a speech verb in the character creator
2020-10-01 14:03:44 -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
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
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
The0bserver
e0089ea813 Again? 2020-10-01 06:44:11 -04:00
silicons
c8d6f3d22a Merge pull request #13477 from LetterN/patch-2
Adds craftable railings
2020-10-01 03:13:51 -07:00
silicons
d8e58b1c48 Merge pull request #13452 from Tupinambis/CarbonHydrogenBromine
Ascent Port Project: Methane and Methyl Bromide Gas Additions
2020-10-01 03:13:15 -07:00
silicons
3149732bbb Merge pull request #13441 from Putnam3145/shiver-fever-patch
Makes fever use the proper thresholds and shivering have thresholds at all.
2020-10-01 03:11:23 -07:00
silicons
71de73e16b Merge pull request #13423 from MrJWhit/drone-e-button
Gives drones back their e button (port)
2020-10-01 03:11:04 -07:00
silicons
fba8bfbf4f Merge pull request #13467 from Putnam3145/past-me-idiot
Fixes vore prefs (I was looking in the wrong place the whole time)
2020-10-01 03:10:04 -07:00
silicons
4dd9f20d22 Merge pull request #13470 from EmeraldSundisk/skelter
Helter-Skelter.
2020-10-01 03:09:51 -07:00