shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
29,919 Commits 5 Branches 0 Tags
101640170bd2f14bcd235668d33db9309ef49e64
Commit Graph

569 Commits

Author SHA1 Message Date
kevinz000
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
kevinz000
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
Ghommie
a365f3b499 Demodularize and nerfs mag rifles with re(?)added power cell requirements. 2020-02-03 05:16:32 +01:00
kevinz000
c24c83c1bd Merge pull request #10835 from Ghommie/Ghommie-cit546 
Something about runtime errors.
 2020-02-02 16:31:15 -07:00
Ghom
bb1f65813e Merge pull request #10858 from Citadel-Station-13/kevinz000-patch-4 
Fixes APC ui_data runtime
 2020-02-02 18:06:44 +01:00
Artur
e7ddfdd8d8 Merge remote-tracking branch 'upstream/master' into TGUIs_Nexties 2020-02-02 13:31:54 +01:00
kevinz000
e0f967eaa2 Update apc.dm 2020-02-02 02:57:14 -07:00
kevinz000
3812d2d9fa Merge pull request #10850 from Ghommie/Ghommie-cit548 
Fixes maploaded APC terminals direction.
 2020-02-02 02:54:53 -07:00
kevinz000
33577e0d82 Merge pull request #10813 from Ghommie/Ghommie-cit540 
Unicode support updates from tgstation.
 2020-02-02 01:47:24 -07:00
Ghommie
cbcb9f32ba Fixes maploaded APC terminals direction. 2020-02-02 04:21:30 +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
Ghom
3337181cac Merge pull request #10352 from Seris02/smchanges 
Changes to the way SM handles power related to integrity and max integrity damage
 2020-02-01 18:46:10 +01:00
Ghommie
8923810de2 Something about runtime errors. 2020-02-01 07:19:49 +01:00
Ghommie
7f14fa3c71 not-so-wip now. 2020-01-31 19:20:59 +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
Ghom
fa5a69523b Merge pull request #10414 from CameronWoof/lights-booooooooooooooi 
The Great Citadel De-Pissening of 2020
 2020-01-28 18:12:30 +01:00
Seris02
feca294f48 tada 2020-01-28 13:56:37 +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
Artur
e360ac1d36 Conflict fix 2020-01-24 23:06:32 +01:00
kevinz000
88f625edfc Merge pull request #10636 from Ghommie/Ghommie-cit512 
Trilby's solar panels PR but improved.
 2020-01-23 04:35:13 -07:00
kevinz000
8f60d01208 Merge remote-tracking branch 'citadel/master' into kevinz000-patch-8 2020-01-20 22:47:21 -07:00
Ghommie
ddf037da92 Trilby's solar panels PR but improved. 2020-01-21 00:28:41 +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
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
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
Hatterhat
590d71ddc1 hey ghom i fixed it i think 2020-01-18 23:35:52 -06: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
Ghom
34872f6969 Merge pull request #10570 from kevinz000/map_network_helpers 
Power cable + atmos pipe auto mapping helpers
 2020-01-17 22:34:38 +01:00
Artur
472d18403c Merge remote-tracking branch 'Upstream/master' into TGUIs_Nexties 2020-01-16 11:38:09 +02:00
kevinz000
512b112154 happythink 2020-01-15 20:45:05 -07:00
Ghom
70c1b0635a early returns. 2020-01-16 03:14:39 +01:00
kevinz000
554f23e790 aight bet 2020-01-15 18:04:05 -07:00
kevinz000
872628d9aa Apply suggestions from code review 
thank you gamer

Co-Authored-By: Ghom <42542238+Ghommie@users.noreply.github.com>
 2020-01-15 18:02:23 -07:00
Artur
8b8a112d2c Ohkay 2020-01-15 09:41:33 +02:00
kevinz000
8f5d4a0a49 Merge remote-tracking branch 'citadel/master' into nightshift_1 2020-01-12 18:27:03 -08:00
Hatterhat
9aedc62ddb Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into tg-40920 2020-01-12 12:39:17 -06: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
Hatterhat
2842434d00 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into tg-40920 2020-01-12 02:49:58 -06:00
kevinz000
60524fb9c7 Merge pull request #10416 from r4d6/RCD-Updates 
Massive RCD Port & Updates
 2020-01-12 00:45:21 -08:00
Hatterhat
080cb74893 tgstation 40920 tweaked and tested for cit 2020-01-10 22:56:11 -06:00
kevinz000
8725ffe916 Merge remote-tracking branch 'citadel/master' into nightshift_1 2020-01-10 06:12:59 -08: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
r4d6
c3f47e713a Merge branch 'master' into RCD-Updates 2020-01-07 00:04:43 -05:00
kevinz000
4599abde4a Merge pull request #10420 from MrJWhit/radiation-plasma-usage 
Increase radiation plasma usage in radiation collector
 2020-01-06 19:46:42 -08:00