cyberpresidentvanellope/S.P.L.U.R.T-Station-13
1
0
Fork 0
mirror of https://github.com/SPLURT-Station/S.P.L.U.R.T-Station-13.git synced 2026-01-27 17:33:30 +00:00
Code Issues Packages Projects Releases Wiki Activity
30,712 Commits 55 Branches 0 Tags
4c10c830bf94de5f41e8c06bca0de5a856ad46f4
Commit Graph

375 Commits

Author SHA1 Message Date
kevinz000
379c914099 Merge pull request #10704 from Ghommie/Ghommie-cit529 
More Runtimenator fixes.
 2020-02-16 05:10:19 -07:00
kevinz000
b9e8be5784 Merge pull request #10940 from Ghommie/Ghommie-cit560 
First tweak to cargo reagents selling.
 2020-02-15 12:15:50 -07:00
Ghommie
4a621fb1aa Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit560 2020-02-14 19:39:53 +01:00
Trilbyspaceclone
0bd1357e5f flour 2020-02-12 15:03:15 -05:00
Trilbyspaceclone
1ce9232958 Update cereals.dm 2020-02-12 15:00:08 -05:00
Seris02
4ec99a38e2 merge fixes 2020-02-07 15:28:05 +08:00
Ghommie
0703c6eea6 First tweak to cargo reagents selling. 2020-02-06 22:34:54 +01:00
kevinz000
7898dd089e Merge pull request #10888 from Ghommie/Ghommie-cit554 
Ports "Cleans up plante gene mutability."
 2020-02-06 00:49:09 -07:00
Seris02
d0100345fd done hopefully 2020-02-05 17:00:38 +08:00
Seris02
6cc6aa12be yeehaw it's done 2020-02-05 16:54:57 +08:00
kevinz000
d5a44097a3 Merge pull request #10862 from Hatterhat/boy-i-fucked-up-that-examine 
seed extractor examine tweak/fix
 2020-02-04 03:32:57 -07:00
Ghom
dd4e1d8f57 Update flowers.dm 2020-02-04 06:57:07 +01:00
Ghom
4e4b0d718a Update mushrooms.dm 2020-02-04 06:52:54 +01:00
Ghom
dcb3447c12 Update misc.dm 2020-02-04 06:51:50 +01:00
Ghommie
b6509d25e6 Ports "Cleans up plante gene mutability." 2020-02-04 06:34:42 +01:00
Hatterhat
ca8e40caea i mean its a stupid multiplier regardless 
thanks ghom

Co-Authored-By: Ghom <42542238+Ghommie@users.noreply.github.com>
 2020-02-02 14:33:45 -06:00
Hatterhat
9190b69ba3 double whoops 2020-02-02 13:40:23 -06:00
Hatterhat
5dc971f8e8 whoops 2020-02-02 13:20:43 -06:00
Seris02
18489e5b65 merge fixes 2020-02-02 11:51:26 +08:00
Ghommie
188f726ffd unicode support port wip 2020-01-31 05:32:00 +01:00
kevinz000
40b479eb17 Update seeds.dm 2020-01-25 08:56:06 -07:00
Ghommie
5cf7c259fa Runtimenator 2: Compile-net 2020-01-25 02:39:58 +01:00
Ghommie
f2b04be561 More Runtimenator fixes. 2020-01-25 02:16:45 +01:00
Seris02
74be93a8cc hasSiliconAccessInArea vars change 2020-01-21 11:44:49 +08:00
Seris02
a100f9382e better, there, happy now github 2020-01-20 14:51:53 +08: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
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
Seris02
fdf3871cb7 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into hijackbackup 2020-01-18 18:30:51 +08:00
Seris02
04b34ec8ed hijack implant 2020-01-18 18:04:31 +08: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
timothyteakettle
17ce27bd70 remove trait genes without disks 
botany fix that lets you remove trait genes without having to have a redundant disk inserted
 2020-01-13 23:23:49 +00: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
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
080cb74893 tgstation 40920 tweaked and tested for cit 2020-01-10 22:56:11 -06:00
Ghommie
686a76dd1d Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit265 2020-01-04 13:35:05 +01:00
Ghommie
4d06d231f8 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit490 2020-01-02 17:49:01 +01:00
Ghom
78e4c608ad Merge pull request #10319 from Seris02/coconutsyep 
porting azarak's coconuts from hyper station
 2019-12-31 13:16:07 +01:00
Seris02
46c68f8fd8 Update code/modules/hydroponics/gene_modder.dm 
Co-Authored-By: Ghom <42542238+Ghommie@users.noreply.github.com>
 2019-12-31 09:34:22 +08:00
Seris02
2e8c671a2f Update code/modules/hydroponics/seeds.dm 
Co-Authored-By: Ghom <42542238+Ghommie@users.noreply.github.com>
 2019-12-31 09:34:15 +08:00
Seris02
5e403dd0a7 Update code/modules/hydroponics/seeds.dm 
Co-Authored-By: Ghom <42542238+Ghommie@users.noreply.github.com>
 2019-12-31 09:34:03 +08:00
Ghommie
49f1176170 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit490 2019-12-30 16:06:16 +01:00
Seris02
1030698c10 did this actually change anything 2019-12-30 21:18:05 +08:00
Seris02
84574a150b weh 2019-12-30 21:00:25 +08:00
Seris02
f663c4db96 tiny fixes 2019-12-30 11:24:12 +08:00
Trilbyspaceclone
a2b79e043f Update code/modules/hydroponics/grown/grass_carpet.dm 
Co-Authored-By: Ghom <42542238+Ghommie@users.noreply.github.com>
 2019-12-29 14:57:22 -05:00
Trilbyspaceclone
94f305656d Update grass_carpet.dm 2019-12-28 22:57:38 -05:00