e8e625cb5c
Merge pull request #14603 from Putnam3145/fix-base-option
...
Activity tracking; traitor class tweaks
2021-04-18 18:49:27 -06:00
4811216f07
Activity tracking; traitor class tweaks
2021-04-13 06:42:32 -07:00
ef2482c6b0
renders storage objects independently per user ( #14545 )
...
* sigh
* sigh
* override
* hah..
* kinda working
* done
2021-04-13 15:16:21 +02:00
2b2dc88d6f
viro symptom typo fix ( #14600 )
...
fixes a typo stating wrong treshold
2021-04-12 18:39:24 +02:00
610dd41cb9
Fixes phantom mob-holder items
2021-04-08 21:12:30 -07:00
f998efa7bc
Merge pull request #14551 from BlueWildrose/ThePuddler2
...
This was going to just be a fix for slime puddles making mutation and cult visual indicators disappear but it ended up becoming more complicated than I thought
2021-04-08 03:23:57 -06:00
a367a057e4
Merge pull request #14562 from BlueWildrose/poppinoff
...
Buffs the genetic mutation Autotomy
2021-04-08 03:23:22 -06:00
e29beaf852
I'll use this linter error as an opportunity to fix some grammar
2021-04-03 11:26:35 -07:00
d55bb8231d
Buffs autotomy
2021-04-03 10:55:34 -07:00
b363cdd5ca
fixes puddles, cultism checks, spellchecks
2021-04-01 04:29:35 -07:00
f976a89157
Merge remote-tracking branch 'origin/master' into perlin-genny
2021-03-31 08:19:31 +08:00
bdbb33842e
Merge pull request #14513 from Putnam3145/chaos-for-secret
...
Makes threat a subsystem instead of dynamic-attached
2021-03-27 01:33:27 -06:00
8a5d87725b
Merge pull request #14515 from CuteMoff/Plasmaispogtake2
...
Lets try again, Plasma Ingots (Fucked up the first time)
2021-03-27 01:32:47 -06:00
bf382f490c
Merge pull request #14518 from necromanceranne/shield_explodies_fix
...
Shields: Changes, additional flags, bug fixes, sprites
2021-03-27 01:31:55 -06:00
2368968c66
Ports #42721 which happened to resolve this already
2021-03-26 08:45:14 +11:00
dd295d20c2
Merge branch 'master' into Plasmaispogtake2
2021-03-25 10:44:12 -04:00
7265724c5b
Update basemats.dm
2021-03-25 10:29:56 -04:00
899b94f0f3
Made threat a subsystem instead of dynamic-attached.
2021-03-24 23:44:37 -07:00
e3fb2d5491
Merge remote-tracking branch 'origin/master' into perlin-genny
2021-03-24 21:55:47 +08:00
ee4fad7966
Update basemats.dm
2021-03-23 20:34:17 -04:00
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
bfb122d706
Merge pull request #14475 from qweq12yt/black-market-fixes
...
Black Market: The return
2021-03-22 21:14:57 -06:00
292f67e098
Merge remote-tracking branch 'origin/master' into perlin-genny
2021-03-20 20:36:56 +08:00
1f7b15d8f8
clonwops
2021-03-19 15:35:17 -03:00
2c2e779aa6
Merge remote-tracking branch 'origin/master' into fixes-2
2021-03-19 10:28:43 +08:00
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
b105a3c831
Merge pull request #14347 from timothyteakettle/language-tab
...
the speech panel pr
2021-03-16 20:31:58 +01:00
228105b391
laptop and closet decon fix
2021-03-16 14:47:28 +08:00
79a464ca8c
Merge pull request #14141 from KeRSedChaplain/clockcultrework_v2
...
Clockwork cult rite additions and other edits
2021-03-16 07:39:41 +01:00
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
69d927e756
Merge branch 'master' into void-but-for-real
2021-03-12 23:10:19 -08:00
0b64ea1ea4
thermal is a recipe now
2021-03-13 02:50:10 +00:00
456cea91f3
thermals locked
2021-03-13 02:47:20 +00:00
da303f7cf8
stimmed
2021-03-13 02:45:08 +00:00
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
935e46b492
The Mapping Update
...
Cleans up the map (again)
Makes mining code more better
2021-03-12 12:11:35 +08:00
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
18fdd0c6cf
Merge pull request #14337 from kiwedespars/we-hate-cqc
...
nerfs cqc (probably)
2021-03-10 01:32:14 -07:00
3b92e33112
Merge branch 'master' into void-but-for-real
2021-03-09 12:29:50 -08:00
3ce6459aef
void heretic and many other prs
2021-03-09 02:58:34 -08:00
d5b0251cb5
Merge branch 'master' into matContainer
2021-03-09 05:42:47 -05:00
de6f1401bb
final fix
2021-03-08 13:24:28 +08:00
0db08088c4
Fixes material insertion animations not working when there is no silo
2021-03-07 22:43:55 -05:00
395bdaf5f9
removes code i commented out
2021-03-07 04:13:18 -05:00
703567e591
other fixes
2021-03-07 04:09:36 -05:00
22b33d1a6e
Merge remote-tracking branch 'origin/master' into hardsync-1.5
2021-03-07 13:04:36 +08:00
f875218284
Fixes material component
2021-03-06 03:48:52 -05:00
34697acf74
missing icon fix & stop throwing out parts
2021-03-05 19:29:52 +08:00
edfe7220c4
lintfix
2021-03-05 15:45:57 +08:00
2542fe05e9
mapmerge update + mats properly work
2021-03-05 15:38:35 +08:00
silicons