Commit Graph

4839 Commits

Author SHA1 Message Date
Poojawa
ab0e0667f2 Makes Travis happy 2018-01-31 18:11:19 -06:00
Poojawa
2f16174e7c overdue refractor on layering code
also probably fixes missing sprites
2018-01-31 10:13:17 -06:00
Poojawa
aa04e62b29 cult lol xd 2018-01-31 08:07:22 -06:00
Poojawa
d7659ac6b2 sync with master 2018-01-31 07:02:55 -06:00
Poojawa
a7f0ffb6f0 modules 2018-01-31 06:56:28 -06:00
LetterJay
527e6545e2 Merge pull request #5216 from Citadel-Station-13/upstream-merge-35081
[MIRROR] Potato battery nerf
2018-01-31 04:12:45 -06:00
LetterJay
903a89e281 Merge pull request #5213 from Citadel-Station-13/upstream-merge-35045
[MIRROR] Turrets now check borgs!
2018-01-31 04:12:11 -06:00
LetterJay
7ac807afa6 Merge pull request #5184 from Citadel-Station-13/upstream-merge-34849
[MIRROR] Adds the reverse bear trap item, available to traitor clowns in the uplink for 5 TC
2018-01-31 04:07:37 -06:00
LetterJay
3dc5dc2974 Merge pull request #5181 from Citadel-Station-13/upstream-merge-35003
[MIRROR] Makes the asset cache faster
2018-01-31 04:06:43 -06:00
LetterJay
32256336b3 Merge pull request #5177 from deathride58/mycomputerisapotato
Moves toggle animal digestion button to object tab
2018-01-31 04:05:45 -06:00
LetterJay
fb5125bd16 Merge pull request #5171 from Citadel-Station-13/upstream-merge-35027
[MIRROR] Adds cloning data disks to techwebs
2018-01-31 03:03:15 -06:00
LetterJay
9a24afb8a4 Merge pull request #5164 from Citadel-Station-13/upstream-merge-34950
[MIRROR] Readds bz canisters to cargo order packs
2018-01-31 03:02:31 -06:00
LetterJay
198677b4cf Merge pull request #5211 from Citadel-Station-13/upstream-merge-35116
[MIRROR] Cleans up wirer code.
2018-01-31 03:00:24 -06:00
LetterJay
e6574a34f6 Merge pull request #5208 from Citadel-Station-13/upstream-merge-35069
[MIRROR] Removes Tech-Disk Exports
2018-01-31 02:59:37 -06:00
LetterJay
d49a578463 Merge pull request #5195 from Citadel-Station-13/upstream-merge-35064
[MIRROR] Fixes blood contract names
2018-01-30 23:16:41 -06:00
LetterJay
58da631638 Merge pull request #5192 from Citadel-Station-13/upstream-merge-34599
[MIRROR] adds extendohands
2018-01-30 23:16:22 -06:00
Jalleo
358a6085a1 Potato battery nerf (#35081)
* Very temp I want to see what people believe is a more suitable size because this is ridiculous

* Damn comments being my bane when I have to redo a local branch and mess up grr

* Does the request from the maintainer
2018-01-30 22:45:38 -06:00
ExcessiveUseOfCobblestone
31cf679ce9 Turrets now check borgs! (#35045)
* epic

* epic2

* epic

* 150 hours

* 150^2 hours
2018-01-30 22:45:10 -06:00
Iamgoofball
8e6aaf70c3 Cleans up wirer code. (#35116)
* Cleans up wirer code.

🆑 Iamgoofball
fix: Minor code cleanup on the wirer
/🆑
2018-01-30 22:44:49 -06:00
Liam
e292b050f8 bye 2018-01-30 22:44:21 -06:00
Poojawa
a24788842b dogborg tweaks, so fuggin DUMB (#5202)
* apparantly you need shuttles, who knew

* some tweaks

Sprites need adjustments
Janidogs need adjustments in UI

* Hm, maybe a fix. Revert attempt to rename sprites

* [MIRROR] Better Chat Squashing (#5193)

* Merge pull request #35058 from uraniummeltdown/chatsquash

Better Chat Squashing

* Better Chat Squashing

* [MIRROR] Sexy Solar Sprites (#5191)

* replaced solar panel sprites with better ones

* Sexy Solar Sprites

* Automatic changelog generation for PR #5191 [ci skip]

* [MIRROR] New Coffin Sprite (#5190)

* coffins have a new sprite (#34995)

* New Coffin Sprite

* Automatic changelog generation for PR #5190 [ci skip]

* [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

* Automatic changelog generation for PR #5187 [ci skip]

* [MIRROR] Expand Cyborg (#5183)

* Expand Cyborg (#34958)

* Expand Cyborg

* i ded pls nerf

* Oh sheet

* Expand Cyborg

* Automatic changelog generation for PR #5183 [ci skip]

* [MIRROR] Cosmic Bedsheet (#5170)

* adds cosmic space bedsheet

* Cosmic Bedsheet

* [MIRROR] The punisher no longer punishes ticker subsystems with delayed fires (#5174)

* Merge pull request #34964 from MrStonedOne/patch-463

The punisher no longer punishes ticker subsystems with delayed fires

* The punisher no longer punishes ticker subsystems with delayed fires

* Fuck this I'm done with it
2018-01-30 15:17:46 -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
Jordan Brown
bfd6f8b792 Fixes blood contract names (#35064) 2018-01-29 21:57:11 -06:00
PKPenguin321
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
Ashe Higgs
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
Poojawa
6af1b18712 [MIRROR] Makes the asset cache faster
https://github.com/tgstation/tgstation/pull/35003

Origional PR
2018-01-29 13:10:45 -06:00
Poojawa
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
Mark9013100
c7498412ee Adds cloning data disks to techwebs 2018-01-28 22:06:45 -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
Nick
124f68bf87 Readds bz canisters to cargo order packs (#34950)
* Update packs.dm

* Update packs.dm
2018-01-28 18:39:07 -06: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