Artur
|
dabdf16eac
|
Coonflict fiiixeeess
|
2020-05-13 12:56:17 +03:00 |
|
Artur
|
5b7d9a9008
|
Merge conflict fix
|
2020-05-13 12:37:18 +03:00 |
|
Trilbyspaceclone
|
871361936c
|
Replaces mosins in russian crates with 10mm surplus rifles (#12176)
* Update security.dm
* Update armory.dm
* desc
Co-authored-by: Ghom <42542238+Ghommie@users.noreply.github.com>
|
2020-05-13 05:35:01 +02:00 |
|
kevinz000
|
4aca1e8f62
|
Update medicine_reagents.dm (#12233)
|
2020-05-13 04:20:05 +02:00 |
|
Lin
|
fd30edca9c
|
infinixeno (#12234)
|
2020-05-13 03:18:25 +02:00 |
|
kevinz000
|
ffc7211444
|
Update _wires.dm (#12199)
|
2020-05-12 22:02:40 +02:00 |
|
kevinz000
|
81424914e6
|
Merge pull request #12215 from Trilbyspaceclone/patch-377
Adds more ballmer lines
|
2020-05-12 12:35:05 -07:00 |
|
kevinz000
|
5364666d0c
|
Merge pull request #12212 from Trilbyspaceclone/patch-376
Buffs and corrects organ storage box
|
2020-05-12 12:34:45 -07:00 |
|
kevinz000
|
6ddd0ffa77
|
Merge pull request #12207 from Ghommie/Ghommie-cit743
Fixed several item action buttons not using their own states
|
2020-05-12 12:28:24 -07:00 |
|
kevinz000
|
ff2158b20b
|
Merge pull request #12206 from Ghommie/Ghommie-cit742
Porting tg's icon for that plant-speak language.
|
2020-05-12 12:28:08 -07:00 |
|
kevinz000
|
395d434e6e
|
Merge pull request #12200 from Ghommie/Ghommie-cit738
nutrition adjustment wrapper procs from tg.
|
2020-05-12 12:28:02 -07:00 |
|
kevinz000
|
40d2d35ffa
|
Merge pull request #12205 from Ghommie/Ghommie-cit741
A few runtimes, fixed.
|
2020-05-12 12:27:45 -07:00 |
|
kevinz000
|
afbbde610a
|
Merge pull request #12201 from Ghommie/Ghommie-cit740
Purging unused dogborg items.
|
2020-05-12 12:27:26 -07:00 |
|
Ghommie
|
757706653d
|
Map paths.
|
2020-05-12 21:01:34 +02:00 |
|
Ghommie
|
7fb96ab0cf
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit685
|
2020-05-12 20:06:59 +02:00 |
|
kevinz000
|
90d4f213bf
|
Update preferences.dm (#12230)
|
2020-05-12 17:39:37 +02:00 |
|
Trilbyspaceclone
|
95330e4baf
|
Update life.dm
|
2020-05-11 17:17:04 -04:00 |
|
Trilbyspaceclone
|
c14197bd1b
|
Update life.dm
|
2020-05-11 17:16:10 -04:00 |
|
Trilbyspaceclone
|
0df3483d6f
|
Update life.dm
|
2020-05-11 17:15:29 -04:00 |
|
Trilbyspaceclone
|
8fa1a0ba58
|
Update life.dm
|
2020-05-11 15:48:01 -04:00 |
|
Trilbyspaceclone
|
720abbf1c5
|
Update life.dm
|
2020-05-11 15:21:49 -04:00 |
|
Trilbyspaceclone
|
1e5cce73d9
|
Update life.dm
|
2020-05-11 15:19:39 -04:00 |
|
Trilbyspaceclone
|
db87da599c
|
Update firstaid.dm
|
2020-05-11 08:41:03 -04:00 |
|
Trilbyspaceclone
|
3c87647fd2
|
Update firstaid.dm
|
2020-05-11 08:32:36 -04:00 |
|
kappa-sama
|
78004a7b73
|
kek (#12208)
|
2020-05-11 13:57:42 +02:00 |
|
kevinz000
|
0ed3b17d28
|
Merge pull request #12179 from Putnam3145/fix-atmos
Brings back the gas archive
|
2020-05-11 04:19:50 -07:00 |
|
kevinz000
|
657a4831b4
|
Merge pull request #12182 from kappa-sama/patch-25
you can now mass produce electrochromatic kits
|
2020-05-11 04:18:48 -07:00 |
|
kevinz000
|
f1ba2ae8e4
|
Merge pull request #12196 from Citadel-Station-13/Ghommie-patch-1
bumps up savefile version cause horns/wings
|
2020-05-11 04:18:29 -07:00 |
|
kevinz000
|
0646f16377
|
Merge pull request #12085 from Citadel-Station-13/Ghommie-patch-2
makes the uranium mat two times less radioactive
|
2020-05-11 04:15:07 -07:00 |
|
kevinz000
|
992905846d
|
Merge pull request #12160 from Linzolle/cold-mining
Explorer's gear gives full-body cold resistance
|
2020-05-11 04:08:17 -07:00 |
|
kevinz000
|
2d225540fa
|
Merge pull request #12185 from Detective-Google/this-is-why-we-can't-have-nice-things
Nerfs multiple ice ruins
|
2020-05-11 04:07:46 -07:00 |
|
kevinz000
|
8cbe44f20c
|
Merge pull request #12192 from Ghommie/Ghommie-cit737
Reorganizing techweb nodes into a subfolder.
|
2020-05-11 04:07:16 -07:00 |
|
Lin
|
5a6b48cdfb
|
Merge pull request #12191 from Ghommie/Ghommie-cit736
Fixing IPCs and synth lizard antennas not showing up.
|
2020-05-11 03:40:39 +00:00 |
|
Lin
|
d9cd4f37f2
|
Merge pull request #12157 from Ghommie/Ghommie-cit731
Fixing some runtimes and issues.
|
2020-05-11 03:34:04 +00:00 |
|
kevinz000
|
f292d4047c
|
Adds OOC notes (#12067)
* ooc notes
* fixes
* repath
* ok
* This SHOULD compile, or else...
Co-authored-by: Ghom <42542238+Ghommie@users.noreply.github.com>
|
2020-05-11 01:35:48 +02:00 |
|
Trilbyspaceclone
|
b019915d10
|
Removes alien crate adds ape crate (#12178)
* Update science.dm
* Update snacks_meat.dm
* Update science.dm
* Apply suggestions from code review
kinda didnt want to just take tg's ape cubes but what ever
Co-authored-by: Ghom <42542238+Ghommie@users.noreply.github.com>
Co-authored-by: Ghom <42542238+Ghommie@users.noreply.github.com>
|
2020-05-11 01:10:45 +02:00 |
|
kevinz000
|
65ae939837
|
Update empulse.dm (#12183)
|
2020-05-11 01:10:13 +02:00 |
|
Ghommie
|
71b725b511
|
Fixed several item action buttons not using their own states
|
2020-05-11 01:07:34 +02:00 |
|
Ghom
|
615db74a46
|
THIS TIME FOR REAL!
|
2020-05-11 00:51:49 +02:00 |
|
Ghommie
|
7109851089
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit742
|
2020-05-11 00:46:51 +02:00 |
|
Ghom
|
a3e60364af
|
Update craft.dm
|
2020-05-11 00:35:28 +02:00 |
|
Ghommie
|
e8a0ea5acc
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit731
|
2020-05-11 00:34:22 +02:00 |
|
Ghom
|
9b68a036af
|
Update ice_demon.dm
|
2020-05-10 23:53:37 +02:00 |
|
kevinz000
|
7cfbdf3a1d
|
Update human.dm (#12203)
|
2020-05-10 23:51:49 +02:00 |
|
Ghommie
|
46ba884965
|
A few runtimes, fixed.
|
2020-05-10 23:47:30 +02:00 |
|
kevinz000
|
1cf2311930
|
Merge pull request #12164 from Ghommie/Ghommie-cit733
Porting "Refactors language holder"
|
2020-05-10 14:16:42 -07:00 |
|
kevinz000
|
6b9fc7eccf
|
Merge pull request #12169 from Ghommie/Ghommie-cit734
Porting some radial menu updates, and that one clown mask skin.
|
2020-05-10 14:14:19 -07:00 |
|
Ghommie
|
5ed6a18ef7
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit740
|
2020-05-10 22:36:04 +02:00 |
|
Ghommie
|
e0b91c53af
|
Purging unused dogborg items.
|
2020-05-10 22:17:05 +02:00 |
|
Ghommie
|
667c12d413
|
nutrition adjustment wrapper procs.
|
2020-05-10 21:41:50 +02:00 |
|