Commit Graph

25280 Commits

Author SHA1 Message Date
DeltaFire
2d684c88be readds a accidentally removed thing
Apparently, someone accidentally removed the functionality of being able to inject beakers in heaters without having to remove them, which is pretty required fore more complex reactions. This readds that.
Also tweaks the Ion release of the zeolite reaction a bit (-0.2 > -0.15)
2020-10-09 00:06: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
27ae95dd26 Merge pull request #13499 from Putnam3145/toilet-loot-fix
Makes toilet loot not exist to cause bad GC bugs.
2020-10-03 18:07:10 -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
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
Letter N
09283ca485 beans 2020-10-03 13:49:20 +08:00
Letter N
195dd5356b sig missing 2020-10-03 11:47:43 +08:00
Putnam
29213bbcbe ok i guess it has to be initialize 2020-10-02 17:39:53 -07:00
Putnam
3b21c31872 Makes water closet loot work and not cause bad GC bugs. 2020-10-02 16:56:21 -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
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
e012b8f082 typo 2020-10-01 17:18:28 +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
The0bserver
e0089ea813 Again? 2020-10-01 06:44:11 -04:00
Letter N
84a6624b03 Update cinematic.dm 2020-10-01 18:18:24 +08: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