Commit Graph

4857 Commits

Author SHA1 Message Date
CitadelStationBot 2d9f549af3 [MIRROR] Raises the cid check disconnect time out (#5272)
* raises the cid check disconnect time out (#35244)

Disconnects from deleting the client are immediate, where are other commands are queued to some degree or another, browse is the worst one of all since it has to queue behind after connect resource sends as well as the asset cache or browse_rsc calls.

I'm finding hints that clients on lagger connections are getting disconnected before getting the reconnect command, and I was able to reproduce this myself on a cell phone connection while connecting to terry

* Raises the cid check disconnect time out
2018-02-04 23:05:22 -06:00
deathride58 65d507f31f Darkens chatbox a lil to go along with the UI's dark theme (#5250) 2018-02-04 22:27:38 -06:00
CitadelStationBot 71f5bee4c4 [MIRROR] Future proofs Easter calculations (#5247)
* Merge pull request #35079 from tortellinitony/easter

Future proofs Easter calculations

* Future proofs Easter calculations
2018-02-04 22:22:56 -06:00
CitadelStationBot 7ddf4addd0 [MIRROR] Fixes spelling error in explorer_gear.dm (#5239)
* Spelling FIX

* Fixes spelling error in explorer_gear.dm
2018-02-04 22:19:36 -06:00
CitadelStationBot 1d11603d52 [MIRROR] Fixes a naughty dot (#5237)
* Merge pull request #35150 from DaxDupont/myanusisbleeding

Fixes a naughty dot

* Fixes a naughty dot
2018-02-04 22:11:48 -06:00
CitadelStationBot e2ce020a62 [MIRROR] Fixes a couple of typos and ports one New to Initialize (#5233)
* Merge pull request #35145 from vuonojenmustaturska/acidtypos

Fixes a couple of typos and ports one New to Initialize

* Fixes a couple of typos and ports one New to Initialize
2018-02-04 22:11:07 -06:00
CitadelStationBot ee0245c79f [MIRROR] Tomatoes and other foods found to have girl parts; removed from vegetable piles (#5226)
* Merge pull request #35122 from CosmicScientist/you-say-tomaetoe-i-say-tomato-youre-wrong

Tomatoes and other foods found to have girl parts; removed from vegetable piles

* Tomatoes and other foods found to have girl parts; removed from vegetable piles
2018-02-04 22:07:17 -06:00
CitadelStationBot dc06d0373c [MIRROR] Fixes lightfixture placement issue (#5225)
* Fixes lightfixture placement issue

* Fixes lightfixture placement issue
2018-02-04 22:06:22 -06:00
deathride58 142e96a2dd [READY] Adds night shifts (#4281)
* initial commit - adds night shifts

* fixes lighting not updating when nightshift is triggered and fixes compiling issues

* makes red alert override nightshift

* Update lighting.dm

* adds announcements for nightshift changes

* fixes nightshift flip-flopping during the night, adjusts night message a little, moves from minor_announce to priority_announce

* Update cit_nightshift.dm

* fixes compiling errors
2018-02-04 21:28:41 -06:00
Poojawa 467df149fd I swear every player on this server is a complete idiot
God forbid anyone has anything remotely fun.
2018-02-04 08:16:54 -06:00
Poojawa ed72d175c8 actually no, let's just do this 2018-02-03 10:34:42 -06:00
Poojawa 1bc69ec9b2 Vore alterations 2018-02-03 10:28:27 -06:00
Poojawa 7294424397 Makes Stargazers admin only 2018-02-03 09:03:16 -06:00
Poojawa 9755eb28ee compile fixes 2018-02-03 06:32:16 -06:00
Poojawa 059b34050b Removes Stargazers, far too liable to be abused by powergamers 2018-02-03 06:24:27 -06:00
Poojawa e0703fcecc Removes Fun 2018-02-01 21:39:30 -06:00
deathride58 408e0cce5f Fixes genital previews (#5251) 2018-02-01 12:58:44 -06:00
Poojawa ae888f1dff fix problems with one weird trick
if I'm not using something, I shouldn't be using it.
2018-02-01 08:56:01 -06:00
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