984796b8c6
sigh
2020-07-20 10:46:52 -07:00
58e26c540c
merge from master
2020-07-20 10:18:44 -07:00
6ab250dd03
sigh
2020-07-20 10:13:50 -07:00
b06948bed4
fry smite
2020-07-20 17:48:37 +01:00
eab0ae8af0
small changes
2020-07-20 17:20:54 +01:00
30e96eb062
makes various structures work better for a station based mode
...
Also updates scripture descriptions to not be from the old version of the mode
2020-07-20 03:26:41 -04:00
21af6d4805
same as last commit but I actually stage all the right files
2020-07-20 03:20:13 -04:00
beb6dd6e08
scripture changes and new marauder variant
...
The Ark summoning scripture is being temporarily moved to applications until I can fix it not showing up in a new UI tab, as well as adds the Clockwork Guardian, a marauder variant that acts similar to holoparasites/guardian spirits in the sense that they're linked to a host. slower than normal marauders but with more health, they can automatically block and counter any melee attack, and heal their host up to a small amount if the host is heavily injured (65% health)
2020-07-20 03:16:03 -04:00
7e836837f9
Merge pull request #4 from DeltaFire15/COGGERS
...
Stablegateway stuff from Deltafire but I put it in my own repo
2020-07-20 03:04:44 -04:00
ae83a6df02
fix
2020-07-19 19:51:17 -07:00
e2b68797b7
bugfixes
2020-07-20 00:49:00 +01:00
f265b85d3b
Merge pull request #12810 from lolman360/master
...
service borg fix/tweak
2020-07-20 11:42:59 +12:00
8709a72fc0
fry everything
2020-07-20 00:40:18 +01:00
e416a2377e
Merge branch 'master' into foodport-p2-7/12/20
2020-07-19 18:58:52 -04:00
1ebb81e44c
Fixes, final tweaks.
2020-07-19 18:52:20 -04:00
ba15c17e02
here
2020-07-19 15:14:44 -04:00
26a240ddb9
bye
2020-07-19 15:14:12 -04:00
1b99cb9201
everything has the bonesetter
2020-07-19 18:32:44 +01:00
fdfee756b7
you can enter stamcrit now
2020-07-19 18:18:22 +01:00
ca6b289da6
fix tables and some minor thing
2020-07-19 17:49:22 +01:00
f2e0e5c247
Merge pull request #12814 from Citadel-Station-13/silicons-patch-35
...
fixes gateways switching to active power use when thy should not be using power at all
2020-07-19 11:10:51 -05:00
7094649881
don't like this
2020-07-19 11:30:55 +02:00
38f05bf230
6 because i feel like it
2020-07-19 04:37:51 -04:00
6075af8eb0
nerfies
2020-07-19 04:28:44 -04:00
a0250cfaaa
Update _movespeed_modifier.dm
2020-07-18 20:42:39 -07:00
7fc7d5888a
Update _movespeed_modifier.dm
2020-07-18 20:39:05 -07:00
55f8e37544
sigh
2020-07-18 20:26:11 -07:00
910869d6bf
more
2020-07-18 19:44:12 -07:00
20381927e4
Update projectile.dm
2020-07-18 19:18:42 -07:00
506ddd83fe
Meatloaf, Meatball sub, fixes.
2020-07-18 22:16:19 -04:00
b1ccccb322
more
2020-07-18 18:51:16 -07:00
1a040dd2a6
changes
2020-07-18 18:44:17 -07:00
0c6368e3e7
e
2020-07-18 18:34:16 -07:00
0b98b0409b
sigh
2020-07-18 18:29:09 -07:00
7c5d4f863d
click cd breakout
2020-07-18 18:10:21 -07:00
3d65be4ee9
sigh
2020-07-18 18:03:17 -07:00
89ecaf3b82
Potato Meals, Sweet and Sour.
2020-07-18 20:53:16 -04:00
1ba6777b35
Whew
2020-07-18 17:49:06 -07:00
771a28e685
oh boy
2020-07-18 17:48:51 -07:00
de5e87d522
Fixes a typo
2020-07-19 02:37:11 +03:00
2effbf4db0
Fixes Spiral, and Cracker Box
2020-07-18 18:53:47 -04:00
1a5008fee7
Merge branch 'master' into wound-port
2020-07-18 23:06:49 +01:00
ba3dc6a73b
Merge pull request #12679 from silicons/unarmed_parry
...
Ok ok hear me out: Implements unarmed parry.
2020-07-18 17:02:02 -05:00
f2e039a743
back up to 5
2020-07-18 17:42:35 -04:00
345c5c593d
everyone but slimes can scar basically
2020-07-18 22:31:52 +01:00
74eadcf9c2
removes a singular full stop
2020-07-18 22:25:42 +01:00
f290050a78
Merge branch 'wound-port' of https://github.com/timothyteakettle/Citadel-Station-13 into wound-port
2020-07-18 22:02:24 +01:00
b184cfefc5
imagine allowing wound healing
2020-07-18 22:00:28 +01:00
974b80a2fd
Merge branch 'master' into wound-port
2020-07-18 21:45:24 +01:00
fe79c53f04
bugfixes
2020-07-18 21:40:19 +01:00
silicons