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
9faff5ecb6
Merge pull request #13461 from Detective-Google/arcade-carpets
...
adds arcade carpets
2020-10-03 18:07:44 -07:00
7586c38d52
Merge pull request #13487 from DeltaFire15/borg-KA-upgrade-fix
...
Fixes borg KA upgrade installation
2020-10-03 18:03:11 -07:00
bbbdc57b2f
Merge pull request #13483 from DeltaFire15/revenant-fix
...
Fixes Revenants reviving
2020-10-03 18:02:56 -07:00
7f7ba4caf8
Merge pull request #13481 from DeltaFire15/smithery-fixes
...
A bunch of blacksmithing fixes / tweaks
2020-10-03 18:02:42 -07:00
20f1e0818e
Merge pull request #13479 from LetterN/another-update-mayhaps
...
Fixes minimap, and dmdocs other things
2020-10-03 18:02:29 -07:00
6094cd7191
Merge pull request #13508 from DeltaFire15/robotic-fixes
...
bodypart fixes - robotic bodypart & digitigrade edition
2020-10-03 14:32:45 -07:00
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
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
0393ffe0c3
Merge pull request #13489 from timothyteakettle/species-color-define
...
standardizes minimum brightness of mutant parts
2020-10-03 14:21:20 -07:00
73cebb3629
Merge pull request #13482 from DeltaFire15/heretic-husking-tweak
...
Tweaks heretic sacrifice husking
2020-10-03 14:20:58 -07:00
3e6428567a
Merge pull request #13488 from DeltaFire15/pacifist-parry-fix
...
No harmful parry countering for pacifists.
2020-10-03 14:20:07 -07:00
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
79af981467
fixes some fun limb code
2020-10-03 21:51:49 +02:00
737257552a
Fixes ghost funny + keeps SDGF view fix.
2020-10-02 23:17:12 -07:00
09283ca485
beans
2020-10-03 13:49:20 +08:00
4b6870ed1b
the fuck
2020-10-02 12:07:09 -04:00
64b4abca4b
oopsie
2020-10-02 12:05:05 -04:00
96d46ca0e4
Makes the slimeperson swap-body UI stay open when you switch bodies
2020-10-02 12:03:24 -04:00
158b1d584f
woopsy
2020-10-02 14:54:57 +01:00
3ba9031fe2
Revert "gender part support"
...
This reverts commit 358041c2ef
2020-10-02 14:54:05 +01:00
358041c2ef
gender part support
2020-10-02 14:50:42 +01:00
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
710ab0ffa6
Update eyes.dm
2020-10-01 22:06:03 +01:00
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
cd81cd4402
why
2020-10-01 21:19:40 +01:00
7726b0456c
Merge branch 'master' into cool-ipcs
2020-10-01 21:06:16 +01:00
14e217082f
compile
2020-10-01 20:51:53 +01:00
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
57132d0b32
Merge remote-tracking branch 'upstream/master' into clothing
2020-10-01 14:06:21 -05:00
98703e6ad6
Merge remote-tracking branch 'upstream/master' into arcade-carpets
2020-10-01 13:41:10 -05:00
e1123ad7fe
color define
2020-10-01 18:55:32 +01:00
173ecfaa6c
prevents pacifists from performing harmful counter attacks
2020-10-01 17:58:14 +02:00
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
9d76f6af80
good cloaks
...
i like gooder cloaks
2020-10-01 15:08:39 +01:00
9e702c2ede
No more self sufficiency.
2020-10-01 06:49:54 -04:00
e0089ea813
Again?
2020-10-01 06:44:11 -04:00
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
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
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
38c25bdc9d
Merge pull request #13466 from Putnam3145/sdgf-fix
...
Cleans up and fixes SDGF code a bit, consistent naked clones, transfer_ckey resets view range
2020-10-01 03:07:08 -07:00
bb09acff4c
Merge pull request #13463 from timothyteakettle/slime-sprites
...
adds luminescent and stargazer sprites as selectable body sprites for slimes
2020-10-01 03:06:41 -07:00
f8bd6d3f49
Merge pull request #13458 from lolman360/plumbingfix3
...
smoke machine/autoharvest hydro tray fix
2020-10-01 03:06:19 -07:00
ebcbe7e901
Merge pull request #13431 from EmeraldSundisk/cargoclothes
...
Gives Cargo Technicians the choice of longer trousers.
2020-10-01 03:03:41 -07:00
b7650f3dea
Merge pull request #13398 from timothyteakettle/wound-config
...
wound config values, wound bonus for how damaged a limb is
2020-10-01 03:02:35 -07:00
8b36cf6f64
Merge pull request #13375 from timothyteakettle/emp-rework
...
the emp rework (emp severity reduces as you move from epicentre, severity is 1-100)
2020-10-01 03:01:18 -07:00
46a80af956
Merge pull request #13317 from LetterN/what-if-the-savefile-itself-is-teakproof-questionmark_charachter
...
Ports tgstation/tgstation#52549
2020-10-01 02:56:39 -07:00
7f08969f48
Merge pull request #13457 from SandPoot/master
...
Fixes not getting an action button.
2020-10-01 11:44:22 +02:00
fc3feae4c5
Plumbing component removed, for now.
2020-10-01 05:43:09 -04:00
a2597a4d84
Merge pull request #13448 from Tupinambis/spelling
...
Fixes a spelling error in an armor value that caused runtimes.
2020-10-01 11:42:55 +02:00
DeltaFire