Commit Graph
13098 Commits
Author SHA1 Message Date
CitadelStationBotandPoojawa 6a180f7e4a [MIRROR] NODISMEMBER species will no longer lose limbs when cloning (#5278)
* NODISMEMBER species will no longer lose limbs when cloning (#35247)

* NODISMEMBER species will no longer lose limbs when cloning
2018-02-04 23:14:00 -06:00
CitadelStationBot d2393c1026 Automatic changelog generation for PR #5276 [ci skip] 2018-02-04 23:12:49 -06:00
CitadelStationBotandPoojawa 78ca971767 [MIRROR] Adds sprites for conveyor belt constructs (#5276)
* Adds sprites for conveyor belt constructs (#35252)

* lemme just convey this thought

* slight sprite update

* asdf

* Adds sprites for conveyor belt constructs
2018-02-04 23:12:47 -06:00
CitadelStationBot a864566199 Automatic changelog generation for PR #5275 [ci skip] 2018-02-04 23:12:26 -06:00
CitadelStationBotandPoojawa 071af77c99 [MIRROR] Corrects Airlock Animation Looping (#5275)
* Merge pull request #35220 from uraniummeltdown/airlocksprite

Corrects Airlock Animation Looping

* Corrects Airlock Animation Looping
2018-02-04 23:12:24 -06:00
CitadelStationBot d49c7bb283 Automatic changelog generation for PR #5294 [ci skip] 2018-02-04 23:11:34 -06:00
CitadelStationBotandPoojawa 60292af57f [MIRROR] Disentangles Command Reports from Metagame (#5294)
* Disentangles Command Reports from Metagame (#35192)

* False report fix

* Less Accurate Command Report

* Disentangles Command Reports from Metagame
2018-02-04 23:11:32 -06:00
CitadelStationBotandPoojawa 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
CitadelStationBotandPoojawa 00e49e1eb9 [MIRROR] Removes a singular word from CONTRIBUTING.md (#5268)
* Merge pull request #35251 from praisenarsie/patch-26

Removes a singular word from CONTRIBUTING.md

* Removes a singular word from CONTRIBUTING.md
2018-02-04 23:04:56 -06:00
CitadelStationBot aaeb0446c0 Automatic changelog generation for PR #5270 [ci skip] 2018-02-04 23:02:03 -06:00
CitadelStationBotandPoojawa 5aec2724c1 [MIRROR] The firelock on Box's circuit lab no longer covers up the room's airlock (#5270)
* Moves the circ. lab firelock down a tile (#35217)

* The firelock on Box's circuit lab no longer covers up the room's airlock
2018-02-04 23:02:01 -06:00
CitadelStationBotandPoojawa 8a3fed5509 [MIRROR] Adds a note about for loop speed (#5267)
* Merge pull request #35154 from Iamgoofball/patch-387

Adds a note about for loop speed

* Adds a note about for loop speed
2018-02-04 23:01:44 -06:00
CitadelStationBot b0b0c516ab Automatic changelog generation for PR #5265 [ci skip] 2018-02-04 22:47:00 -06:00
CitadelStationBotandPoojawa d346420e9f [MIRROR] Fingerprints are transferred from pipe fittings to newly-secured pipes, and migrates securing them to wrench_act() from attackby() (#5265)
* Merge pull request #35210 from Xhuis/pipe_fingerprints

Fingerprints are transferred from pipe fittings to newly-secured pipes, and migrates securing them to wrench_act() from attackby()

* Fingerprints are transferred from pipe fittings to newly-secured pipes, and migrates securing them to wrench_act() from attackby()
2018-02-04 22:46:58 -06:00
CitadelStationBot 19a8b66255 Automatic changelog generation for PR #5258 [ci skip] 2018-02-04 22:37:02 -06:00
CitadelStationBotandPoojawa c014527627 [MIRROR] Hijack objectives will only be given out if there are 30 or more players. (#5258)
* Hijack objectives will only be given out if there are 30 or more players. (#35202)

* Hijack objectives will only be given out if there are 30 or more players.
2018-02-04 22:37:00 -06:00
CitadelStationBotandPoojawa 0bb8649794 [MIRROR] Fix map keys overflowing earlier than expected (#5259)
* Merge pull request #35133 from AutomaticFrenzy/patch/key-overflow-fix

Fix map keys overflowing earlier than expected

* Fix map keys overflowing earlier than expected
2018-02-04 22:35:52 -06:00
CitadelStationBot 6b035b9d3d Automatic changelog generation for PR #5257 [ci skip] 2018-02-04 22:35:33 -06:00
CitadelStationBotandPoojawa 3a7d148417 [MIRROR] Soap now has inhand sprites (#5257)
* Soap now has inhand sprites (#35159)

* Delete items_lefthand.dmi

* Add files via upload

* Delete items_righthand.dmi

* Add files via upload

* Delete custodial_lefthand.dmi

* Delete custodial_righthand.dmi

* Add files via upload

* Delete items_lefthand.dmi

* Delete items_righthand.dmi

* Add files via upload

* Update clown_items.dm

* Soap now has inhand sprites
2018-02-04 22:35:31 -06:00
CitadelStationBot 9f51dd4288 Automatic changelog generation for PR #5254 [ci skip] 2018-02-04 22:30:12 -06:00
CitadelStationBotandPoojawa b1e9ca385f [MIRROR] Adds yeehaw to the discoball dj soundboard (#5254)
* yeehaw (#35172)

* Adds yeehaw to the discoball dj soundboard
2018-02-04 22:30:10 -06:00
deathride58andGitHub ef3160dce9 quick pre-server-compile hotfix - adds splitter = 75 to cit's modified skin.dmf 2018-02-04 23:30:04 -05:00
CitadelStationBot 806b1defd3 Automatic changelog generation for PR #5253 [ci skip] 2018-02-04 22:29:40 -06:00
NickandPoojawa 0c07e1de56 [RDM]More loadout stuff (#5253)
* and BOOM SHAKALA

* Update uniform.dm

* hmm

* dedado

* boop

* Be da deem armor values!
2018-02-04 22:29:38 -06:00
CitadelStationBot ec17f41740 Automatic changelog generation for PR #5252 [ci skip] 2018-02-04 22:28:14 -06:00
deathride58andPoojawa f20c921f8a moves input bar to below chat (#5252) 2018-02-04 22:28:12 -06:00
CitadelStationBot bcaba89c69 Automatic changelog generation for PR #5250 [ci skip] 2018-02-04 22:27:40 -06:00
deathride58andPoojawa 65d507f31f Darkens chatbox a lil to go along with the UI's dark theme (#5250) 2018-02-04 22:27:38 -06:00
CitadelStationBotandPoojawa d47ab945fe [MIRROR] Removes __DATASTRUCTURES (#4791)
* Removes unused datastructures (#34292)

* Removes __DATASTRUCTURES

* Update heap.dm

* Update heap.dm

* heap
2018-02-04 22:25:10 -06:00
CitadelStationBotandPoojawa 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
CitadelStationBotandPoojawa 0941f98f96 [MIRROR] Cleans up single frame get flat icon. (#5245)
* Merge pull request #35171 from AnturK/thanksbyond

Cleans up single frame get flat icon.

* Cleans up single frame get flat icon.
2018-02-04 22:21:24 -06:00
CitadelStationBotandPoojawa 59fc595ba3 [MIRROR] Fix hook installation on Linux (#5244)
* Merge pull request #35161 from AutomaticFrenzy/patch/hook-install

Fix hook installation on Linux

* Fix hook installation on Linux
2018-02-04 22:21:05 -06:00
CitadelStationBotandPoojawa ae1a00f345 [MIRROR] Fixes iscatperson helper (#5241)
* Fixes iscatperson check

* Fixes iscatperson helper
2018-02-04 22:20:42 -06:00
CitadelStationBotandPoojawa 799038ab26 [MIRROR] blasts away a double stacked blast door in atmosia (#5240)
* blasts away a double stacked blast door in atmosia

* blasts away a double stacked blast door in atmosia
2018-02-04 22:20:26 -06:00
CitadelStationBotandPoojawa 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
CitadelStationBotandPoojawa 2abb2b2e9d [MIRROR] Revert "Removes unused consts from dbcore (#34711)" (#5206)
* Merge pull request #35120 from tgstation/a

Revert "Removes unused consts from dbcore (#34711)"

* Revert "Removes unused consts from dbcore (#34711)"
2018-02-04 22:12:37 -06:00
CitadelStationBotandPoojawa 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 695284fcd8 Automatic changelog generation for PR #5234 [ci skip] 2018-02-04 22:11:34 -06:00
CitadelStationBotandPoojawa 50fa4d2239 [MIRROR] Blacklists servant golems from the magic mirror (#5234)
* Blacklists servant golems from the magic mirror (#35147)

* Blacklists servant golems from the magic mirror
2018-02-04 22:11:32 -06:00
CitadelStationBotandPoojawa 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 7fcb3eddba Automatic changelog generation for PR #5179 [ci skip] 2018-02-04 22:10:23 -06:00
cebutrisandPoojawa 44908503bf Stunswords! (#5179)
* adds in stunswords

* inhands!

* fixes cell charge text.

* adds in the kit and also fuck admin.txt

* Fixes some formatting

* replaces the placeholder icon with

* i hate everything

* tries to fix the dme. hopefully.

* tries again
2018-02-04 22:10:21 -06:00
CitadelStationBot 91345fddc1 Automatic changelog generation for PR #5231 [ci skip] 2018-02-04 22:09:40 -06:00
CitadelStationBotandPoojawa ba06d1cb97 [MIRROR] Listening fix (#5231)
* Removes ghost spawner from Syndicate listening ruin (#35083)

* Does what Kor says

* Other part of the fix if Kor wants it

* Does what KorPhearon wants

* Listening fix
2018-02-04 22:09:38 -06:00
CitadelStationBotandPoojawa 31b261ff7b [MIRROR] Increases mineral amount needed for rough metal false walls (#5229)
* Increases mineral amount needed for rough metal false walls (#35065)

* Increases mineral amount needed for rough metal false walls
2018-02-04 22:08:28 -06:00
CitadelStationBotandPoojawa 4d1a5db892 [MIRROR] Corrects Some \ref Macros (#5228)
* Merge pull request #35136 from uraniummeltdown/correcttheref

Corrects Some \ref Macros

* Corrects Some \ref Macros
2018-02-04 22:08:05 -06:00
CitadelStationBot b3f36e5917 Automatic changelog generation for PR #5227 [ci skip] 2018-02-04 22:07:44 -06:00
CitadelStationBotandPoojawa 684c98d2e2 [MIRROR] Cloner checks if occupant is human rather than just carbon (#5227)
* Cloner checks if occupant is human rather than just carbon (#35077)

* Makes cloner sure its human

* Revert "Makes cloner sure its human"

This reverts commit 2591f2a7cd74cc83d9afcbac5df59bfea20962df.

* travis fix maybe

* Cloner checks if occupant is human rather than just carbon
2018-02-04 22:07:42 -06:00
CitadelStationBot 3578d42011 Automatic changelog generation for PR #5226 [ci skip] 2018-02-04 22:07:19 -06:00
CitadelStationBotandPoojawa 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