Commit Graph

41586 Commits

Author SHA1 Message Date
KorPhaeron 214272c8c8 Fixes ancient goliathes (#35242) 2018-02-04 01:33:46 -06:00
KorPhaeron 1a17244d26 Fixes ancient goliathes tentacle attack (#35243) 2018-02-04 01:33:20 -06:00
MrDoomBringer 61b63b1752 Fixes attackby in expressconsole.dm, moves bluespace pod upgrade further down the line in techwebs (#35249)
* yaga

* node change

* okay cobby
2018-02-04 01:32:52 -06:00
arsserpentarium 0b757c82ae battery rig fix (#35254)
* fix

* oops

* Auto stash before rebase of "tgstation/master"

* remove double notification
2018-02-04 01:30:20 -06:00
Jordan Brown 96d88b808a Merge pull request #35248 from KorPhaeron/gravity2
Fixes mecha grav catapult not being available in techwebs
2018-02-04 01:15:33 -05:00
ShizCalev 34897d8709 Removed tripAI landmark (#35256) 2018-02-04 01:13:40 -05:00
ShizCalev 50123b1e52 Allows blobs to destroy decals 2018-02-03 21:21:15 -06:00
KorPhaeron a8c68f3d9b NODISMEMBER species will no longer lose limbs when cloning (#35247) 2018-02-03 21:05:30 -05:00
Dax Dupont bfb943d5e7 Fixes sending cross station messages during wait period 2018-02-04 02:07:38 +01:00
Tad Hardesty 11ae82148c Fix research investigate logs 2018-02-03 16:27:18 -08:00
AnturK 05aa7257b1 Hmm explicit might have been better for readability. 2018-02-03 17:57:55 -06:00
AnturK 25433e05cb Fixes blood overlay layers. 2018-02-03 17:57:55 -06:00
MrDoomBringer bce710c796 Adds sprites for conveyor belt constructs (#35252)
* lemme just convey this thought

* slight sprite update

* asdf
2018-02-03 18:53:29 -05:00
XDTM 945051524c Makes slime scanning more readable 2018-02-03 23:02:12 +01:00
Tad Hardesty cc43ae9b33 Remove revenantspawn landmark from code (#35238) 2018-02-03 14:10:05 -05:00
Kyle Spier-Swenson 47f3d89265 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
2018-02-03 14:09:25 -05:00
kevinz000 7f345a96e5 Update explosive.dm 2018-02-03 02:22:29 -08:00
vuonojenmustaturska 5d37ce3ea5 Merge pull request #35208 from Xhuis/standard_borg_abscond
Fixes servant cyborgs with the Standard module not having Abscond
2018-02-03 01:42:24 +02:00
vuonojenmustaturska cb71837e9f 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()
2018-02-03 01:40:24 +02:00
KorPhaeron 61569bd662 Fixes mecha grav catapult construction 2018-02-02 17:24:10 -06:00
Leo 1e8e46e4f4 Merge pull request #35216 from optimumtact/goodbyecruelandunassocaiatedworld
Removes ketrazine
2018-02-02 21:18:46 -02:00
ExcessiveUseOfCobblestone 791f364a62 Update morgue.dm (#35227) 2018-02-02 13:44:18 -05:00
MoreRobustThanYou ba7f60c8bb Holorays! (#35020)
* Holorays!
2018-02-02 20:24:28 +02:00
Ashe Higgs 5d999571a1 Adds pineapples to botany, and Hawaiian pizza (#35205)
* Adds pineapples.
2018-02-02 19:35:31 +02:00
Dax Dupont 29df7a8ef2 Hijack objectives will only be given out if there are 30 or more players. (#35202) 2018-02-02 14:39:11 -02:00
Epoc fd73034111 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
2018-02-02 11:56:04 +01:00
Ashe Higgs 6ba865b112 makes reebe more than steam vent + brass skewer + pressure sensor + matrix simulator 2k18 by adding adjacency checks and some other things (#34888)
* traps patch

* flags!
2018-02-02 11:14:38 +01:00
vuonojenmustaturska 13ef0ea21e Merge pull request #35185 from Xhuis/eyesontheinsideofourbrains
Fixes white "eye" pixels appearing on races with custom eyes on their sprite
2018-02-02 02:19:36 +02:00
oranges 1aef06f9e5 Removes ketrazine
bye felicia
2018-02-01 22:47:15 +00:00
Nick 70ba493e9d yeehaw (#35172) 2018-02-01 16:50:19 -05:00
Xhuis 047f188b07 Fingerprints transfer on pipe wrench 2018-02-01 15:25:19 -05:00
Xhuis d7a815227a Fixes standard cyborgs not having Abscond 2018-02-01 15:04:10 -05:00
Jordan Brown 78a7a2822b Ports telecoms to Initialize (#35163) 2018-02-01 13:02:49 -02:00
vuonojenmustaturska 72ddb81048 Merge pull request #34872 from AnturK/theresabraininymyhead
Fixes changelings retaining fake brains on de-changelining
2018-02-01 17:00:03 +02:00
Jordan Brown d8b8086fdb Merge pull request #35079 from tortellinitony/easter
Future proofs Easter calculations
2018-02-01 09:47:00 -05:00
vuonojenmustaturska 33aa1696d6 Lavaland bomb runtime fix (#35183)
* lavaland bomb runtime fix

* revert previous commit, fix decals instead

* remove stray return
2018-02-01 13:30:41 +01:00
Leo 90edb64c19 Merge pull request #35171 from AnturK/thanksbyond
Cleans up single frame get flat icon.
2018-02-01 10:24:26 -02:00
AnturK 75c2173faa Okay but i'm not going to check if changeling dullahans work 2018-02-01 10:11:04 +01:00
Jordan Brown be30e328c8 Fix roundend splash screens 2018-02-01 03:04:35 -06:00
ShizCalev 098276749d Fixes iscatperson check 2018-02-01 03:04:05 -06:00
TechnoAlchemist 46af0ba6fb Spelling FIX 2018-01-31 22:18:46 -06:00
Leo bf8983dd7e Merge pull request #35150 from DaxDupont/myanusisbleeding
Fixes a naughty dot
2018-01-31 22:38:29 -02:00
Ashe Higgs 6164e25f3e Blacklists servant golems from the magic mirror (#35147) 2018-01-31 17:19:18 -05:00
Leo 6c1d7cf6b8 Merge pull request #35145 from vuonojenmustaturska/acidtypos
Fixes a couple of typos and ports one New to Initialize
2018-01-31 20:14:22 -02:00
cebutris 8c50239f3a Changes stunbaton battery examine text to use [src] (#35153) 2018-01-31 20:13:42 -02:00
Xhuis dad2aa7ae4 Removes white eyespots from several species 2018-01-31 16:05:35 -05:00
Ashe Higgs cf5e28ad83 Give integration cogs power generation (#35181) 2018-02-01 09:09:44 +13:00
GLACoding 615f30d260 Increases mineral amount needed for rough metal false walls (#35065) 2018-01-31 13:32:46 -02:00
Leo 1fe474c9c8 Merge pull request #35136 from uraniummeltdown/correcttheref
Corrects Some \ref Macros
2018-01-31 13:29:59 -02:00
Jordan Brown 9e0eaa3b00 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
2018-01-31 10:10:31 -05:00