Commit Graph

541 Commits

Author SHA1 Message Date
Ghom d693d3ef26 Merge pull request #11807 from Citadel-Station-13/kevinz000-patch-4
datum pipeline null gasmix stack trace now gives a REF()
2020-04-12 05:46:07 +02:00
spookydonut 230e5fca20 fix everything 2020-04-11 15:32:09 +08:00
kevinz000 9d931c0a3a Update datum_pipeline.dm 2020-04-10 04:32:16 -07:00
Putnam 31f4269515 Makes miasma generate correctly, reverts previous pluox change. 2020-04-05 03:23:58 -07:00
Putnam 1bf37dfb1b Doubles pluoxium specific heat 2020-04-04 22:04:37 -07:00
actioninja abde27c098 layer changes 2020-03-28 23:50:08 -07:00
Ghommie ad4d290ea7 WIP 2020-03-08 19:26:01 +01:00
kevinz000 9420424c8f Merge pull request #11332 from Ghommie/Ghommie-cit603
Replaces EXCEPTION() with stack_trace() and CRASH()
2020-03-06 00:14:13 -07:00
Ghommie bb7bfc04cc Replaces EXCEPTION() with stack_trace() and CRASH() 2020-03-05 01:47:04 +01:00
kevinz000 045d5b2dbf fixes 2020-02-27 20:06:52 -07:00
kevinz000 f6542b381c Merge remote-tracking branch 'citadel/master' into mobility_flags 2020-02-21 23:29:25 -07:00
Ghommie 8fbfd07692 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit229 2020-02-22 00:55:32 +01:00
kevinz000 c7273c03be Merge remote-tracking branch 'citadel/master' into mobility_flags 2020-02-19 19:12:27 -07:00
Ghommie 698f0b8177 Something about pAIs and silicon access priviledges. 2020-02-18 16:20:44 +01:00
kevinz000 eca0e0f2dc Merge remote-tracking branch 'citadel/master' into mobility_flags 2020-02-13 00:39:20 -07:00
kevinz000 ecbb7767c3 Update cryo.dm 2020-02-11 23:07:47 -07:00
Seris02 4ec99a38e2 merge fixes 2020-02-07 15:28:05 +08:00
Seris02 6cc6aa12be yeehaw it's done 2020-02-05 16:54:57 +08:00
kevinz000 6a8a606f97 Merge remote-tracking branch 'citadel/master' into mobility_flags 2020-02-04 16:01:25 -07:00
Putnam d2f1069764 Ported atmos reaction priority fix 2020-02-04 14:32:39 -08:00
Ghommie a726f09201 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit229 2020-02-04 03:54:52 +01:00
Seris02 18489e5b65 merge fixes 2020-02-02 11:51:26 +08:00
Ghommie 95db5084ab Screw commit history. 2020-02-02 01:26:04 +01:00
Arturlang 83ce84cdc4 Merge branch 'master' into TGUIs_Nexties 2020-01-30 20:46:20 +02:00
Artur db36a90e35 Fixes. 2020-01-30 19:23:38 +01:00
r4d6 cd048ebd77 AAAAAAH 2020-01-29 21:50:55 -05:00
r4d6 c57dedd808 fix 2020-01-29 12:30:05 -05:00
kevinz000 611fd7ea89 Merge remote-tracking branch 'citadel/master' into mobility_flags 2020-01-27 23:35:35 -07:00
Ghom 9ee208dd4f Merge pull request #10722 from Putnam3145/fix-relief
Relief valve fixes
2020-01-27 05:37:53 +01:00
Seris02 e45cc4933c Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into hijackbackup 2020-01-27 08:33:38 +08:00
kevinz000 603ab65ed1 Merge pull request #10151 from Ghommie/Ghommie-cit450
refactors area code to allow for multiple areas to share the same APC, fire, air alarms etc.
2020-01-25 19:33:26 -07:00
Putnam 6df56a2cf8 properly fixed flags, also made it close on one side's pressure 2020-01-25 18:31:53 -08:00
Putnam aba40056b3 relief valve tweaks 2020-01-25 17:10:40 -08:00
Putnam3145 a08cd7c046 Merge pull request #10718 from r4d6/HE-Fix
Fix HE Manifold's sprites
2020-01-25 14:31:11 -08:00
r4d6 d5c09f11bc Fix 2020-01-25 17:23:00 -05:00
Artur e360ac1d36 Conflict fix 2020-01-24 23:06:32 +01:00
Artur ff8289c177 Fixes 2020-01-24 18:48:50 +01:00
Ghommie 721fd108f9 A few more, ported, runtime fixes. 2020-01-24 03:02:07 +01:00
kevinz000 1b7265d8c1 Merge pull request #10605 from r4d6/Layer
Port TG Layers updates and Freezer update
2020-01-23 04:46:52 -07:00
Ghom fcbc5149c4 Merge pull request #10606 from r4d6/patch-2
Update the Passive Vents that I added
2020-01-23 02:40:54 +01:00
r4d6 c78944c5bc Update 2020-01-22 13:47:57 -05:00
Seris02 74be93a8cc hasSiliconAccessInArea vars change 2020-01-21 11:44:49 +08:00
Ghommie 5644617786 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit450 2020-01-20 20:59:38 +01:00
Artur 8b21a60ac9 MF Line endings 2020-01-20 14:09:22 +02:00
Artur f5ad854c2c Conflict fix 2020-01-20 13:50:52 +02:00
Seris02 a100f9382e better, there, happy now github 2020-01-20 14:51:53 +08:00
kevinz000 f85527ab4b Merge remote-tracking branch 'citadel/master' into mobility_flags 2020-01-19 16:18:12 -07:00
kevinz000 088e586b47 Merge pull request #9601 from Ghommie/Ghommie-cit265
Ports move force and move resist, movement/pushing/pulling tweaks & co.
2020-01-19 16:10:56 -07:00
Ghom 536900a7ac Merge pull request #10520 from Hatterhat/tg-40920
you like examining things? - port of tgstation 40920
2020-01-19 16:37:40 +01:00
Seris02 47d1f46172 fixes and stuff 2020-01-19 15:53:32 +08:00