DeltaFire
afd8af60e3
Merge pull request #14430 from YakumoChen/genetics
...
Adjusts Thermals in Genetics; Moves X-ray implant to illegal tech.
2021-03-23 22:35:54 +01:00
silicons
bfb122d706
Merge pull request #14475 from qweq12yt/black-market-fixes
...
Black Market: The return
2021-03-22 21:14:57 -06:00
kappa-sama
1f7b15d8f8
clonwops
2021-03-19 15:35:17 -03:00
LetterN
2c2e779aa6
Merge remote-tracking branch 'origin/master' into fixes-2
2021-03-19 10:28:43 +08:00
silicons
e0cc6e3502
Merge pull request #14391 from kiwedespars/void-but-for-real
...
[HERETICS] Void & a handful of heretics-related PRS
2021-03-18 06:38:40 -06:00
DeltaFire
b105a3c831
Merge pull request #14347 from timothyteakettle/language-tab
...
the speech panel pr
2021-03-16 20:31:58 +01:00
LetterN
228105b391
laptop and closet decon fix
2021-03-16 14:47:28 +08:00
DeltaFire
79a464ca8c
Merge pull request #14141 from KeRSedChaplain/clockcultrework_v2
...
Clockwork cult rite additions and other edits
2021-03-16 07:39:41 +01:00
HeroWithYay
5ee6f23841
Safty isn't a word and even if it was this wouldn't be how you use it in a sentence.
2021-03-14 03:39:31 +13:00
kiwedespars
69d927e756
Merge branch 'master' into void-but-for-real
2021-03-12 23:10:19 -08:00
YakumoChen
0b64ea1ea4
thermal is a recipe now
2021-03-13 02:50:10 +00:00
YakumoChen
456cea91f3
thermals locked
2021-03-13 02:47:20 +00:00
YakumoChen
da303f7cf8
stimmed
2021-03-13 02:45:08 +00:00
kiwedespars
e145bdafe8
adds domain expansion
...
- adds domain expansion, final spell for void heretics
- makes clap1 into an emote
- makes cleave a little more enticing with two guaranteed critical wounds and brute damage
- buffs void mark
2021-03-11 21:26:58 -08:00
silicons
939a493334
Merge pull request #14306 from Putnam3145/supernova
...
Adds a supernova event, with tweaks to allow this
2021-03-10 01:32:52 -07:00
silicons
18fdd0c6cf
Merge pull request #14337 from kiwedespars/we-hate-cqc
...
nerfs cqc (probably)
2021-03-10 01:32:14 -07:00
kiwedespars
3b92e33112
Merge branch 'master' into void-but-for-real
2021-03-09 12:29:50 -08:00
kiwedespars
3ce6459aef
void heretic and many other prs
2021-03-09 02:58:34 -08:00
Sneakyrat6
d5b0251cb5
Merge branch 'master' into matContainer
2021-03-09 05:42:47 -05:00
Letter N
de6f1401bb
final fix
2021-03-08 13:24:28 +08:00
Sneakyrat6
0db08088c4
Fixes material insertion animations not working when there is no silo
2021-03-07 22:43:55 -05:00
Sneakyrat6
395bdaf5f9
removes code i commented out
2021-03-07 04:13:18 -05:00
Sneakyrat6
703567e591
other fixes
2021-03-07 04:09:36 -05:00
Letter N
22b33d1a6e
Merge remote-tracking branch 'origin/master' into hardsync-1.5
2021-03-07 13:04:36 +08:00
Sneakyrat6
f875218284
Fixes material component
2021-03-06 03:48:52 -05:00
Letter N
34697acf74
missing icon fix & stop throwing out parts
2021-03-05 19:29:52 +08:00
Letter N
edfe7220c4
lintfix
2021-03-05 15:45:57 +08:00
Letter N
2542fe05e9
mapmerge update + mats properly work
2021-03-05 15:38:35 +08:00
Letter N
cb346a3847
a
2021-03-05 14:29:36 +08:00
Lin
cf048e1f65
Merge pull request #14354 from Putnam3145/volume-change
...
Makes ash storm volume quieter
2021-03-04 13:32:29 -06:00
Letter N
a87e4533e5
support for tgs4 noconfigs needed***
2021-03-03 17:33:14 +08:00
Letter N
754c24748e
Merge remote-tracking branch 'origin/master' into hardsync-1.5
2021-03-03 17:09:01 +08:00
Putnam
235f916c61
Makes ash storm volume quieter.
2021-03-02 12:32:14 -08:00
Timothy Teakettle
fa765ec4c3
nope
2021-03-01 20:58:21 +00:00
kiwedespars
081b669345
Merge branch 'master' into we-hate-cqc
2021-02-27 22:19:16 -08:00
kiwedespars
123f686e7f
makes chokehold mute
2021-02-27 22:18:44 -08:00
Putnam
311d766bd5
Adds a supernova event, with tweaks to allow this
2021-02-24 02:56:14 -08:00
Letter N
5c39381117
Merge remote-tracking branch 'origin/master' into rustsql
2021-02-23 11:36:05 +08:00
Letter N
5304029dd9
Merge remote-tracking branch 'origin/master' into hardsync-1.5
2021-02-23 11:01:42 +08:00
silicons
f581d8c8e0
Merge pull request #14264 from dzahlus/pain-emote-updates
...
Pain emote is now added to getting wounded! As well as more pain sounds
2021-02-21 14:56:26 -07:00
silicons
ae63422727
Merge pull request #14269 from Putnam3145/aphro-readd
...
More arousal logging; adds back aphro/nympho
2021-02-21 14:50:32 -07:00
kiwedespars
de69e9996a
nerfs cqc
2021-02-21 13:10:08 -08:00
Putnam
cbac292731
Adds back aphro, nympho
2021-02-18 21:22:43 -08:00
Letter N
7d39949a2f
Merge remote-tracking branch 'origin/master' into rustsql
2021-02-19 12:38:32 +08:00
Letter N
037378eb7d
Merge remote-tracking branch 'origin/master' into hardsync-1.5
2021-02-19 10:34:47 +08:00
SandPoot
69af7d35f8
Update remote_materials.dm
2021-02-18 15:16:40 -03:00
SandPoot
123de14009
upload files
2021-02-18 15:05:39 -03:00
SandPoot
f738023097
Revert "Merge branch 'tool_behavior-replacing' of https://github.com/SandPoot/Citadel-Station-13 into tool_behavior-replacing"
...
This reverts commit 2e29f30fdf724910cfab
2021-02-18 15:04:46 -03:00
SandPoot
2e29f30fdf
Merge branch 'tool_behavior-replacing' of https://github.com/SandPoot/Citadel-Station-13 into tool_behavior-replacing
2021-02-18 15:04:22 -03:00
SandPoot
cf2e70671a
upload files
2021-02-18 14:47:10 -03:00
