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 2025-12-13 03:13:51 +00:00
Code Issues Packages Projects Releases Wiki Activity
21,617 Commits 55 Branches 0 Tags
f76737dc0472ac901b245453b3d96c2ab8ec687a
Commit Graph

551 Commits

Author SHA1 Message Date
deathride58
fb66d382fa Merge pull request #8727 from Ghommie/Ghommie-cit78 
Porting in the "Mediborg's Amputation Adventure" and Minesweeper arcades.
 2019-06-28 00:47:09 -04:00
kevinz000
e7331b3c98 Merge pull request #8571 from Thalpy/Dwarf 
Medical smartdarts.
 2019-06-23 06:24:10 -07:00
kevinz000
90564c714d Merge pull request #8710 from Arturlang/Nanite_Fixes 
Fixes some nanite runtimes, and exploits
 2019-06-23 06:08:36 -07:00
Ghommie
138535f9f6 Porting in the "Mediborg's Amputation Adventure" and Minesweeper arcade machines. 2019-06-22 23:15:51 +02:00
Arturlang
8be06ddcd0 Fixes 2019-06-21 17:27:57 +03:00
Fermi
fec1df2098 Rephrasal for understanding. 2019-06-19 00:52:45 +01:00
Fermi
f5c98f5d57 Merge branch 'Dwarf' of https://github.com/Thalpy/Citadel-Station-13 into Dwarf 2019-06-19 00:17:30 +01:00
Fermi
fe6296b58a Added crafting recipies as per Bhijin's request. 2019-06-19 00:17:18 +01:00
Thalpy
1cc0724519 Merge branch 'master' into Dwarf 2019-06-17 12:09:55 +01:00
kevinz000
78c969a9cb Merge pull request #8584 from Trilbyspaceclone/patch-172 
Organ Storage box
 2019-06-16 19:43:10 -07:00
kevinz000
d3555d6782 Merge pull request #8243 from Trilbyspaceclone/meteor 
More Meteor defenses
 2019-06-16 01:01:43 -07:00
deathride58
88a8db87c2 Merge pull request #8612 from BlackMajor/Ooga 
Makes a small adjustment to the ash walker camp.
 2019-06-15 21:29:55 -04:00
Trilbyspaceclone
f32291146b Update all_nodes.dm 2019-06-14 12:02:55 -04:00
Trilbyspaceclone
c5e3010cfa Update misc_designs.dm 2019-06-14 12:01:52 -04:00
BlackMajor
7523c86071 Wasn't I supposed to do this in January 2019-06-10 22:55:38 +12:00
Trilbyspaceclone
0d7b769eee Merge branch 'master' into meteor 2019-06-09 17:01:06 -04:00
Trilbyspaceclone
b073c29b19 Update all_nodes.dm 2019-06-08 16:17:49 -04:00
Trilbyspaceclone
3b941210e5 Update medical_designs.dm 2019-06-08 16:16:17 -04:00
kevinz000
2f2885f1d6 Merge pull request #8558 from Ghommie/Ghommie-cit35 
Ports in the container_type to reagents flags refactor.
 2019-06-08 01:26:28 -07:00
kevinz000
ab565d2483 Merge pull request #8547 from Ghommie/Ghommie-cit29 
Moves traits to datums and turn the accessors into defines
 2019-06-08 01:22:16 -07:00
Fermi
3bb1a8dd00 OOPS. 2019-06-08 02:19:39 +01:00
Fermi
f44b9048af Added to vendors/tech. 2019-06-08 01:00:51 +01:00
deathride58
aa53cc9ea9 Merge branch 'master' into fuckatmos 2019-06-07 04:38:47 -04:00
Ghommie
7aac9e6280 Updates reagents a bit. 2019-06-07 06:27:04 +02:00
Ghommie
d3d2b8d898 should be ready. 2019-06-06 19:24:20 +02:00
Ghommie
44358e054a Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit29 2019-06-06 15:24:31 +02:00
Ghommie
0e630680ba forgot to pull from upstream. One second. 2019-06-06 15:20:27 +02:00
kevinz000
1efdfd38e0 Merge pull request #8436 from Trilbyspaceclone/patch-137 
Allows bio genes to make synth meat
 2019-05-31 17:43:22 -07:00
kevinz000
f5b3484e92 Merge pull request #8295 from Trilbyspaceclone/T_T 
[Ready] Nerfs(Not really) Engi printing and organized many designs
 2019-05-30 11:12:35 -07:00
Trilbyspaceclone
5b549f030d huh... 2019-05-26 04:50:19 -04:00
Trilbyspaceclone
a29aed136b Update misc_designs.dm 2019-05-25 18:25:01 -04:00
Trilbyspaceclone
df236fbda5 Update comp_board_designs.dm 2019-05-25 18:24:33 -04:00
Trilbyspaceclone
7b4ddd8965 Update comp_board_designs.dm 2019-05-25 18:24:19 -04:00
Trilbyspaceclone
c8734cebdc Update biogenerator_designs.dm 2019-05-25 16:35:50 -04:00
deathride58
4fc31f6322 Merge branch 'master' into fuckatmos 2019-05-25 15:34:06 -04:00
kevinz000
0dba89c4e7 Merge pull request #8325 from Trilbyspaceclone/patch-118 
[Ready] Cleaner looking autolathen organization
 2019-05-25 11:51:17 -07:00
Trilbyspaceclone
d1887d2431 Update comp_board_designs_medical.dm 2019-05-24 23:05:47 -04:00
Trilbyspaceclone
633bea1ad2 Update machine_designs_sci.dm 2019-05-24 22:56:44 -04:00
Trilbyspaceclone
a43e4a6ca1 Update machine_designs_medical.dm 2019-05-24 22:55:59 -04:00
Trilbyspaceclone
1ff9489901 Update machine_designs_sci.dm 2019-05-24 22:37:59 -04:00
Trilbyspaceclone
a0ee1aaccb Poojawa hissy fit for a game they dont even play. 
Out Standing Move
 2019-05-24 22:35:05 -04:00
CdrCross
82d308eb5e Defibrillator Upgrades Proofread 
My first ever contribution to Citadel, and first ever real GitHub Commit. This PR is a simple exercise in fixing and standardising some flavour text across Trilby's otherwise excellent defibrillator upgrades. (PR#8173)
No stats or gameplay elements have been adjusted.
 2019-05-21 23:37:28 +02:00
Trilbyspaceclone
3e4412e171 Delete autolathe_designs.dm 2019-05-12 02:04:07 -04:00
Trilbyspaceclone
62e5037eab Merge branch 'master' into patch-118 2019-05-12 02:03:32 -04:00
Trilbyspaceclone
db74544a7c Create autolathe_designs.dm 2019-05-12 02:02:49 -04:00
kevinz000
9f3aa6de13 Merge pull request #8316 from Trilbyspaceclone/Lock_and_key 
Better Locked Collar checks
 2019-05-11 22:21:16 -07:00
kevinz000
9b135ed56b Merge pull request #8338 from Sishen1542/satchel-holding 
Satchel of Holding!
 2019-05-11 22:14:15 -07:00
Trilbyspaceclone
1f1926a70e Create machine_designs_all_misc.dm 2019-05-11 12:26:56 -04:00
Trilbyspaceclone
f47c0786f3 Add files via upload 2019-05-11 11:42:31 -04:00
Trilbyspaceclone
172d56ace5 Add files via upload 2019-05-11 11:41:56 -04:00