shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
33,888 Commits 5 Branches 0 Tags
07299f4cf029fc66856c135b1571f005463c33df
Commit Graph

22230 Commits

Author SHA1 Message Date
DeltaFire 07299f4cf0 ... why do people not proofread their code 
Fixes
1. Neovgre recharging near sigils
2. Neovgre healing on brass floor
3. ... the weapon firing sound
 2020-05-14 20:06:03 +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 3079db0c5b Merge pull request #12224 from MrJWhit/added-space-for-a-space-ruin 
Adding Space diner location for future use
 2020-05-14 04:48:33 -07: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 2e01c46fc9 Merge pull request #12227 from TheObserver-sys/WhyInEnginesNameDidWeUseACellFromAtmosForElectroplating 
Fixes Electroplating for real this time! We promise!
 2020-05-14 04:46:47 -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
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
Ghommie 62418ced9d floor 2020-05-13 03:50:27 +02: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
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
The0bserver e9a432d438 Initial Commit: Hey Drake? Where's the cell for electroplating? 2020-05-12 04:07:26 -04:00
MrJWhit bc148ad39f Space diner location 2020-05-12 01:52:47 -04: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
Ghommie dfae071015 Final adjustments. 2020-05-11 19:05:58 +02: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
kevinz000 dbfa8ac1ea Merge branch 'master' into typing_indicators 2020-05-11 05:00:23 -07: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