Cheridan
7909f8728d
Merge pull request #17351 from KorPhaeron/dragon3
...
Drake Fixes
2016-05-03 22:52:34 -05:00
Joan Lung
6a927695e5
Merge pull request #17342 from Shadowlight213/Ahelprelay
...
Adds cross server adminhelp relaying
2016-05-03 22:46:18 -04:00
Shadowlight213
a3b4d118c4
Gives relays their own proc
2016-05-03 19:14:24 -07:00
Cheridan
6649e136d0
Lavaland Ruin update ( #17348 )
...
* Lavaland Ruin update
* Make Beach Biodome Great
2016-05-03 20:38:44 -05:00
Cheridan
75f404b326
Merge pull request #17337 from ChangelingRain/innatecomms
...
Cult communication is now innate and has an action button
2016-05-03 20:23:52 -05:00
Joan Lung
85d60e93f3
Merge pull request #17318 from coiax/we-can-hear-you
...
Revenant and alien whispering heard by ghosts
2016-05-03 17:16:28 -04:00
KorPhaeron
6e10a6a839
Stronger Attack
2016-05-03 11:46:09 -05:00
Aloraydrel
89ab88a7e1
Lab coats can carry emergency oxygen tanks ( #17307 )
...
* Adds emergency tanks to labcoat.dm
* I have little idea what im doing but this should work
* Ok this is it
* Ree
2016-05-03 12:55:48 +02:00
KorPhaeron
d191efc751
Merge pull request #17329 from Cheridan/scavengers
...
Ashwalker Den Update
2016-05-03 03:01:50 -05:00
Jack Edge
72310cc63e
More code review
2016-05-03 08:16:26 +01:00
Cheridan
e64783c1fa
Merge pull request #17282 from coiax/brobot-is-an-artist
...
Service and standard cyborgs get a spraycan; service cyborgs get a cyborg-hand labeler
2016-05-03 01:55:01 -05:00
KorPhaeron
423ee67c73
Merge pull request #17330 from coiax/lavaproof-staff
...
Staff of lava is now lavaproof
2016-05-03 01:03:46 -05:00
KorPhaeron
11fa336dd9
Ghost sword fix
2016-05-03 00:10:39 -05:00
KorPhaeron
9775b8cdcc
Dragon Fixes
2016-05-02 21:44:11 -05:00
Joan Lung
fe060eb1fa
Merge pull request #17306 from coiax/fleshmend-diminishing-returns
...
Fleshmend: Diminishing returns; Panacea: Better.
2016-05-02 18:52:17 -04:00
Jack Edge
50fd90e25f
Fixes compile errors
2016-05-02 23:20:12 +01:00
Jack Edge
c1e4c0163c
Code review
2016-05-02 23:08:31 +01:00
Jack Edge
4ee3d491e7
Corrected incorrect description of booze
2016-05-02 22:23:36 +01:00
Cheridan
d67922d626
Walker tendrils strip mobs before gibbing now
2016-05-02 14:38:41 -05:00
Shadowlight213
50372a586f
Adds basic cross server message relay system. Currently setup to relay adminhelps to the other server in the case of no admins on a server.
2016-05-02 11:53:29 -07:00
AnturK
340b1d01ff
Merge pull request #17314 from RemieRichards/mecha_pilot_fix
...
Mecha and Mecha pilot fixes
2016-05-02 20:25:44 +02:00
Joan Lung
faad4d5b71
Merge pull request #17293 from RemieRichards/clothing_variable_modding
...
Allows clothing to alter variables on the wearer, Admin modifiable too!
2016-05-02 12:21:23 -04:00
Remie Richards
bc754a7bfc
Fixes Haunted Mecha, Fixes Mecha damage runtimes, Fixes Mecha bumpsmash working without a pilot.
2016-05-02 17:18:34 +01:00
Nerd Lord
0897f3bc20
Cult communication is now innate and has an action button
2016-05-02 09:11:06 -04:00
AnturK
878d76a4b7
Merge pull request #17062 from Core0verload/bloodbrood
...
New function for hivelord core / legion heart
2016-05-02 11:39:18 +02:00
Jack Edge
292901357e
Staff of lava is now lavaproof
...
Staff of lava is now lavaproof.
2016-05-02 09:07:47 +01:00
Cheridan
6db3624cf8
Ashwalker Scavengers
2016-05-02 02:45:39 -05:00
Cheridan
581a755ae5
Merge pull request #17269 from Core0verload/supplytimer
...
Drops supply shuttle delay to 1 minute
2016-05-02 00:01:46 -05:00
Cheridan
46c0b3c6db
Merge pull request #17281 from bgobandit/memerystocks
...
Changes the stock market permanently and drastically
2016-05-01 23:53:52 -05:00
Cheridan
08579759fb
Merge pull request #17296 from ChangelingRain/justwatch
...
Watchers now instantly fire at targets instead of setting temperature
2016-05-01 23:30:25 -05:00
Cheridan
009988b553
Merge pull request #17292 from erwgd/PlasmamanStartInternalsOn
...
When joining game as plasmaman, start with internals on
2016-05-01 21:58:30 -05:00
Joan Lung
d31f5ed876
Merge pull request #17280 from TechnoAlchemisto/I_can't_escape_my_cycles_of_guilt
...
Security Fashion Refactor
2016-05-01 19:33:22 -04:00
TechnoAlchemist
56a2a606c6
helmet standard issue
2016-05-01 13:36:11 -07:00
Remie Richards
77c7640139
fixes some vars on /nanotrasen pilots
2016-05-01 21:25:35 +01:00
Jack Edge
0d740e31f2
Revenant and alien whispering heard by ghosts
...
Revenant transmit and alien whisper now also sent to all ghosts, a la
abductor chat.
2016-05-01 20:53:52 +01:00
Remie Richards
00bdc99254
fixes mecha_pilots not targeting empty mecha correctly, fixes them attacking friendly/their own mecha, adds nanotrasen mecha_pilots.
2016-05-01 19:32:15 +01:00
Remie Richards
f903deb2a2
Allows clothing to alter variables on the wearer, Admin modifiable too!
2016-05-01 18:22:21 +01:00
MMMiracles
a72e48ffe3
the fact this never came up is surprising
2016-05-01 12:20:06 -04:00
Jack Edge
d9aac22800
Code review
2016-05-01 16:10:00 +01:00
Joan Lung
72f25a53e6
Merge pull request #17277 from KorPhaeron/cyborg_buffs2
...
Cyborg Blueprints
2016-05-01 11:05:48 -04:00
c0
20c64fbfbf
Blood brood
2016-05-01 17:19:29 +03:00
Jack Edge
56665c70c6
Fleshmend: Diminishing returns; Panacea: Better.
...
🆑 coiax, Robustin
tweak: Changeling Fleshmend is much less effective when used repeatedly
in a short time. Changeling Panacea is much more effective at purging
reagents, reducing radiation and now reduces braindamage.
/🆑
Also fixed a description problem in pentacid which isn't true. It
doesn't do brute damage.
2016-05-01 13:59:50 +01:00
Mercenaryblue
1be07b13ef
Paperplane balance fix ( #17278 )
...
Drastically reduced eye damage proc chances
2016-05-01 12:22:11 +02:00
Jordie
2881b4a09e
Merge pull request #17144 from Cheridan/scavengers
...
Adds scavengers for ash walkers.
2016-05-01 19:45:49 +10:00
Jordie
76d5557d90
Merge pull request #17227 from coiax/i-can-participate-too
...
Removed objectionable absinthe name, procedurally generates absinthe name instead
2016-05-01 19:41:53 +10:00
Jack Edge
14a14ccb97
Code review
2016-05-01 10:28:07 +01:00
Cheridan
70d1ecfb68
Fixing conflicts
2016-05-01 04:11:21 -05:00
Cheridan
3981f27e3d
Merge branch 'master' of https://github.com/tgstation/-tg-station into scavengers
...
Conflicts:
code/modules/mob/living/simple_animal/hostile/mining_mobs.dm
icons/mob/animal.dmi
icons/mob/mob.dmi
2016-05-01 04:06:26 -05:00
Cheridan
0a45f89bdc
Finishes scavengers
2016-05-01 03:51:25 -05:00
Jordie
d0dcd62e87
Merge pull request #17268 from Core0verload/grubgrub
...
Goldgrub no longer can burrow into the station floor
2016-05-01 17:50:09 +10:00