Commit Graph

875 Commits

Author SHA1 Message Date
Putnam3145 90bc48f579 Some hallucination tweaks 2021-07-20 22:49:08 -07:00
silicons 5204f5a6d9 Merge pull request #13991 from Putnam3145/auxtools-atmos
Replaces extools with auxtools; atmos overhaul
2021-06-27 11:01:32 -07:00
Putnam3145 a7765aed6f Fixes shoddy math & assumptions causing APCs in sufficiently high-power-requiring rooms to work forever (#14896)
* Fixes shoddy math & assumptions causing bad

* i typed it. i know it did.
2021-06-27 16:39:32 +02:00
Putnam 39dbbd0f21 Fixed deactivated supermatters eating gas 2021-06-13 09:22:43 -07:00
Putnam 86177c51c4 auxgm part 1
see also https://github.com/Baystation12/Baystation12/blob/dev/code/modules/xgm/xgm_gas_data.dm
2021-06-08 09:54:28 -07:00
Putnam d03bf641dd extreme optimization project to maybe fix game 2021-06-06 21:58:24 -07:00
Putnam e580c504fa Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into auxtools-atmos 2021-05-21 18:52:16 -07:00
Putnam 8d96de6b03 More tweaks, whoops 2021-05-06 14:52:17 -07:00
silicons 47489c21d6 Merge remote-tracking branch 'citadel/master' into auxtools-atmos 2021-04-27 00:59:45 -07:00
qweq12yt eff724a3f5 time to LOUD 2021-04-06 18:57:00 -03:00
Putnam f1e55f2df0 Paranoid updates to maybe fix air duplication 2021-03-20 22:02:47 -07:00
LetterN 292f67e098 Merge remote-tracking branch 'origin/master' into perlin-genny 2021-03-20 20:36:56 +08:00
DeltaFire 79a464ca8c Merge pull request #14141 from KeRSedChaplain/clockcultrework_v2
Clockwork cult rite additions and other edits
2021-03-16 07:39:41 +01:00
Letter N 935e46b492 The Mapping Update
Cleans up the map (again)
Makes mining code more better
2021-03-12 12:11:35 +08:00
silicons 939a493334 Merge pull request #14306 from Putnam3145/supernova
Adds a supernova event, with tweaks to allow this
2021-03-10 01:32:52 -07:00
silicons 34c4887b69 Merge pull request #14351 from Putnam3145/teg-uncap
Uncaps TEG output
2021-03-09 00:17:47 -07:00
Putnam cc360288bd Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into auxtools-atmos 2021-03-08 14:46:46 -08:00
Letter N cb346a3847 a 2021-03-05 14:29:36 +08:00
Dan-Neposh ca2f302d69 Rewords Nar'Sies death annoucement 2021-03-04 10:51:44 -05:00
Dan-Neposh b2f80555bb hopefully fixes run linters, as well as rewords some announcements 2021-03-04 01:58:36 -05:00
Putnam 1f8b7cda94 Uncaps TEG 2021-03-02 03:04:45 -08:00
Putnam f07a9c13fb Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into auxtools-atmos 2021-03-02 01:44:58 -08:00
Putnam 311d766bd5 Adds a supernova event, with tweaks to allow this 2021-02-24 02:56:14 -08:00
Letter N 5304029dd9 Merge remote-tracking branch 'origin/master' into hardsync-1.5 2021-02-23 11:01:42 +08:00
Letter N 037378eb7d Merge remote-tracking branch 'origin/master' into hardsync-1.5 2021-02-19 10:34:47 +08:00
SandPoot 123de14009 upload files 2021-02-18 15:05:39 -03:00
SandPoot f738023097 Revert "Merge branch 'tool_behavior-replacing' of https://github.com/SandPoot/Citadel-Station-13 into tool_behavior-replacing"
This reverts commit 2e29f30fdf, reversing
changes made to 724910cfab.
2021-02-18 15:04:46 -03:00
SandPoot 2e29f30fdf Merge branch 'tool_behavior-replacing' of https://github.com/SandPoot/Citadel-Station-13 into tool_behavior-replacing 2021-02-18 15:04:22 -03:00
SandPoot cf2e70671a upload files 2021-02-18 14:47:10 -03:00
Dan-Neposh 2ec2f55eb7 updates fork 2021-02-17 12:03:28 -05:00
silicons 3cac44b2f0 a 2021-02-15 19:35:16 -07:00
Letter N 45d6a5f87f it compiles, UNTESTED YET 2021-02-13 21:41:59 +08:00
Dan-Neposh fb75c6a949 adds in ending sequence for Ratvar spawning, + various other changes
above, as well as cancelling out each gods round end sequence depending on who wins their fight, plus some description edits which make more sense with the station based setting
2021-01-22 00:04:04 -05:00
Dan-Neposh 48d8ffc9a7 reverts every change slowing down developement of this PR 2021-01-21 23:42:23 -05:00
Putnam 158dd11d8d Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into auxtools-atmos 2021-01-19 17:52:40 -08:00
Putnam f05df1c7de Huge optimizations+some fixes 2021-01-19 17:48:20 -08:00
Dan-Neposh 04d5721c4d Merge branch 'master' into clockcultrework_v2 2021-01-14 19:51:15 -05:00
silicons ddad368d6a Merge remote-tracking branch 'citadel/master' into tgsync 2021-01-08 00:33:57 -08:00
silicons 0c87c3b0e0 fiX 2020-12-28 12:15:55 -08:00
Letter N 1095142a5f Merge remote-tracking branch 'origin/master' into semi-sync 2020-12-26 10:58:12 +08:00
DeltaFire 971ea2010f Merge pull request #13865 from Citadel-Station-13/silicons-patch-41
cell/proc/give() no longer lets you give negative charge
2020-12-25 19:46:16 +01:00
silicons 488bf18106 Update apc.dm 2020-12-24 21:31:02 -07:00
silicons f2b16b82fc Update cell.dm 2020-12-24 21:26:25 -07:00
Letter N 56fb81d02c Immursive Audio 2 2020-12-24 11:06:49 +08:00
Letter N a808f805d4 ASYNC EVERYTHING! 2020-12-21 16:24:51 +08:00
silicons a20f14b937 Merge pull request #13705 from Putnam3145/buff-rad-collector
Buffs rad collectors
2020-11-25 22:23:17 -07:00
silicons f301ed4f8f Merge pull request #13689 from DeltaFire15/apc-power-fuckery
Fixes APC recharge power use
2020-11-25 22:21:57 -07:00
DeltaFire ac20bb7d8c fixes up a tiiny cell charge oversight 2020-11-24 19:43:14 +01:00
Putnam a7fc05a1c7 Buffs rad collectors. 2020-11-24 06:43:17 -08:00
DeltaFire adc2af2dde typo 2020-11-18 22:51:54 +01:00