shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
2,971 Commits 5 Branches 0 Tags
c97658e39aedd459f7406c8dac27d571c0a9feb8
Commit Graph
2971 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
CitadelStationBot c97658e39a Knocked-over chairs have materials. 2017-06-15 19:48:25 -05:00
LetterJayandGitHub f0f6341588 Create verbs.dm 2017-06-15 10:06:05 -05:00
LetterJayandGitHub b4b439ce95 fix datum verbs 2017-06-15 10:04:27 -05:00
CitadelStationBot 3ba1ea18cf Automatic changelog generation for PR #1603 [ci skip] 2017-06-14 21:53:37 -05:00
CitadelStationBotandkevinz000 ca6b27a482 Fixes high luminosity eyes (#1603) 2017-06-14 19:53:36 -07:00
CitadelStationBot f0a5376a27 Automatic changelog generation for PR #1599 [ci skip] 2017-06-14 16:38:58 -05:00
LetterJayandGitHub 310ff0ea94 Merge pull request #1599 from Verkister/master 
A new dogborgo.
 2017-06-14 16:38:56 -05:00
Verkister 5b753a5180 Does it still slap those goddamn item pictures on every hit? How do I make it not to! Blagh. 2017-06-15 00:05:22 +03:00
Verkister 4bab1168d9 :^↕ 2017-06-14 23:53:13 +03:00
Verkister bac4cebfe8 removed a twig fro mthe gearbox. 2017-06-14 23:43:21 +03:00
Verkister e24faba491 A new dogborgo! 
-Stole some virgo borgo modifications for them puppies.
-Added janiborgo dog.
-Nuked the fine balance with horribly abusable exploits :^)
-Y'all hubbie 4chog gamerkids can suck my egg.
-This update received Jay's blessing before I even started porting these.

(apparently had some older junk edits that tried to cram into the pr)
 2017-06-14 23:18:44 +03:00
Verkister 4f3d39c693 A new dogborgo. 
-Stole some virgo borgo modifications for them puppies.
-Added janiborgo dog.
-Nuked the fine balance with horribly abusable exploits :^)
-Y'all hubbie 4chog gamerkids can suck my egg.
-This update received Jay's blessing before I even started porting these.
 2017-06-14 23:13:38 +03:00
LetterJayandGitHub 45b311e7f8 Merge pull request #1424 from Citadel-Station-13/upstream-merge-28046 
[MIRROR] Adds some more syndicate equipment.
 2017-06-14 14:46:57 -05:00
LetterJayandGitHub d6d1a26376 Create ghost_role_spawners.dm 2017-06-14 14:28:57 -05:00
LetterJayandGitHub df629847bc Create ghost_role_spawners.dm 2017-06-14 13:19:00 -05:00
LetterJayandGitHub c877fdb501 Merge branch 'master' into upstream-merge-28046 2017-06-14 13:10:37 -05:00
LetterJayandGitHub defb7d75c1 Merge pull request #1598 from Citadel-Station-13/SyndicateStuff 
New syndicate cosmetics, turfs, and spawners.
 2017-06-14 12:28:08 -05:00
LetterJayandGitHub b602462cbb Create portable_turret.dm 2017-06-14 12:05:31 -05:00
CitadelStationBot 6effb0fd54 Automatic changelog generation for PR #1597 [ci skip] 2017-06-14 11:47:10 -05:00
LetterJayandGitHub be70bbbd5c Merge pull request #1597 from Citadel-Station-13/GulimonsRus 
Adds guilmon as a race (via Muffin)
 2017-06-14 11:47:09 -05:00
LetterJay b0bc3d546f Merge branch 'SyndicateStuff' of https://github.com/Citadel-Station-13/Citadel-Station-13 into SyndicateStuff 2017-06-14 11:46:40 -05:00
LetterJay 01e49188b6 missed some icons 2017-06-14 11:46:25 -05:00
LetterJayandGitHub 74e6bc7ee2 Merge branch 'master' into SyndicateStuff 2017-06-14 11:44:32 -05:00
LetterJay 813bcc2b8d commit 2017-06-14 11:16:54 -05:00
LetterJay c11b9632dd incorrect layer fix 2017-06-14 10:46:15 -05:00
LetterJay 67770a25be final commit(?) 2017-06-14 09:54:14 -05:00
Verkister da6cd22d13 Merge branch 'master' of https://github.com/Verkister/Citadel-Station-13 2017-06-14 17:38:56 +03:00
LetterJayandGitHub ff8b2acf9e Merge pull request #1461 from Citadel-Station-13/upstream-merge-28145 
[MIRROR] Syndicate Uplink - Typos & Grammar mk2
 2017-06-14 08:58:35 -05:00
CitadelStationBot 6e784dc230 Automatic changelog generation for PR #1460 [ci skip] 2017-06-14 08:55:45 -05:00
LetterJayandGitHub c1af381233 Merge pull request #1460 from Citadel-Station-13/upstream-merge-28142 
[MIRROR] Adds another parallax layer
 2017-06-14 08:55:44 -05:00
LetterJayandGitHub 5117b3ea88 Merge pull request #1458 from Citadel-Station-13/upstream-merge-28146 
[MIRROR] Makes processing subsystems respect qdel and PROCESS_KILL
 2017-06-14 08:54:17 -05:00
LetterJayandGitHub 9df28d90bf Merge pull request #1456 from Citadel-Station-13/upstream-merge-28150 
[MIRROR] Fixes CE's hand drill changing size
 2017-06-14 08:54:05 -05:00
LetterJayandGitHub 80be7ee88a Merge pull request #1455 from Citadel-Station-13/upstream-merge-28125 
[MIRROR] I might HAVE accidently made dualwielding hilariously OP again so have a nerf!
 2017-06-14 08:53:52 -05:00
LetterJayandGitHub 0cadef3794 Merge pull request #1439 from Citadel-Station-13/upstream-merge-28102 
[MIRROR] Graceful shutdown now asks the server to kill it
 2017-06-14 08:52:02 -05:00
CitadelStationBot d1527d2bde Automatic changelog generation for PR #1353 [ci skip] 2017-06-14 08:49:17 -05:00
LetterJayandGitHub a2a897220f Merge pull request #1353 from Citadel-Station-13/upstream-merge-27952 
[MIRROR] [Box] Removes extra unattached vent from Xenobiology Lab
 2017-06-14 08:49:14 -05:00
CitadelStationBot 2ade889f3f Automatic changelog generation for PR #1325 [ci skip] 2017-06-14 08:49:03 -05:00
LetterJayandGitHub e1e60417f2 Merge pull request #1325 from Citadel-Station-13/upstream-merge-27884 
[MIRROR] CereStation Security Department Revamp (and other misc fixes/changes)
 2017-06-14 08:49:01 -05:00
LetterJayandGitHub 7dcb2fa68e Update tables_racks.dm 2017-06-14 08:30:25 -05:00
LetterJayandGitHub aba07154d0 Delete ghost_role_spawners.dm.rej 2017-06-14 08:27:11 -05:00
LetterJayandGitHub 815c4500bc Delete lavaland_ruin_code.dm.rej 2017-06-14 08:27:05 -05:00
LetterJayandGitHub 9d747590a0 Create lavaland_ruin_code.dm 2017-06-14 08:26:14 -05:00
LetterJayandGitHub 0f966610de Update ghost_role_spawners.dm 2017-06-14 08:25:09 -05:00
LetterJayandGitHub 40065d004f Create tgstation.2.1.4.dmm 2017-06-14 08:20:52 -05:00
CitadelStationBot 9e4fcc02fa Automatic changelog generation for PR #1361 [ci skip] 2017-06-14 08:20:51 -05:00
LetterJayandGitHub 3c1af1d450 Merge pull request #1361 from Citadel-Station-13/upstream-merge-27967 
[MIRROR] Fixes thunderdome, moves delta nuke op shuttle locations a bit.
 2017-06-14 08:20:50 -05:00
LetterJayandGitHub 885297aec3 Update cerestation.dmm 2017-06-14 08:18:20 -05:00
LetterJayandGitHub 2ff24e70a5 Merge pull request #1218 from Citadel-Station-13/upstream-merge-27686 
[MIRROR] No more erros
 2017-06-14 08:16:02 -05:00
LetterJayandGitHub 5dc3c2987c Merge pull request #1593 from Citadel-Station-13/PanicBunker 
Fixes the panic bunker age check
 2017-06-14 06:43:54 -05:00
CitadelStationBot 47a200860f Automatic changelog generation for PR #1534 [ci skip] 2017-06-14 06:41:02 -05:00