shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
12,823 Commits 5 Branches 0 Tags
ee6bc3d45f5be261a23ef3296df29ea46707cf58
Commit Graph

8341 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
2d4065e15c Merge pull request #5143 from Citadel-Station-13/upstream-merge-34866 
[MIRROR] Fixes the eminence getting spammed by blessed tiles.
 2018-01-28 04:01:20 -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
Dax Dupont
643e58714e Fixes the eminence getting spammed by blessed tiles. (#34866) 
* Fixes the eminence getting spammed by blessed tiles.

* Forgot to commit this

* world time meme
 2018-01-27 23:21:48 -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
c7c2d25c14 Merge pull request #5134 from Citadel-Station-13/upstream-merge-34923 
[MIRROR] Fixes roundend report runtime
 2018-01-27 14:18:46 -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
9f9d3e4312 Merge pull request #5130 from Citadel-Station-13/upstream-merge-34952 
[MIRROR] Left out a closing parenthesis in LERP
 2018-01-27 14:18:06 -06:00
LetterJay
434449724e Merge pull request #5129 from Citadel-Station-13/upstream-merge-34969 
[MIRROR] Fixes marooned status.
 2018-01-27 14:17:55 -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
65bea3bf1c Merge pull request #5125 from Citadel-Station-13/upstream-merge-34927 
[MIRROR] Removes landmark tag generation
 2018-01-27 14:17:31 -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
oranges
56f1634886 Merge pull request #34923 from Jordie0608/escapedisreallyamisnomerbecauseyoucanneverescapefromss13 
Fixes roundend report runtime
 2018-01-26 22:03:26 -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
vuonojenmustaturska
ec4ebd2e3c Merge pull request #34952 from ninjanomnom/its-hard-to-see-under-the-wraps 
Left out a closing parenthesis in LERP
 2018-01-26 18:04:05 -06:00
AnturK
c86f4b7351 Fixes marooned status. 2018-01-26 14:41:36 -06:00
Jordan Brown
b71d6f962d Merge pull request #34945 from epochayur/master 
Slows Simple Clowns
 2018-01-26 12:37:51 -06:00
ShizCalev
e53dbbc2ec Removes landmark tag generation (#34927) 2018-01-26 11:22:22 -06:00
ShizCalev
1c38838793 Parrot fixes (#34934) 2018-01-26 11:21:09 -06:00
deathride58
acb7d1827b Merge pull request #5119 from Citadel-Station-13/upstream-merge-34884 
[MIRROR] Fixes pneumatic cannon contents deletion
 2018-01-26 15:55:30 +00:00
deathride58
b0712e4892 Merge pull request #5116 from Citadel-Station-13/upstream-merge-34915 
[MIRROR] Fixed the simple rotation component
 2018-01-26 15:55:10 +00:00
deathride58
0dcb98f754 Merge pull request #5115 from Citadel-Station-13/upstream-merge-34918 
[MIRROR] Correct spelling of armament
 2018-01-26 15:54:46 +00: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
3c017a55ec Merge pull request #5108 from Citadel-Station-13/upstream-merge-34891 
[MIRROR] Fixes airlocks playing closing sound while already closed
 2018-01-26 15:50:57 +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
ba98d2a7f1 Merge pull request #5105 from Citadel-Station-13/upstream-merge-34899 
[MIRROR] clear_zeroth_law sanity check
 2018-01-26 15:49:34 +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
90611e16ed Merge pull request #5101 from Citadel-Station-13/upstream-merge-34873 
[MIRROR] Fixes Infinite Airlock Materials
 2018-01-26 15:47:29 +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
vuonojenmustaturska
5eb79ec417 Fixes pneumatic cannon contents deletion (#34884) 
* Fix pneumatic cannon contents deletion

* honk

* Update pneumaticCannon.dm
 2018-01-26 04:37:37 -06:00
Jordan Brown
f703e0f8d8 Merge pull request #34915 from Cruix/flipstuff 
Fixed the simple rotation component
 2018-01-26 03:01:11 -06:00
Jordan Brown
721f628f60 Merge pull request #34918 from AutomaticFrenzy/patch/armament 
Correct spelling of armament
 2018-01-26 03:01:01 -06: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