shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
3,508 Commits 5 Branches 0 Tags
ef4befcdd5b7c2000407bed236e9b80c1ddfbf00
Commit Graph

532 Commits

Author SHA1 Message Date
LetterJay
db9b069075 re-adds headpatting (#1903) 2017-07-06 10:29:58 -07:00
LetterJay
dd70580a72 Merge pull request #1901 from Citadel-Station-13/upstream-merge-28992 
[MIRROR] Adds Necropolis curses for cursed items in Necropolis ruins
 2017-07-06 11:22:24 -05:00
LetterJay
c62086af13 Merge pull request #1900 from Citadel-Station-13/upstream-merge-28877 
[MIRROR] Makes pulsing the AI wire of a borg offer the user the option to change it and properly notifies the AI when it is cut.
 2017-07-06 10:56:52 -05:00
LetterJay
223c95940d Merge pull request #1898 from Citadel-Station-13/upstream-merge-29008 
[MIRROR] Cleans up posibrain code
 2017-07-06 10:52:06 -05:00
LetterJay
67194851a8 Merge pull request #1897 from Citadel-Station-13/upstream-merge-29032 
[MIRROR] Tweaks the blood-drunk miner
 2017-07-06 10:51:39 -05:00
CitadelStationBot
4796ede787 Adds Necropolis curses for cursed items in Necropolis ruins 2017-07-06 10:15:09 -05:00
LetterJay
69dea00ba6 Merge pull request #1894 from Citadel-Station-13/upstream-merge-28958 
[MIRROR] Replaces all instances of spawn() with addtimer/INVOKE_ASYNC
 2017-07-06 10:04:01 -05:00
CitadelStationBot
9c5b764058 Makes pulsing the AI wire of a borg offer the user the option to change it and properly notifies the AI when it is cut. 2017-07-06 09:53:35 -05:00
CitadelStationBot
eb7f6c515b Cleans up posibrain code 2017-07-06 09:43:16 -05:00
CitadelStationBot
b555dce39f Tweaks the blood-drunk miner 2017-07-06 09:40:05 -05:00
CitadelStationBot
beccb4742f Replaces all instances of spawn() with addtimer/INVOKE_ASYNC 2017-07-06 09:14:03 -05:00
CitadelStationBot
21878a77f0 Fixes heartbeat sounds playing indefinitely in certain cases 2017-07-06 08:26:23 -05:00
Poojawa
b1b4826c0c July 5th TG sync (#1883) 
July 5th TG sync
 2017-07-05 22:14:19 -05:00
Poojawa
36a1898bde Dogborg balance tweaks (#1805) 
* Update dogborgstuff.dm

* Compile fixes

* minor code standards tweaks
 2017-07-05 10:01:57 -05:00
CitadelStationBot
a1ff07ed1f [MIRROR] Organs for catgirls (#1457) 
* Organs for catgirls

* Delete tgstation.dme.rej

* Update tgstation.dme
 2017-07-05 09:12:59 -05:00
CitadelStationBot
ac16176c20 Fixes deathgasping while being cloned (#1852) 2017-07-01 21:20:47 -07:00
CitadelStationBot
471380aa2c Makes movement delay calculation not round to the tick (#1711) 2017-06-30 21:20:26 -07:00
CitadelStationBot
fce1875d73 Observers can see through some alternate apperances (#1829) 2017-06-30 20:47:57 -07:00
CitadelStationBot
a9a2a29dd4 Fix the lobby menu not showing when the mysql connection had ghosted (#1839) 2017-06-30 20:47:36 -07:00
CitadelStationBot
1ad4947e58 Adds a small recovery window to variable length megafauna attacks for more predictable melee resolution (#1844) 2017-06-30 20:47:21 -07:00
CitadelStationBot
9d5e51777b use_power var now uses a define to reflect it not being a bool (#1842) 2017-06-30 20:41:59 -07:00
LetterJay
735b25c6e3 Merge branch 'master' into upstream-merge-28916 2017-06-30 10:36:11 -05:00
LetterJay
f5f168f9f6 Merge pull request #1812 from Citadel-Station-13/upstream-merge-28858 
[MIRROR] Adds heartbeats
 2017-06-30 10:31:53 -05:00
LetterJay
cc6f626047 Update life.dm 2017-06-30 09:59:53 -05:00
CitadelStationBot
cea4ef905e Tweaks how ash drake shadows look at the beginning and end of swoops 2017-06-30 09:20:24 -05:00
CitadelStationBot
c4e8b87f44 Heartbeat fix 2017-06-30 09:18:18 -05:00
CitadelStationBot
98ff55f786 Adds heartbeats 2017-06-28 14:01:39 -05:00
CitadelStationBot
bdc234ea4b Fixes lings losing organs on humanization 2017-06-28 08:31:51 -05:00
CitadelStationBot
d2ff4f2374 Cogscarabs will now visually flip over when stunned (#1535) 2017-06-28 04:09:05 -05:00
LetterJay
7f250e742a Merge pull request #1798 from Citadel-Station-13/upstream-merge-28856 
[MIRROR] Straight jackets can now properly be put onto others
 2017-06-27 22:53:40 -05:00
LetterJay
e680da7de6 Merge pull request #1770 from Citadel-Station-13/upstream-merge-28584 
[MIRROR] Ancient Space Station [Space Spawn Ruin]
 2017-06-27 21:25:50 -05:00
CitadelStationBot
ed4aa5a01a Straight jackets can now properly be put onto others 2017-06-27 15:34:06 -05:00
CitadelStationBot
360209314d Some fixes for the anomalous crystal 2017-06-27 08:13:38 -05:00
LetterJay
bd0f0c794b Merge pull request #1789 from Citadel-Station-13/upstream-merge-28822 
[MIRROR] Fixes the Hierophant's walls runtiming
 2017-06-26 21:17:16 -05:00
CitadelStationBot
0f23003c2f Fixes the Hierophant's walls runtiming 2017-06-26 15:59:25 -05:00
CitadelStationBot
abeac9d2ae Fixes PAIs deleting their card on death 2017-06-26 15:55:15 -05:00
LetterJay
ba2e896d8c Merge pull request #1719 from Citadel-Station-13/upstream-merge-28636 
[MIRROR] Fixes random runtime
 2017-06-26 10:53:07 -05:00
CitadelStationBot
10f3b3db50 Fixes the AI core being flammable 2017-06-26 09:38:44 -05:00
LetterJay
260ee23be8 Merge pull request #1649 from Citadel-Station-13/upstream-merge-28490 
[MIRROR] The Hierophant is a little less chaotic and murdery on average
 2017-06-26 06:23:25 -05:00
LetterJay
f1937eb1fc Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2017-06-26 06:14:55 -05:00
LetterJay
5571cca37c .rej cleanup 2017-06-26 06:14:42 -05:00
CitadelStationBot
d4c54bb0b5 Ancient Space Station [Space Spawn Ruin] 2017-06-25 11:03:27 -05:00
CitadelStationBot
bef1ffc086 Robotic legs let you use pockets without a jumpsuit, robotic chest lets you wear an ID/belt without jumpsuit 2017-06-24 14:49:11 -05:00
CitadelStationBot
f919e995dc Stamina projectiles no longer set off grenades and flamethrowers 2017-06-22 11:00:13 -05:00
LetterJay
20486e0184 🆑 
sounddel: Removes oof
/🆑
 2017-06-22 08:59:33 -05:00
LetterJay
d04001c09d another huge sync 2017-06-21 18:00:00 -05:00
CitadelStationBot
ce21809692 Fixes random runtime 2017-06-21 07:47:09 -05:00
CitadelStationBot
989b991b05 Adds framework for equip delays and adds it to the straight jacket 2017-06-19 22:06:18 -05:00
LetterJay
767fe0b490 fixes examine text with people who have flavor 2017-06-19 20:43:33 -05:00
LetterJay
a63fbd9286 Merge pull request #1490 from Citadel-Station-13/upstream-merge-26965 
[MIRROR] Ports Goonchat
 2017-06-19 17:25:18 -05:00