Commit Graph

27538 Commits

Author SHA1 Message Date
CitadelStationBot 2a893caa30 Automatic changelog generation for PR #10306 [ci skip] 2019-12-30 13:11:36 -06:00
Ghom d3bf4bbb8c Merge pull request #10306 from Arturlang/patch-2
Removes most of vampire armor and removes stun scaling, and associates the buffs with physiology
2019-12-30 20:11:34 +01:00
Arturlang 0776cade21 Ghommies fixes 2019-12-30 20:18:49 +02:00
CitadelStationBot f8296b53cb Automatic changelog generation for PR #10339 [ci skip] 2019-12-30 11:24:53 -06:00
Ghom e309497af2 Merge pull request #10339 from Seris02/teleivdrip
telescopic IV drips
2019-12-30 18:24:50 +01:00
Seris02 f0ba93052d yee2. 2019-12-30 23:53:10 +08:00
Seris02 bebd1a4600 yee. 2019-12-30 23:52:36 +08:00
Ghom bfc6687916 Merge pull request #10351 from Citadel-Station-13/changelog
changelog.html
2019-12-30 16:25:02 +01:00
CitadelStationBot 40ad6cb49f Automatic changelog generation for PR #10337 [ci skip] 2019-12-30 09:03:37 -06:00
Ghom 0bbae3500f Merge pull request #10337 from Seris02/autoooc
Auto OOC
2019-12-30 16:03:34 +01:00
Seris02 9653dc470b Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into autoooc 2019-12-30 22:48:39 +08:00
CitadelStationBot 557116ebd2 changelog.html 2019-12-30 10:18:47 +00:00
CitadelStationBot cef4fc9fdd Automatic changelog generation for PR #10333 [ci skip] 2019-12-30 04:18:23 -06:00
Ghom 20de4dfe50 Merge pull request #10333 from Trilbyspaceclone/patch-255
Makes grass distill into light beer
2019-12-30 11:18:20 +01:00
CitadelStationBot 11827be5ed Automatic changelog generation for PR #10348 [ci skip] 2019-12-30 04:08:55 -06:00
Ghom 6e506c949e Merge pull request #10348 from Putnam3145/radiation
fix divide by 0 runtime in new contam
2019-12-30 11:08:52 +01:00
Ghom a6e72c8cad ok 2019-12-30 11:00:21 +01:00
CitadelStationBot 5a8380f77b Automatic changelog generation for PR #10320 [ci skip] 2019-12-30 02:26:22 -06:00
kevinz000 fef66b1bd7 Merge pull request #10320 from Seris02/exclusion
excludes certain ghost roles from being affected by health events
2019-12-30 00:26:19 -08:00
CitadelStationBot a406edc3fd Automatic changelog generation for PR #10331 [ci skip] 2019-12-30 02:20:38 -06:00
kevinz000 eb00538843 Merge pull request #10331 from Trilbyspaceclone/patch-254
Buffs borg hypo's
2019-12-30 00:20:35 -08:00
CitadelStationBot fc473f0645 Automatic changelog generation for PR #10168 [ci skip] 2019-12-30 02:17:49 -06:00
kevinz000 7e5729ffaf Merge pull request #10168 from Ghommie/Ghommie-cit459
Allows ghost mentors to orbit around the target instead of setting their view to theirs.
2019-12-30 00:17:46 -08:00
CitadelStationBot 3fcf55b2ee Automatic changelog generation for PR #10239 [ci skip] 2019-12-30 02:15:06 -06:00
kevinz000 ae77577ed3 Merge pull request #10239 from Ghommie/Ghommie-cit480
Fixing a few consistency issues with Nightmares.
2019-12-30 00:15:03 -08:00
kevinz000 97aadba950 Merge pull request #10259 from Citadel-Station-13/revert-10126-he-tweaks
Revert "Makes HE pipes realistically radiate away heat"
2019-12-30 00:13:45 -08:00
CitadelStationBot be33ed0a74 Automatic changelog generation for PR #10334 [ci skip] 2019-12-30 02:11:52 -06:00
kevinz000 80606f42ac Merge pull request #10334 from keronshb/REFLECTORBLOBPORT
Ports reflector blobs
2019-12-30 00:11:50 -08:00
CitadelStationBot 4b07e5e452 Automatic changelog generation for PR #10335 [ci skip] 2019-12-30 02:11:41 -06:00
kevinz000 d1434c767c Merge pull request #10335 from kappa-sama/patch-12
mouth slice
2019-12-30 00:11:38 -08:00
CitadelStationBot e22a0d03b5 Automatic changelog generation for PR #10336 [ci skip] 2019-12-30 02:11:30 -06:00
kevinz000 0dc55b209a Merge pull request #10336 from ItzGabby/Poly-Collar-UI-Fix
Fixes UI for poly collars
2019-12-30 00:11:27 -08:00
CitadelStationBot 6c2fd39294 Automatic changelog generation for PR #10243 [ci skip] 2019-12-30 02:09:20 -06:00
kevinz000 74edd7b13f Merge pull request #10243 from Putnam3145/lewdchem-better-options
Lewd chem sanity pass/"ERP preferences"
2019-12-30 00:09:18 -08:00
CitadelStationBot db3be04f62 Automatic changelog generation for PR #10312 [ci skip] 2019-12-30 02:07:35 -06:00
kevinz000 3f4594d78e Merge pull request #10312 from Commandersand/prayfornoconflictslel
ports rp dresses/pants/chaps, available through loadout or vendors(without breaking my github branch)
2019-12-30 00:07:32 -08:00
CitadelStationBot 6b804fba8f Automatic changelog generation for PR #10095 [ci skip] 2019-12-30 02:03:24 -06:00
kevinz000 310d343242 Merge pull request #10095 from Ghommie/Ghommie-cit443
Buffs clown ops by removing their clumsiness and adding a new trait to be used in place of several clown role checks.
2019-12-30 00:03:21 -08:00
Putnam 1b7e9c6716 wow divide by 0 very cool 2019-12-29 22:03:23 -08:00
Putnam3145 640419eed5 Merge pull request #10343 from Ghommie/Ghommie-cit494
[s] Fixes anti-ghost-role vars a little.
2019-12-29 20:54:55 -08:00
Seris02 f1292c503c makes it a trait 2019-12-30 11:33:15 +08:00
Ghommie 0ab817c208 [s] Fixes ghost anti-ghostrole timers a little. 2019-12-29 22:22:20 +01:00
Trilbyspaceclone a2b79e043f Update code/modules/hydroponics/grown/grass_carpet.dm
Co-Authored-By: Ghom <42542238+Ghommie@users.noreply.github.com>
2019-12-29 14:57:22 -05:00
CitadelStationBot af36465413 Automatic changelog generation for PR #10323 [ci skip] 2019-12-29 10:31:02 -06:00
Ghom d1a4bf6895 Merge pull request #10323 from Seris02/pandorafix
probably fixes pandoras attacking their owners
2019-12-29 17:30:59 +01:00
CitadelStationBot c9cbd55fed Automatic changelog generation for PR #10324 [ci skip] 2019-12-29 10:24:22 -06:00
Ghom b549670e39 Merge pull request #10324 from Trilbyspaceclone/patch-253
Honey no longer murders slimes
2019-12-29 17:24:19 +01:00
Seris02 b96bcf6eec tiny fix 2019-12-29 23:47:30 +08:00
Seris02 9b3654e4ff telescopic IVs 2019-12-29 23:26:53 +08:00
Seris02 e093b5e5cd roundend too 2019-12-29 18:51:10 +08:00