shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
28,527 Commits 5 Branches 0 Tags
a8569fa7e5284c1998cdecfc0e7a2fc36f3f9072
Commit Graph

491 Commits

Author SHA1 Message Date
kevinz000 60524fb9c7 Merge pull request #10416 from r4d6/RCD-Updates 
Massive RCD Port & Updates
 2020-01-12 00:45:21 -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
kevinz000 68a0eddeaf Merge pull request #10285 from Ghommie/Ghommie-cit491 
[s] Fixes singularity pulls duping rods out of engine floors.
 2020-01-08 13:31:31 -08:00
Putnam3145 b09ef97ae3 Merge pull request #10305 from BlackMajor/Yeehaw 
Various Mining borg changes. And some extras.
 2020-01-07 16:50:21 -08:00
BlackMajor 05a644cc41 Revert "Merge branch 'master' into Yeehaw" 
This reverts commit 972c03f79f, reversing
changes made to 8ebd698763.
 2020-01-08 12:26:45 +13:00
BlackMajor 972c03f79f Merge branch 'master' into Yeehaw 2020-01-08 12:25:50 +13:00
BlackMajor b41c9cd844 Sync with master 2020-01-08 12:25:22 +13:00
BlackMajor 5a97259ba9 Fix a couple of bugs, add wrapping paper and destination tagger 2020-01-07 15:33:16 +13:00
Ghommie f5b251db66 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit490 2020-01-03 18:24:39 +01:00
r4d6 7347cb0ba6 Merge branch 'master' into RCD-Updates 2020-01-03 03:09:11 -05:00
r4d6 5e3abec704 Removing turf with RCD cost mats. 
Port : https://github.com/tgstation/tgstation/pull/46801
 2020-01-03 02:06:47 -05:00
Lin f7b91f9b65 Merge pull request #10238 from Ghommie/Ghommie-cit478 
Brings in some mapping code updates.
 2020-01-03 00:01:54 +00:00
Lin b1ccd512db Merge pull request #10215 from Ghommie/Ghommie-cit473 
Ports "Fixes ChangeTurf CHANGETURF_INHERIT_AIR flag and add it to all calls."
 2020-01-03 00:00:51 +00:00
BlackMajor 8085022d97 Couple of changes. Starting on the point bank. 2019-12-31 23:28:30 +13:00
BlackMajor 375e59a77d Merge branch 'master' into Yeehaw 2019-12-29 22:12:40 +13:00
BlackMajor 206a5e168a More mining changes 2019-12-29 20:15:49 +13:00
Ghommie 7837688426 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit490 2019-12-28 23:41:10 +01:00
Ghommie 60134ea8ae [s] Fixes singularity pulls duping rods out of engine floors. 2019-12-25 03:34:42 +01:00
Ghommie e74339ce8b Jfc that's a lot of work! 2019-12-23 04:24:13 +01:00
Ghommie 12aa266efe Missed this one too. 2019-12-19 12:27:30 +01:00
Ghommie 8566e2396d Brings in some mapping code updates. 2019-12-19 00:44:14 +01:00
Ghommie 5bf252a58c Ports "Fixes ChangeTurf CHANGETURF_INHERIT_AIR flag and add it to all calls." 2019-12-17 01:57:56 +01:00
Ghommie 80402a0d88 Ports some hud and update_icon code updates. 2019-12-16 23:29:20 +01:00
Ghommie e0caf6007b Fixes space hermit asteroid rocks unintendedly spawning airless asteroid turf when mined, save for the perimeter... 2019-12-07 04:02:33 +01:00
kevinz000 e2f9a68c2c Merge pull request #10049 from Useroth/new-tg-plants 
Colored fairy grass, because fuck your eyes.
 2019-12-05 21:43:24 -07:00
Useroth b9ce4a8622 Oopsie 2019-12-05 01:49:55 +01:00
Useroth 950b884da5 Adds colored fairygrass. 2019-12-05 01:47:42 +01:00
Ghommie 74baa00634 Ports "#44787" 2019-11-28 19:37:46 +01:00
BlackMajor c81d1fe7a3 Merge pull request #9867 from Ghommie/Ghommie-cit375 
Ports "examine-code refactor"
 2019-11-25 11:31:03 +13:00
BlackMajor 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
Useroth 2ced7db508 Ported a bunch of tg hydroponic stuff. 2019-11-21 10:53:57 +01:00
Ghommie 21f15e411d Part 3 2019-11-19 19:34:42 +01:00
Ghommie a52e292cc8 Ports "examine-code refactor"... part 1... 2019-11-19 03:28:06 +01:00
Ghommie 641ddebed1 Ports "Uses defines for turf atmos" 2019-11-17 03:19:35 +01:00
kevinz000 178aedc5cc Merge pull request #9754 from Ghommie/Ghommie-cit330 
porting "global to static"
 2019-11-14 16:38:27 -07:00
kevinz000 6909857e04 Merge pull request #9632 from Ghommie/Ghommie-cit281 
Porting multi-z support updates.
 2019-11-14 15:58:53 -07:00
kevinz000 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
kevinz000 3015ec5c04 Merge pull request #9764 from Ghommie/Ghommie-cit335 
Dreamchecker compatibility changes, part 1.
 2019-11-14 01:37:41 -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 19a511929d and "Replaces the slime extract in the clown biodome with a superlube sprayer." 2019-11-11 23:39:03 +01:00
Ghommie e50c56150e ports "Adds superlube to the clown ruin" and buffs clown PDAs 2019-11-11 23:10:22 +01:00
Ghommie 42d9e3cf51 Porting Robustin's Syndicate Infiltrator PR 2019-11-11 18:49:18 +01:00
Ghommie 1e49ce76d3 Dreamchecker compatibility changes, part 1. 2019-11-10 20:48:30 +01:00
Ghommie 9591bb5471 porting "global to static" 2019-11-09 22:53:56 +01:00
Ghommie a650e1e411 Ports "Renames is_hot and is_sharp to get_temperature and get_sharpness" 2019-11-05 05:37:28 +01:00
Ghommie a2f9aaf899 Porting "Adjacent Atmos subsystem revival" 2019-10-28 17:04:31 +01:00
Ghommie 4aa1d55abb Porting multi-z support updates. 2019-10-27 16:32:32 +01:00
Ghommie a50606bb67 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit259 2019-10-24 10:10:07 +02:00
Ghommie e1928a18f1 Porting GetComponent macros removal, and some related changes. 2019-10-23 15:04:28 +02:00