Commit Graph

4811 Commits

Author SHA1 Message Date
Liam
e292b050f8 bye 2018-01-30 22:44:21 -06:00
CitadelStationBot
f3c585935f [MIRROR] Typo fix in Bubblegum desc and outdated comment (#5198)
* Merge pull request #35055 from 81Denton/hecking-typo

Typo fix in Bubblegum desc and outdated comment

* Typo fix in Bubblegum desc and outdated comment
2018-01-30 10:14:23 -06:00
CitadelStationBot
eb9bfbcbb0 [MIRROR] Expand Cyborg (#5183)
* Expand Cyborg (#34958)

* Expand Cyborg

* i ded pls nerf

* Oh sheet

* Expand Cyborg
2018-01-30 07:30:51 -06:00
CitadelStationBot
c93df0ae55 [MIRROR] Makes fire colorful and anime (#5187)
* Makes fire colorful and anime (#34977)

* - Makes fire colorful and anime

* - Updates light color on fires
- Makes fire update color less often (1/7th as often)

* - Changes the transition from blue to purple to be much more gradual, it starts at 40000 and peaks at 120000 Kelvin now
- Changes fusion fire (>4 million Kelvin) to have a slight colorshift to it (It's just the druggy overlay).

* - Moves fire above gas (and everything else)
- Changes fire alpha for low temperature fires to compensate for items no longer rendering on top of fire

* - Makes the new fire layer a define and makes sure it isn't above "Hyperspace Ripples" whatever that is

* - Removes comment

* - FIRE_LAYER is already defined for burning humans.

* Makes fire colorful and anime
2018-01-30 07:26:04 -06:00
CitadelStationBot
001dbde0c9 [MIRROR] Sexy Solar Sprites (#5191)
* replaced solar panel sprites with better ones

* Sexy Solar Sprites
2018-01-30 07:23:46 -06:00
CitadelStationBot
670bc6a929 [MIRROR] Better Chat Squashing (#5193)
* Merge pull request #35058 from uraniummeltdown/chatsquash

Better Chat Squashing

* Better Chat Squashing
2018-01-30 07:23:18 -06:00
deathride58
9dc6a9dacb Merge pull request #5161 from Citadel-Station-13/upstream-merge-34992
[MIRROR] Microwave Powercrêpe
2018-01-29 02:30:49 +00:00
deathride58
1e9e50fa03 Merge pull request #5160 from Citadel-Station-13/upstream-merge-34939
[MIRROR] Increases Drone Speed
2018-01-29 02:30:34 +00:00
deathride58
90cd07e798 Merge pull request #5109 from Citadel-Station-13/upstream-merge-34913
[MIRROR] Fixes not being able to stop tail wagging
2018-01-29 02:28:31 +00:00
uraniummeltdown
f868cb146f alt-click on microwave to cook (#34992) 2018-01-28 18:29:27 -06:00
Anonmare
1eae1971e3 Increases Drone Speed (#34939)
* Increases Drone Speed

* Update _drone.dm

* I'm not changing it again
2018-01-28 18:27:14 -06:00
LetterJay
b690ac4af1 Merge pull request #5151 from Citadel-Station-13/upstream-merge-35018
[MIRROR] Rice (pudding) is no longer a salad.
2018-01-28 15:16:52 -06:00
LetterJay
a05921f657 Merge pull request #5150 from Citadel-Station-13/upstream-merge-34982
[MIRROR] Makes lighting corner optimization a little more sane
2018-01-28 15:16:39 -06:00
LetterJay
cc5c6ec9a3 Merge pull request #5149 from Citadel-Station-13/upstream-merge-34996
[MIRROR] Fixes held_mob release runtime
2018-01-28 15:16:28 -06:00
LetterJay
044c13f607 Update emote.dm 2018-01-28 15:13:12 -06:00
vuonojenmustaturska
f005e65ab0 Merge pull request #35018 from DaxDupont/rice-pudding
Rice (pudding) is no longer a salad.
2018-01-28 11:34:14 -06:00
Jordan Brown
307e028811 Merge pull request #34982 from vuonojenmustaturska/lightingdeopt
Makes lighting corner optimization a little more sane
2018-01-28 10:34:04 -06:00
Leo
13d9ea5a1c Merge pull request #34996 from ShizCalev/held_mob-runtime
Fixes held_mob release runtime
2018-01-28 10:22:41 -06:00
vuonojenmustaturska
6c855bfcee fix lizard jobs (#34994) 2018-01-28 08:16:23 -06:00
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