shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
11,398 Commits 5 Branches 0 Tags
85aa297923831020a903abca6490f49c766e787a
Commit Graph
11398 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
deathride58andGitHub 85aa297923 Merge branch 'master' into mapsyncs43293845982 2018-01-07 20:30:41 +00:00
deathride58andGitHub 57d79640f4 Merge pull request #4691 from Citadel-Station-13/upstream-merge-34134 
[MIRROR] Corrects inconsistent usage of 310.055, 310.15, & 310 as body temp
 2018-01-07 20:30:06 +00:00
deathride58 3e937fcecf Merges #4679 , #4670 , and #4677 2018-01-07 15:29:42 -05:00
deathride58andGitHub a2b4ffccdf Merge branch 'master' into mapsyncs43293845982 2018-01-07 20:24:18 +00:00
deathride58andGitHub d2ec28b1e6 Merge branch 'master' into mapsyncs43293845982 2018-01-07 20:23:00 +00:00
deathride58andGitHub cc0cb03046 Merge pull request #4693 from Citadel-Station-13/upstream-merge-34127 
[MIRROR] Removes the weird timer shennaigans from exp tracking
 2018-01-07 20:21:47 +00:00
deathride58andGitHub 7f19b55888 Merge pull request #4689 from Citadel-Station-13/upstream-merge-34131 
[MIRROR] Fixes sunglasses' incorrect description
 2018-01-07 20:21:31 +00:00
deathride58andGitHub 4795dce925 Merge pull request #4690 from Citadel-Station-13/upstream-merge-34130 
[MIRROR] fixes package wrap stack name
 2018-01-07 20:21:17 +00:00
deathride58andGitHub dd5dc57043 Update blood.dm 2018-01-07 15:20:11 -05:00
deathride58 ca058b1266 reverts rolling bucket timer subsystem 2018-01-07 15:15:21 -05:00
CitadelStationBot b54b6a2740 Removes the weird timer shennaigans from exp tracking 2018-01-07 11:06:14 -06:00
LeoandCitadelStationBot d5a54402cf Merge pull request #34127 from tgstation/Cyberboss-patch-7 
Removes the weird timer shennaigans from exp tracking
 2018-01-07 11:06:14 -06:00
ShizCalevandCitadelStationBot 7956e3df27 Corrects inconsistent usage of 310.055, 310.15, & 310 as body temp 2018-01-07 11:02:49 -06:00
CitadelStationBot 9fcc37a92b fixes package wrap stack name 2018-01-07 02:08:51 -06:00
modularized_suicideandCitadelStationBot c2851e7837 priority:critical 2018-01-07 02:08:51 -06:00
CitadelStationBot 3bbb18f815 Fixes sunglasses' incorrect description 2018-01-07 02:07:39 -06:00
modularized_suicideandCitadelStationBot f13426c5af many flashes?? 2018-01-07 02:07:39 -06:00
deathride58andGitHub 277320b126 Merge pull request #4685 from Citadel-Station-13/upstream-merge-34114 
[MIRROR] Fixes some antags missing from roundend report
 2018-01-06 20:30:02 +00:00
LetterJayandGitHub 8c448b0d52 Merge pull request #4686 from Citadel-Station-13/upstream-merge-34116 
[MIRROR] Adds ban option for team antags
 2018-01-06 10:23:17 -06:00
LetterJayandGitHub f36b07371f Update datum_traitor.dm 2018-01-06 10:23:08 -06:00
LetterJayandGitHub 40d5d1b82e Merge pull request #4684 from Citadel-Station-13/upstream-merge-34107 
[MIRROR] Fixes relabeled canisters reverting sprites when broken
 2018-01-06 10:22:46 -06:00
CitadelStationBot cf8e8663be Adds ban option for team antags 2018-01-06 08:52:32 -06:00
JordieandCitadelStationBot 8f8e16ba12 Adds ban option for team antags (#34116) 
* adds ban option for team antags

* conversion antags ban button
 2018-01-06 08:52:31 -06:00
AnturKandCitadelStationBot 0638dabfd2 Fixes some antags missing from roundend report 2018-01-06 08:51:51 -06:00
CitadelStationBot 6c4c64809a Fixes relabeled canisters reverting sprites when broken 2018-01-06 08:51:33 -06:00
LeoandCitadelStationBot fdfa61c1c8 Merge pull request #34107 from ShizCalev/canister-sprite 
Fixes relabeled canisters reverting sprites when broken
 2018-01-06 08:51:32 -06:00
CitadelStationBot e4c0115d3a Automatic changelog generation for PR #4680 [ci skip] 2018-01-05 19:56:27 -06:00
deathride58andGitHub 29047804e2 Merge pull request #4680 from Citadel-Station-13/upstream-merge-32733 
[MIRROR] [512] Disallow cross-Z examination and manipulation
 2018-01-06 01:56:24 +00:00
CitadelStationBot 0315f5d244 Automatic changelog generation for PR #4671 [ci skip] 2018-01-05 16:26:55 -06:00
deathride58andGitHub c66d78534b Merge pull request #4671 from Citadel-Station-13/upstream-merge-34087 
[MIRROR] Fixes meta toxins lab
 2018-01-05 22:26:53 +00:00
deathride58andGitHub bd160e46d9 Update adjacent.dm 2018-01-05 17:25:41 -05:00
CitadelStationBot 6e4f10449c Automatic changelog generation for PR #4676 [ci skip] 2018-01-05 16:17:31 -06:00
deathride58andGitHub 01582ce0b7 Merge pull request #4676 from Citadel-Station-13/upstream-merge-34056 
[MIRROR]  Fixes infernal jaunt causing devils to get stuck if interrupted
 2018-01-05 22:17:28 +00:00
CitadelStationBot 3a5b2c9b6e Automatic changelog generation for PR #4681 [ci skip] 2018-01-05 16:16:56 -06:00
deathride58andGitHub ebf3863195 Merge pull request #4681 from Citadel-Station-13/upstream-merge-34034 
[MIRROR] Makes crayons draw at the location you click
 2018-01-05 22:16:53 +00:00
deathride58andGitHub 6f720a2010 Merge pull request #4672 from Citadel-Station-13/upstream-merge-34083 
[MIRROR] Removed some superfluous stack code
 2018-01-05 22:16:16 +00:00
deathride58andGitHub 4f30d77421 Merge pull request #4678 from Citadel-Station-13/upstream-merge-34109 
[MIRROR] Changes Rock Description to be more descriptive
 2018-01-05 22:15:22 +00:00
CitadelStationBot 4c32fd4e71 Automatic changelog generation for PR #4668 [ci skip] 2018-01-05 16:14:18 -06:00
deathride58andGitHub c58fa5c732 Merge pull request #4668 from Citadel-Station-13/upstream-merge-34081 
[MIRROR] Fixed PDAs not calling parent in equipped()
 2018-01-05 22:14:16 +00:00
deathride58andGitHub baf104d3d8 Merge pull request #4669 from Citadel-Station-13/upstream-merge-34082 
[MIRROR] Made the squeek component not make things squeak so often
 2018-01-05 22:14:03 +00:00
deathride58andGitHub e0ff75a870 Merge pull request #4673 from Citadel-Station-13/upstream-merge-34077 
[MIRROR] Fix incorrect method variable description in throw_impact
 2018-01-05 22:13:19 +00:00
CitadelStationBot cb02d46646 Automatic changelog generation for PR #4674 [ci skip] 2018-01-05 16:12:46 -06:00
deathride58andGitHub 6af2abfa0e Merge pull request #4674 from Citadel-Station-13/upstream-merge-34084 
[MIRROR] Reduce away mission load time drastically
 2018-01-05 22:12:44 +00:00
CitadelStationBot a1f212a818 Automatic changelog generation for PR #4675 [ci skip] 2018-01-05 16:12:30 -06:00
deathride58andGitHub 4b5a9b19e3 Merge pull request #4675 from Citadel-Station-13/upstream-merge-34089 
[MIRROR] Show the correct coordinates when a pulse rifle prize is found
 2018-01-05 22:12:26 +00:00
CitadelStationBot 9091c5f9d8 Makes crayons draw at the location you click 2018-01-05 09:28:07 -06:00
Jordan BrownandCitadelStationBot 505fc95ad0 Merge pull request #34034 from deathride58/goonstylecrayons 
Makes crayons draw at the location you click
 2018-01-05 09:28:07 -06:00
Jordan BrownandCitadelStationBot 5c64e25288 [512] Disallow cross-Z examination and manipulation 2018-01-05 09:25:54 -06:00
CitadelStationBot 63d1b35f3e Changes Rock Description to be more descriptive 2018-01-05 08:44:38 -06:00
Jordan BrownandCitadelStationBot 464a2820e3 Merge pull request #34109 from Niknakflak/Its_not_just_a_boulder_its_a_rock 
Changes Rock Description to be more descriptive
 2018-01-05 08:44:38 -06:00