Commit Graph
1605 Commits
Author SHA1 Message Date
Ghommie 62ff589840 Something about a couple runtimes. 2020-02-12 09:10:24 +01:00
LinandGitHub 5717700146 Merge pull request #10925 from Ghommie/Ghommie-cit558
runtime is forever, errors are eternal.
2020-02-07 17:29:49 +00:00
kevinz000andGitHub 3c5a3cb4d4 Merge pull request #10883 from ancientpower/ghost-newscasters
Allows ghosts to read newscasters and books
2020-02-05 23:46:04 -07:00
Ghommie ab06c23a2b runtime is forever, errors are eternal. 2020-02-05 23:48:17 +01:00
GhomandGitHub ee2ab7c9f0 Update defibrillator_mount.dm 2020-02-04 23:51:55 +01:00
GhomandGitHub 3cd6cfb7d5 Update defibrillator_mount.dm 2020-02-04 23:50:33 +01:00
LinandGitHub 66638a39b7 Merge pull request #10851 from Citadel-Station-13/Ghommie-patch-3
Fixing little blood bank gnerator examine runtime error.
2020-02-04 20:36:28 +00:00
kevinz000andGitHub 275b1f73e0 Merge pull request #10849 from Ghommie/Ghommie-cit547
Removing a troublesome argument from organ/Remove() in favor or using the 'owner' variable
2020-02-04 03:39:14 -07:00
kevinz000andGitHub 66fc2e77f0 Merge pull request #10865 from Ghommie/Ghommie-cit550
Demodularizes and nerfs magnetic rifles/pistols with power cell requirements.
2020-02-04 03:35:33 -07:00
GhomandGitHub 6de00c21f0 Update dna_console.dm 2020-02-04 04:11:21 +01:00
ancientpower 5aecdb6a4d initial commit 2020-02-03 20:10:39 -06:00
Ghommie a365f3b499 Demodularize and nerfs mag rifles with re(?)added power cell requirements. 2020-02-03 05:16:32 +01:00
kevinz000andGitHub 2393dc26eb Merge pull request #10779 from Ghommie/Ghommie-cit538
added a second macro argument to STATION_TIME and STATION_TIME_TIMESTAMP.
2020-02-02 16:31:59 -07:00
GhomandGitHub 6f66d76680 Merge pull request #10705 from kevinz000/revert_poojawa_blood_1
Cleanup/Partial revert of RGB blood ""rework""
2020-02-02 19:08:57 +01:00
Artur e7ddfdd8d8 Merge remote-tracking branch 'upstream/master' into TGUIs_Nexties 2020-02-02 13:31:54 +01:00
kevinz000andGitHub 33577e0d82 Merge pull request #10813 from Ghommie/Ghommie-cit540
Unicode support updates from tgstation.
2020-02-02 01:47:24 -07:00
GhomandGitHub 5b91908674 Fixing little blood bank gnerator examine runtime. 2020-02-02 04:27:17 +01:00
Ghommie 8de11845d5 Removing a troublesome argument from organ/Remove() in favor or using the 'owner' variable 2020-02-02 03:39:49 +01:00
Ghommie 188f726ffd unicode support port wip 2020-01-31 05:32:00 +01:00
Tupinambis ffa7590203 Status Displays should now actually work 2020-01-30 16:07:26 -06:00
ArturlangandGitHub 83ce84cdc4 Merge branch 'master' into TGUIs_Nexties 2020-01-30 20:46:20 +02:00
kevinz000andGitHub e6e545b1f2 Merge pull request #9860 from Ghommie/Ghommie-cit374
Ports "Mime PDAs only accept emojis for messages, mime cartridge comes with an emoji guidebook"
2020-01-29 20:15:22 -07:00
Ghommie 05567e2292 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit538 2020-01-30 03:42:50 +01:00
Ghommie 0dba1b5102 added a second macro argument to STATION_TIME and STATION_TIME_TIMESTAMP. 2020-01-30 02:17:02 +01:00
kevinz000andGitHub 3bf0e1d5c4 Merge pull request #10701 from Ghommie/Ghommie-cit527
Ported further runtime fixes by AnturK.
2020-01-28 17:57:26 -07:00
kevinz000andGitHub 3d3086ac23 Merge pull request #10736 from Citadel-Station-13/Ghommie-patch-3
An oversight with one of the new area helper procs.
2020-01-28 17:55:39 -07:00
GhomandGitHub 6567f9dd0d Merge pull request #10711 from Citadel-Station-13/kevinz000-patch-8
buffs door crushing
2020-01-27 05:38:59 +01:00
GhomandGitHub 7b49d4842a Fire alarms. 2020-01-27 05:05:08 +01:00
kevinz000andGitHub 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
Artur 6529a34dbc Reviever suggestions
HTML doesnt need compiling.
2020-01-25 15:18:18 +01:00
kevinz000andGitHub f199b720aa Merge pull request #10689 from Ghommie/Ghommie-cit524
Even more runtime fixes.
2020-01-25 05:54:20 -07:00
kevinz000andGitHub 9ba6984f4f Update door.dm 2020-01-25 05:49:38 -07:00
kevinz000 24cbe67f27 optimizations, unnecessary crap, undocumented ipc change 2020-01-24 21:18:19 -07:00
Artur e360ac1d36 Conflict fix 2020-01-24 23:06:32 +01:00
Ghommie 856ef236f3 Further runtime fixes by AnturK. 2020-01-24 23:01:30 +01:00
Ghommie c69032ff42 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit374 2020-01-24 18:56:27 +01:00
Artur ff8289c177 Fixes 2020-01-24 18:48:50 +01:00
GhomandGitHub 9013c7aa9c Merge pull request #10630 from Citadel-Station-13/kevinz000-patch-17
Nerfs cloning
2020-01-24 16:23:28 +01:00
Ghommie 67f58b8a59 A few more runtime fixes. 2020-01-24 03:30:34 +01:00
kevinz000andGitHub 1b7265d8c1 Merge pull request #10605 from r4d6/Layer
Port TG Layers updates and Freezer update
2020-01-23 04:46:52 -07:00
Artur 255f2ce449 Testmerge Conflict fix? 2020-01-22 20:17:42 +01:00
Ghommie b1a4cc0406 renormalize 2020-01-20 21:17:06 +01: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
kevinz000andGitHub a53511a53d Update cloning.dm 2020-01-20 11:28:27 -07: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
kevinz000andGitHub 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
GhomandGitHub 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
Hatterhat 590d71ddc1 hey ghom i fixed it i think 2020-01-18 23:35:52 -06:00
r4d6 5084146400 Port 2020-01-18 18:46:22 -05:00