shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
11,354 Commits 5 Branches 0 Tags
d5a54402cfa0b0e39c29680259b21a806ea5b6ee
Commit Graph
7563 Commits
Author SHA1 Message Date
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
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
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
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
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
deathride58andGitHub bd160e46d9 Update adjacent.dm 2018-01-05 17:25:41 -05: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
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
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
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
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
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
Shadowlight213andCitadelStationBot e20cbe5aa7 Fixes infernal jaunt causing devils to get stuck if interrupted (#34056) 
* Fixes infernal jaunt causing devils to get stuck if stunned.

* defines because I know a maintainer will yell at me for this.
 2018-01-05 06:05:16 -06:00
Tad HardestyandCitadelStationBot a55d2e7ff7 Show the correct coordinates when a pulse rifle prize is found (#34089) 2018-01-05 06:03:05 -06:00
Tad HardestyandCitadelStationBot 81cdedea5d Fix away missions taking 2+ minutes to load (#34084) 2018-01-05 06:01:52 -06:00
orangesandCitadelStationBot 6012a5c6eb Fix bug with smashing bottles on throw (#34077) 
The passed in variable is a datum, not a mob

Corrects the description for another instance of this
 2018-01-05 06:01:44 -06:00
CruixandCitadelStationBot 015c46cbae Removed some superfluous stack code (#34083) 2018-01-05 06:01:36 -06:00
CruixandCitadelStationBot e7641dd004 Made the squeek component not make things squeak so often (#34082) 2018-01-05 06:00:08 -06:00
CruixandCitadelStationBot 406ccb256f Fixed PDAs not calling parent in equipped() (#34081) 2018-01-05 05:59:54 -06:00
deathride58andGitHub 3266cdfe0c Merge pull request #4667 from Citadel-Station-13/upstream-merge-34066 
[MIRROR] Fixes white power cables in DM
 2018-01-05 02:45:53 +00:00
deathride58andGitHub 3a8e2870ca Merge pull request #4662 from Citadel-Station-13/upstream-merge-34059 
[MIRROR] You now have to stand next to the decoy nuke disk and examine it to know it's fake
 2018-01-05 02:44:21 +00:00
ShizCalevandCitadelStationBot 3d3f28e091 Fixes white power cables in DM (#34066) 2018-01-04 20:16:31 -06:00
deathride58andGitHub 877bd463b1 Merge pull request #4666 from Citadel-Station-13/upstream-merge-34091 
[MIRROR] Fixes explosion runtimes
 2018-01-05 02:02:22 +00:00
deathride58andGitHub f6c495885c Merge pull request #4663 from Citadel-Station-13/upstream-merge-34060 
[MIRROR] Fixes brothers not assigning properly.
 2018-01-05 01:57:59 +00:00
deathride58andGitHub 1bfba8fd50 Update nuclearbomb.dm 2018-01-04 20:56:53 -05:00
deathride58andGitHub f875444339 Merge pull request #4661 from Citadel-Station-13/upstream-merge-34075 
[MIRROR] Adds more observation messages in deadchat
 2018-01-05 01:56:07 +00:00
deathride58andCitadelStationBot c63661871f Fixes explosion runtimes (#34091) 
* fixes explosion runtimes

* cyka
 2018-01-04 19:52:56 -06:00
LeoandCitadelStationBot 7a2955b96f Merge pull request #34060 from AnturK/brotherfix 
Fixes brothers not assigning properly.
 2018-01-04 15:17:56 -06:00
ShiggyDiggyDoandCitadelStationBot 8a176e126e You now have to stand next to the decoy nuke disk and examine it to know it's fake 2018-01-04 15:17:43 -06:00
Dax DupontandCitadelStationBot bf3468f61c Adds more observation messages in deadchat (#34075) 
* Adds more observation messages

* so bold kobold

* caching
 2018-01-04 15:16:58 -06:00
orangesandCitadelStationBot a227ddf3c1 Merge pull request #34025 from DaxDupont/PDAColor 
PDA Interface color is now a preference.
 2018-01-03 21:12:09 -06:00
LetterJayandGitHub f2b1898235 Merge pull request #4649 from Citadel-Station-13/upstream-merge-34041 
[MIRROR] Fixes afterattack running when clicking a portal
 2018-01-03 15:24:26 -06:00
Jordan BrownandCitadelStationBot 50d75e53c9 Fixes #34030 (#34041) 2018-01-03 15:10:22 -06:00
vuonojenmustaturskaandCitadelStationBot edea89c8fe You can taste oil (#34046) 2018-01-03 15:06:54 -06:00
deathride58andGitHub 94eeb5981d Merge pull request #4646 from Citadel-Station-13/upstream-merge-34031 
[MIRROR] Prevents Nar-Sie from being double-summoned
 2018-01-03 18:56:31 +00:00
deathride58andGitHub f39253a0cc Merge pull request #4645 from Citadel-Station-13/upstream-merge-34023 
[MIRROR] Less is more - Nerfs explosion camera shake
 2018-01-03 18:56:17 +00:00
deathride58andGitHub b09086022d Merge pull request #4644 from Citadel-Station-13/upstream-merge-34040 
[MIRROR] Fixes marauder ghostclick jump
 2018-01-03 18:54:36 +00:00
deathride58andGitHub 6dc4584401 Merge pull request #4643 from Citadel-Station-13/upstream-merge-34033 
[MIRROR] Fix mimes being able to laugh audibly
 2018-01-03 18:54:12 +00:00
deathride58andGitHub 64b5feae78 Merge pull request #4642 from Citadel-Station-13/upstream-merge-34038 
[MIRROR] Fixes text pad window title
 2018-01-03 18:53:51 +00:00
Jordan BrownandCitadelStationBot 1d235c0a72 Merge pull request #34031 from ShizCalev/narsie-summons 
Prevents Nar-Sie from being double-summoned
 2018-01-03 12:25:35 -06:00
Jordan BrownandCitadelStationBot 3516c837d9 Merge pull request #34023 from deathride58/LESSISMOREHOLYFUCK 
Less is more - Nerfs explosion camera shake
 2018-01-03 11:59:55 -06:00
Jordan BrownandCitadelStationBot a642a1c298 Merge pull request #34040 from AnturK/maraudercheck 
Fixes marauder ghostclick jump
 2018-01-03 11:58:42 -06:00