Commit Graph
38361 Commits
Author SHA1 Message Date
siliconsandGitHub 1f4e3b9a92 Merge branch 'master' into patch-2 2020-10-01 03:09:38 -07:00
CitadelStationBot edb180fdb8 Automatic changelog generation for PR #13466 [ci skip] 2020-10-01 05:07:12 -05:00
siliconsandGitHub 38c25bdc9d Merge pull request #13466 from Putnam3145/sdgf-fix
Cleans up and fixes SDGF code a bit, consistent naked clones, transfer_ckey resets view range
2020-10-01 03:07:08 -07:00
CitadelStationBot 7957d69297 Automatic changelog generation for PR #13463 [ci skip] 2020-10-01 05:06:44 -05:00
siliconsandGitHub bb09acff4c Merge pull request #13463 from timothyteakettle/slime-sprites
adds luminescent and stargazer sprites as selectable body sprites for slimes
2020-10-01 03:06:41 -07:00
CitadelStationBot 6684d1d9d7 Automatic changelog generation for PR #13458 [ci skip] 2020-10-01 05:06:22 -05:00
siliconsandGitHub f8bd6d3f49 Merge pull request #13458 from lolman360/plumbingfix3
smoke machine/autoharvest hydro tray fix
2020-10-01 03:06:19 -07:00
CitadelStationBot f6d5aa15f7 Automatic changelog generation for PR #13455 [ci skip] 2020-10-01 05:06:06 -05:00
siliconsandGitHub 7553508a2a Merge pull request #13455 from Putnam3145/pyroclastic-policy
Added policy config for sentient pyro slimes (no actual policy yet)
2020-10-01 03:06:03 -07:00
CitadelStationBot 836a8c8b54 Automatic changelog generation for PR #13450 [ci skip] 2020-10-01 05:05:40 -05:00
siliconsandGitHub bbb7ff347d Merge pull request #13450 from MrJWhit/new-swat-sprites
Plz work, new heavy suits
2020-10-01 03:05:35 -07:00
CitadelStationBot 8c1210492b Automatic changelog generation for PR #13446 [ci skip] 2020-10-01 05:05:19 -05:00
siliconsandGitHub a9ad06c107 Merge pull request #13446 from Putnam3145/dynamic-why-prob
Makes dynamic less probabilistic, keeping the desired threat level more aggressively
2020-10-01 03:05:15 -07:00
CitadelStationBot d52e4782ed Automatic changelog generation for PR #13443 [ci skip] 2020-10-01 05:04:24 -05:00
siliconsandGitHub 47aef0d574 Merge pull request #13443 from ItzGabby/gabby-wooden-floors
Gabbys new wooden floor tile types
2020-10-01 03:04:21 -07:00
CitadelStationBot 2dab76d6f4 Automatic changelog generation for PR #13431 [ci skip] 2020-10-01 05:03:44 -05:00
siliconsandGitHub ebcbe7e901 Merge pull request #13431 from EmeraldSundisk/cargoclothes
Gives Cargo Technicians the choice of longer trousers.
2020-10-01 03:03:41 -07:00
CitadelStationBot dfef3ac23b Automatic changelog generation for PR #13429 [ci skip] 2020-10-01 05:03:27 -05:00
siliconsandGitHub 095a6ae008 Merge pull request #13429 from Putnam3145/fix-initial-atmos
Fixed a dumb typo that may or may not be causing atmos jank.
2020-10-01 03:03:24 -07:00
CitadelStationBot 5636c7f3d2 Automatic changelog generation for PR #13398 [ci skip] 2020-10-01 05:02:38 -05:00
siliconsandGitHub b7650f3dea Merge pull request #13398 from timothyteakettle/wound-config
wound config values, wound bonus for how damaged a limb is
2020-10-01 03:02:35 -07:00
CitadelStationBot 71a07e68be Automatic changelog generation for PR #13375 [ci skip] 2020-10-01 05:01:22 -05:00
siliconsandGitHub 8b36cf6f64 Merge pull request #13375 from timothyteakettle/emp-rework
the emp rework (emp severity reduces as you move from epicentre, severity is 1-100)
2020-10-01 03:01:18 -07:00
CitadelStationBot 0505d65da7 Automatic changelog generation for PR #13317 [ci skip] 2020-10-01 04:56:43 -05:00
siliconsandGitHub 46a80af956 Merge pull request #13317 from LetterN/what-if-the-savefile-itself-is-teakproof-questionmark_charachter
Ports tgstation/tgstation#52549
2020-10-01 02:56:39 -07:00
CitadelStationBot 40922db2c9 Automatic changelog generation for PR #13457 [ci skip] 2020-10-01 04:44:24 -05:00
GhomandGitHub 7f08969f48 Merge pull request #13457 from SandPoot/master
Fixes not getting an action button.
2020-10-01 11:44:22 +02:00
CitadelStationBot a7a05c41a4 Automatic changelog generation for PR #13448 [ci skip] 2020-10-01 04:42:58 -05:00
GhomandGitHub a2597a4d84 Merge pull request #13448 from Tupinambis/spelling
Fixes a spelling error in an armor value that caused runtimes.
2020-10-01 11:42:55 +02:00
GhomandGitHub fb95d873aa Merge pull request #13383 from Citadel-Station-13/silicons-patch-37
fixes bomb component allowing pickup
2020-10-01 11:42:21 +02:00
GhomandGitHub dd43594e5b Merge pull request #13417 from Citadel-Station-13/silicons-patch-1
fixes mecha trackers
2020-10-01 11:40:24 +02:00
Putnam3145andGitHub 22ca31e7d4 Merge pull request #13422 from Citadel-Station-13/species_slowdown_fix
Fixes angels not being fast while flying
2020-10-01 02:40:18 -07:00
Putnam3145andGitHub 50894bc627 Merge pull request #13454 from Citadel-Station-13/silicons-patch-6
fixes botany harvest causing attack hand to runtime
2020-10-01 02:39:38 -07:00
Putnam3145andGitHub 005376be2e Merge pull request #13418 from Citadel-Station-13/silicons-patch-3
bumps typing indicator timeout because 5 minutes is too little to write emotes
2020-10-01 02:35:53 -07:00
Putnam3145andGitHub 44f05bcb21 Merge pull request #13372 from Citadel-Station-13/silicons-patch-35
please stop using explosive holoparasites to make instant kill toolboxes
2020-10-01 02:35:12 -07:00
CitadelStationBot 5d7266178a Automatic changelog generation for PR #13391 [ci skip] 2020-10-01 04:33:53 -05:00
siliconsandGitHub 75d4cc5f66 Merge pull request #13391 from dapnee/let's-change-lambda
Lambda Mk.II
2020-10-01 02:33:43 -07:00
Changelogs fc25feae91 Automatic changelog compile [ci skip] 2020-10-01 00:15:54 +00:00
siliconsandGitHub 28ea9cc91c Merge pull request #13469 from Citadel-Station-13/revert-13436-worse-idea
Revert "C++ innovations: adds an "unstuck" step to SSair, AKA brute forcing LINDA"
2020-09-30 11:54:52 -07:00
CitadelStationBot 0a64b35d1c Automatic changelog generation for PR #13416 [ci skip] 2020-09-30 11:22:28 -05:00
siliconsandGitHub 9f3b456583 Merge pull request #13416 from BlueWildrose/slimenoises
Unique slimeperson screams and laughter, and adds new customizable speech verbs
2020-09-30 09:22:25 -07:00
Changelogs 56e4205d2d Automatic changelog compile [ci skip] 2020-09-30 00:15:26 +00:00
zeroisthebiggayandGitHub 40f404498d ok
ok
2020-09-29 18:51:28 -04:00
ZandarioandGitHub 9104e2c041 Revert "C++ innovations: adds an "unstuck" step to SSair, AKA brute forcing LINDA" 2020-09-29 15:40:12 -05:00
Putnam 2b1f9405ae fixed the config names and such. 2020-09-29 05:13:48 -07:00
Putnam 4d2a2b178b Made transfer_ckey reset view range. 2020-09-29 04:11:01 -07:00
Putnam 47d43b1710 Made 80% at 1 purity, but harder ramp. 2020-09-29 04:10:50 -07:00
Putnam 8a01b949bf Cleaned up SDGF and consistencised clones. 2020-09-29 03:47:09 -07:00
Changelogs 924c866e8d Automatic changelog compile [ci skip] 2020-09-29 00:15:19 +00:00
timothyteakettle 396872e98e show the right thing 2020-09-28 23:21:34 +01:00