shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
27,251 Commits 5 Branches 0 Tags
5fbe7fcc2be52bbf1843db33ca8d5e2cd04f5224
Commit Graph
1328 Commits
Author SHA1 Message Date
Artur 02048ce009 Bludsuckers 2019-11-29 21:28:14 +02:00
kevinz000andGitHub 4183d00da2 Merge pull request #9966 from Ghommie/Ghommie-cit400 
Ports elements: Lightweight shared/global components.
 2019-11-28 23:08:32 -07:00
Ghommie e6484a22a8 Ports tgstation loom changes, and durathred golems. 2019-11-29 05:34:17 +01:00
Linzolle 829cc3d81c Revert "Merge pull request #9613 from Linzolle/hat-toss" 
This reverts commit d67b7f620d, reversing
changes made to dabfba8a0d.
 2019-11-27 20:23:33 -06:00
Ghommie dd9116ee70 Ports elements: Lightweight shared/global components. 2019-11-28 01:47:20 +01:00
Ghommie f9680130f9 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit329 2019-11-27 18:48:20 +01:00
Ghommie 4e05c27cdb Updating supply pods code. 2019-11-27 01:54:10 +01:00
kevinz000andGitHub 4ffe9cd464 Update traits.dm 2019-11-25 22:53:22 -07:00
Linzolle cc54e5230f Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into abductor-update 2019-11-25 21:01:25 -06:00
BlackMajorandGitHub 786d40032d Merge pull request #9922 from GrayRachnid/braintraumasport 
Ports new Brain Traumas from /tg/. Does not include the shitty creeper antag or Wizard Traumas, i'm porting wizard traumas later. Also adds the Desynchronizer and changes the way some heaRing args are handled.
 2019-11-25 12:31:15 +13:00
BlackMajorandGitHub 6f98efb18e Merge pull request #9902 from Useroth/new-tg-plants 
[TESTMERGE READY] Ported a bunch of tg hydroponics content.
 2019-11-25 11:30:43 +13:00
kevinz000andGitHub 75510d8da9 Merge pull request #9749 from Trilbyspaceclone/patch-238 
What do you mean I cant hold the armory on my back? -BOH nerf
 2019-11-23 11:42:37 -07:00
GrayRachnid c8e52fb8e1 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into disablesnolegs 2019-11-22 15:24:15 -05:00
Useroth 2ced7db508 Ported a bunch of tg hydroponic stuff. 2019-11-21 10:53:57 +01:00
kevinz000andGitHub 8df8acb1b7 Merge pull request #9811 from Ghommie/Ghommie-cit353 
Dreamchecker compatibility changes, part 2.
 2019-11-20 21:49:58 -07:00
kevinz000andGitHub 755559bb66 Merge pull request #9836 from Ghommie/Ghommie-cit364 
Ports "Uses defines for turf atmos"
 2019-11-19 21:32:42 -07:00
deathride58andGitHub cb70f47a48 Merge pull request #9814 from Citadel-Station-13/kevinz000-patch-115 
modifies donator config entry to allow multiple ckeys per line
 2019-11-19 13:38:20 -05:00
Linzolle f9b632019b Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into abductor-update 2019-11-18 21:39:45 -06:00
TrilbyspacecloneandGitHub b64b039709 correctes commits 2019-11-18 06:30:47 -05:00
Ghommie 641ddebed1 Ports "Uses defines for turf atmos" 2019-11-17 03:19:35 +01:00
kevinz000andGitHub 66f8b5f404 Merge pull request #9769 from Ghommie/Ghommie-cit336 
ID console fixes and other tweaks.
 2019-11-16 01:17:23 -07:00
LinandGitHub 6aa6eaafe6 Merge branch 'master' into abductor-update 2019-11-15 23:24:51 +00:00
Putnam f3c4897b48 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into super-special-awesome-dynamic 2019-11-14 22:31:48 -08:00
kevinz000andGitHub 3624f90c45 Update donator_groupings.dm 2019-11-14 18:22:59 -07:00
Ghommie c20bc123ab Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit336 2019-11-15 01:10:39 +01:00
Ghommie f401e622c3 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit329 2019-11-15 01:01:08 +01:00
kevinz000andGitHub 02e8a73265 Merge pull request #9737 from Ghommie/Ghommie-cit326 
Ports techweb backend refactor & co.
 2019-11-14 16:45:09 -07:00
kevinz000andGitHub 4c89b8c33f Merge pull request #9628 from Trilbyspaceclone/Cargo_MKII 
[Ready] [Testmerge] MK II Cargo Rework - Sell harder edition
 2019-11-14 16:00:45 -07:00
kevinz000andGitHub 6909857e04 Merge pull request #9632 from Ghommie/Ghommie-cit281 
Porting multi-z support updates.
 2019-11-14 15:58:53 -07:00
kevinz000andGitHub 2f4562a63b Merge pull request #9656 from Ghommie/Ghommie-cit290 
Purging a lot of space indention in favor of tabs.
 2019-11-14 15:55:04 -07:00
kevinz000andGitHub 318c03cc28 Merge pull request #9683 from Ghommie/Ghommie-cit303 
Dullahans fixes and QoL.
 2019-11-14 15:52:11 -07:00
Ghommie 358db4f390 Dreamchecker compatibility changes, part 2. 2019-11-14 14:54:12 +01:00
Putnam 304ce37d6c Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into super-special-awesome-dynamic 2019-11-14 02:23:48 -08:00
kevinz000andGitHub 487f98bf68 Merge pull request #9775 from Ghommie/Ghommie-cit340 
ports "Adds superlube to the clown ruin", "Replaces the slime extract in the clown biodome with a superlube sprayer." and buffs clown PDAs
 2019-11-14 01:40:16 -07:00
kevinz000andGitHub 3015ec5c04 Merge pull request #9764 from Ghommie/Ghommie-cit335 
Dreamchecker compatibility changes, part 1.
 2019-11-14 01:37:41 -07:00
Putnam 5e51cc63f9 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into super-special-awesome-dynamic 2019-11-13 16:58:44 -08:00
TrilbySpaceClone ec57e28c17 Merge branch 'master' into Cargo_MKII 2019-11-13 08:00:24 -05:00
kevinz000andGitHub 4e3147b228 Merge pull request #9755 from Ghommie/Ghommie-cit331 
lentext to length, yet another 513 requirement.
 2019-11-12 23:59:31 -07:00
Ghommie 4ef1d64356 PR #47500, #47501, #47557, #47588. 2019-11-12 19:00:45 +01:00
Ghommie c5a7c28a1b Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit281 2019-11-12 16:04:05 +01:00
Ghommie e50c56150e ports "Adds superlube to the clown ruin" and buffs clown PDAs 2019-11-11 23:10:22 +01:00
Ghommie d06b6fd83e Adding a new PDA reskin, sprites from CEV-Eris (plus bits from Beestation and Cit-RP) 2019-11-11 21:34:47 +01:00
Ghommie 63da5ffb13 ID console fixes and other tweaks. 2019-11-11 17:10:14 +01:00
WeblureandGitHub 3dac695d53 Merge branch 'master' into Xenobio-Hotkeys 2019-11-10 21:55:22 -07:00
Putnam 2120526525 Merged upstream dynamic fixes ported by Ghommie. 2019-11-10 18:48:59 -08:00
LinandGitHub df051186eb Merge branch 'master' into abductor-update 2019-11-11 00:08:59 +00:00
Ghommie e0afed1f8e QoL dullahan ahealing. 2019-11-11 00:39:19 +01:00
Ghommie e977ba6729 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit290 2019-11-10 23:17:58 +01:00
Ghommie 1e49ce76d3 Dreamchecker compatibility changes, part 1. 2019-11-10 20:48:30 +01:00
kevinz000andGitHub d1f6483687 Merge pull request #9704 from Ghommie/Ghommie-cit314 
Minor ninja tweaks and stealth nerf.
 2019-11-10 11:31:25 -07:00