shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
29,824 Commits 5 Branches 0 Tags
34f43dccb4691012b16a9745f2aeecfc35a1f522
Commit Graph
6814 Commits
Author SHA1 Message Date
GhomandGitHub 047059617c Merge pull request #10645 from r4d6/Modular-Lavaland 
Modularize the mining base
 2020-01-23 02:53:34 +01:00
GhomandGitHub 04811c9c22 Merge pull request #10450 from Citadel-Station-13/kevinz000-patch-8 
(is this really a good idea) hitscan emitters
 2020-01-23 02:44:17 +01:00
Ghommie b0da18e404 Fixes chainsaw force being set to 0 on unwield. 2020-01-23 02:13:55 +01:00
ShadeAwareandGitHub 0b1a0e7286 Update weaponry.dm 2020-01-22 17:54:27 -05:00
ShadeAwareandGitHub 1c4f37b5bf MAKING THE CODE LESS SHIT THANS TO ARTUR AND SUN WUKONG 
WHY DID IT TAKE ME SO LONG TO DO THIS THEY LITERALLY SPOONFED ME THE INFORMATION GOD IM SO FUCKING STUPID AND RETARD GOD I FUCKING I FHUHDHJUGDFJTUFUGFUG7F7BGFJKDOKDIVFUBHFB
 2020-01-22 17:50:57 -05:00
kappa-samaandGitHub c8cfd4e150 cursed 2020-01-22 16:52:28 -05:00
Artur 255f2ce449 Testmerge Conflict fix? 2020-01-22 20:17:42 +01:00
r4d6 e3cb379bde Add the Mining Base as a submap 2020-01-21 20:31:40 -05:00
kevinz000 8f60d01208 Merge remote-tracking branch 'citadel/master' into kevinz000-patch-8 2020-01-20 22:47:21 -07:00
kevinz000 41191c3974 trauma 2020-01-20 19:01:11 -07:00
ShadeAwareandGitHub 08016a8461 Ghommie commands, I obey. 2020-01-20 20:22:09 -05:00
GhomandGitHub c244f95ed9 Merge pull request #10588 from PersianXerxes/tweakEngieField 
Reduces Forcefield Projector Range to Two Tiles
 2020-01-21 02:17:38 +01:00
kevinz000 5abc1104c0 ok 2020-01-20 18:03:54 -07:00
kevinz000 221e05b3c8 add line 2020-01-20 17:58:58 -07:00
kevinz000 bb14b255d2 Merge remote-tracking branch 'citadel/master' into kevinz000-patch-12 2020-01-20 17:51:56 -07:00
ShadeAwareandGitHub 9f488c80a1 Update weaponry.dm 2020-01-20 18:49:04 -05:00
Ghommie c93f16e4d4 Unused variable. 2020-01-21 00:45:51 +01:00
Ghommie ddf037da92 Trilby's solar panels PR but improved. 2020-01-21 00:28:41 +01:00
ShadeAwareandGitHub 6f243f9c44 Update weaponry.dm 2020-01-20 18:08:05 -05:00
ShadeAwareandGitHub ffef7cd4db Update weaponry.dm 2020-01-20 17:33:18 -05:00
kevinz000andGitHub 0661bc2558 Update PDA.dm 2020-01-20 15:26:24 -07: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
GhomandGitHub 4c6af66050 Merge pull request #10617 from Citadel-Station-13/kevinz000-patch-16 
Grenades can now actually have their timers adjusted
 2020-01-20 20:02:06 +01:00
kevinz000andGitHub a53511a53d Update cloning.dm 2020-01-20 11:28:27 -07:00
GhomandGitHub 5bc7229a9f Quick rubber toolbox materials fix. 2020-01-20 19:11:43 +01:00
Putnam 815b4f033d made flavor things a game option + more hoard 2020-01-20 04:13:54 -08: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
Putnam dfaa3bf15c Added another flavor obj, "horde" to "hoard" 2020-01-20 03:46:44 -08:00
kevinz000 051ca8c050 checks 2020-01-20 03:45:40 -07:00
Putnam 67c2fdca52 more flavor objectives 2020-01-20 01:20:42 -08:00
Putnam 8e674817a9 errors 2020-01-20 00:30:18 -08:00
kevinz000 ecddef2f21 compile 2020-01-19 22:58:08 -07:00
kevinz000GitHubGhom
 		0b10b8cf89 Update code/game/objects/items/devices/PDA/PDA.dm 
Co-Authored-By: Ghom <42542238+Ghommie@users.noreply.github.com>
 2020-01-19 22:41:19 -07:00
Putnam 06c66617e6 m o r e traitor objectives 2020-01-19 18:58:10 -08:00
kevinz000andGitHub b1cd0f4ede Update grenade.dm 2020-01-19 16:11:49 -07: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
kevinz000andGitHub 374f4f143e Update PDA.dm 2020-01-19 13:45:16 -07:00
kevinz000andGitHub 90fcedd188 Update grenade.dm 2020-01-19 13:40:09 -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
Putnam cc1fcee4ac Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into one-more-dojo-tweak 2020-01-19 03:56:41 -08:00
Putnam bc5646f8b1 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into antag-overhaul 2020-01-19 00:56:17 -08:00
Seris02 45b844c231 more fixes + code improvements 2020-01-19 16:48:19 +08:00
Seris02 afe7c15645 merge fixes 2020-01-19 16:40:45 +08:00
Putnam 5eba760aa8 Reworked survivalist 2020-01-18 22:07:54 -08:00
Hatterhat 590d71ddc1 hey ghom i fixed it i think 2020-01-18 23:35:52 -06:00
Putnam e1cf63e0ac Greentext tweaked 2020-01-18 21:32:42 -08:00
kevinz000andGitHub 72e2961972 Update PDA.dm 2020-01-18 21:34:24 -07:00
kevinz000andGitHub 9619a6bf5d Update PDA.dm 2020-01-18 19:37:12 -07:00