Commit Graph

26370 Commits

Author SHA1 Message Date
BlackMajor bd7c9d11d3 oh no 2020-07-16 02:02:29 +12:00
Keate Senior 775c568a5b the ark now screams more
halves the time between screams so that cultists know its in trouble. From 60 seconds to 30 seconds.
2020-07-15 00:46:35 -04: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
Keate Senior e9ca36b902 ahaha nice I deleted the line that gives them the slab 2020-07-15 00:08:37 -04:00
Keate Senior 6275b5ae97 Forgot the 'advanced' prefix here, since thats what it is, essentially 2020-07-15 00:07:57 -04:00
b1tt3r1n0 d678806143 Circle Game, Updated
Title
2020-07-14 23:40:09 -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 0a4a0fadb3 snails 2020-07-14 20:59:25 +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
Timothy Teakettle 11148b0a26 optimisaiton 2020-07-14 18:51:46 +01:00
Timothy Teakettle 1f8e47c0f5 actually works 2020-07-14 18:40:20 +01:00
Artur 57e0cafb15 Fixes clockwork sleepers 2020-07-14 20:01:04 +03:00
silicons a381ed324d Update game_mode.dm 2020-07-14 09:28:50 -07:00
Timothy Teakettle dd1cce50e8 better solution 2020-07-14 17:23:18 +01:00
Timothy Teakettle 657810bb13 please fix it 2020-07-14 17:08:57 +01: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
Timothy Teakettle 98f63772b3 fix wrestling rotation 2020-07-14 14:35:13 +01: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
Artur c964cadd85 Makes amber alert work 2020-07-14 16:15:32 +03:00
silicons c333a71c74 Update life.dm 2020-07-14 04:30:38 -07:00
TheSpaghetti 4b615b8a6f It should actually work now.
Co-authored-by: silicons <2003111+silicons@users.noreply.github.com>
2020-07-14 02:20:27 -04:00
DeltaFire 8f1e191500 stealthy cogging
APC locks after cogging, drain gets averted by prioritized powerallocation
2020-07-14 00:39:21 +02:00
zerothebigboy 5b3050f692 b 2020-07-13 17:01:41 -04:00
zerothebigboy 4c0248835f b 2020-07-13 17:01:23 -04:00
Timothy Teakettle 8de062adbb fix 2020-07-13 19:46:51 +01:00
zerothebigboy 85f8491003 b 2020-07-13 14:45:18 -04: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 2be790e8d7 Merge pull request #12736 from Citadel-Station-13/silicons-patch-21
hey let's not have 25% micro borgs going around killing people
2020-07-13 11:51:10 -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
TheSpaghetti cb8725d08d ok maybe it is 2020-07-12 17:20: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