Commit Graph
8533 Commits
Author SHA1 Message Date
CitadelStationBotandPoojawa 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
CitadelStationBotandPoojawa 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
CitadelStationBotandPoojawa 0b330482fc [MIRROR] New Coffin Sprite (#5190)
* coffins have a new sprite (#34995)

* New Coffin Sprite
2018-01-30 07:24:18 -06:00
CitadelStationBotandPoojawa 001dbde0c9 [MIRROR] Sexy Solar Sprites (#5191)
* replaced solar panel sprites with better ones

* Sexy Solar Sprites
2018-01-30 07:23:46 -06:00
CitadelStationBotandPoojawa 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
Jordan BrownandCitadelStationBot bfd6f8b792 Fixes blood contract names (#35064) 2018-01-29 21:57:11 -06:00
PKPenguin321andCitadelStationBot e4dd53a89f adds extendohands (#34599)
* adds extendohands

* adds to arcade prizes, crafting menu
also adds an alternate named/desc'd version for arcade prizes

* removes the else

* actual conflict fix instead of accidental revert

* ACME -> acme
2018-01-29 21:56:44 -06:00
vuonojenmustaturskaandCitadelStationBot 5541395022 Merge pull request #35047 from ShizCalev/servant_blocker-bomb
Fixes being able to bomb servant blockers
2018-01-29 21:55:38 -06:00
Ashe HiggsandCitadelStationBot 597b2864eb Adds the reverse bear trap item, available to traitor clowns in the uplink for 5 TC (#34849)
* Do you want to play a game?

* removes leftover code from earlier dev

* Some things

* optimizations, from the heart, for the soul
2018-01-29 21:55:27 -06:00
Improvedname ac17f58d3d adds kink refill packs 2018-01-29 21:00:32 +01:00
PoojawaandGitHub 6af1b18712 [MIRROR] Makes the asset cache faster
https://github.com/tgstation/tgstation/pull/35003

Origional PR
2018-01-29 13:10:45 -06:00
PoojawaandGitHub 03086dfa91 Tg 1 28 sync testing/confirmation (#5178)
* maps, tgui, tools

* defines and helpers

* onclick and controllers

* datums

fucking caught that hulk reversal too.

* game and shuttle modular

* module/admin

* oh god they fucking moved antag shit again

* haaaaate. Haaaaaaaaaate.

* enables moff wings

* more modules things

* tgstation.dme

before I forget something important

* some mob stuff

* s'more mob/living stuff

* some carbon stuff

* ayy lmaos and kitchen meat

* Human stuff

* species things

moff wings have a 'none' version too

* the rest of the module stuff.

* some strings

* misc

* mob icons

* some other icons.

* It compiles FUCK BORERS

FUCK BORERS
2018-01-29 04:42:29 -06:00
deathride58 5300ebdeee Moves toggle animal digestion button to object tab 2018-01-28 23:49:32 -05:00
Mark9013100andCitadelStationBot c7498412ee Adds cloning data disks to techwebs 2018-01-28 22:06:45 -06:00
NickandGitHub 8440d0e6fd Update cit_vendors.dm 2018-01-29 04:01:34 +00:00
NickandGitHub 529cf64ab9 Kinky mai boy 2018-01-29 03:40:35 +00:00
deathride58andGitHub 3e2292ac1d Merge pull request #5166 from Cyberboss/patch-1
Fixes the mapdiffbot issue
2018-01-29 02:31:15 +00:00
deathride58andGitHub 9dc6a9dacb Merge pull request #5161 from Citadel-Station-13/upstream-merge-34992
[MIRROR] Microwave Powercrêpe
2018-01-29 02:30:49 +00:00
deathride58andGitHub 1e9e50fa03 Merge pull request #5160 from Citadel-Station-13/upstream-merge-34939
[MIRROR] Increases Drone Speed
2018-01-29 02:30:34 +00:00
deathride58andGitHub 34b93a8d42 Merge pull request #5159 from Citadel-Station-13/upstream-merge-34926
[MIRROR] Makes revenants spawn on dead bodies & bodycontainers
2018-01-29 02:30:17 +00:00
deathride58andGitHub 7673583ce1 Merge pull request #5157 from Citadel-Station-13/upstream-merge-35025
[MIRROR] Warp whistle now respects notransform
2018-01-29 02:29:18 +00:00
deathride58andGitHub 539621a846 Merge pull request #5127 from Citadel-Station-13/upstream-merge-34875
[MIRROR] Removes overhead and fixes null runtime with NAMEOF
2018-01-29 02:29:00 +00:00
deathride58andGitHub 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
Jordan BrownandGitHub 8261e15126 Fixes the mapdiffbot issue 2018-01-28 21:18:21 -05:00
NickandCitadelStationBot 124f68bf87 Readds bz canisters to cargo order packs (#34950)
* Update packs.dm

* Update packs.dm
2018-01-28 18:39:07 -06:00
uraniummeltdownandCitadelStationBot f868cb146f alt-click on microwave to cook (#34992) 2018-01-28 18:29:27 -06:00
AnonmareandCitadelStationBot 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
Jordan BrownandCitadelStationBot b9f575fa11 Merge pull request #34926 from ShizCalev/morguetray-revenant
Makes revenants spawn on dead bodies & bodycontainers
2018-01-28 18:03:41 -06:00
LetterJayandGitHub 84be31bb00 Update unsorted.dm 2018-01-28 15:19:22 -06:00
LetterJayandGitHub da5d277ddb Merge pull request #5156 from Citadel-Station-13/upstream-merge-34983
[MIRROR] Removes /New() from landmarks
2018-01-28 15:18:06 -06:00
LetterJayandGitHub 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
LetterJayandGitHub 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
LetterJayandGitHub 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
LetterJayandGitHub 044c13f607 Update emote.dm 2018-01-28 15:13:12 -06:00
LeoandCitadelStationBot b543882c64 Merge pull request #35025 from vuonojenmustaturska/toot
Warp whistle now respects notransform
2018-01-28 15:08:33 -06:00
LeoandCitadelStationBot 59eac5ca55 Merge pull request #34983 from tgstation/Cyberboss-patch-1
Removes /New() from landmarks
2018-01-28 15:08:25 -06:00
vuonojenmustaturskaandCitadelStationBot 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 BrownandCitadelStationBot 307e028811 Merge pull request #34982 from vuonojenmustaturska/lightingdeopt
Makes lighting corner optimization a little more sane
2018-01-28 10:34:04 -06:00
LeoandCitadelStationBot 13d9ea5a1c Merge pull request #34996 from ShizCalev/held_mob-runtime
Fixes held_mob release runtime
2018-01-28 10:22:41 -06:00
vuonojenmustaturskaandCitadelStationBot 6c855bfcee fix lizard jobs (#34994) 2018-01-28 08:16:23 -06:00
LetterJayandGitHub 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
LetterJayandGitHub 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
LetterJayandGitHub 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
LetterJayandGitHub 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
LetterJayandGitHub 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
LetterJayandGitHub 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 EdgeandCitadelStationBot 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 DupontandCitadelStationBot 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
orangesandCitadelStationBot 38f0f17fb7 Merge pull request #35031 from KorPhaeron/imthecook
Stops titlescreen chef spam
2018-01-27 23:21:39 -06:00
vuonojenmustaturskaandCitadelStationBot cbfe2c997b Revert "Power Cell explosions are now log" 2018-01-27 23:21:15 -06:00