kevinz000
|
3c97782a87
|
Merge pull request #11483 from Hatterhat/mining-borg-nerfs
mining borg nerfs - "they should be outclassed lategame"
|
2020-03-16 13:22:23 -07:00 |
|
kevinz000
|
8fdb1e5964
|
Merge pull request #11465 from Seris02/duffelbagholding
duffel bags of holding
|
2020-03-16 06:12:40 -07:00 |
|
Hatterhat
|
1fe67d5ce9
|
a finger of the monkey's paw curls.
|
2020-03-16 01:35:47 -05:00 |
|
Hatterhat
|
802d37a399
|
borgs should be outclassed lategame and not hunt
|
2020-03-15 15:55:31 -05:00 |
|
Seris02
|
5a04b43db4
|
duffel baaaaaaaaaaags
|
2020-03-14 16:12:17 +08:00 |
|
Ghommie
|
0876a1eef6
|
Porting datum components system updates.
|
2020-03-12 18:22:26 +01:00 |
|
kevinz000
|
b8642c5622
|
Merge pull request #11424 from necromanceranne/death_coma_stuff
Some fakedeath fixes requested by kev also ports a fix from tg to regen coma
|
2020-03-11 17:24:03 -07:00 |
|
kevinz000
|
69c21f4b76
|
Merge pull request #10327 from Seris02/tggenetics
ports tg genetics
|
2020-03-11 17:01:37 -07:00 |
|
necromanceranne
|
c37d30a617
|
Some fixes requested by kev also ports a fix from tg
|
2020-03-11 15:43:47 +11:00 |
|
kevinz000
|
e210f7d535
|
Merge pull request #11391 from Ghommie/Ghommie-cit612
Porting "Further update_icon splitup"
|
2020-03-10 05:58:17 -07:00 |
|
Seris02
|
cccd0e9eef
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into tggenetics
|
2020-03-09 16:49:32 +08:00 |
|
Ghommie
|
ee1eea8874
|
Ports "Switches out the three billion args of electrocute act for flags"
|
2020-03-09 04:01:23 +01:00 |
|
Ghommie
|
59b1a223a3
|
Ok, done.
|
2020-03-08 22:51:36 +01:00 |
|
Ghom
|
1e0ea6facf
|
Merge pull request #11353 from Citadel-Station-13/kevinz000-patch-22
Rebalances nanite adrenals
|
2020-03-08 01:40:07 +01:00 |
|
kevinz000
|
93d995eb18
|
k
|
2020-03-06 10:13:11 -07:00 |
|
kevinz000
|
0ace3f2310
|
Update buffing.dm
|
2020-03-06 05:42:28 -07:00 |
|
kevinz000
|
16d6ba9e21
|
Merge pull request #11323 from Ghommie/Ghommie-cit600
Porting a couple material datums code updates and fixes.
|
2020-03-06 00:17:21 -07:00 |
|
deathride58
|
2e35c09dec
|
Merge pull request #10451 from kevinz000/mobility_flags
Mobility flags + combat rework stuff refactoring, fixes a few edge cases including the Oh Dreaded Xenomorph Hardstuns, etc etc time to break the game
|
2020-03-05 20:03:56 -05:00 |
|
Ghom
|
5e603c1cce
|
Merge pull request #11064 from Trilbyspaceclone/more_implants
3 new arm tool set implants
|
2020-03-06 01:25:02 +01:00 |
|
Ghom
|
44a9add328
|
Merge pull request #11328 from Trilbyspaceclone/Hey-Teens!
Removed unused techweb var - Cargo selling of Techwebs nodes
|
2020-03-06 01:21:09 +01:00 |
|
TrilbySpaceClone
|
7e51cf9ab3
|
Removed unused techweb var
|
2020-03-04 16:30:10 -05:00 |
|
Ghommie
|
f2c8a7cd6f
|
Porting a couple material datums code updates and fixes.
|
2020-03-04 15:59:46 +01:00 |
|
kevinz000
|
56eab760fc
|
Merge remote-tracking branch 'citadel/master' into mobility_flags
|
2020-02-27 20:11:36 -07:00 |
|
Seris02
|
6b2bbe0133
|
there fixed
|
2020-02-26 06:51:03 +08:00 |
|
Seris02
|
c4e9472b85
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into nomoreailipreading
|
2020-02-24 17:48:58 +08:00 |
|
Seris02
|
cbdb12e110
|
yes
|
2020-02-24 17:47:29 +08:00 |
|
Hatterhat
|
ba81184fef
|
Merge branch 'master' into quickpatch-enzyme
|
2020-02-22 18:06:17 -06:00 |
|
Trilbyspaceclone
|
2cd8adf4da
|
Update medical_designs.dm
|
2020-02-22 19:06:11 -05:00 |
|
Trilbyspaceclone
|
cf8b41723d
|
Update medical_designs.dm
|
2020-02-22 18:35:40 -05:00 |
|
TrilbySpaceClone
|
c638a83e23
|
Merge branch 'master' into more_implants
|
2020-02-22 18:34:02 -05:00 |
|
Trilbyspaceclone
|
511692a7cb
|
Update medical_designs.dm
|
2020-02-22 18:30:32 -05:00 |
|
Seris02
|
c3ec44b0d0
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into tggenetics
|
2020-02-22 19:54:10 +08:00 |
|
kevinz000
|
f6542b381c
|
Merge remote-tracking branch 'citadel/master' into mobility_flags
|
2020-02-21 23:29:25 -07:00 |
|
kevinz000
|
856af1f182
|
Merge pull request #10848 from Ghommie/Ghommie-cit229
Porting Floyd Materials: Trying again edition
|
2020-02-21 23:28:44 -07:00 |
|
kevinz000
|
5a580dda20
|
Update suppression.dm
|
2020-02-21 18:18:37 -07:00 |
|
Ghommie
|
8fbfd07692
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit229
|
2020-02-22 00:55:32 +01:00 |
|
kevinz000
|
a784a74ccb
|
Merge remote-tracking branch 'citadel/master' into mobility_flags
|
2020-02-21 13:35:26 -07:00 |
|
keronshb
|
7a1bc9d22b
|
Fixes the travis issues
Fixes the travis issues, Exo still remains a mystery
|
2020-02-20 19:11:04 -05:00 |
|
keronshb
|
4ca9eb4171
|
Fixes healing nanites
Fixes Accelerated Regeneration, Bio Regen, and Mechanical.
Also changed one line on Exo nanites but it doesn't fix those. Dunno what to do.
|
2020-02-20 18:11:54 -05:00 |
|
Ghom
|
26bbc64f16
|
Merge pull request #11136 from Owai-Seek/broomport-2-17-19
Ports Broom, Tweak Janitor Vendor
|
2020-02-20 11:48:06 +01:00 |
|
Ghom
|
d680ab9fd5
|
Merge pull request #11025 from Arturlang/TGUI_Next_Nanites
Ports TGUI Next and a lot of misc updates for nanites.
|
2020-02-20 11:27:48 +01:00 |
|
Hatterhat
|
b5e369aaf1
|
i forgot about that one
|
2020-02-19 21:00:31 -06:00 |
|
Hatterhat
|
2d32c47743
|
so i forgot to change that over
|
2020-02-19 20:59:02 -06:00 |
|
kevinz000
|
c7273c03be
|
Merge remote-tracking branch 'citadel/master' into mobility_flags
|
2020-02-19 19:12:27 -07:00 |
|
kevinz000
|
49279086b7
|
Merge pull request #11113 from CameronWoof/biogeneratin'
Adds diethylamine and saltpetre to the biogenerator
|
2020-02-19 19:03:35 -07:00 |
|
kevinz000
|
9589c3116b
|
Merge pull request #11115 from Ghommie/Ghommie-cit583
Something more about runtime errors.
|
2020-02-19 19:03:01 -07:00 |
|
Arturlang
|
901b54b7e8
|
Webedit man to the doom and rescue
|
2020-02-20 01:38:28 +02:00 |
|
Arturlang
|
796f51b557
|
Merge branch 'master' into TGUI_Next_Nanites
|
2020-02-20 00:52:55 +02:00 |
|
kevinz000
|
0e4692c63d
|
Merge remote-tracking branch 'citadel/master' into mobility_flags
|
2020-02-18 18:16:34 -07:00 |
|
Winter Flare
|
ed46d3ca1c
|
Typo
|
2020-02-18 00:37:28 -05:00 |
|