Commit Graph
17950 Commits
Author SHA1 Message Date
Seris02andGitHub bc2e4f3b5a desc 2019-12-30 19:08:37 +08:00
GhomandGitHub 20de4dfe50 Merge pull request #10333 from Trilbyspaceclone/patch-255
Makes grass distill into light beer
2019-12-30 11:18:20 +01:00
GhomandGitHub 6e506c949e Merge pull request #10348 from Putnam3145/radiation
fix divide by 0 runtime in new contam
2019-12-30 11:08:52 +01:00
GhomandGitHub a6e72c8cad ok 2019-12-30 11:00:21 +01:00
Putnam 418e4c21ef Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into dojo-ghostrole 2019-12-30 01:56:59 -08:00
Putnam cb1403e095 oh yeah that's there too 2019-12-30 01:54:46 -08:00
Putnam 6e9d13e48f Replace the cryopod with a simple ghost button. 2019-12-30 01:52:06 -08:00
KathrinBailey 283ccceb24 CE Locker Exodus: The Removaling
Removes junk from the CE locker.
Adds empty engineering lockers.
I don't know how to do this as a child and not have populate contents fill the child.
2019-12-30 09:25:03 +00:00
Putnam f2759abb4c fixed a runtime 2019-12-30 01:18:05 -08:00
TrilbyspacecloneandGitHub 24d4684afb Maybe he means this? 2019-12-30 03:56:44 -05:00
Putnam 90ebbdfdb9 elements are so good. they're so good 2019-12-30 00:53:03 -08:00
kevinz000 24e3b88a34 Merge remote-tracking branch 'citadel/master' into michael_labs 2019-12-30 00:32:25 -08:00
kevinz000andGitHub 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
kevinz000andGitHub eb00538843 Merge pull request #10331 from Trilbyspaceclone/patch-254
Buffs borg hypo's
2019-12-30 00:20:35 -08:00
kevinz000andGitHub ae77577ed3 Merge pull request #10239 from Ghommie/Ghommie-cit480
Fixing a few consistency issues with Nightmares.
2019-12-30 00:15:03 -08:00
kevinz000andGitHub 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
kevinz000andGitHub 80606f42ac Merge pull request #10334 from keronshb/REFLECTORBLOBPORT
Ports reflector blobs
2019-12-30 00:11:50 -08:00
kevinz000andGitHub d1434c767c Merge pull request #10335 from kappa-sama/patch-12
mouth slice
2019-12-30 00:11:38 -08:00
kevinz000andGitHub 0dc55b209a Merge pull request #10336 from ItzGabby/Poly-Collar-UI-Fix
Fixes UI for poly collars
2019-12-30 00:11:27 -08:00
kevinz000andGitHub 74edd7b13f Merge pull request #10243 from Putnam3145/lewdchem-better-options
Lewd chem sanity pass/"ERP preferences"
2019-12-30 00:09:18 -08:00
kevinz000andGitHub 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
kevinz000andGitHub 47c92e380c Merge branch 'master' into throwing_disarm_stuff 2019-12-30 00:05:17 -08:00
kevinz000andGitHub 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
Putnam ad83211058 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into dojo-ghostrole 2019-12-29 21:28:49 -08:00
Putnam a4c356ad57 added a cryo to the ghost cafe 2019-12-29 21:28:09 -08:00
Putnam cc087b990c Code improvements 2019-12-29 21:01:55 -08:00
Putnam3145andGitHub 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 40730b48d5 few fixes 2019-12-30 11:49:16 +08:00
Seris02 f1292c503c makes it a trait 2019-12-30 11:33:15 +08:00
Seris02 f663c4db96 tiny fixes 2019-12-30 11:24:12 +08:00
Putnam ddf233e0d5 Made no antags show up after auto call 2019-12-29 18:53:49 -08:00
Putnam 93207cae0b made "random" more random 2019-12-29 18:53:27 -08:00
Putnam fb9b6dcc10 SCORING WRONG THE WHOLE TIME 2019-12-29 18:25:11 -08:00
Putnam fa35c5128c Rebalancing bloodsuckers a tad 2019-12-29 18:09:23 -08:00
TrilbyspacecloneandGitHub 4a5715e5ac Update belt.dm 2019-12-29 19:13:32 -05:00
Ghommie 87cca7a649 ...which var are you? 2019-12-30 01:05:54 +01:00
Ghommie 8a32b89f17 Wait a minute... 2019-12-30 01:05:21 +01:00
Ghommie 55cb844bc2 chestbursters deleting brains fix. 2019-12-30 01:00:36 +01:00
Ghommie edd05cebea Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit367 2019-12-30 00:28:36 +01:00
BlackMajor c14a639f6e crusher wasn't dealing damage whoops 2019-12-30 12:25:12 +13:00
Ghommie 0ab817c208 [s] Fixes ghost anti-ghostrole timers a little. 2019-12-29 22:22:20 +01:00
keronshb baf8b28f3a Fixes Reduced Diagnostics and adds disks
Fixes reduced diagnostics not working properly and adds program disks for each of the new nanites.
2019-12-29 16:03:38 -05:00
TrilbyspacecloneandGitHub 1cc4464726 Update engine_goggles.dm 2019-12-29 15:01:02 -05:00
TrilbyspacecloneandGitHub ee7346f280 got it 2019-12-29 15:00:33 -05:00
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
Putnam eb9e27a497 actually screw this "remove if recent" thing it's too much trouble 2019-12-29 11:23:37 -08:00
Putnam 68c9a371d9 Made story *purely* story, no extended-weighting 2019-12-29 10:56:48 -08:00
GhomandGitHub d1a4bf6895 Merge pull request #10323 from Seris02/pandorafix
probably fixes pandoras attacking their owners
2019-12-29 17:30:59 +01:00
GhomandGitHub b549670e39 Merge pull request #10324 from Trilbyspaceclone/patch-253
Honey no longer murders slimes
2019-12-29 17:24:19 +01:00