shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
42,722 Commits 5 Branches 0 Tags
be2e9629832dbb3000515cd14bd75a90fa3fb00a
Commit Graph

18777 Commits

Author SHA1 Message Date
Trilbyspaceclone c6c4d61ee3 Cargo Rework - MK *why did I ever lison to people that were just powergamers?* (#11975) 
* Baby wheels off

* Oh god factorio is dead!

* Gas-p the nerfs!

* Update gear.dm

* tools

* Update large_objects.dm
 2020-05-15 03:57:28 +02:00
kevinz000 10944d1b52 The bag of holding (and I guess backpack) balancing pass no one asked for (#11864) 
* Ok

* whew

* ok

* fix

* ehh

* fix

* buff disks

* Update _compile_options.dm

* Update tgstation.dme
 2020-05-15 03:44:56 +02:00
Trilbyspaceclone af0d1da409 Nerfs Drake Armor (#12133) 
* Update cloaks.dm

* Update cloaks.dm

* Update cloaks.dm

* Update cloaks.dm

* Update cloaks.dm

* Update cloaks.dm
 2020-05-15 03:40:13 +02:00
Trilbyspaceclone f0cf2f8cfa Ports commit "fixes space vines" by AnturK (#12254) 
* Update spacevine.dm

* Update spacevine.dm
 2020-05-14 15:07:32 +02:00
jjpark-kb 99425bbd88 Radial Mining Vendor Voucher (#12246) 2020-05-14 13:59:40 +02:00
kevinz000 f44e9b662b Merge pull request #12238 from Ghommie/Ghommie-cit747 
Some quick economy fixes and improvements.
 2020-05-14 04:48:14 -07:00
kevinz000 616d104c23 Merge pull request #12189 from Ghommie/Ghommie-cit735 
Skill modifier datums.
 2020-05-14 04:46:24 -07:00
Arturlang ada31990d0 Fixes prosthetic causing bloodsuckers to bug out (#12136) 
* Fixes prosthetic causing bloodsuckers to bug out

* Moved it per ghommies suggestions
 2020-05-14 13:44:48 +02:00
Ghom fc980b31c2 I did a typo. 2020-05-14 13:44:06 +02:00
Ghom ce2bb9ff84 Kevinz "the braveless" 000's suggestion. 2020-05-14 13:43:36 +02:00
kappa-sama fc0ac23eed slight modifications to soda/booze dispenser emag reagents (#12174) 
* these

* coom.

* move

* Update code/modules/reagents/chemistry/machinery/chem_dispenser.dm

Co-authored-by: Ghom <42542238+Ghommie@users.noreply.github.com>

* Update code/modules/reagents/chemistry/machinery/chem_dispenser.dm

Co-authored-by: Ghom <42542238+Ghommie@users.noreply.github.com>

Co-authored-by: Ghom <42542238+Ghommie@users.noreply.github.com>
 2020-05-14 04:27:19 +02:00
Lin 0d92783a91 oops. (#12242) 2020-05-14 00:22:57 +02:00
Trilbyspaceclone 899c5a4575 Corrects evey storge with storage (#12220) 
* Update medical.dm

* Update autobottler.dm

* Update autobotter_designs.dm

* Update medical_designs.dm

* Update hardsuit.dm

* Update code/modules/cargo/bounties/medical.dm

Co-authored-by: Ghom <42542238+Ghommie@users.noreply.github.com>
 2020-05-13 21:21:11 +02:00
Lin 2dedf0d6b6 Merge pull request #12015 from kevinz000/typing_indicators 
Typing Indicators (v2)
 2020-05-13 18:19:26 +00:00
Artur 1682cfd3fd Compile 2020-05-13 13:52:12 +03:00
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