shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
10,589 Commits 5 Branches 0 Tags
1a5006dc2ff9c397eae80ca51fcbcdee47f90b3f
Commit Graph

10589 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
LetterJay 1a5006dc2f Merge pull request #4473 from Citadel-Station-13/upstream-merge-33672 
[MIRROR] Fixes bullets making sounds in space and water
 2017-12-21 04:55:16 -06:00
LetterJay f8f04b1ce9 Merge pull request #4452 from Citadel-Station-13/upstream-merge-33470 
[MIRROR] [READY]Refactors reagent container types
 2017-12-21 04:50:20 -06:00
LetterJay 86fed404b1 Update weldingtool.dm 2017-12-21 04:36:01 -06:00
LetterJay 3973b368de Merge branch 'master' into upstream-merge-33470 2017-12-21 03:24:03 -06:00
LetterJay 56ecc13289 Merge pull request #4325 from Citadel-Station-13/upstream-merge-33246 
[MIRROR] Roundend report refactor
 2017-12-21 03:22:31 -06:00
CitadelStationBot 3a529ecc2b Fixes bullets making sounds in space and water 2017-12-21 00:09:08 -06:00
ShizCalev 92b018bed7 Fixes bullets making sounds in space and water (#33672) 
* Bullet sounds

* explicit lists
 2017-12-21 00:09:08 -06:00
CitadelStationBot 408cf32ddc Automatic changelog generation for PR #4445 [ci skip] 2017-12-20 21:47:52 -06:00
deathride58 4d08f9b0bc Merge pull request #4445 from Citadel-Station-13/upstream-merge-33635 
[MIRROR] Fixes captain's PDA showing the toggle remote door menu option
 2017-12-21 03:47:50 +00:00
deathride58 b4321a1dbe Merge pull request #4435 from Citadel-Station-13/upstream-merge-33636 
[MIRROR] restores reaction max_reqs checking code
 2017-12-21 03:44:57 +00:00
deathride58 59947b4b3b Merge pull request #4424 from Citadel-Station-13/upstream-merge-33632 
[MIRROR] properly disables fusion
 2017-12-21 03:43:30 +00:00
CitadelStationBot f3e7f5f2fd Automatic changelog generation for PR #4420 [ci skip] 2017-12-20 21:42:40 -06:00
deathride58 b2187123fb Merge pull request #4420 from Citadel-Station-13/upstream-merge-33405 
[MIRROR] [Ready]Brain Trauma additions
 2017-12-21 03:42:38 +00:00
CitadelStationBot 425c4314c0 Automatic changelog generation for PR #4453 [ci skip] 2017-12-20 21:30:24 -06:00
deathride58 cf80b8a573 Merge pull request #4453 from Citadel-Station-13/upstream-merge-33651 
[MIRROR] Changelings learn languages from people they absorb
 2017-12-21 03:30:22 +00:00
deathride58 0be7ea0755 Merge pull request #4451 from Citadel-Station-13/upstream-merge-33599 
[MIRROR] Callback security and usr
 2017-12-21 03:29:13 +00:00
deathride58 15233cbda3 Merge pull request #4460 from Citadel-Station-13/upstream-merge-33543 
[MIRROR] Adds NAMEOF, VARSET_CALLBACK, and VARSET_LIST_CALLBACK
 2017-12-21 03:28:46 +00:00
deathride58 17dda62a93 Merge pull request #4461 from Citadel-Station-13/upstream-merge-33622 
[MIRROR] restores add_gas(), assert_gas(), and thermal_energy() as wrapper procs
 2017-12-21 03:28:14 +00:00
deathride58 58f5069180 Merge pull request #4463 from Citadel-Station-13/upstream-merge-33664 
[MIRROR] Halve gun empty sound level
 2017-12-21 03:27:50 +00:00
deathride58 811cd917aa Merge pull request #4457 from Citadel-Station-13/upstream-merge-33683 
[MIRROR] Fixes get admin command
 2017-12-21 03:27:32 +00:00
deathride58 a30bcfa77f Merge pull request #4465 from Citadel-Station-13/upstream-merge-33669 
[MIRROR] Makes tails stop wagging when unconscious or stunned
 2017-12-21 03:26:00 +00:00
CitadelStationBot 9273eeb832 Automatic changelog generation for PR #4464 [ci skip] 2017-12-20 21:25:43 -06:00
deathride58 2de3b12364 Merge pull request #4464 from Citadel-Station-13/upstream-merge-33594 
[MIRROR] Adds knock off component
 2017-12-21 03:25:41 +00:00
CitadelStationBot 48de10d250 Automatic changelog generation for PR #4467 [ci skip] 2017-12-20 21:25:02 -06:00
deathride58 2b9afae649 Merge pull request #4467 from Citadel-Station-13/upstream-merge-33679 
[MIRROR] Fixes grammer issue
 2017-12-21 03:24:59 +00:00
LetterJay 84f51a8cbb antag team 2017-12-20 13:24:06 -06:00
CitadelStationBot 15c1217ee4 Fixes grammer issue 2017-12-20 12:02:25 -06:00
jughu 2c4e5bae9e Fixes grammer issue (#33679) 2017-12-20 12:02:25 -06:00
CitadelStationBot aa35ee0159 Makes tails stop wagging when unconscious or stunned 2017-12-20 05:55:45 -06:00
ShizCalev b83dd93309 lizard stuff (#33669) 2017-12-20 05:55:45 -06:00
LetterJay 00d3b8f1b7 a lot of shit synced in this one commit. 2017-12-20 02:53:51 -06:00
LetterJay 92c347d068 Merge branch 'master' into upstream-merge-33246 2017-12-20 00:27:06 -06:00
LetterJay 5f69eac050 Update mind.dm 2017-12-20 00:19:39 -06:00
LetterJay de967e2d8e Merge pull request #4459 from Citadel-Station-13/NukeOps 
[MIRROR]Nuke Op Datumization
 2017-12-20 00:19:01 -06:00
CitadelStationBot 8d1c931f9c Adds knock off component 2017-12-20 00:14:37 -06:00
Jordan Brown 25d5e5b6b4 Merge pull request #33594 from AnturK/knockoff 
Adds knock off component
 2017-12-20 00:14:36 -06:00
CitadelStationBot 7bb021328a Halve gun empty sound level 2017-12-20 00:14:29 -06:00
Jordan Brown b305f1bb26 Merge pull request #33664 from optimumtact/darkgenerallordhassnowflakeears 
Halve gun empty sound level
 2017-12-20 00:14:28 -06:00
CitadelStationBot 0ce17f29ed restores add_gas(), assert_gas(), and thermal_energy() as wrapper procs 2017-12-20 00:14:13 -06:00
oranges d960c45e77 Merge pull request #33622 from duncathan/assert_gas 
restores add_gas(), assert_gas(), and thermal_energy() as wrapper procs
 2017-12-20 00:14:13 -06:00
CitadelStationBot c90b888b3c Adds NAMEOF, VARSET_CALLBACK, and VARSET_LIST_CALLBACK 2017-12-20 00:14:03 -06:00
Jordan Brown e6e197c88a Adds NAMEOF, VARSET_CALLBACK, and VARSET_LIST_CALLBACK (#33543) 
* Adds NAMEOF and VARSET_CALLBACK

* Fix VARSET_CALLBACK

* Change names, add VARSET_LIST_CALLBACK

* Fix var names

* Additional macro safety. Update commen

* ImprovedName

* Fixing
 2017-12-20 00:14:03 -06:00
LetterJay 8a1ed70888 Update roundend.dm 2017-12-20 00:08:37 -06:00
LetterJay d6a5ee596b Update mind.dm 2017-12-19 23:55:36 -06:00
LetterJay 5bd61908a3 Update game_mode.dm 2017-12-19 23:53:36 -06:00
LetterJay 4d5c32ae56 Update game_mode.dm 2017-12-19 22:11:04 -06:00
LetterJay 7dec65ff85 fuck 2017-12-19 20:20:09 -06:00
LetterJay 36ad355f9d Update mind.dm 2017-12-19 20:08:49 -06:00
LetterJay a8e36670e2 Update mind.dm 2017-12-19 20:02:03 -06:00
LetterJay 7c3dc0705c Update tgstation.dme 2017-12-19 19:36:49 -06:00