Commit Graph

24553 Commits

Author SHA1 Message Date
silicons d43a5cae26 let's refactor attack_hand. 2020-07-20 11:19:20 -07:00
silicons 924309aab8 changeS 2020-07-20 11:11:12 -07:00
silicons dec84af233 Merge pull request #12830 from Funce/genetic-spider-fix
Fixes genewebs being impossibly impassable
2020-07-20 10:49:10 -07:00
silicons 984796b8c6 sigh 2020-07-20 10:46:52 -07:00
silicons 58e26c540c merge from master 2020-07-20 10:18:44 -07:00
silicons 6ab250dd03 sigh 2020-07-20 10:13:50 -07:00
Timothy Teakettle b06948bed4 fry smite 2020-07-20 17:48:37 +01:00
Timothy Teakettle a0c166c490 badmin safeguarding 2020-07-20 17:43:58 +01:00
Timothy Teakettle c68f0559d9 old instant eating speed 2020-07-20 17:29:09 +01:00
Timothy Teakettle eab0ae8af0 small changes 2020-07-20 17:20:54 +01:00
Keate Senior 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
Keate Senior 21af6d4805 same as last commit but I actually stage all the right files 2020-07-20 03:20:13 -04:00
Keate Senior 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
Heretical Lizard 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
silicons 6ac765eca5 Update subsystems.dm 2020-07-19 20:08:56 -07:00
silicons 512174b782 Update subsystems.dm 2020-07-19 20:07:16 -07:00
silicons ae83a6df02 fix 2020-07-19 19:51:17 -07:00
Chiirno 64d5bd0030 switches around messages 2020-07-19 21:38:44 -03:00
Funce 0c07faa3e0 For future reference, '.' return overrides 'return' statements 2020-07-20 12:22:18 +12:00
Funce 2af449a3c7 Fixes genewebs being impossibly impassable 2020-07-20 11:55:23 +12:00
timothyteakettle e2b68797b7 bugfixes 2020-07-20 00:49:00 +01:00
BlackMajor f265b85d3b Merge pull request #12810 from lolman360/master
service borg fix/tweak
2020-07-20 11:42:59 +12:00
timothyteakettle 8709a72fc0 fry everything 2020-07-20 00:40:18 +01:00
Winter Flare e416a2377e Merge branch 'master' into foodport-p2-7/12/20 2020-07-19 18:58:52 -04:00
Winter Flare 1ebb81e44c Fixes, final tweaks. 2020-07-19 18:52:20 -04:00
Timothy Teakettle 037cec508e fixes a math mistake 2020-07-19 21:43:17 +01:00
kappa-sama ba15c17e02 here 2020-07-19 15:14:44 -04:00
kappa-sama 26a240ddb9 bye 2020-07-19 15:14:12 -04:00
Timothy Teakettle 1b99cb9201 everything has the bonesetter 2020-07-19 18:32:44 +01:00
Timothy Teakettle fdfee756b7 you can enter stamcrit now 2020-07-19 18:18:22 +01:00
Timothy Teakettle a8d2f558bc use old table pushing 2020-07-19 17:53:25 +01:00
Timothy Teakettle ca6b289da6 fix tables and some minor thing 2020-07-19 17:49:22 +01:00
Lin b47872c079 Merge pull request #12802 from Citadel-Station-13/silicons-patch-31
fixes eshields not reflecting while active blocking uh oh
2020-07-19 11:12:32 -05:00
Lin 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
Kraseo 7094649881 don't like this 2020-07-19 11:30:55 +02:00
kappa-sama 38f05bf230 6 because i feel like it 2020-07-19 04:37:51 -04:00
kappa-sama 6075af8eb0 nerfies 2020-07-19 04:28:44 -04:00
silicons 5b408d5b33 Update space.dm 2020-07-18 20:52:15 -07:00
silicons 9b1aa39497 Update space.dm 2020-07-18 20:51:30 -07:00
silicons 53dd4fc857 Update areas.dm 2020-07-18 20:50:28 -07:00
silicons a0250cfaaa Update _movespeed_modifier.dm 2020-07-18 20:42:39 -07:00
silicons 7fc7d5888a Update _movespeed_modifier.dm 2020-07-18 20:39:05 -07:00
silicons 55f8e37544 sigh 2020-07-18 20:26:11 -07:00
silicons 910869d6bf more 2020-07-18 19:44:12 -07:00
silicons 20381927e4 Update projectile.dm 2020-07-18 19:18:42 -07:00
Winter Flare 506ddd83fe Meatloaf, Meatball sub, fixes. 2020-07-18 22:16:19 -04:00
silicons b1ccccb322 more 2020-07-18 18:51:16 -07:00
silicons 1a040dd2a6 changes 2020-07-18 18:44:17 -07:00
silicons 0c6368e3e7 e 2020-07-18 18:34:16 -07:00
silicons 0b98b0409b sigh 2020-07-18 18:29:09 -07:00