shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
26,186 Commits 5 Branches 0 Tags
994c01c8ec03ee23ca410f31474b11bedc7d1c19
Commit Graph

1186 Commits

Author SHA1 Message Date
Fermi
1509d9d183 Revert "Merge remote-tracking branch 'upstream/master'" 
This reverts commit 135608551f, reversing
changes made to ce7e9ac452.
 2019-11-24 03:04:13 +00:00
Fermi
c8b206a4cf Revert "pls" 
This reverts commit 8c97511871.
 2019-11-24 03:04:04 +00:00
Fermi
4c1c257035 Revert "Revert "pls"" 
This reverts commit b23f2a4460.
 2019-11-24 03:02:21 +00:00
Fermi
9eaed4ea8e Revert "pls2" 
This reverts commit 0eb635b908.
 2019-11-24 03:02:04 +00:00
Fermi
0eb635b908 pls2 
ugh
 2019-11-24 02:52:17 +00:00
Fermi
b23f2a4460 Revert "pls" 
This reverts commit 8c97511871.
 2019-11-24 02:49:20 +00:00
Fermi
8c97511871 pls 
ugh
 2019-11-24 02:47:52 +00:00
Fermi
135608551f Merge remote-tracking branch 'upstream/master' 2019-11-24 02:45:28 +00:00
Fermi
00601a0c87 Revert "PLASE" 
This reverts commit 8af225e6e3.
 2019-11-24 02:44:00 +00:00
Fermi
8af225e6e3 PLASE 2019-11-24 02:41:21 +00:00
Fermi
b404e18b15 Merge branch 'master' into FERMICHEMCurTweaks 2019-11-23 00:10:33 +00:00
Putnam3145
6145cd0d96 Merge pull request #9886 from Ghommie/Ghommie-cit384 
chem dispenser beakers and bikehorn fixes.
 2019-11-22 15:48:28 -08:00
Ghommie
ac44bfcad2 chem dispenser beakers and bikehorn fixes. 2019-11-20 17:55:11 +01:00
Ghommie
c21a137a62 Fixes super-lube waterflower. 2019-11-19 22:56:29 +01:00
kevinz000
81303b1225 Merge pull request #9786 from Ghommie/Ghommie-cit345 
Fixing some reagents taste descriptions.
 2019-11-14 16:22:54 -07:00
kevinz000
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
kevinz000
6909857e04 Merge pull request #9632 from Ghommie/Ghommie-cit281 
Porting multi-z support updates.
 2019-11-14 15:58:53 -07:00
kevinz000
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
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
e70a76085c Merge pull request #9789 from PersianXerxes/fixReagentDescriptions 
Corrects the descriptions of meth and ephedrine
 2019-11-14 01:38:01 -07:00
TrilbySpaceClone
73661cfe52 more fixing+ chem selling tweaks 2019-11-13 09:39:42 -05:00
TrilbySpaceClone
de1ce4afc8 more crates and explote fixing 2019-11-13 09:15:44 -05:00
TrilbySpaceClone
ec57e28c17 Merge branch 'master' into Cargo_MKII 2019-11-13 08:00:24 -05: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
Persi
c784cab060 Corrects the descriptions of meth and ephedrine to reflect that their movespeed buffs were previously removed. 2019-11-12 05:37:30 -05:00
Ghommie
fd33879b33 Fixing some reagent taste descriptions. 2019-11-12 06:20:33 +01:00
Ghommie
29114de3f1 The actual waterflower, am I funny yet? 2019-11-12 00:47:36 +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
TrilbySpaceClone
6e328ea1b1 art of the deal 2019-11-11 07:26:12 -05: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
kevinz000
c46b425402 Merge pull request #9719 from Ghommie/Ghommie-cit318 
Renames is_hot and is_sharp to get_temperature and get_sharpness, just like how ol tg did.
 2019-11-10 11:26:06 -07:00
Ghommie
892b66470b Fixing several minor runtimes. 2019-11-05 23:07:29 +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
4ab3512dda Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit281 2019-11-04 23:15:12 +01:00
Ghommie
29daa0c908 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit290 2019-11-04 22:59:24 +01:00
TrilbySpaceClone
82b148b7b7 Merge branch 'master' into Cargo_MKII 2019-11-03 17:53:06 -05:00
TrilbySpaceClone
bd4501e11c the last touches? 2019-11-03 17:26:28 -05:00
kevinz000
d9c38d0589 Merge pull request #8948 from Ghommie/Ghommie-cit156 
Cleaning up the arousal module.
 2019-10-31 17:27:03 -07:00
Ghommie
6cf35a67b1 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit290 2019-10-31 23:17:39 +01:00
Ghommie
17e794bd59 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit281 2019-10-31 01:43:44 +01:00
kevinz000
ae4aee794e Merge pull request #9592 from Ghommie/Ghommie-cit262 
Porting movespeed modification system updates.
 2019-10-29 21:27:53 -07:00
Ghommie
a5b37b658b Purging a lot of space indention in favor of tabs. 2019-10-29 15:46:31 +01:00
Ghommie
f54449bc7c Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit281 2019-10-28 16:41:50 +01:00
Ghommie
2d8e383b9c Quickfixing hypospray missin icons. 2019-10-28 00:52:47 +01:00
Ghommie
4aa1d55abb Porting multi-z support updates. 2019-10-27 16:32:32 +01:00
Ghommie
bf92aa2ffb Unmodularize MkII hyposprays and other reagent items sprites. 2019-10-26 19:14:28 +02:00
Ghommie
79c3700d25 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit156 2019-10-25 12:42:28 +02:00
Ghommie
cb74be29ae Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit262 2019-10-25 12:40:50 +02:00
kevinz000
eb50df892a Merge pull request #9550 from Ghommie/Ghommie-cit253 
Fixes temporary transformation sting triggering heart attacks on heartless humans.
 2019-10-24 18:48:09 -07:00