silicons
|
29b7b49fe9
|
Merge pull request #13528 from DeltaFire15/robotic-limbs-PT2
Robotic limbs 2 : Threshhold Boogaloo
|
2020-10-11 17:33:00 -07:00 |
|
Tupinambis
|
3224533a7c
|
Merge branch 'master' into spooder
|
2020-10-11 14:31:23 -05:00 |
|
DeltaFire
|
a5fce4b6ed
|
Merge remote-tracking branch 'upstream/master' into robotic-limbs-PT2
|
2020-10-11 15:39:41 +02:00 |
|
silicons
|
737b6460af
|
Merge pull request #13497 from Zandario/species-refactor
Refactors some defines for easier Species Development
|
2020-10-10 22:00:49 -07:00 |
|
DeltaFire
|
4ccf40f775
|
Revert "Revert "Merge branch 'master' into robotic-limbs-PT2""
This reverts commit 27a099c6bf.
|
2020-10-11 00:53:18 +02:00 |
|
DeltaFire
|
27a099c6bf
|
Revert "Merge branch 'master' into robotic-limbs-PT2"
This reverts commit 73b5267425, reversing
changes made to 2e780bfff2.
|
2020-10-11 00:51:39 +02:00 |
|
DeltaFire
|
73b5267425
|
Merge branch 'master' into robotic-limbs-PT2
|
2020-10-11 00:44:28 +02:00 |
|
silicons
|
3557f00316
|
Merge pull request #13498 from deathride58/lingbloodupgrade
Lingblood rework (Loudness is now an average, rather than a sum)
|
2020-10-06 17:04:38 -07:00 |
|
DeltaFire
|
06cb91ca3d
|
updates all BODYPART_ORGANIC occurances
:)
|
2020-10-06 18:01:25 +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
|
0393ffe0c3
|
Merge pull request #13489 from timothyteakettle/species-color-define
standardizes minimum brightness of mutant parts
|
2020-10-03 14:21:20 -07:00 |
|
Zandario
|
bc75c12080
|
Update other_reagents.dm
|
2020-10-02 21:08:06 -05:00 |
|
deathride58
|
cbe6178a11
|
reworks ling blood - loudness is now calculated via the average of your loud abilities rather than the sum
|
2020-10-02 19:21:30 -04:00 |
|
Zandario
|
1620e3887c
|
Merge branch 'master' into species-refactor
|
2020-10-02 17:19:48 -05:00 |
|
Zandario
|
bdd121cd81
|
Prep Work
|
2020-10-02 17:17:50 -05:00 |
|
Tupinambis
|
d2860b38c7
|
normalization
|
2020-10-01 18:46:31 -05:00 |
|
Tupinambis
|
f1bc1ccafb
|
Merge branch 'master' into spooder
# Conflicts:
# code/modules/surgery/organs/eyes.dm
I have no idea if this will work
|
2020-10-01 17:10:42 -05:00 |
|
Timothy Teakettle
|
7726b0456c
|
Merge branch 'master' into cool-ipcs
|
2020-10-01 21:06:16 +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
|
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
|
f8bd6d3f49
|
Merge pull request #13458 from lolman360/plumbingfix3
smoke machine/autoharvest hydro tray fix
|
2020-10-01 03:06:19 -07:00 |
|
silicons
|
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 |
|
Tupinambis
|
113b84ab50
|
Ports arachnids from WaspStation
|
2020-09-30 15:10:17 -05: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
|
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
|
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
|
917dfdd403
|
Update alcohol_reagents.dm
|
2020-09-05 10:38:32 -04:00 |
|
silicons
|
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
|
9c8f3305bb
|
Merge branch 'master' into spike-loot-differentces
|
2020-08-30 00:41:42 -04:00 |
|
silicons
|
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
|
c4885d81f3
|
Merge branch 'master' into spike-loot-differentces
|
2020-08-27 03:41:14 -04:00 |
|
silicons
|
8699ce2174
|
fixes a bunch of broken clickdelays (#13218)
* fixes
* fix
|
2020-08-25 20:58:20 +02:00 |
|
Sonic121x
|
bfc5be9d8b
|
fix tea
|
2020-08-22 03:32:42 +08:00 |
|
silicons
|
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 |
|