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

1413 Commits

Author SHA1 Message Date
kevinz000
f199b720aa Merge pull request #10689 from Ghommie/Ghommie-cit524 
Even more runtime fixes.
 2020-01-25 05:54:20 -07:00
kevinz000
72cfd35438 Merge pull request #10684 from Ghommie/Ghommie-cit521 
fix for hypospray jank.
 2020-01-25 05:53:42 -07:00
kevinz000
72a8096137 Merge pull request #10683 from Ghommie/Ghommie-cit520 
A few consistencies for those "shoes" that don't actually cover feet.
 2020-01-25 05:53:26 -07:00
kevinz000
147c0d8852 Merge pull request #10680 from Ghommie/Ghommie-cit518 
snowflake-friendly towels.
 2020-01-24 16:15:27 -07:00
Ghom
d5daae98c7 Merge pull request #9905 from Trilbyspaceclone/glassware 
[Ready] Cargo MK III - Glassware Addtion
 2020-01-24 18:46:25 +01:00
kevinz000
831ac91917 Merge pull request #10073 from Ghommie/Ghommie-cit435 
Ports timestop and sepia extracts improvements/tweaks.
 2020-01-24 00:25:53 -07:00
Ghommie
bd6e364612 But wait, there is more! 
No...
 2020-01-24 04:33:55 +01:00
Ghommie
1ba4c19c64 A couple more. 2020-01-24 03:50:44 +01:00
Ghommie
67f58b8a59 A few more runtime fixes. 2020-01-24 03:30:34 +01:00
Ghommie
9ee70c7931 Travis is just faster at compiling, I can work on other things meanwhile 2020-01-24 02:34:32 +01:00
Ghommie
ba2c149d4d Improvements. 2020-01-24 02:22:32 +01:00
Ghommie
6b62aef86c Missing ! 2020-01-24 02:19:52 +01:00
Ghommie
524f665f4a fix for hypospray jank. 2020-01-24 02:17:41 +01:00
Ghommie
05150e821e A few consistencies for those "shoes" that don't actually cover feet. 2020-01-24 01:25:23 +01:00
Ghommie
c8bf148216 snowflake-friendly towels. 2020-01-24 00:06:07 +01:00
Trilbyspaceclone
9466b0f4ca Merge branch 'master' into glassware 2020-01-23 13:31:04 -05:00
Ghom
3c53619f2a Merge pull request #10616 from Citadel-Station-13/kevinz000-patch-15 
Renames created volume in pyrotechnics to multiplier to alleviate confusion
 2020-01-21 03:05:22 +01:00
kevinz000
efe3ebdb53 bet 2020-01-20 17:50:07 -07:00
Trilbyspaceclone
ab464de0b7 Update glass.dm 2020-01-20 16:10:12 -05: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
kevinz000
0b0a6429ea Update pyrotechnics.dm 2020-01-19 13:31:11 -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
3ee855ab77 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit265 2020-01-18 22:14:06 +01:00
Ghom
da8b29dd23 Merge pull request #10591 from Citadel-Station-13/kevinz000-patch-12 
Removes blood duplication via virus mix
 2020-01-18 01:25:34 +01: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
kevinz000
eddb6fda68 Update others.dm 2020-01-17 14:32:51 -07:00
kevinz000
edccfa3523 Update others.dm 2020-01-17 14:15:08 -07:00
kevinz000
e69253bf87 Update others.dm 2020-01-17 14:12:51 -07:00
Putnam
d29603ad77 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into arousal-bad 2020-01-15 15:57:32 -08:00
Ghom
8a06f2f45c Merge pull request #10499 from Hatterhat/tg-40046 
more /tg/station ports - tools! logging! some other fun stuff!
 2020-01-15 01:05:36 +01:00
Putnam
21dde64da2 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into chemistry-aaa 2020-01-14 03:27:03 -08:00
TrilbySpaceClone
92dc5e61c3 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into glassware 2020-01-13 03:42:20 -05:00
Ghommie
f45f979c27 Merge branch 'Ghommie-cit265' of https://github.com/Ghommie/Citadel-Station-13 into Ghommie-cit435 2020-01-12 23:21:03 +01: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
Hatterhat
83f8e42fb3 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into tg-40046 2020-01-12 12:37:19 -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
0773f1b7fa sweet merciful FUCK what is this merge 2020-01-12 02:53:30 -06:00
Hatterhat
55c6e0d97e Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into tg-40920 2020-01-12 02:51:21 -06: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
e1ae3f3c07 Merge pull request #10492 from Trilbyspaceclone/plastic__world 
Plastic snow
 2020-01-12 00:49:39 -08:00
Putnam3145
01db064038 Merge pull request #10532 from Ghommie/Ghommie-cit503 
A few reagents related fixes.
 2020-01-12 00:41:00 -08:00
Putnam
38dcb78625 chemistry fixes 2020-01-11 18:15:50 -08:00
Ghommie
16db38a08f Travis man good 2020-01-11 20:51:15 +01:00
Ghommie
c709a9e4a9 A few reagents related fixes. 2020-01-11 18:45:54 +01:00
Hatterhat
080cb74893 tgstation 40920 tweaked and tested for cit 2020-01-10 22:56:11 -06:00
Putnam
48fadffbfb Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into arousal-bad 2020-01-10 17:57:03 -08:00