5795f6bbe2
Merge branch 'master' into master
2019-08-05 09:09:36 +01:00
ec2a3ea778
Ports "Bluespace research updates" and "Teleportation standardization, channels, and interception"
2019-07-31 18:56:00 +02:00
9c7b1dee97
Merge branch 'master' into master
2019-07-15 21:23:04 +01:00
1564f38ff8
Merge pull request #8725 from Trilbyspaceclone/meme_tools
...
Adds more bronze tools
2019-07-14 14:48:27 -07:00
c418312cc6
Merge branch 'master' into master
2019-07-09 05:33:09 +01:00
1b4df74efb
Merge pull request #8802 from Ghommie/Ghommie-cit101
...
Ports in RPGs for nuke ops, failsafe uplink codes, some carp plushie exploit fix etc.
2019-07-07 02:39:07 -07:00
8a6e669060
Merge branch 'master' into master
2019-07-04 03:14:29 +01:00
cf225f335a
Forgot to rename the box.
2019-07-01 00:18:35 +01:00
f39a5d2f6a
Ports in RPGs for nuke ops, failsafe uplinks and some carp plushie exploit fix.
2019-06-30 21:53:33 +02:00
937d6467e6
Buncha fixes and QoL stuff. (pH, hypo, heater and dispencer_
2019-06-30 19:16:27 +01:00
696d879874
Merge branch 'master' into master
2019-06-29 15:48:25 +01:00
3aaed75a95
Update smelting_designs.dm
2019-06-29 04:49:29 -04:00
75fa9d633c
Update autolathe_designs_tools.dm
2019-06-28 21:56:17 -04:00
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
e9f36b79bb
Merge branch 'master' into meme_tools
2019-06-23 21:07:55 -04:00
10109d0fe5
Merge branch 'pr/18'
2019-06-23 19:15:07 +01:00
138535f9f6
Porting in the "Mediborg's Amputation Adventure" and Minesweeper arcade machines.
2019-06-22 23:15:51 +02:00
51119ad6fd
tools
2019-06-22 15:37:28 -04:00
fec1df2098
Rephrasal for understanding.
2019-06-19 00:52:45 +01:00
f5c98f5d57
Merge branch 'Dwarf' of https://github.com/Thalpy/Citadel-Station-13 into Dwarf
2019-06-19 00:17:30 +01:00
fe6296b58a
Added crafting recipies as per Bhijin's request.
2019-06-19 00:17:18 +01:00
41eee65b15
Merge branch 'master' into master
2019-06-17 12:18:40 +01:00
1cc0724519
Merge branch 'master' into Dwarf
2019-06-17 12:09:55 +01:00
78c969a9cb
Merge pull request #8584 from Trilbyspaceclone/patch-172
...
Organ Storage box
2019-06-16 19:43:10 -07:00
c5e3010cfa
Update misc_designs.dm
2019-06-14 12:01:52 -04:00
0d7b769eee
Merge branch 'master' into meteor
2019-06-09 17:01:06 -04:00
3b941210e5
Update medical_designs.dm
2019-06-08 16:16:17 -04:00
3bb1a8dd00
OOPS.
2019-06-08 02:19:39 +01:00
f44b9048af
Added to vendors/tech.
2019-06-08 01:00:51 +01:00
e58a94bcc7
Merge remote-tracking branch 'upstream/master'
2019-06-01 03:12:38 +01:00
1efdfd38e0
Merge pull request #8436 from Trilbyspaceclone/patch-137
...
Allows bio genes to make synth meat
2019-05-31 17:43:22 -07:00
2eceb6f57b
Added a cybernetic tongue and sprites. Fixed furranium.
2019-06-01 01:28:52 +01:00
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
79a7b6b45b
Fixes.
2019-05-27 20:25:57 +01:00
a1afeb880f
Final testing. Added pH meter too. Compile safe.
2019-05-27 15:00:19 +01:00
5b549f030d
huh...
2019-05-26 04:50:19 -04:00
a29aed136b
Update misc_designs.dm
2019-05-25 18:25:01 -04:00
df236fbda5
Update comp_board_designs.dm
2019-05-25 18:24:33 -04:00
7b4ddd8965
Update comp_board_designs.dm
2019-05-25 18:24:19 -04:00
c8734cebdc
Update biogenerator_designs.dm
2019-05-25 16:35:50 -04:00
0dba89c4e7
Merge pull request #8325 from Trilbyspaceclone/patch-118
...
[Ready] Cleaner looking autolathen organization
2019-05-25 11:51:17 -07:00
d1887d2431
Update comp_board_designs_medical.dm
2019-05-24 23:05:47 -04:00
633bea1ad2
Update machine_designs_sci.dm
2019-05-24 22:56:44 -04:00
a43e4a6ca1
Update machine_designs_medical.dm
2019-05-24 22:55:59 -04:00
1ff9489901
Update machine_designs_sci.dm
2019-05-24 22:37:59 -04:00
a0ee1aaccb
Poojawa hissy fit for a game they dont even play.
...
Out Standing Move
2019-05-24 22:35:05 -04:00
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
3e4412e171
Delete autolathe_designs.dm
2019-05-12 02:04:07 -04:00
62e5037eab
Merge branch 'master' into patch-118
2019-05-12 02:03:32 -04:00
db74544a7c
Create autolathe_designs.dm
2019-05-12 02:02:49 -04:00
Thalpy