shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
13,776 Commits 5 Branches 0 Tags
05ab5f7c0c15be95ae4c7ea1fad4e69d88171a39
Commit Graph

13776 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
deathride58 05ab5f7c0c Merge pull request #5510 from Citadel-Station-13/upstream-merge-35552 
[MIRROR] [s]Fixes writing bugs/exploits
 2018-02-16 01:32:23 +00:00
CitadelStationBot ef99b4a031 Automatic changelog generation for PR #5509 [ci skip] 2018-02-15 19:32:00 -06:00
deathride58 64dc40d293 Merge pull request #5509 from Citadel-Station-13/upstream-merge-35606 
[MIRROR] Apples now taste like apples
 2018-02-16 01:31:58 +00:00
CitadelStationBot d64e86b1a9 Automatic changelog generation for PR #5508 [ci skip] 2018-02-15 19:31:26 -06:00
deathride58 4c2db869ef Merge pull request #5508 from Citadel-Station-13/upstream-merge-35131 
[MIRROR] Adds sounds and some small QoL improvements to the circuit imprinter, and allows them to recycle empty assemblies
 2018-02-16 01:31:24 +00:00
CitadelStationBot 8a801f1e18 Automatic changelog generation for PR #5505 [ci skip] 2018-02-15 19:29:17 -06:00
deathride58 d7c06fec6f Merge pull request #5505 from Citadel-Station-13/upstream-merge-35342 
[MIRROR] Adds Cryostatis Shotgun Darts
 2018-02-16 01:29:14 +00:00
deathride58 a6ac0df5c4 Merge pull request #5504 from Citadel-Station-13/upstream-merge-35651 
[MIRROR] Gives eggbox an inhand image, cleans up heartbox inhands
 2018-02-16 01:28:54 +00:00
deathride58 ee004e3359 Merge pull request #5503 from Citadel-Station-13/upstream-merge-35655 
[MIRROR] fixes firedoor layer for the last god damn time
 2018-02-16 01:28:35 +00:00
deathride58 05a0ce13a1 Merge pull request #5501 from Citadel-Station-13/upstream-merge-35611 
[MIRROR] Spellcheck: Fixed a typo on an eldritch god's pronunciation
 2018-02-16 01:27:09 +00:00
deathride58 2e6efc58aa Merge pull request #5500 from Citadel-Station-13/upstream-merge-35635 
[MIRROR] Fixes the name on the cook's culinary school training
 2018-02-16 01:26:56 +00:00
deathride58 aa5fed9369 Merge pull request #5499 from Citadel-Station-13/upstream-merge-35654 
[MIRROR] Fixes turret faction on snowdin map
 2018-02-16 01:26:23 +00:00
deathride58 64ec78b5de Merge pull request #5498 from Citadel-Station-13/upstream-merge-35636 
[MIRROR] Spellchecks announcement's grammar
 2018-02-16 01:26:09 +00:00
deathride58 cd28894a2f Merge pull request #5497 from Citadel-Station-13/upstream-merge-35644 
[MIRROR] Fix GLOB setup runtimes not affecting the counter
 2018-02-16 01:24:33 +00:00
CitadelStationBot 39a9a0c9b1 Automatic changelog generation for PR #5495 [ci skip] 2018-02-15 19:12:09 -06:00
deathride58 efa1f99f9d Merge pull request #5495 from Citadel-Station-13/upstream-merge-35548 
[MIRROR] Slime Radio Potion
 2018-02-16 01:12:07 +00:00
deathride58 13dbb82e06 Merge pull request #5494 from Citadel-Station-13/upstream-merge-35561 
[MIRROR] Fixes rnd console runtimes
 2018-02-16 01:11:25 +00:00
CitadelStationBot 068605798a Automatic changelog generation for PR #5493 [ci skip] 2018-02-15 19:10:49 -06:00
deathride58 22398affc5 Merge pull request #5493 from Citadel-Station-13/upstream-merge-35661 
[MIRROR] Mekhi goes on the table
 2018-02-16 01:10:46 +00:00
deathride58 6802b64db7 Merge pull request #5492 from Citadel-Station-13/upstream-merge-35664 
[MIRROR] Fixes some tooltip runtimes
 2018-02-16 01:10:28 +00:00
deathride58 3dac047801 Update implanter.dm 2018-02-15 20:09:30 -05:00
ShizCalev 98bbfb8709 [s]Fixes writing bugs/exploits 2018-02-15 16:10:03 -06:00
CitadelStationBot f7cb4791ea Apples now taste like apples 2018-02-15 14:52:26 -06:00
oranges 7fd53748f0 Merge pull request #35606 from coiax/hydroponic-foods-taste 
Apples now taste like apples
 2018-02-15 14:52:26 -06:00
CitadelStationBot 6436e2c3c9 Adds sounds and some small QoL improvements to the circuit imprinter, and allows them to recycle empty assemblies 2018-02-15 14:46:06 -06:00
Ashe Higgs dc100371f3 Adds sounds and some small QoL improvements to the circuit imprinter, and allows them to recycle empty assemblies (#35131) 
🆑 Xhuis
tweak: Removing and printing integrated circuits will now attempt to place them into a free hand.
tweak: You can now hit an integrated circuit printer with an unsecured electronic assembly to recycle all of the parts in the assembly en masse.
tweak: You can now recycle empty electronic assemblies in an integrated circuit printer!
soundadd: Integrated circuit printers now have sounds for printing circuits and assemblies.
/🆑

Some low-hanging fruit for circuits. I was trying them earlier, and these were the main things that I was surprised didn't exist, so I added them. I'm not sure about the assembly manipulation yet (may have been intentional?) but it feels a lot smoother to use, especially since misprints can be emptied out and then recycled instead of awkwardly removing each component and then disposing of the case.
 2018-02-15 14:46:06 -06:00
CitadelStationBot 7e57f3927c Adds Cryostatis Shotgun Darts 2018-02-15 14:25:06 -06:00
MMMiracles bd9ad82bbf Adds Cryostatis Shotgun Darts (#35342) 
* adds cryostatis shotgun darts, because shooting tiny water+potassium bombs into people is funny

* lowers amount from 15 to 10

* Update ammo_casings.dm
 2018-02-15 14:25:05 -06:00
CitadelStationBot 011582fdc4 Gives eggbox an inhand image, cleans up heartbox inhands 2018-02-15 14:23:49 -06:00
TehZombehz 326238e59f Gives eggbox an inhand image, cleans up heartbox inhands 2018-02-15 14:23:48 -06:00
deathride58 1cda9ef2b4 Merge pull request #5491 from Citadel-Station-13/upstream-merge-35692 
[MIRROR] Moves garbage up in the init order
 2018-02-15 17:07:02 +00:00
CitadelStationBot 58960e3ad1 fixes firedoor layer for the last god damn time 2018-02-15 10:40:13 -06:00
Jordan Brown 1b8a0232c0 Merge pull request #35655 from ShizCalev/DOOR-LAYERING-FIX-FINALE 
fixes firedoor layer for the last god damn time
 2018-02-15 10:40:13 -06:00
CitadelStationBot 1eedb42184 Spellcheck: Fixed a typo on an eldritch god's pronunciation 2018-02-15 10:39:55 -06:00
ThePainkiller 87708abd4c Fixed a typo on an eldritch god's pronunciation (#35611) 
Changed the text to get the Necronomicon. It's "Cthulhu" not "Cthulu", get it right!
 2018-02-15 10:39:55 -06:00
CitadelStationBot c44b43a23e Fixes the name on the cook's culinary school training 2018-02-15 10:39:44 -06:00
Iamgoofball 04ec62d03d Fixes the name on the cook's culinary school training (#35635) 
Totally forgot to do this
 2018-02-15 10:39:44 -06:00
CitadelStationBot 467cc1036d Fixes turret faction on snowdin map 2018-02-15 10:39:34 -06:00
Jordan Brown c58a9c4a27 Merge pull request #35654 from ShizCalev/snowdin-fix 
Fixes turret faction on snowdin map
 2018-02-15 10:39:34 -06:00
CitadelStationBot 2faa8edca3 Spellchecks announcement's grammar 2018-02-15 10:39:26 -06:00
FrozenGuy5 efb5cd342c Spellchecks announcement's grammar (#35636) 
* no <br>

* i shall not take the risk
 2018-02-15 10:39:25 -06:00
CitadelStationBot 1f9216c95f Fix GLOB setup runtimes not affecting the counter 2018-02-15 10:39:17 -06:00
Jordan Brown f93365c00b Fix GLOB setup runtimes not affecting the counter (#35644) 2018-02-15 10:39:17 -06:00
CitadelStationBot 23e4ba1d23 Slime Radio Potion 2018-02-15 10:38:59 -06:00
KorPhaeron 0ed0abbd4c Slime Radio Potion (#35548) 
* Slime Radio Potion

* Deletes inaccurate comment
 2018-02-15 10:38:59 -06:00
CitadelStationBot db8d431272 Fixes rnd console runtimes 2018-02-15 10:38:49 -06:00
vuonojenmustaturska e70194f329 Merge pull request #35561 from ShizCalev/rndconsole-runtime 
Fixes rnd console runtimes
 2018-02-15 10:38:49 -06:00
CitadelStationBot 88ca65182d Mekhi goes on the table 2018-02-15 10:38:38 -06:00
Jordan Brown e95d3cd700 Merge pull request #35661 from MrStonedOne/patch-483 
Mekhi goes on the table
 2018-02-15 10:38:37 -06:00
CitadelStationBot a018b63bf8 Fixes some tooltip runtimes 2018-02-15 10:38:27 -06:00