shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
14,166 Commits 5 Branches 0 Tags
e5aa6ea1cd223c08935cdcdab4e2d8a4e5127ffa
Commit Graph

5242 Commits

Author SHA1 Message Date
LetterJay 5964f97877 Merge pull request #5145 from Citadel-Station-13/upstream-merge-34940 
[MIRROR] Syndicate comms agents have Codespeak training
 2018-01-28 04:02:01 -06:00
LetterJay 335bcfaff1 Merge pull request #5142 from Citadel-Station-13/upstream-merge-35031 
[MIRROR] Stops titlescreen chef spam
 2018-01-28 04:00:03 -06:00
LetterJay 3f3ef78428 Merge pull request #5139 from Citadel-Station-13/upstream-merge-35034 
[MIRROR] Revert "Power Cell explosions are now log"
 2018-01-28 03:59:21 -06:00
LetterJay 157295d1f6 Merge pull request #5138 from Citadel-Station-13/upstream-merge-34972 
[MIRROR] [Ready] Rebalances Chameleon Kits for lowpop
 2018-01-28 03:59:10 -06:00
LetterJay c86b256eee Merge pull request #5132 from Citadel-Station-13/upstream-merge-34791 
[MIRROR] Mobs start with a random nutrition amount
 2018-01-28 03:58:38 -06:00
Jack Edge b1b9f5cbee Syndicate comms agents have Codespeak training 
🆑 coiax
add: Nanotrasen Security Division has reported that syndicate comms agents,
both on lavaland and in space, have had training in "Codespeak", a top
secret language for stealthy communication.
/🆑

Why? So they can secret talk with traitors that actually buy Codespeak
books.
 2018-01-27 23:22:06 -06:00
oranges 38f0f17fb7 Merge pull request #35031 from KorPhaeron/imthecook 
Stops titlescreen chef spam
 2018-01-27 23:21:39 -06:00
vuonojenmustaturska cbfe2c997b Revert "Power Cell explosions are now log" 2018-01-27 23:21:15 -06:00
81Denton 547a80eb22 [Ready] Rebalances Chameleon Kits for lowpop (#34972) 
* 🆑 Denton, Anonmare, kevinz000
tweak: Removed the player minimum on syndicate chameleon kits.
rscdel: To compensate, regular chameleon kits no longer contain noslip shoes.
tweak: Reduced the chameleon kit price to 2 TC (same total price for kit+noslips).
/🆑

Chameleon kits were given a minimum player limit due to the noslips that come with them.
This PR removes the player limit as well as the noslips, but lowers the TC cost by 2.

That way, lowpop tators can have disguises while highpop has the same total price for the old chameleon+noslips combo.

* Created a shoes/chameleon/noslip subtype and moved the NOSLIP_1 flag to it. Made sure that all other regular noslips refer to the new subtype.
 2018-01-27 23:21:06 -06:00
LetterJay f3aaef86eb Merge pull request #5135 from Citadel-Station-13/boring-slug-ban 
Fixes borer banning href oversight
 2018-01-27 14:19:00 -06:00
LetterJay 6a4027766d Merge pull request #5133 from Citadel-Station-13/upstream-merge-34799 
[MIRROR] Makes Chameleon Kits less restricted
 2018-01-27 14:18:30 -06:00
LetterJay d83ac344fa Merge pull request #5126 from Citadel-Station-13/upstream-merge-34945 
[MIRROR] Slows Simple Clowns
 2018-01-27 14:17:42 -06:00
LetterJay 396245d85f Update mob.dm 2018-01-27 14:16:47 -06:00
Poojawa ac97b1593e Fixes borer banning href oversight 
Remove borers when.
 2018-01-27 06:03:23 -06:00
Anonmare 039226dc8e Makes Chameleon Kits less restricted (#34799) 
[Changelogs]: The Syndicate would like to apologise to its agents on under-manned stations for failing to supply them with proper disguises

🆑
balance: The Syndicate Chameleon Kit is now available during rounds of lower population. Because of course you can have an e-sword and revolver without restriction but disguising and RP is verboten because we deathmatch station now.
/🆑

[why]: I'd rather remove the restriction entirely but I'm sure someone will complain that a perfect disguise is OP on low-pop but Sleeping Carp/Revolver/etc isn't somehow
 2018-01-26 19:57:22 -06:00
coiax 6d9e8110f5 Mobs start with a random nutrition amount 2018-01-26 19:56:09 -06:00
Jordan Brown b71d6f962d Merge pull request #34945 from epochayur/master 
Slows Simple Clowns
 2018-01-26 12:37:51 -06:00
ShizCalev 1c38838793 Parrot fixes (#34934) 2018-01-26 11:21:09 -06:00
deathride58 86fa4871a6 Merge pull request #5114 from Citadel-Station-13/upstream-merge-34910 
[MIRROR] Fixes Ketrazine recipe
 2018-01-26 15:54:25 +00:00
deathride58 870f2320b5 Merge pull request #5112 from Citadel-Station-13/upstream-merge-34906 
[MIRROR] Removes Sulfuric Acid requirements from computer parts
 2018-01-26 15:53:14 +00:00
deathride58 d8434f2b4a Merge pull request #5111 from Citadel-Station-13/upstream-merge-34904 
[MIRROR] fixes pancake runtimes
 2018-01-26 15:52:55 +00:00
deathride58 ebfa263653 Merge pull request #5110 from Citadel-Station-13/upstream-merge-34897 
[MIRROR] Fixes orbiting stopping when entering disposals
 2018-01-26 15:52:39 +00:00
deathride58 a539f6103a Merge pull request #5107 from Citadel-Station-13/upstream-merge-34881 
[MIRROR] Adds Pax to the Peacekeeper Borg's "Peace Hypospray"
 2018-01-26 15:50:38 +00:00
deathride58 20eca7bc22 Merge pull request #5106 from Citadel-Station-13/upstream-merge-34852 
[MIRROR] Power Cell explosions are now log
 2018-01-26 15:49:55 +00:00
deathride58 5e6000d02d Merge pull request #5104 from Citadel-Station-13/upstream-merge-34900 
[MIRROR] Syringe update_icon sanity
 2018-01-26 15:48:53 +00:00
deathride58 9118715588 Merge pull request #5103 from Citadel-Station-13/upstream-merge-34901 
[MIRROR] Fixes brains being left in hands after being inserted into heads
 2018-01-26 15:48:28 +00:00
deathride58 5bc3ad8016 Merge pull request #5102 from Citadel-Station-13/upstream-merge-34876 
[MIRROR] Nuke op intelligence potions also grant an internal ID
 2018-01-26 15:47:56 +00:00
deathride58 8ee42a5282 Merge pull request #5090 from Citadel-Station-13/upstream-merge-34755 
[MIRROR] All color inputs use current color as default choice
 2018-01-26 15:44:23 +00:00
deathride58 4008898f54 Merge pull request #5054 from Citadel-Station-13/upstream-merge-34829 
[MIRROR] Removes animation from photos
 2018-01-26 15:39:38 +00:00
Jordan Brown 5db9ca3085 Merge pull request #34910 from GuppyLaxx/idk 
Fixes Ketrazine recipe
 2018-01-26 03:00:52 -06:00
Jordan Brown c381c639cb Merge pull request #34906 from epochayur/master 
Removes Sulfuric Acid requirements from computer parts
 2018-01-26 03:00:32 -06:00
Jordan Brown 2af5ee4cc5 Merge pull request #34904 from ShizCalev/pancake-length 
fixes pancake runtimes
 2018-01-26 03:00:24 -06:00
Jordan Brown d0c648b702 Merge pull request #34897 from YPOQ/orbitfix 
Fixes orbiting stopping when entering disposals
 2018-01-26 03:00:16 -06:00
Jordan Brown ca8f80e454 Fixes not being able to stop tail wagging 2018-01-26 03:00:08 -06:00
Jordan Brown f2d75f1439 Merge pull request #34881 from Robustin/paxPK 
Adds Pax to the Peacekeeper Borg's "Peace Hypospray"
 2018-01-26 02:59:45 -06:00
Jordan Brown ffffd35345 Merge pull request #34852 from Iamgoofball/patch-376 
Power Cell explosions are now log
 2018-01-26 02:59:36 -06:00
ShizCalev e4a96fe2cd Syringe update_icon sanity 2018-01-26 02:59:21 -06:00
YPO f51fcc835f Fixes brains being left in hands after being inserted into heads 2018-01-26 02:59:12 -06:00
Jack Edge a07c6c4d9e Nuke op intelligence potions also grant an internal ID 
🆑 coiax
add: Syndicate intelligence potions also grant an internal syndicate ID
card to the simple animal granted intelligence. This effectively means
that Cayenne can open the airlocks on the Infiltrator.
/🆑

And also maintenance I guess. But she could already smash her way
through doors.

Why? So Cayenne can open airlocks on the infiltrator. That's why.
 2018-01-26 02:59:04 -06:00
LetterJay 7b06b12726 Merge pull request #5098 from Citadel-Station-13/upstream-merge-34859 
[MIRROR] Removes sulpheric acid requirement from express console circuits
 2018-01-25 14:15:06 -06:00
LetterJay 13c3c7b4e7 Merge pull request #5038 from Citadel-Station-13/upstream-merge-34466 
[MIRROR] Fake nuclear disks are even more convincing
 2018-01-25 13:41:02 -06:00
Leo 45c46f721e Merge pull request #34859 from tgstation/Cyberboss-patch-4 
Removes sulpheric acid requirement from express console circuits
 2018-01-25 05:09:41 -06:00
LetterJay 9234d01b76 Merge pull request #5069 from Citadel-Station-13/upstream-merge-33773 
[MIRROR] [Ready]Minor Slime Update: slimepeople get the slime language, slimes speak slime instead of common
 2018-01-25 00:51:00 -06:00
LetterJay 76fab4fccf Revert "[MIRROR] Fix old usages of trait introduced by the trait merge" 2018-01-24 23:14:51 -06:00
LetterJay 50c3debdcf Merge pull request #5092 from Citadel-Station-13/upstream-merge-34383 
[MIRROR] You can now defib monkeys
 2018-01-24 21:45:16 -06:00
LetterJay 7fcce308b6 Merge pull request #5084 from Citadel-Station-13/upstream-merge-34894 
[MIRROR] Fix old usages of trait introduced by the trait merge
 2018-01-24 21:44:59 -06:00
LetterJay 1dffa54809 Merge pull request #5091 from Citadel-Station-13/upstream-merge-34623 
[MIRROR] Makes templates able to use PlaceOnTop
 2018-01-24 21:44:21 -06:00
LetterJay cd17afba45 Update preferences.dm 2018-01-24 21:44:00 -06:00
LetterJay c30127d0d5 Merge pull request #5089 from Citadel-Station-13/upstream-merge-34841 
[MIRROR] Fixes derelict area issues
 2018-01-24 21:43:24 -06:00
LetterJay 0c43d1ef92 Merge pull request #5088 from Citadel-Station-13/upstream-merge-34838 
[MIRROR] Fixes poly's ghost SM spam
 2018-01-24 21:43:07 -06:00