Trilbyspaceclone
|
f43bd91072
|
Merge branch 'master' into A_Tailer's_art
|
2019-10-05 11:50:12 -04:00 |
|
kevinz000
|
7c3036f027
|
Merge pull request #9267 from Tupinambis/EngineeringCriticalFix
Gives the Endivend Upgraded RCDs by default, instead of Autolathe ones.
|
2019-09-28 00:28:43 -07:00 |
|
TrilbySpaceClone
|
41fbb759b2
|
Merge branch 'master' into more_cooking2
|
2019-09-25 14:56:11 -04:00 |
|
kevinz000
|
c4f5ce67b8
|
Merge pull request #9276 from Trilbyspaceclone/war_on_fashen
Adds clip on pokadoted pants, only in 4 types for now
|
2019-09-13 10:43:00 -07:00 |
|
TrilbySpaceClone
|
fa868ce4ff
|
fashen crime
|
2019-09-11 14:22:50 -04:00 |
|
Tupinambis
|
6bdc0ef0c0
|
gives engivend upgraded RCDs by default.
|
2019-09-09 21:12:28 -05:00 |
|
Linzolle
|
64b757f404
|
refactor suits
|
2019-09-07 17:10:10 -05:00 |
|
Trilbyspaceclone
|
a68f35723f
|
Update clothesmate.dm
|
2019-09-05 06:45:22 -04:00 |
|
Trilbyspaceclone
|
b85ff2c5a2
|
Update nutrimax.dm
|
2019-09-05 06:44:59 -04:00 |
|
Trilbyspaceclone
|
57fd7388d3
|
Update nutrimax.dm
|
2019-09-05 06:44:37 -04:00 |
|
Trilbyspaceclone
|
c0c23fcc43
|
Update wardrobes.dm
|
2019-09-05 06:43:41 -04:00 |
|
TrilbySpaceClone
|
fd585aa6ea
|
Merge branch 'master' into more_cooking2
|
2019-09-03 11:22:38 -04:00 |
|
nik707
|
2307f7a2a6
|
Merge pull request #9146 from Raptorizer/Botany-Peaches
New plant type: Peaches
|
2019-08-29 19:59:37 -05:00 |
|
TrilbySpaceClone
|
d3852ebd56
|
even more
|
2019-08-29 19:39:10 -04:00 |
|
nik707
|
8e40e9d887
|
Merge pull request #9186 from Sishen1542/walklikeanegyptian
spellcheck of pharaoh gear, added pharaoh gear to chappy vendor p2
|
2019-08-28 00:02:39 -05:00 |
|
Trilbyspaceclone
|
ce28e71cd3
|
2 free ones for anyone that wants them
|
2019-08-26 17:08:48 -04:00 |
|
TrilbySpaceClone
|
44893b6ee7
|
It just works
|
2019-08-26 06:32:54 -04:00 |
|
TrilbySpaceClone
|
db317b65af
|
Grand!
|
2019-08-24 19:39:15 -04:00 |
|
Ghommie
|
24fe7126c4
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit28
|
2019-08-24 19:05:51 +02:00 |
|
Sishen
|
3f86a92efa
|
Merge branch 'walk-like-an-egyptian' into walklikeanegyptian
|
2019-08-23 14:42:35 -04:00 |
|
Sishen
|
ed2c3f3cbd
|
Fixes spelling mistakes, adds pharaoh gear to chaplain vendor
|
2019-08-19 13:53:05 -04:00 |
|
lolman360
|
323073f8d4
|
Merge pull request #6 from Trilbyspaceclone/patch-213
Patch 213
|
2019-08-19 11:12:50 +10:00 |
|
TrilbySpaceClone
|
e1cee15720
|
seed
|
2019-08-18 01:40:36 -04:00 |
|
Raptorizer
|
ff58fec243
|
New plant type: Peaches
Botanists can now grow peaches from a new pack of seeds!
|
2019-08-17 02:50:56 -05:00 |
|
lolman360
|
e838da8039
|
Merge pull request #3 from Citadel-Station-13/master
3
|
2019-08-17 11:55:56 +10:00 |
|
kevinz000
|
c2dd7111d0
|
Merge pull request #9112 from Trilbyspaceclone/patch-209
Heyyyy lets make sure the strawberry seeds are in the vender and spelled correctly
|
2019-08-16 17:17:04 -07:00 |
|
kappa-sama
|
4ca72c7733
|
re-add sugarcane to megaseed vendors
how did this happen
|
2019-08-16 14:38:25 -04:00 |
|
Trilbyspaceclone
|
32d70bbb6a
|
>_<
|
2019-08-11 19:10:34 -04:00 |
|
lolman360
|
da61b66f5c
|
ban me?
|
2019-08-11 11:11:30 +10:00 |
|
Thalpy
|
5795f6bbe2
|
Merge branch 'master' into master
|
2019-08-05 09:09:36 +01:00 |
|
kevinz000
|
4f0dc33d1b
|
Merge pull request #9021 from Ghommie/Ghommie-cit174
Ports "Adds techpriest robes and adds them to the RoboDrobe"
|
2019-08-05 00:49:29 -07:00 |
|
TrilbySpaceClone
|
3a85f9473c
|
amazing
|
2019-08-02 14:37:52 -04:00 |
|
Ghommie
|
7c9c51b777
|
Ports "Adds techpriest robes and adds them to the RoboDrobe"
|
2019-07-31 21:54:55 +02:00 |
|
Fermi
|
d080446a77
|
Merge branch 'pr/20'
|
2019-07-28 23:28:19 +01:00 |
|
Sishen
|
68083aa0c6
|
a
|
2019-07-25 21:43:02 -04:00 |
|
Sishen
|
612021b9d5
|
h
|
2019-07-25 21:43:02 -04:00 |
|
kevinz000
|
f114094138
|
Merge pull request #8926 from Thalpy/Secbats
Secbats
|
2019-07-22 20:15:36 -07:00 |
|
Thalpy
|
15ab1a26a4
|
Merge branch 'master' into master
|
2019-07-21 01:50:41 +01:00 |
|
Fermi
|
75d6768ba7
|
Changed how the box works so it's not a storage.
|
2019-07-19 22:12:05 +01:00 |
|
Fermi
|
4ab5060596
|
Adds secbats (tested)
|
2019-07-19 17:07:02 +01:00 |
|
Ghommie
|
589cdae0e1
|
Towels
|
2019-07-18 00:03:49 +02:00 |
|
Ghommie
|
1e1f8e627f
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit28
|
2019-07-15 17:33:41 +02:00 |
|
Thalpy
|
f77bcc9765
|
Merge branch 'master' into master
|
2019-07-14 15:10:32 +01:00 |
|
Ghommie
|
31bd9104bb
|
Ports "Adds blueshirt items to sectech and defines them better."
|
2019-07-13 06:42:09 +02:00 |
|
Thalpy
|
cc39c9f896
|
Merge branch 'master' into master
|
2019-07-06 16:03:17 +01:00 |
|
Ghommie
|
3c2e03c247
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit58
|
2019-07-04 23:46:04 +02:00 |
|
Thalpy
|
8a6e669060
|
Merge branch 'master' into master
|
2019-07-04 03:14:29 +01:00 |
|
Ghommie
|
ffecca8c11
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit28
|
2019-07-03 03:24:28 +02:00 |
|
Thalpy
|
937d6467e6
|
Buncha fixes and QoL stuff. (pH, hypo, heater and dispencer_
|
2019-06-30 19:16:27 +01:00 |
|
Ghommie
|
0371a5513a
|
Porting in 18 new drinks from the TGstation, plus tweaking and fixes.
|
2019-06-29 06:03:57 +02:00 |
|