shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
14,136 Commits 5 Branches 0 Tags
83d1ad9e4572ece67bff43637b54732125ea8f92
Commit Graph
14136 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
CitadelStationBotandPoojawa 83d1ad9e45 [MIRROR] Fixes jugg spell object damage (#5626) 
* Merge pull request #35839 from AnturK/take-code-damage

Fixes jugg spell object damage

* Fixes jugg spell object damage
 2018-02-21 09:27:50 -06:00
CitadelStationBotandPoojawa 54889864ab [MIRROR] Hopefully fixes gas miners (#5628) 
* Merge pull request #35828 from tgstation/Cyberboss-patch-2

Hopefully fixes gas miners

* Hopefully fixes gas miners
 2018-02-21 09:27:30 -06:00
CitadelStationBot 1724781d73 Automatic changelog generation for PR #5623 [ci skip] 2018-02-21 00:42:14 -06:00
PoojawaandGitHub 8305efd5a1 Vore preference fix + Sounds respect wall barriers (#5623) 
* various vore QoLs

* removed unused button, added the verb
 2018-02-21 00:42:11 -06:00
deathride58andGitHub a89323182f Merge pull request #5622 from Citadel-Station-13/upstream-merge-35832 
[MIRROR] Removes duplicate first death log
 2018-02-21 06:31:33 +00:00
deathride58andGitHub 172459b2d8 Merge pull request #5620 from Citadel-Station-13/upstream-merge-35823 
[MIRROR] Fixes clowntears not grinding properly #35814
 2018-02-21 06:31:11 +00:00
CitadelStationBot f09aa4b862 Automatic changelog generation for PR #5619 [ci skip] 2018-02-21 00:30:34 -06:00
deathride58andGitHub 1a76be5baa Merge pull request #5619 from Citadel-Station-13/upstream-merge-35759 
[MIRROR] Adds the dish drive, obtainable through techwebs and with circuit boards in the chef and bartender's lockers
 2018-02-21 06:30:31 +00:00
CitadelStationBot a2bc2f7c73 Removes duplicate first death log 2018-02-20 18:58:49 -06:00
JordieandCitadelStationBot b031f73ef4 Removes duplicate first death log (#35832) 
* Update blackbox.dm

* Update death.dm

* Update ticker.dm
 2018-02-20 18:58:48 -06:00
CitadelStationBot 85c0c288fb Fixes clowntears not grinding properly #35814 2018-02-20 17:28:12 -06:00
OrdonisandCitadelStationBot 3a1cfe9f59 Fixes #35814 (#35823) 
Ree container changes ruined my neat solution now it's less neat
reeeeeeeeeeee
 2018-02-20 17:28:12 -06:00
CitadelStationBot 355fe7a0f9 Adds the dish drive, obtainable through techwebs and with circuit boards in the chef and bartender's lockers 2018-02-20 17:10:40 -06:00
Ashe HiggsandCitadelStationBot 08bc84d3db Adds the dish drive, obtainable through techwebs and with circuit boards in the chef and bartender's lockers (#35759) 
* Adds the dish drive

* a e s t h e t i c

* Puts a dish drive circuit in the chef locker

* wardrobes, better control

* shiz!

* shiz! (x2)
 2018-02-20 17:10:40 -06:00
deathride58andGitHub 2ac71b3647 Merge pull request #5614 from Citadel-Station-13/upstream-merge-35838 
[MIRROR] Fixes transit runtime.
 2018-02-20 15:27:01 +00:00
CitadelStationBot 64d0e4df4a Automatic changelog generation for PR #5613 [ci skip] 2018-02-20 09:26:52 -06:00
deathride58andGitHub 93a90664b7 Merge pull request #5613 from Citadel-Station-13/upstream-merge-35792 
[MIRROR] Fixes multiserver mining formula
 2018-02-20 15:26:49 +00:00
CitadelStationBot 0fbd2f62f6 Automatic changelog generation for PR #5612 [ci skip] 2018-02-20 09:26:17 -06:00
deathride58andGitHub d2e49dd52e Merge pull request #5612 from Citadel-Station-13/upstream-merge-35802 
[MIRROR] Fixes ore stack sprites
 2018-02-20 15:26:11 +00:00
CitadelStationBot 0c60268f38 Automatic changelog generation for PR #5611 [ci skip] 2018-02-20 09:26:02 -06:00
deathride58andGitHub 3779e384ec Merge pull request #5611 from Citadel-Station-13/upstream-merge-35507 
[MIRROR] [READY]NTnet circuit fix
 2018-02-20 15:25:59 +00:00
CitadelStationBot d5eda1c615 Automatic changelog generation for PR #5610 [ci skip] 2018-02-20 09:25:47 -06:00
deathride58andGitHub 182ec24fa2 Merge pull request #5610 from Citadel-Station-13/upstream-merge-35464 
[MIRROR] Adds tutorial holopads for the hazard course.
 2018-02-20 15:25:45 +00:00
CitadelStationBot 4557574e0b Automatic changelog generation for PR #5609 [ci skip] 2018-02-20 09:25:23 -06:00
deathride58andGitHub cee4822b2a Merge pull request #5609 from Citadel-Station-13/upstream-merge-35436 
[MIRROR] Adds several new phobias
 2018-02-20 15:25:19 +00:00
CitadelStationBot a961c8979f Automatic changelog generation for PR #5608 [ci skip] 2018-02-20 09:24:53 -06:00
deathride58andGitHub 89e5028452 Merge pull request #5608 from Citadel-Station-13/upstream-merge-35547 
[MIRROR] [READY] Ctrl-clicking mobs is consistent in that it upgrades grabs
 2018-02-20 15:24:51 +00:00
CitadelStationBot f1d96bf54d Automatic changelog generation for PR #5607 [ci skip] 2018-02-20 09:24:28 -06:00
deathride58andGitHub 79db3ba93d Merge pull request #5607 from Citadel-Station-13/upstream-merge-35578 
[MIRROR] Adds a debug circuitry printer, along with some assorted circuit fixes and tweaks
 2018-02-20 15:24:26 +00:00
CitadelStationBot 1c06510231 Automatic changelog generation for PR #5606 [ci skip] 2018-02-20 09:23:52 -06:00
deathride58andGitHub 5b7f37da25 Merge pull request #5606 from Citadel-Station-13/upstream-merge-35582 
[MIRROR] The end-round report now shows the name, area, ckey, damage taken, and last words of the first person to die that round
 2018-02-20 15:23:50 +00:00
deathride58andGitHub 0fb4a03c69 Merge pull request #5605 from Citadel-Station-13/upstream-merge-35621 
[MIRROR] Fixes noslip shoes not showing up in nuke ops uplink
 2018-02-20 15:23:34 +00:00
CitadelStationBot 6229cc8a21 Automatic changelog generation for PR #5604 [ci skip] 2018-02-20 09:23:24 -06:00
deathride58andGitHub d1c08b145f Merge pull request #5604 from Citadel-Station-13/upstream-merge-35633 
[MIRROR] Improves mining voucher choices and minebots
 2018-02-20 15:23:21 +00:00
deathride58andGitHub 2a36977048 Merge pull request #5603 from Citadel-Station-13/upstream-merge-35710 
[MIRROR] Change-Projectile cleanup (and now you can be ANY* species)
 2018-02-20 15:22:50 +00:00
deathride58andGitHub cd19411211 Merge pull request #5602 from Citadel-Station-13/upstream-merge-35737 
[MIRROR] Italian mustache respects capital letters more
 2018-02-20 15:22:33 +00:00
deathride58andGitHub a5d9fc4ddd Merge pull request #5601 from Citadel-Station-13/upstream-merge-35740 
[MIRROR] Fixes mushroom bowls
 2018-02-20 15:21:59 +00:00
deathride58andGitHub c9d36d7ec8 Merge pull request #5600 from Citadel-Station-13/upstream-merge-35780 
[MIRROR] Fixed instant summon behavior with simple animals
 2018-02-20 15:21:39 +00:00
deathride58andGitHub 77f48a3ceb Merge pull request #5599 from Citadel-Station-13/upstream-merge-35782 
[MIRROR] Fixed mutate not removing its effects when refunded
 2018-02-20 15:21:16 +00:00
deathride58andGitHub e70ba8d322 Merge pull request #5598 from Citadel-Station-13/upstream-merge-35793 
[MIRROR] Fixes up foam and smoke code and comments again to atleast be correct
 2018-02-20 15:20:51 +00:00
CitadelStationBot 6943a24618 Automatic changelog generation for PR #5597 [ci skip] 2018-02-20 09:20:32 -06:00
deathride58andGitHub 940351b8de Merge pull request #5597 from Citadel-Station-13/upstream-merge-35804 
[MIRROR] Fixes ghost role spawners still showing up in the spawner menu even if they're deleted
 2018-02-20 15:20:28 +00:00
CitadelStationBot 5a52b258de Automatic changelog generation for PR #5596 [ci skip] 2018-02-20 09:20:04 -06:00
deathride58andGitHub 11174ef300 Merge pull request #5596 from Citadel-Station-13/upstream-merge-35805 
[MIRROR] Fixes walls under doors breaking to space
 2018-02-20 15:20:01 +00:00
CitadelStationBot b4262286b0 Automatic changelog generation for PR #5595 [ci skip] 2018-02-20 09:19:46 -06:00
deathride58andGitHub 1b27d1a93c Merge pull request #5595 from Citadel-Station-13/upstream-merge-35718 
[MIRROR] Adds circutry to diagnostic hud, adds action flags to circuits
 2018-02-20 15:19:43 +00:00
CitadelStationBot aaaced5ecf Fixes transit runtime. 2018-02-20 04:11:15 -06:00
vuonojenmustaturskaandCitadelStationBot 4a65d8feeb Merge pull request #35838 from AnturK/imdumb 
Fixes transit runtime.
 2018-02-20 04:11:15 -06:00
CitadelStationBot 24cb4c7889 Fixes multiserver mining formula 2018-02-19 22:09:55 -06:00
Jordan BrownandCitadelStationBot c36f144d9e Merge pull request #35792 from DaedalusGame/bitconnect 
Fixes multiserver mining formula
 2018-02-19 22:09:55 -06:00