BlackMajor
|
83a707ee93
|
Removes medihounds, same treatment as janihounds
|
2019-12-13 13:48:22 +13:00 |
|
kevinz000
|
6b53845f06
|
Merge pull request #9268 from Thalpy/FERMICHEMCurTweaks
[READY] [Please merge me] Fermichem tweaks: Purity, Astral, RNG, MK, SMilk, SDGF, furranium, hatmium, eigen, nanite.
|
2019-11-26 16:01:48 -07:00 |
|
Fermi
|
614a462176
|
Revert "Revert "Merge remote-tracking branch 'upstream/master'""
This reverts commit 1509d9d183.
|
2019-11-24 03:33:02 +00:00 |
|
Fermi
|
ba4fa1ef67
|
Revert "PLASE"
This reverts commit 8af225e6e3.
|
2019-11-24 03:06:08 +00:00 |
|
Fermi
|
aeb8606ce0
|
Revert "Revert "PLASE""
This reverts commit 00601a0c87.
|
2019-11-24 03:04:52 +00:00 |
|
Fermi
|
1509d9d183
|
Revert "Merge remote-tracking branch 'upstream/master'"
This reverts commit 135608551f, reversing
changes made to ce7e9ac452.
|
2019-11-24 03:04:13 +00:00 |
|
Fermi
|
c8b206a4cf
|
Revert "pls"
This reverts commit 8c97511871.
|
2019-11-24 03:04:04 +00:00 |
|
Fermi
|
4c1c257035
|
Revert "Revert "pls""
This reverts commit b23f2a4460.
|
2019-11-24 03:02:21 +00:00 |
|
Fermi
|
9eaed4ea8e
|
Revert "pls2"
This reverts commit 0eb635b908.
|
2019-11-24 03:02:04 +00:00 |
|
Fermi
|
0eb635b908
|
pls2
ugh
|
2019-11-24 02:52:17 +00:00 |
|
Fermi
|
b23f2a4460
|
Revert "pls"
This reverts commit 8c97511871.
|
2019-11-24 02:49:20 +00:00 |
|
Fermi
|
8c97511871
|
pls
ugh
|
2019-11-24 02:47:52 +00:00 |
|
Fermi
|
135608551f
|
Merge remote-tracking branch 'upstream/master'
|
2019-11-24 02:45:28 +00:00 |
|
Fermi
|
00601a0c87
|
Revert "PLASE"
This reverts commit 8af225e6e3.
|
2019-11-24 02:44:00 +00:00 |
|
Fermi
|
8af225e6e3
|
PLASE
|
2019-11-24 02:41:21 +00:00 |
|
Fermi
|
b404e18b15
|
Merge branch 'master' into FERMICHEMCurTweaks
|
2019-11-23 00:10:33 +00:00 |
|
GrayRachnid
|
c8e52fb8e1
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into disablesnolegs
|
2019-11-22 15:24:15 -05:00 |
|
Hatterhat
|
f161b01f6b
|
ayytech plants
|
2019-11-19 17:26:44 -06:00 |
|
kevinz000
|
4c89b8c33f
|
Merge pull request #9628 from Trilbyspaceclone/Cargo_MKII
[Ready] [Testmerge] MK II Cargo Rework - Sell harder edition
|
2019-11-14 16:00:45 -07:00 |
|
TrilbySpaceClone
|
6e328ea1b1
|
art of the deal
|
2019-11-11 07:26:12 -05:00 |
|
TrilbySpaceClone
|
0662245d80
|
corrections
|
2019-11-06 22:52:44 -05:00 |
|
TrilbySpaceClone
|
82b148b7b7
|
Merge branch 'master' into Cargo_MKII
|
2019-11-03 17:53:06 -05:00 |
|
TrilbySpaceClone
|
bd4501e11c
|
the last touches?
|
2019-11-03 17:26:28 -05:00 |
|
TrilbySpaceClone
|
a8248c68f4
|
perhaps
|
2019-11-03 12:53:02 -05:00 |
|
TrilbySpaceClone
|
5c4cd15762
|
Hmm
|
2019-11-03 11:05:45 -05:00 |
|
Ghommie
|
b17346a44e
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit220
|
2019-10-30 14:46:42 +01:00 |
|
Hatterhat
|
ebd05a3fb1
|
today i will make a one line fix and steal it from sishen
|
2019-10-28 22:39:46 -05:00 |
|
kevinz000
|
da387bfdf4
|
Merge pull request #9620 from YakumoChen/proto_beanbag
Adds Beanbag Slugs to Seclathe
|
2019-10-27 16:13:31 -07:00 |
|
YakumoChen
|
0845c6915e
|
adds beanbag to sec lathe
|
2019-10-26 10:19:01 +00:00 |
|
kevinz000
|
8b22c95479
|
Merge pull request #9606 from Ghommie/Ghommie-cit270
Unmodularize research.
|
2019-10-25 20:09:26 -07:00 |
|
Ghommie
|
6f19899dd2
|
Unmodularize research.
|
2019-10-24 23:28:15 +02:00 |
|
deathride58
|
f85f110baa
|
Merge pull request #9047 from Poojawa/syntheticbloods
RGB Blood Reworks + Blood generator
|
2019-10-23 20:54:55 -04:00 |
|
BlackMajor
|
2a6cbe4df2
|
Merge pull request #8938 from Citadel-Station-13/kevinz000-patch-55
Adds pyro/cryo/advanced grenade casings to science, as well as test range firing pins, floralrays, and stunshells
|
2019-10-24 13:48:29 +13:00 |
|
Poojawa
|
6fc750dca0
|
Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into syntheticbloods
|
2019-10-21 19:13:19 -05:00 |
|
Poojawa
|
ffeae20daa
|
Merge remote-tracking branch 'Citadel-Station-13/master' into syntheticbloods
|
2019-10-18 06:01:52 -05:00 |
|
Linzolle
|
3b1e66ad05
|
more consistent naming
|
2019-10-17 17:23:47 -05:00 |
|
Linzolle
|
88814415dc
|
tend wounds
|
2019-10-17 16:59:33 -05:00 |
|
Poojawa
|
394c947d14
|
Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into syntheticbloods
|
2019-10-11 23:10:45 -05:00 |
|
Linzolle
|
d2ea3b0165
|
one letter off
|
2019-10-11 20:53:19 -05:00 |
|
Linzolle
|
b50804dfc3
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into dissection
|
2019-10-11 20:06:26 -05:00 |
|
Thalpy
|
6b986632be
|
Merge branch 'master' into FERMICHEMCurTweaks
|
2019-10-11 22:23:18 +01:00 |
|
kevinz000
|
b0b274762c
|
Merge pull request #9441 from lolman360/whydowehave1000branches
Ports /tg/ advanced surgerytools and tool defines.
|
2019-10-11 12:10:31 -07:00 |
|
Thalpy
|
9bb045b60a
|
Merge branch 'master' into FERMICHEMCurTweaks
|
2019-10-08 13:10:35 +01:00 |
|
lolman360
|
2709570f01
|
techwebs and stuff i forgot
i am not a 1 commit wonder
|
2019-10-08 20:02:26 +11:00 |
|
Poojawa
|
3113074bfb
|
Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into syntheticbloods
|
2019-10-08 02:55:32 -05:00 |
|
GrayRachnid
|
9f8ad74bf9
|
New traumas and some other things.
|
2019-10-08 03:53:01 -04:00 |
|
kevinz000
|
6fc746a5af
|
Merge pull request #9226 from Trilbyspaceclone/unmodular_2
Unmodulars a few things + new sprite + new welder tank(unused
|
2019-10-08 00:30:54 -07:00 |
|
Ghommie
|
5232728ee7
|
Ports "Adds three new .38 ammo types", also lazily adding .357 AP
|
2019-10-07 05:25:47 +02:00 |
|
Fermi
|
60adaa9f1b
|
Merge branch 'master' into FERMICHEMCurTweaks
|
2019-09-26 08:44:21 +01:00 |
|
XDTM
|
947bb8cc69
|
port muscled veins too why not
|
2019-09-22 19:59:17 -05:00 |
|