shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
40,231 Commits 5 Branches 0 Tags
9cebd096ebc98bdf339ccbc3ff91a667cf2120bf
Commit Graph

17612 Commits

Author SHA1 Message Date
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
Detective Google e2ddfcf77b Merge remote-tracking branch 'upstream/master' into snaxi2 2020-05-13 00:56:25 -05:00
Putnam 86afd889f1 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into putnamos-for-real 2020-05-12 22:39:32 -07: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
Detective Google 4378a34ea7 Merge remote-tracking branch 'upstream/master' into snaxi2 2020-05-12 21:34:04 -05:00
kevinz000 4aca1e8f62 Update medicine_reagents.dm (#12233) 2020-05-13 04:20:05 +02:00
Putnam 0b2b34e867 Fixes multi-z proper 2020-05-12 19:13:39 -07:00
Ghommie 88e499a39a Some quick economy fixes and improvements. 2020-05-13 03:31:16 +02:00
Lin fd30edca9c infinixeno (#12234) 2020-05-13 03:18:25 +02:00
Detective Google 6e5e1b249f Merge remote-tracking branch 'upstream/master' into snaxi2 2020-05-12 18:38:28 -05:00
Putnam e243752369 Removed tossing from pressure diff (for now) 2020-05-12 16:10:20 -07:00
Putnam 8458f97692 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into putnamos-for-real 2020-05-12 13:34:31 -07:00
kevinz000 81424914e6 Merge pull request #12215 from Trilbyspaceclone/patch-377 
Adds more ballmer lines
 2020-05-12 12:35:05 -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
kevinz000 1f773cf4fe fixes 2020-05-12 11:52:45 -07: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
kevinz000 8952eb3e96 WOOPS 2020-05-12 07:45:00 -07:00
kevinz000 ea35e297c2 fixes 2020-05-12 07:38:52 -07:00
Putnam baaee906a2 fixin' a multiz segfault 2020-05-11 22:01:20 -07:00
Putnam 17826fe98b monstermos wow 2020-05-11 22:00:04 -07:00
Detective Google bfde367c4e Merge remote-tracking branch 'upstream/master' into snaxi2 2020-05-11 20:56:42 -05:00
Putnam c859cfee6b Bad merge, ouchies 2020-05-11 17:36:26 -07:00
Putnam 478400979d Added a fallback, just in case (may not work?) 2020-05-11 17:13:47 -07:00
Putnam f4f80594bd Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into putnamos-for-real 2020-05-11 17:10:55 -07:00
Putnam 121d594faa Fixes 2020-05-11 17:09:35 -07:00
Putnam e8d7da56f4 Ported C++mos from yogs (help me) 2020-05-11 15:44:26 -07:00
Ghom bd19763236 Update lighting.dm 2020-05-12 00:18:27 +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
kevinz000 dbfa8ac1ea Merge branch 'master' into typing_indicators 2020-05-11 05:00:23 -07: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 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 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
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