Commit Graph

17612 Commits

Author SHA1 Message Date
silicons b279c82bb2 whew 2020-07-15 17:10:08 -07:00
silicons dba5855929 epic 2020-07-15 17:01:22 -07:00
silicons 96fb3cad8f ok 2020-07-15 17:00:17 -07:00
silicons 6fbd7914f5 stuff 2020-07-15 16:58:44 -07:00
CameronWoof a493ecdc4a suture and mesh additions 2020-07-15 16:44:24 -07:00
Timothy Teakettle a7e2668eff funniest 2020-07-15 23:50:39 +01:00
silicons f653fd5c3c kay 2020-07-15 14:58:51 -07:00
silicons 8f478ce66a quirky uh oh 2020-07-15 14:47:59 -07:00
silicons 6121cbd091 Merge pull request #12738 from timothyteakettle/travelling-traders
the travelling trader midround event
2020-07-15 08:50:20 -07:00
BlackMajor bd7c9d11d3 oh no 2020-07-16 02:02:29 +12:00
Keate Senior 14384abb59 removes the commented out Geis and Cache summon scriptures
Geis won't really work well how it is currently, and Caches could be added in the future as a form of storage/delivery system or power generation.
2020-07-15 00:12:30 -04:00
Winter Flare d6413d5559 Adds Cracker Box, Soup
Fixes stray pixels on some sushi sprites.
Adds Spiral Soup, Bear Chili
Adds Cracker Box
2020-07-14 22:43:34 -04:00
Timothy Teakettle 6be10d041c add to clothesmate 2020-07-14 21:10:37 +01:00
Timothy Teakettle 55af5f8ea2 give me my snails 2020-07-14 20:26:31 +01:00
Lin b6d8167c1e Merge pull request #12760 from Sonic121x/patch-2
Fix Paramedic Jumpsuit
2020-07-14 14:22:17 -05:00
Artur 8af78d1189 Merge remote-tracking branch 'origin/TGUI-3.0' into TGUI-3.0 2020-07-14 18:10:29 +03:00
Artur f5ee74803f Updates minter to tg and the prereqs 2020-07-14 18:08:12 +03:00
Arturlang 75eb276c98 Merge branch 'master' into TGUI-3.0 2020-07-14 16:17:23 +03:00
Artur d0f1a805e4 Merge remote-tracking branch 'Upstream/master' into TGUI-3.0 2020-07-14 16:15:48 +03:00
silicons c333a71c74 Update life.dm 2020-07-14 04:30:38 -07:00
DeltaFire 8f1e191500 stealthy cogging
APC locks after cogging, drain gets averted by prioritized powerallocation
2020-07-14 00:39:21 +02:00
Timothy Teakettle 8de062adbb fix 2020-07-13 19:46:51 +01:00
zerothebigboy 3ccd994080 a 2020-07-13 13:52:56 -04:00
Lin 004c00325f Merge pull request #12747 from Citadel-Station-13/silicons-patch-24
refactors circuit screens a bit, no more messages coming out of the floor
2020-07-13 12:22:58 -05:00
Lin 55c4e40fbb Merge pull request #12706 from silicons/records
adds security/medical records to character setup
2020-07-13 11:50:02 -05:00
Lin e143b69aa6 Merge pull request #12741 from Hatterhat/vog-but-with-less-line-changes
removing vog's ability to commit sin, probably
2020-07-13 11:31:25 -05:00
Lin ba4a77fc30 Merge pull request #12737 from Citadel-Station-13/silicons-patch-22
hey can we not have circuit fusion bombs
2020-07-13 11:29:23 -05:00
Lin 1b3112528c Merge pull request #12746 from silicons/react
chemical reactions now have priority - "the first grenade helped with the revenant and the second blew up the evacuation shuttle"
2020-07-13 11:28:52 -05:00
Artur 732a1ca438 Fixes linter and conflict shit 2020-07-13 16:35:12 +03:00
Artur 5f9364c5f8 Merge remote-tracking branch 'Upstream/master' into TGUI-3.0 2020-07-13 16:20:54 +03:00
Artur d1b3990875 Fixed scanner export 2020-07-13 16:20:21 +03:00
Sonic121x b128a21309 Paramedic jump suit adjust
paramedic jump suit now adjust able.
light version of paramedic jump suit now have a digitigrade version
2020-07-13 20:33:59 +08:00
Strazyplus 15470de825 Don't DragON me, mister!
Removes comments from code
Removes mentions of Navier
Why are we still here? Just to suffer?
2020-07-13 07:01:48 -04:00
YakumoChen 072b4b673f set hierophant friendly fire to on by default 2020-07-13 09:40:58 +00:00
Winter Flare d7f5de97da Oops. 2020-07-12 22:34:32 -04:00
Winter Flare 20cc3cad55 re-add bitesize. 2020-07-12 22:15:06 -04:00
Winter Flare 351d1748fc Updates some comments. 2020-07-12 22:05:08 -04:00
Timothy Teakettle 29628dd82a cows 2020-07-12 21:40:16 +01:00
Timothy Teakettle c0687886e4 using initial is better practice 2020-07-12 21:38:09 +01:00
Linzolle 8f578da614 PLS NO PREF BREAK 2020-07-12 14:32:19 -05:00
DeltaFire c6ea2981f4 oop 2020-07-12 18:57:47 +02:00
DeltaFire 0b0fbc1272 Updates stable gateways
Changes some stuff around, makes gateways automatically stable if they are a reebe-station obelisk-obelisk gateway
2020-07-12 18:36:59 +02:00
Timothy Teakettle 0705130448 small edgecase 2020-07-12 17:31:37 +01:00
silicons 6bf209d9a5 Update output.dm 2020-07-12 06:56:48 -07:00
silicons d9a7e860dd Update output.dm 2020-07-12 06:13:19 -07:00
silicons b94c1ab709 Update output.dm 2020-07-12 06:10:26 -07:00
silicons 72c5c2234e ok 2020-07-12 05:15:55 -07:00
Strazyplus 92a6d673ba Drakes are dragons too 2020-07-12 07:32:09 -04:00
Strazyplus 2eb353d195 More License detail tweaks. 2020-07-12 00:56:43 -04:00
Keate Senior 80b4c03c82 Initial changes to get this to github for public reviewing
-Removes the Reebe z level and puts it on the cc z level
-Replaces the Neovgre mech stepsound
-Moves spacial gateway into drivers so the cult isn't stuck stationside
-Adds the Belligerant scripture, which applies the Belligerant status effect to non-clankers in range
-Various other changes currently commented out for later work on them.
-removes the abductor teleport cameras from Reebe
-adds a Brass multitool, essentially just an advanced multitool with a special sprite.
-makes clockcult armor have 0 laser defense normally and 10 defense when the ark is almost done summoning Ratvar instead of -25 --> -15
-Makes spear recalling worded to support the addition of new weapons to summon
-Adds new structures for power generation and shuttle delaying
-Other changes I've probably forgotton, but are too lazy to scrounge through the code at 12:43 AM
2020-07-12 00:43:54 -04:00