Commit Graph

9531 Commits

Author SHA1 Message Date
Artur af65b626e3 Merge remote-tracking branch 'Upstream/master' into TGUI-3.0 2020-07-16 15:56:08 +03:00
Letter N 2afab07b4a https://github.com/tgstation/tgstation/pull/52255 2020-07-16 20:05:37 +08:00
Keate Senior 287df312e1 Reebe should probably initialize with the mode again, huh. 2020-07-16 02:31:38 -04:00
CameronWoof a493ecdc4a suture and mesh additions 2020-07-15 16:44:24 -07:00
silicons f653fd5c3c kay 2020-07-15 14:58:51 -07:00
Timothy Teakettle 0184739005 undo the woopsy 2020-07-15 19:53:37 +01: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 06a4e57de9 changing this just means they can pick up jetpacks 2020-07-16 02:11:38 +12:00
BlackMajor bd7c9d11d3 oh no 2020-07-16 02:02:29 +12: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 0a4a0fadb3 snails 2020-07-14 20:59:25 +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
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 c964cadd85 Makes amber alert work 2020-07-14 16:15:32 +03: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
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
Artur 5f9364c5f8 Merge remote-tracking branch 'Upstream/master' into TGUI-3.0 2020-07-13 16:20:54 +03: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
Timothy Teakettle 75c962ef7b handle removal 2020-07-12 20:18:49 +01:00
Timothy Teakettle c3d490a803 very cool 2020-07-12 20:15:57 +01: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
Strazyplus 582be67063 Lawyer-drake when?
unmodularized drakeborg
added licencing documentation
reduced / simpified code comments
2020-07-12 00:42:46 -04:00
silicons f99a0564de Merge pull request #12693 from Owai-Seek/trashbag-7-4-20
Trashbag Whitelist Update
2020-07-11 21:28:12 -07:00
timothyteakettle 3e5f981825 speed 4 for embeds 2020-07-12 03:17:50 +01:00
Strazyplus 13fe156a8b Dragon online! 2020-07-11 21:32:34 -04:00
timothyteakettle fbb9fe2d9c better fork 2020-07-12 02:14:50 +01:00
timothyteakettle cff2e3d680 never set max amount to 0 2020-07-12 00:58:34 +01:00
timothyteakettle 8712dd6de4 bugfixes 2020-07-12 00:31:45 +01:00
Timothy Teakettle c1592ad162 more rewards 2020-07-11 23:27:29 +01:00
silicons 62df48b2f0 Update robot_upgrades.dm 2020-07-11 15:11:53 -07:00
Lin 955d9fa0cc Merge pull request #12624 from Citadel-Station-13/policy
policy configuration & support hooks for clone memory disorder
2020-07-11 16:40:38 -05:00
Lin e87653f781 Merge pull request #12594 from Citadel-Station-13/silicons-patch-3
what if you could override the entire say verb/emphasis system to audibly emote with ! like in baycode servers
2020-07-11 16:00:39 -05:00
silicons 00867c064c Merge pull request #12715 from HeroWithYay/Drinkable_Telecrystals
Drinkable and Sell-able Telecrystals
2020-07-11 00:49:15 -07:00
silicons 3d80792e79 more 2020-07-11 00:37:56 -07:00
silicons 4f4c6b85bf Merge pull request #12720 from timothyteakettle/eye-contact
port examines and eye contact
2020-07-11 00:14:47 -07:00
Chiirno 2940f0efa5 Update code/game/objects/items/storage/firstaid.dm
Co-authored-by: silicons <2003111+silicons@users.noreply.github.com>
2020-07-10 02:35:42 -04:00
silicons 8686029009 Update turnstile.dm 2020-07-09 23:04:58 -07:00
silicons 6af7519727 Update turnstile.dm 2020-07-09 23:04:06 -07:00
silicons 31da81aff4 Merge pull request #12217 from Putnam3145/putnamos-for-real
The real fastmos: C++ monstermos port
2020-07-09 20:37:18 -07:00