Thalpy
|
9c7b1dee97
|
Merge branch 'master' into master
|
2019-07-15 21:23:04 +01:00 |
|
kevinz000
|
1564f38ff8
|
Merge pull request #8725 from Trilbyspaceclone/meme_tools
Adds more bronze tools
|
2019-07-14 14:48:27 -07:00 |
|
kevinz000
|
705b12fc50
|
Merge pull request #8724 from Trilbyspaceclone/Rnd_brakeup
Brakes up Blue space Rnd tech nodes
|
2019-07-14 14:20:03 -07:00 |
|
Ghommie
|
129ca9d71f
|
Ports "Refactors NODROP flag into TRAIT_NODROP"
|
2019-07-13 10:27:39 +02:00 |
|
Thalpy
|
c418312cc6
|
Merge branch 'master' into master
|
2019-07-09 05:33:09 +01:00 |
|
deathride58
|
42cee552fe
|
Merge pull request #8709 from Trilbyspaceclone/Fel_port_1
Ports "Fixes every issue in the slimes milestone. #44450"
|
2019-07-08 18:10:46 -04:00 |
|
deathride58
|
59577f8818
|
Merge pull request #8750 from Arturlang/Nanite_Brain_Damage_Fix
Fixes trauma healing nanites.
|
2019-07-08 18:07:04 -04:00 |
|
kevinz000
|
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 |
|
Thalpy
|
8a6e669060
|
Merge branch 'master' into master
|
2019-07-04 03:14:29 +01:00 |
|
Thalpy
|
cf225f335a
|
Forgot to rename the box.
|
2019-07-01 00:18:35 +01:00 |
|
Ghommie
|
f39a5d2f6a
|
Ports in RPGs for nuke ops, failsafe uplinks and some carp plushie exploit fix.
|
2019-06-30 21:53:33 +02:00 |
|
Thalpy
|
937d6467e6
|
Buncha fixes and QoL stuff. (pH, hypo, heater and dispencer_
|
2019-06-30 19:16:27 +01:00 |
|
Thalpy
|
696d879874
|
Merge branch 'master' into master
|
2019-06-29 15:48:25 +01:00 |
|
Sishen
|
3aaed75a95
|
Update smelting_designs.dm
|
2019-06-29 04:49:29 -04:00 |
|
Trilbyspaceclone
|
75fa9d633c
|
Update autolathe_designs_tools.dm
|
2019-06-28 21:56:17 -04:00 |
|
Arturlang
|
8160da6a6a
|
Reviewer suggestions
|
2019-06-28 11:06:33 +03:00 |
|
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 |
|
Arturlang
|
c0c7597c76
|
Fixes trauma healing nanites.
|
2019-06-25 12:39:30 +03:00 |
|
Trilbyspaceclone
|
53c61b9050
|
Merge branch 'master' into Rnd_brakeup
|
2019-06-23 21:09:53 -04:00 |
|
Trilbyspaceclone
|
e9f36b79bb
|
Merge branch 'master' into meme_tools
|
2019-06-23 21:07:55 -04:00 |
|
Fermi
|
fdba8c000f
|
Fixing compiling errors.
|
2019-06-23 20:03:37 +01:00 |
|
Fermi
|
10109d0fe5
|
Merge branch 'pr/18'
|
2019-06-23 19:15:07 +01: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 |
|
TrilbySpaseClone
|
51119ad6fd
|
tools
|
2019-06-22 15:37:28 -04:00 |
|
TrilbySpaseClone
|
8879cdc24e
|
Update all_nodes.dm
|
2019-06-22 14:10:29 -04:00 |
|
Arturlang
|
8be06ddcd0
|
Fixes
|
2019-06-21 17:27:57 +03:00 |
|
TrilbySpaseClone
|
771ac9724e
|
ports Fel connet
Shamelessly stealing content
|
2019-06-21 04:39:10 -04: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
|
41eee65b15
|
Merge branch 'master' into master
|
2019-06-17 12:18:40 +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 |
|
Fermi
|
6b9becce71
|
Merge branch 'pr/14'
|
2019-06-14 21:29:04 +01: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 |
|