Commit Graph

54284 Commits

Author SHA1 Message Date
tgstation-server
104e29af84 Automatic changelog generation for PR #35020 [ci skip] 2018-02-02 10:24:31 -08:00
MoreRobustThanYou
ba7f60c8bb Holorays! (#35020)
* Holorays!
2018-02-02 20:24:28 +02:00
tgstation-server
229ffde6e4 Automatic changelog generation for PR #35205 [ci skip] 2018-02-02 09:35:34 -08:00
Ashe Higgs
5d999571a1 Adds pineapples to botany, and Hawaiian pizza (#35205)
* Adds pineapples.
2018-02-02 19:35:31 +02:00
vuonojenmustaturska
79ca572d01 Merge pull request #35133 from AutomaticFrenzy/patch/key-overflow-fix
Fix map keys overflowing earlier than expected
2018-02-02 19:33:06 +02:00
tgstation-server
d4b98c665e Automatic changelog generation for PR #35202 [ci skip] 2018-02-02 08:39:14 -08: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
tgstation-server
443d883ab8 Automatic changelog generation for PR #35159 [ci skip] 2018-02-02 02:56:06 -08: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
tgstation-server
1838980262 Automatic changelog generation for PR #34888 [ci skip] 2018-02-02 02:14:41 -08: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
uraniummeltdown
7382bd2ea9 corrects incorrect loop setting on airlock animations 2018-02-02 13:35:04 +05:00
tgstation-server
80bce4c93f Automatic changelog generation for PR #35185 [ci skip] 2018-02-01 16:19:39 -08: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
tgstation-server
92181c72f1 Automatic changelog generation for PR #35172 [ci skip] 2018-02-01 13:50:21 -08: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
Leo
2a629d5453 Merge pull request #35161 from AutomaticFrenzy/patch/hook-install
Fix hook installation on Linux
2018-02-01 09:34:28 -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
b1ed8d0dc8 blasts away a double stacked blast door in atmosia 2018-02-01 03:04:21 -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
tgstation-server
c998dd5a37 Automatic changelog compile, [ci skip] 2018-02-01 01:16:08 +00:00
Leo
bf8983dd7e Merge pull request #35150 from DaxDupont/myanusisbleeding
Fixes a naughty dot
2018-01-31 22:38:29 -02:00
tgstation-server
c95c7edccb Automatic changelog generation for PR #35147 [ci skip] 2018-01-31 14:19:21 -08: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
tgstation-server
20744bc26f Automatic changelog generation for PR #35153 [ci skip] 2018-01-31 14:13:45 -08:00
cebutris
8c50239f3a Changes stunbaton battery examine text to use [src] (#35153) 2018-01-31 20:13:42 -02:00
tgstation-server
3c2bbc45c6 Automatic changelog generation for PR #35083 [ci skip] 2018-01-31 14:01:34 -08:00
Jalleo
7ee0dc0ceb 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
2018-01-31 17:01:31 -05:00
Xhuis
dad2aa7ae4 Removes white eyespots from several species 2018-01-31 16:05:35 -05:00
tgstation-server
944a89204a Automatic changelog generation for PR #35181 [ci skip] 2018-01-31 12:09:46 -08: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
tgstation-server
143ca4a351 Automatic changelog generation for PR #35122 [ci skip] 2018-01-31 07:10:33 -08: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
tgstation-server
d25a39abf4 Automatic changelog generation for PR #35077 [ci skip] 2018-01-31 07:10:13 -08:00
Jittai
a83785ba7f 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
2018-01-31 10:10:08 -05:00
ShizCalev
f3955eaaf4 Corrects space tiles on Abandoned Teleporter 2018-01-31 09:05:03 -06:00
ShizCalev
3c345d99de Fixes lightfixture placement issue 2018-01-31 09:04:51 -06:00