shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
29,536 Commits 5 Branches 0 Tags
4bd916d08ac521c9da7bb4aaeca26019dab20496
Commit Graph

873 Commits

Author SHA1 Message Date
kevinz000 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
Ghom 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
Ghommie 188f726ffd unicode support port wip 2020-01-31 05:32:00 +01:00
Arturlang 83ce84cdc4 Merge branch 'master' into TGUIs_Nexties 2020-01-30 20:46:20 +02: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
Ghom 7839724013 Merge pull request #10295 from Citadel-Station-13/kevinz000-patch-2 
Brain surgery can now fix an abductee's mindsnap objectives
 2020-01-29 05:34:49 +01:00
kevinz000 3bf0e1d5c4 Merge pull request #10701 from Ghommie/Ghommie-cit527 
Ported further runtime fixes by AnturK.
 2020-01-28 17:57:26 -07:00
kevinz000 26459a156d Merge pull request #10682 from Ghommie/Ghommie-cit519 
Ports "Makes falsewall hide pipes and wires"
 2020-01-25 05:53:07 -07:00
kevinz000 b9274c63d0 define usage 2020-01-24 22:50:28 -07:00
kevinz000 798af43cae reverts accidental/undocumented voodoo doll buff 2020-01-24 22:01:52 -07:00
kevinz000 afe8e00bdf Merge pull request #10677 from Ghommie/Ghommie-cit515 
Fixes dead malf AIs being able to doomsday, plus a few ported updates.
 2020-01-24 16:14:49 -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
kevinz000 831ac91917 Merge pull request #10073 from Ghommie/Ghommie-cit435 
Ports timestop and sepia extracts improvements/tweaks.
 2020-01-24 00:25:53 -07:00
Seris02 90c7149d8c merge conflict fixes 2020-01-24 10:27:48 +08:00
Ghommie 8e5f221bb9 Ports "Makes falsewall hide pipes and wires" 2020-01-24 00:57:27 +01:00
Ghommie 292aaa58dc Fixes dead malf AI doomsday, a few ported updates. 2020-01-23 17:36:23 +01:00
kevinz000 aa19c2a17b Merge pull request #10603 from Ghommie/Ghommie-cit510 
clockwork cuirass now compatible with snakes. The original author was too lazy.
 2020-01-23 04:47:18 -07:00
kevinz000 b5ca546ac3 patch 2020-01-20 22:45:21 -07:00
kevinz000 41191c3974 trauma 2020-01-20 19:01:11 -07:00
Ghom 7a3f0d140c Merge pull request #10468 from Citadel-Station-13/stop-ghosting 
ghosting no longer makes it so you don't count for abductors
 2020-01-21 02:26:25 +01:00
Artur f5ad854c2c Conflict fix 2020-01-20 13:50:52 +02: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 4a0c85e0c0 Merge pull request #10594 from chefferz/chefferz-abductor1 
Removes shrink rays from abductor console.
 2020-01-19 16:12:51 +01:00
Seris02 45b844c231 more fixes + code improvements 2020-01-19 16:48:19 +08:00
Ghommie ca7bdf5f88 clockwork cuirass now compatible with snakes. The original author is very lazy. 2020-01-18 22:06:14 +01:00
chefferz 54a2b32f42 Update console.dm 2020-01-17 23:55:44 -05:00
Ghommie 9c0b78bc09 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit265 2020-01-18 01:23:08 +01:00
kevinz000 aea0de30d1 Merge pull request #10125 from Ghommie/Ghommie-cit449 
Ports a few projectile code updates by ke:b:inz.
 2020-01-17 15:15:08 -07:00
Artur 472d18403c Merge remote-tracking branch 'Upstream/master' into TGUIs_Nexties 2020-01-16 11:38:09 +02:00
Artur d04c09aba0 Compiles, just need to fix goonchat 2020-01-15 09:44:03 +02:00
Artur 8b8a112d2c Ohkay 2020-01-15 09:41:33 +02:00
Ghom 77bdc8ee58 Merge pull request #10558 from DeltaFire15/clockfixes 
Slimepeople can no longer just chill on vitality matrixes
 2020-01-14 13:51:03 +01:00
Ghommie a0f35f5cfc Merge branch 'Ghommie-cit265' of https://github.com/Ghommie/Citadel-Station-13 into Ghommie-cit435 2020-01-14 00:55:28 +01:00
Ghommie 1d948907f6 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit265 2020-01-13 23:26:21 +01:00
Arturlang f98bc85db0 Merge branch 'master' into mesmerize_quickfiz 2020-01-13 09:44:17 +02:00
Artur 1b852b3a03 Fixes mesmerize 2020-01-13 09:34:40 +02:00
Ghommie f45f979c27 Merge branch 'Ghommie-cit265' of https://github.com/Ghommie/Citadel-Station-13 into Ghommie-cit435 2020-01-12 23:21:03 +01:00
Ghommie c14439494a Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit265 2020-01-12 19:18:03 +01:00
Ghommie 02fbbd4f95 Ouch. 2020-01-12 16:54:08 +01:00
AffectedArc07 16a37e2769 Standardises all files from CRLF to LF 2020-01-12 14:28:01 +00:00
kevinz000 ddff903532 Merge pull request #10518 from Seris02/explosionport 
ports the explosion rework thingamajig
 2020-01-12 00:38:43 -08:00
kevinz000 af562d1421 Update bloodsucker_life.dm 2020-01-11 06:54:29 -08:00
Seris02 29b66db9e3 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into explosionport 2020-01-11 11:29:30 +08:00
Seris02 0b0b80f174 explosions 2020-01-11 11:22:59 +08:00
Lin e5e2e4f012 Merge pull request #10329 from Ghommie/Ghommie-cit490 
Ports reagents id removal and typepath usage.
 2020-01-10 01:34:39 +00:00
Lin c4cb06f8f0 Merge pull request #10112 from Ghommie/Ghommie-cit447 
Refactors that mess of a code for alternate worn clothing sprites for digitigrade and taurs.
 2020-01-10 01:31:20 +00:00
Ghommie 825b4f01c2 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit490 2020-01-10 02:26:19 +01:00