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 and GitHub
9faff5ecb6
Merge pull request #13461 from Detective-Google/arcade-carpets
...
adds arcade carpets
2020-10-03 18:07:44 -07:00
silicons and GitHub
0393ffe0c3
Merge pull request #13489 from timothyteakettle/species-color-define
...
standardizes minimum brightness of mutant parts
2020-10-03 14:21:20 -07:00
Timothy Teakettle and GitHub
7726b0456c
Merge branch 'master' into cool-ipcs
2020-10-01 21:06:16 +01:00
silicons and GitHub
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
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
silicons and GitHub
f8bd6d3f49
Merge pull request #13458 from lolman360/plumbingfix3
...
smoke machine/autoharvest hydro tray fix
2020-10-01 03:06:19 -07:00
silicons and GitHub
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
Detective Google
643421bc23
adds arcade carpets
...
yay
2020-09-28 14:43:03 -05:00
lolman360
9860d296b8
what the fucjk
2020-09-28 14:05:53 +10:00
Timothy Teakettle
12bf3aebda
Merge remote-tracking branch 'upstream/master' into cool-ipcs
2020-09-16 05:12:20 +01:00
Timothy Teakettle
125b50d392
Merge branch 'master' into cool-ipcs
2020-09-16 05:09:02 +01:00
silicons and GitHub
ad128c292e
Merge pull request #13351 from Trilbyspaceclone/patch-402
...
Correrts open loop on race drinks
2020-09-11 14:16:33 -07:00
Timothy Teakettle
58737e42b9
empulse using range
2020-09-10 19:52:34 +01:00
timothyteakettle
e0f44ef717
new emps
2020-09-10 03:49:47 +01:00
BlackMajor and GitHub
ac346a7cc9
Merge pull request #13350 from Citadel-Station-13/silicons-patch-32
...
fixes reagent containers doubleattacking
2020-09-08 12:05:29 +12:00
Trilbyspaceclone and GitHub
917dfdd403
Update alcohol_reagents.dm
2020-09-05 10:38:32 -04:00
silicons and GitHub
7aa2a89243
Update reagent_containers.dm
2020-09-05 00:23:30 -07:00
The0bserver
5f5279d2ff
You wish for change... (Added instabilities.)
2020-09-02 03:15:03 -04:00
The0bserver
6b3a0c3531
A few changes, new fertilizer obtainable now.
2020-09-02 01:00:49 -04:00
The0bserver
5869ddb1cd
Real Fix, Real Fox (I hope.)
2020-09-01 06:55:15 -04:00
The0bserver
7d2d7f84dd
a fix for a fox.
2020-09-01 06:49:05 -04:00
The0bserver
457cb5e238
THIS IS IT LUIGI! ALL REAGENTS SET!
2020-09-01 06:44:46 -04:00
The0bserver
4edf61dde7
New Define File: Botany.dm Earthmother save me.
2020-08-31 00:34:45 -04:00
The0bserver
c2002aca78
This is it, Luigi. We gotta move the function!
2020-08-30 12:44:12 -04:00
Trilbyspaceclone and GitHub
9c8f3305bb
Merge branch 'master' into spike-loot-differentces
2020-08-30 00:41:42 -04:00
silicons and GitHub
5f40c2da37
Merge pull request #13229 from Sonic121x/patch-2
...
Fix Tea and give them a glass sprite
2020-08-29 21:33:21 -07:00
Trilbyspaceclone and GitHub
c4885d81f3
Merge branch 'master' into spike-loot-differentces
2020-08-27 03:41:14 -04:00
silicons and GitHub
8699ce2174
fixes a bunch of broken clickdelays ( #13218 )
...
* fixes
* fix
2020-08-25 20:58:20 +02:00
Sonic121x and GitHub
bfc5be9d8b
fix tea
2020-08-22 03:32:42 +08:00
silicons and GitHub
120bcfc00c
Merge pull request #13178 from lolman360/plumb
...
[READY] ports plumbing (no more waiting for tgui4)
2020-08-20 21:32:26 -07:00
DeltaFire
7a9796e782
minmax torture
2020-08-19 17:05:27 +02:00
lolman360
1654a925b6
Update smoke_machine.dm
2020-08-19 18:26:53 +10:00
lolman360
e82772dc44
kekw
2020-08-19 17:22:52 +10:00
Timothy Teakettle and GitHub
f5300750b5
Revert "[TESTMERGE ONLY] FUCK"
2020-08-17 03:18:36 +01:00
silicons and GitHub
4cd731ce11
Revert "cease your shitcode: cum edition"
2020-08-16 19:06:57 -07:00
silicons
8dedcbcf76
Merge branch '13113'
2020-08-16 18:53:35 -07:00
silicons
b56742beb5
Merge branch 'pr-13110'
2020-08-16 18:40:23 -07:00
Lin and GitHub
d287f44d9a
Merge pull request #13045 from silicons/coggers
...
ports bronze (fake clockwork) airlocks and windows
2020-08-16 20:20:03 -05:00
kiwedespars
bff11c4fe5
fixes, changes.
...
- buffed eldritch fluid
- readded patron's reach as a 1 point off from aggressive spread
- buffed amount of ghouls flesh can have.
- buffed the stam regen of rust a little bit.
- fixed sacrifices not giving points if they were in your pockets (thanks to tgstation/tgstation#51648 )
- removal of heretic status no longer gives a loud deconvert message (thanks to tgstation/tgstation#52629 )
- description fixes, eldritch amulet now works.
2020-08-13 01:12:10 -07:00
Trilbyspaceclone and GitHub
1b61a5feb2
Merge branch 'master' into spike-loot-differentces
2020-08-12 15:10:37 -04:00
lolman360
f10053fe96
suture
2020-08-11 18:03:59 +10:00
kiwedespars
eb8574d6d6
heretics from tg (with changes)
2020-08-10 19:17:26 -07:00
Timothy Teakettle
033fe553e8
cease your shitcode
2020-08-10 21:41:06 +01:00
lolman360
6c4c3e4255
lint!
2020-08-10 09:47:55 +10:00
lolman360
6c57dce54e
WX
2020-08-09 23:52:21 +10:00
lolman360 and GitHub
308d77da7c
Merge branch 'master' into plumb
2020-08-09 22:48:18 +10:00
silicons and GitHub
f20f01cc6b
Merge pull request #12853 from LetterN/TGUI-4
...
TGUI4 port
2020-08-09 05:46:21 -07:00
silicons and GitHub
3068accd2b
Merge pull request #13082 from Putnam3145/anaphro
...
Removed (an)aphrodisiacs.
2020-08-09 05:39:56 -07:00
DeltaFire