Linzolle
|
13b3552e64
|
i'm dumb
|
2019-08-12 14:37:48 -05:00 |
|
Linzolle
|
2095a14256
|
add mining shuttle console to techweb
|
2019-08-12 13:49:26 -05:00 |
|
kevinz000
|
123b478edd
|
Merge pull request #8927 from Ghommie/Ghommie-cit151
Tones down some items attack stamina costs. kills hypereutactic blades copypasta.
|
2019-08-11 10:12:20 -07:00 |
|
Ghommie
|
12c4fc139d
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit151
|
2019-08-09 04:00:23 +02:00 |
|
Thalpy
|
5795f6bbe2
|
Merge branch 'master' into master
|
2019-08-05 09:09:36 +01:00 |
|
Trilbyspaceclone
|
3bad062c23
|
Merge branch 'master' into Unmodular
|
2019-08-05 00:04:44 -04:00 |
|
Ghommie
|
d9a09d7211
|
Undoes a few things.
|
2019-07-31 21:23:20 +02:00 |
|
Ghommie
|
ec2a3ea778
|
Ports "Bluespace research updates" and "Teleportation standardization, channels, and interception"
|
2019-07-31 18:56:00 +02:00 |
|
Fermi
|
fbbc4d8589
|
Merge branch 'pr/21'
|
2019-07-29 22:57:40 +01:00 |
|
Trilbyspaceclone
|
a2b35d71fa
|
port-part1
|
2019-07-28 08:07:44 -04:00 |
|
Thalpy
|
15ab1a26a4
|
Merge branch 'master' into master
|
2019-07-21 01:50:41 +01:00 |
|
Ghommie
|
b87442e633
|
Tones down some items attack stamina costs. kills hypereutactic blades copypasta.
|
2019-07-19 20:09:16 +02:00 |
|
deathride58
|
edbcabdce4
|
Merge pull request #8836 from Citadel-Station-13/kevinz000-patch-55
nanite metabolic synthesis now drains you until you're starving
|
2019-07-17 17:55:27 -04:00 |
|
deathride58
|
80b1383362
|
Merge pull request #8865 from Citadel-Station-13/kevinz000-patch-53
adds an adminspawned nanite hub that draws from admin techweb datum instead
|
2019-07-17 17:50:46 -04:00 |
|
deathride58
|
51665f0d5f
|
Merge pull request #8863 from Citadel-Station-13/kevinz000-patch-51
Makes aggressive replication not useless
|
2019-07-17 17:49:08 -04:00 |
|
deathride58
|
8f41a29697
|
Merge pull request #8867 from Citadel-Station-13/kevinz000-patch-56
Nerfs chain detonation (removes dev radius)
|
2019-07-17 17:47:36 -04:00 |
|
deathride58
|
c36f25144b
|
Merge pull request #8890 from Citadel-Station-13/kevinz000-patch-59
Nerfs nanite armor
|
2019-07-17 17:46:41 -04:00 |
|
Thalpy
|
9c7b1dee97
|
Merge branch 'master' into master
|
2019-07-15 21:23:04 +01:00 |
|
Trilbyspaceclone
|
2a78caa127
|
Merge branch 'master' into Unmodular
|
2019-07-14 18:27:37 -04: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 |
|
kevinz000
|
33250dfcbe
|
buffs it a bit
|
2019-07-14 14:16:44 -07:00 |
|
kevinz000
|
0adb33474d
|
Update buffing.dm
|
2019-07-14 03:24:59 -07:00 |
|
Ghommie
|
129ca9d71f
|
Ports "Refactors NODROP flag into TRAIT_NODROP"
|
2019-07-13 10:27:39 +02:00 |
|
kevinz000
|
239d688fe4
|
Update weapon.dm
|
2019-07-10 22:47:29 -07:00 |
|
kevinz000
|
05a01fe028
|
Update nanite_program_hub.dm
|
2019-07-10 22:11:16 -07:00 |
|
kevinz000
|
84d6fbe249
|
Update weapon.dm
|
2019-07-10 22:00:28 -07:00 |
|
kevinz000
|
a9c41c0fc7
|
hm
|
2019-07-10 10:00:45 -07:00 |
|
kevinz000
|
c14a052eeb
|
Update weapon.dm
|
2019-07-10 03:06:32 -07:00 |
|
Trilbyspaceclone
|
f37e1bf01b
|
Merge branch 'master' into Unmodular
|
2019-07-09 03:14:49 -04:00 |
|
kevinz000
|
fafac3fba6
|
Update utility.dm
|
2019-07-08 23:45:21 -07: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 |
|
kevinz000
|
f541357a2c
|
Update utility.dm
|
2019-07-07 00:30:33 -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 |
|
Trilbyspaceclone
|
063fe4fdef
|
Merge branch 'master' into Unmodular
|
2019-06-23 21:06:21 -04:00 |
|
Fermi
|
fdba8c000f
|
Fixing compiling errors.
|
2019-06-23 20:03:37 +01:00 |
|