Commit Graph
46131 Commits
Author SHA1 Message Date
SandPootandGitHub e9637bb688 Merge branch 'master' into deadmin-prefs 2022-03-22 15:35:46 -03:00
CitadelStationBot c18f0573de Automatic changelog generation for PR #15497 [ci skip] 2022-03-22 11:24:51 -05:00
BlueWildroseandGitHub ac1c3511b1 Advanced mutation toxin nerf; new cure, removes instant subspecies transformation (#15497)
* Advanced mutation toxin nerf

* Adv Mut Toxin nerf fix - needs all cures to FALSE
2022-03-22 17:17:18 +01:00
CitadelStationBot 735ca5dbe5 Automatic changelog generation for PR #15438 [ci skip] 2022-03-21 20:56:49 -05:00
siliconsandGitHub ff6ed43bc1 Merge pull request #15438 from LiteralMushroom/patch-5
Makes it so alter form can affect eyes.
2022-03-21 18:56:47 -07:00
CitadelStationBot 0b70ef1e7c Automatic changelog generation for PR #15568 [ci skip] 2022-03-21 20:55:25 -05:00
LinandGitHub a8a9663832 Merge pull request #15568 from TripleShades/delda
Omega Tcomms and Gravgen Pipes
2022-03-22 01:55:22 +00:00
Changelogs cbd1eca905 Automatic changelog compile [ci skip] 2022-03-22 00:37:49 +00:00
CitadelStationBot f2395b0e06 Automatic changelog generation for PR #15566 [ci skip] 2022-03-20 22:37:51 -05:00
LinandGitHub f96c2be570 Merge pull request #15566 from bunny232/master
Meta customs wire
2022-03-21 03:37:48 +00:00
Changelogs 3e35a8b1c0 Automatic changelog compile [ci skip] 2022-03-21 00:36:16 +00:00
CitadelStationBot 267f435c5a Automatic changelog generation for PR #15564 [ci skip] 2022-03-20 17:30:37 -05:00
LinandGitHub 22a49c1dd7 Merge pull request #15564 from SandPoot/bad-getatomonturf
Fixes balloon alerts sourced on turfs
2022-03-20 22:30:34 +00:00
TripleShades 80bdb7b540 Update OmegaStation.dmm 2022-03-20 17:19:01 -04:00
evan 739c4708b6 Hey what if no dead ends 2022-03-19 19:04:25 -04:00
bunny232andGitHub 8720ea934d Merge pull request #1 from Citadel-Station-13/master
aeughupdoot
2022-03-19 19:01:42 -04:00
Changelogs 1efe80dfed Automatic changelog compile [ci skip] 2022-03-19 00:36:19 +00:00
CitadelStationBot c23c4a7624 Automatic changelog generation for PR #15561 [ci skip] 2022-03-18 16:15:25 -05:00
siliconsandGitHub cc9c22b1e4 Merge pull request #15561 from TripleShades/omegaaaaa
Omega Air Mixer + Turbine Wire
2022-03-18 14:15:22 -07:00
TripleShades 90d1025fbb Update OmegaStation.dmm 2022-03-18 16:56:04 -04:00
SandPoot 3ee2d12b34 Upload files 2022-03-18 12:45:07 -03:00
TripleShades bcf5be78f0 Update OmegaStation.dmm 2022-03-18 01:12:00 -04:00
TripleShades f01338c0e7 Update OmegaStation.dmm 2022-03-18 01:06:43 -04:00
TripleShades 90c42624b3 Update OmegaStation.dmm 2022-03-18 00:56:17 -04:00
TripleShades 164c483796 Update OmegaStation.dmm 2022-03-18 00:53:09 -04:00
Changelogs fe59c7c2be Automatic changelog compile [ci skip] 2022-03-18 00:37:38 +00:00
CitadelStationBot 043f6ddf5e Automatic changelog generation for PR #15559 [ci skip] 2022-03-17 19:00:29 -05:00
LinandGitHub ec380ce26b Merge pull request #15559 from SandPoot/logging-runtimes
Solves some LOG_VICTIM issues
2022-03-18 00:00:25 +00:00
LinandGitHub f2896f3afb Merge pull request #15556 from Citadel-Station-13/silicons-patch-1
fixes parallax trying to make null objects
2022-03-17 06:23:40 +00:00
SandPoot 4da5a57688 global 2022-03-16 18:33:32 -03:00
SandPoot baee52349b Upload files 2022-03-16 15:41:07 -03:00
SandPoot 37fef7fbba Upload files 2022-03-16 15:33:31 -03:00
LinandGitHub a9bd8c3e94 Merge pull request #15554 from TripleShades/aaaaaa
Metastation Nav Beacon
2022-03-16 05:28:09 +00:00
Changelogs 7c1f0ae14f Automatic changelog compile [ci skip] 2022-03-16 00:37:27 +00:00
CitadelStationBot 33e63e381b Automatic changelog generation for PR #15553 [ci skip] 2022-03-15 14:24:20 -05:00
LinandGitHub c0da155ad5 Merge pull request #15553 from Putnam3145/fix-explosive-compressor
Fix implosion compressor impossibility
2022-03-15 19:24:17 +00:00
siliconsandGitHub 6f8fc5125d Update space.dm 2022-03-15 10:24:46 -07:00
Changelogs 9f0ebe17ab Automatic changelog compile [ci skip] 2022-03-15 00:36:30 +00:00
TripleShades f4db732446 Update MetaStation.dmm 2022-03-14 18:05:34 -04:00
CitadelStationBot 2331a30220 Automatic changelog generation for PR #15547 [ci skip] 2022-03-14 13:48:13 -05:00
LinandGitHub c25e074128 Merge pull request #15547 from Putnam3145/extend-min-pop
Adds a minimum vote count to continue rounds
2022-03-14 18:48:11 +00:00
CitadelStationBot 2c5a3736e0 Automatic changelog generation for PR #15546 [ci skip] 2022-03-14 13:47:12 -05:00
LinandGitHub e819fbdb83 Merge pull request #15546 from Putnam3145/fix-supermatter-exploit
Makes supermatter take damage (and not heal) if too near to spaced turfs
2022-03-14 18:47:09 +00:00
Putnam3145 b597675ef4 Fix explosive compressor impossibility 2022-03-14 11:41:20 -07:00
CitadelStationBot 61d54fb437 Automatic changelog generation for PR #15550 [ci skip] 2022-03-13 21:09:06 -05:00
LinandGitHub 99e7249a11 Merge pull request #15550 from Putnam3145/fix_should_equalize
Makes should_do_equalization actually work
2022-03-14 02:09:03 +00:00
Changelogs b9aca99a69 Automatic changelog compile [ci skip] 2022-03-14 00:38:42 +00:00
CitadelStationBot 99a1835e9d Automatic changelog generation for PR #15476 [ci skip] 2022-03-13 16:26:08 -05:00
siliconsandGitHub 861a9f854f Merge pull request #15476 from DeltaFire15/core-alt-pr
Buffs regen core healing for robots on lavaland, nerfs regen cores when not on lavaland
2022-03-13 14:26:06 -07:00
CitadelStationBot 094cd129de Automatic changelog generation for PR #15425 [ci skip] 2022-03-13 16:26:03 -05:00