Commit Graph

  • 96e38e965b Merge branch 'master' into mechs-are-vehicles SandPoot 2022-03-17 22:23:48 -03:00
  • fe59c7c2be Automatic changelog compile [ci skip] Changelogs 2022-03-18 00:37:38 +00:00
  • 043f6ddf5e Automatic changelog generation for PR #15559 [ci skip] CitadelStationBot 2022-03-17 19:00:29 -05:00
  • ec380ce26b Merge pull request #15559 from SandPoot/logging-runtimes Lin 2022-03-18 00:00:25 +00:00
  • f2896f3afb Merge pull request #15556 from Citadel-Station-13/silicons-patch-1 Lin 2022-03-17 06:23:40 +00:00
  • f4b74119cf try to force it through by just changing path SandPoot 2022-03-16 18:37:13 -03:00
  • 4da5a57688 global SandPoot 2022-03-16 18:33:32 -03:00
  • 11522b7761 global var SandPoot 2022-03-16 18:21:37 -03:00
  • 25bcad7be8 Update code/datums/components/armor_plate.dm SandPoot 2022-03-16 18:06:25 -03:00
  • baee52349b Upload files SandPoot 2022-03-16 15:41:07 -03:00
  • 37fef7fbba Upload files SandPoot 2022-03-16 15:33:31 -03:00
  • fdb6413d23 You guys want some logs? SandPoot 2022-03-16 15:22:04 -03:00
  • aec888a7b6 Update files SandPoot 2022-03-16 15:17:57 -03:00
  • a8f454bd72 Upload files SandPoot 2022-03-16 14:00:31 -03:00
  • a9bd8c3e94 Merge pull request #15554 from TripleShades/aaaaaa Lin 2022-03-16 05:28:09 +00:00
  • 7c1f0ae14f Automatic changelog compile [ci skip] Changelogs 2022-03-16 00:37:27 +00:00
  • 33e63e381b Automatic changelog generation for PR #15553 [ci skip] CitadelStationBot 2022-03-15 14:24:20 -05:00
  • c0da155ad5 Merge pull request #15553 from Putnam3145/fix-explosive-compressor Lin 2022-03-15 19:24:17 +00:00
  • 6f8fc5125d Update space.dm silicons 2022-03-15 10:24:46 -07:00
  • 9f0ebe17ab Automatic changelog compile [ci skip] Changelogs 2022-03-15 00:36:30 +00:00
  • f4db732446 Update MetaStation.dmm TripleShades 2022-03-14 18:05:34 -04:00
  • 2331a30220 Automatic changelog generation for PR #15547 [ci skip] CitadelStationBot 2022-03-14 13:48:13 -05:00
  • c25e074128 Merge pull request #15547 from Putnam3145/extend-min-pop Lin 2022-03-14 18:48:11 +00:00
  • 2c5a3736e0 Automatic changelog generation for PR #15546 [ci skip] CitadelStationBot 2022-03-14 13:47:12 -05:00
  • e819fbdb83 Merge pull request #15546 from Putnam3145/fix-supermatter-exploit Lin 2022-03-14 18:47:09 +00:00
  • b597675ef4 Fix explosive compressor impossibility Putnam3145 2022-03-14 11:41:20 -07:00
  • 61d54fb437 Automatic changelog generation for PR #15550 [ci skip] CitadelStationBot 2022-03-13 21:09:06 -05:00
  • 99e7249a11 Merge pull request #15550 from Putnam3145/fix_should_equalize Lin 2022-03-14 02:09:03 +00:00
  • b9aca99a69 Automatic changelog compile [ci skip] Changelogs 2022-03-14 00:38:42 +00:00
  • 99a1835e9d Automatic changelog generation for PR #15476 [ci skip] CitadelStationBot 2022-03-13 16:26:08 -05:00
  • 861a9f854f Merge pull request #15476 from DeltaFire15/core-alt-pr silicons 2022-03-13 14:26:06 -07:00
  • 094cd129de Automatic changelog generation for PR #15425 [ci skip] CitadelStationBot 2022-03-13 16:26:03 -05:00
  • fcfde73f5e Merge pull request #15425 from DeltaFire15/slower-organ-healing silicons 2022-03-13 14:26:00 -07:00
  • 950d0cc489 Automatic changelog generation for PR #15195 [ci skip] CitadelStationBot 2022-03-13 16:25:00 -05:00
  • a3284a0923 Merge pull request #15195 from DeltaFire15/med-revivalchem-nerf silicons 2022-03-13 14:24:57 -07:00
  • dda24ad287 Automatic changelog generation for PR #15375 [ci skip] CitadelStationBot 2022-03-13 14:50:33 -05:00
  • cb1848d06c no more free money (#15375) DeltaFire 2022-03-13 20:50:30 +01:00
  • 9a73e5971b Automatic changelog generation for PR #15548 [ci skip] CitadelStationBot 2022-03-13 12:16:41 -05:00
  • fa10453b99 Merge pull request #15548 from TripleShades/OMEGAAAA Lin 2022-03-13 17:16:37 +00:00
  • 32803f1cd1 Makes should_do_equalization actually work Putnam3145 2022-03-12 13:54:18 -08:00
  • f70745bf6a Update OmegaStation.dmm TripleShades 2022-03-12 16:34:39 -05:00
  • 0395ba47d7 Merge branch 'master' into Projectile_Rework Solaris-Shade 2022-03-11 23:07:31 -05:00
  • a478945424 Merge conflict one Solaris-Shade 2022-03-11 22:49:16 -05:00
  • 171bd18c8a Updated Projectile code some more. Solaris-Shade 2022-03-11 22:23:01 -05:00
  • a6d351a091 i hate decals TripleShades 2022-03-11 16:47:12 -05:00
  • 60f085cdcd god why are the decals like this TripleShades 2022-03-11 16:44:21 -05:00
  • f7bcdb5415 Update OmegaStation.dmm TripleShades 2022-03-11 16:38:50 -05:00
  • 0791a41346 Update OmegaStation.dmm TripleShades 2022-03-11 16:38:23 -05:00
  • 4e2b8949fa it is important that we actually keep track Putnam3145 2022-03-10 21:47:21 -08:00
  • 857253a07b who names a var T. Putnam3145 2022-03-10 21:42:27 -08:00
  • 2abe8f1ed6 Actually, no, just a minimum extend vote count Putnam3145 2022-03-10 21:38:39 -08:00
  • 9b4c3a5be3 Adds a minimum greater vote count to extend rounds Putnam3145 2022-03-10 21:35:08 -08:00
  • 67fb160e66 Automatic changelog compile [ci skip] Changelogs 2022-03-11 00:39:15 +00:00
  • 69389daa3b Automatic changelog generation for PR #15543 [ci skip] CitadelStationBot 2022-03-10 17:51:20 -06:00
  • 4cd8753a23 Merge pull request #15543 from timothyteakettle/floor-tile-moment silicons 2022-03-10 16:51:18 -07:00
  • a307150afd Automatic changelog generation for PR #15536 [ci skip] CitadelStationBot 2022-03-10 17:51:10 -06:00
  • 2a5a79f751 Merge pull request #15536 from SandPoot/JPS silicons 2022-03-10 16:51:07 -07:00
  • 6d3fe538ba Automatic changelog generation for PR #15535 [ci skip] CitadelStationBot 2022-03-10 17:51:02 -06:00
  • cdefa4f64a Merge pull request #15535 from SandPoot/statpanel silicons 2022-03-10 16:50:59 -07:00
  • 5b0d0ef02d Automatic changelog generation for PR #15534 [ci skip] CitadelStationBot 2022-03-10 17:50:31 -06:00
  • b1ba1d60f0 Merge pull request #15534 from SandPoot/screentips silicons 2022-03-10 16:50:28 -07:00
  • d8a91fb3a5 Automatic changelog generation for PR #15540 [ci skip] CitadelStationBot 2022-03-10 17:47:17 -06:00
  • 234b3eae8f Merge pull request #15540 from Citadel-Station-13/more-tritium-enthalpy silicons 2022-03-10 16:47:15 -07:00
  • efc541692d Automatic changelog generation for PR #15520 [ci skip] CitadelStationBot 2022-03-10 17:46:49 -06:00
  • 6cd8291f9e Merge pull request #15520 from Daggertail/master silicons 2022-03-10 16:46:46 -07:00
  • a44d0af4dc hackish supermatter dying on spaced nearby turfs Putnam3145 2022-03-09 07:49:02 -08:00
  • 9aded1bc3c Automatic changelog compile [ci skip] Changelogs 2022-03-09 00:36:18 +00:00
  • 5bee0119fd Automatic changelog generation for PR #15538 [ci skip] CitadelStationBot 2022-03-07 20:42:31 -06:00
  • 7a011c90c5 Merge pull request #15538 from Putnam3145/dynamic-holidie Lin 2022-03-08 02:42:27 +00:00
  • e717e21b26 Automatic changelog compile [ci skip] Changelogs 2022-03-08 00:37:05 +00:00
  • 59451d9088 Update plating.dm Timothy Teakettle 2022-03-07 19:45:58 +00:00
  • 1f00f61380 Update plating.dm Timothy Teakettle 2022-03-07 19:45:27 +00:00
  • b739b192e0 Automatic changelog generation for PR #15541 [ci skip] CitadelStationBot 2022-03-06 19:47:10 -06:00
  • cea01741db Merge pull request #15541 from TripleShades/aaaaa Lin 2022-03-07 01:47:07 +00:00
  • d38c1dd3db Update OmegaStation.dmm TripleShades 2022-03-06 19:37:55 -05:00
  • 967d07c83d Update OmegaStation.dmm TripleShades 2022-03-06 19:34:34 -05:00
  • 5286dcacbf Update OmegaStation.dmm TripleShades 2022-03-06 19:30:56 -05:00
  • 993db66237 Adds a LOT more enthalpy to tritium Putnam3145 2022-03-06 14:54:48 -08:00
  • c5be81c589 tg moved projectiles out of /item, added '/item' back Solaris-Shade 2022-03-06 16:29:58 -05:00
  • 062da9bb05 fixed dynamic days (lowertext) Putnam3145 2022-03-06 13:18:59 -08:00
  • 2fdb70b2b9 [DNM][DNM][WIP] Projectile backend code port and update Solaris-Shade 2022-03-06 15:20:23 -05:00
  • 7bf1bcf857 Some updates SandPoot 2022-03-05 16:18:17 -03:00
  • 21b68944e7 Upload files SandPoot 2022-03-05 16:00:12 -03:00
  • 5f083fbddd Upload files SandPoot 2022-03-05 14:22:42 -03:00
  • 45a49c6106 Upload files SandPoot 2022-03-05 13:49:26 -03:00
  • 67f89eec17 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 SandPoot 2022-03-05 13:30:42 -03:00
  • 906361a462 Automatic changelog compile [ci skip] Changelogs 2022-03-04 00:40:08 +00:00
  • 484aa1c265 Automatic changelog generation for PR #15531 [ci skip] CitadelStationBot 2022-03-02 20:45:41 -06:00
  • 7898c971ea Omega Station Again (#15531) TripleShades 2022-03-02 21:45:39 -05:00
  • c8ca35e14d Automatic changelog compile [ci skip] Changelogs 2022-03-01 00:44:37 +00:00
  • 8bb99cb05b Automatic changelog generation for PR #15530 [ci skip] CitadelStationBot 2022-02-28 16:02:00 -06:00
  • 778bf1777b fixes coiling issue (#15530) Timothy Teakettle 2022-02-28 22:01:57 +00:00
  • 535a5d43e9 Automatic changelog compile [ci skip] Changelogs 2022-02-28 00:36:44 +00:00
  • ae5896d6cf Merge pull request #15525 from keronshb/ambitioncheck Lin 2022-02-27 02:34:13 +00:00
  • 206f5d1fff Automatic changelog generation for PR #15522 [ci skip] CitadelStationBot 2022-02-26 19:09:02 -06:00
  • 2323bd31cd Merge pull request #15522 from bunny232/wintercoats silicons 2022-02-26 18:08:59 -07:00
  • d53c465102 Automatic changelog generation for PR #15526 [ci skip] CitadelStationBot 2022-02-26 19:08:50 -06:00
  • edd3a510f1 Merge pull request #15526 from timothyteakettle/bartender-pda silicons 2022-02-26 18:08:47 -07:00
  • ae2c49b472 Automatic changelog generation for PR #15528 [ci skip] CitadelStationBot 2022-02-26 19:08:30 -06:00
  • bf9afd846d Merge pull request #15528 from SandPoot/time-to-kill-this-broken-system silicons 2022-02-26 18:08:28 -07:00