Commit Graph
25396 Commits
Author SHA1 Message Date
siliconsandGitHub f8bd6d3f49 Merge pull request #13458 from lolman360/plumbingfix3
smoke machine/autoharvest hydro tray fix
2020-10-01 03:06:19 -07: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
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
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
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
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
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
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
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
siliconsandGitHub 6ac175f5b1 Update unsorted.dm 2020-10-01 02:47:44 -07:00
siliconsandGitHub fd520349db Update radiation.dm 2020-10-01 02:46:04 -07:00
GhomandGitHub 7f08969f48 Merge pull request #13457 from SandPoot/master
Fixes not getting an action button.
2020-10-01 11:44:22 +02:00
The0bserver fc3feae4c5 Plumbing component removed, for now. 2020-10-01 05:43:09 -04: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
Letter N 5418fb5b01 fixes minimaps and cinematic, also adds some dmdoc things 2020-10-01 17:36:56 +08: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
The0bserver a9e727954e No more automagic 2020-10-01 04:49:07 -04:00
The0bserver 5a03688bdb Dirt not powered, var cleanup, plumbing enable 2020-10-01 04:43:02 -04:00
The0bserver 48df6a9494 I shot the tray, I made an accurate tip. 2020-10-01 04:07:16 -04:00
Letter N c7875f2792 commit 3 2020-10-01 12:54:49 +08:00
Letter NandGitHub d9ab31e199 commit 2 2020-10-01 11:30:01 +08:00
Letter NandGitHub 945bf051bd get railed 2020-10-01 11:28:56 +08:00
Detective Google c4480afc09 Adds a bunch of RP clothes and ports the detvendor 2020-09-30 20:50:00 -05:00
Tupinambis 67825fef74 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into CarbonHydrogenBromine 2020-09-30 19:21:21 -05:00
timothyteakettle 27c5897c4d update button icon and stand up 2020-10-01 00:17:17 +01:00
Timothy Teakettle 16735e0190 silent paralysis 2020-09-30 21:40:42 +01:00
Timothy Teakettle 6b46fdbc32 fine 2020-09-30 21:16:09 +01:00
Timothy Teakettle df6724f02e Merge remote-tracking branch 'upstream/master' into slime-puddle 2020-09-30 19:55:54 +01: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
Timothy Teakettle 7cab2c658d Merge branch 'master' into slime-puddle 2020-09-30 18:43:25 +01:00
Timothy Teakettle 2223cfeb28 better 2020-09-30 18:41:30 +01: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
Putnam c644495e5e dodgin bullets 2020-09-29 21:07:41 -07:00
Putnam 0c7003b3a5 never code while tired 2020-09-29 20:37:48 -07:00
Timothy Teakettle d783eb58bd more traits 2020-09-30 02:58:58 +01:00
Timothy Teakettle f9cf7429e1 icons and traits 2020-09-30 02:49:21 +01:00
timothyteakettle ccb774b8f2 puddles 2020-09-30 02:15:34 +01: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
EmeraldSundisk a41963fa13 Update space.dm 2020-09-29 13:03:11 -07:00
EmeraldSundisk 41d263da84 Update space.dm 2020-09-29 12:43:40 -07:00
Timothy Teakettle 1b75ccb39d puddle 2020-09-29 18:38:25 +01:00
Putnam f8200a5838 Shitcode fixing inop code. 2020-09-29 06:40:09 -07:00
Putnam 0aec88eaed escape those newlines 2020-09-29 06:12:10 -07:00
Putnam 8704949694 whoops forgot a semicolon 2020-09-29 05:58:04 -07:00