f31cc6e6cf
Update uplink_item.dm
2016-02-22 16:31:44 -05:00
c535ea783e
Update human.dm
2016-02-22 16:28:42 -05:00
d9c6dfce73
Update mob_helpers.dm
2016-02-22 16:27:28 -05:00
9763db99de
Update martial.dm
2016-02-22 16:20:10 -05:00
320b1e958c
Update mob_helpers.dm
2016-02-22 13:24:08 -05:00
9766395322
Merge pull request #15355 from tkdrg/yeah
...
Improves admin counting for irc
2016-02-22 01:27:43 -06:00
09252b4f4b
Merge pull request #15657 from KorPhaeron/abductor
...
Abductor Airlocks
2016-02-22 00:05:15 -06:00
d6d8f59db4
Merge pull request #15445 from Shadowlight213/Syndieboom
...
Fixes away mission loot station balance by removing loot drops from syndicate simple mobs.
2016-02-21 23:15:47 -06:00
56d68ce31f
Merge pull request #15614 from CPTANT/staminabuffnew
...
buffs stamina regeneration take 2
2016-02-21 20:12:44 -06:00
050d6f4070
Merge pull request #15636 from Buggy123/patch-19
...
Dice of fate is now reusable
2016-02-21 20:11:26 -06:00
3ad21db02f
Merge pull request #15647 from Boredone/master
...
Fixs Breach Slugs Magazines
2016-02-21 22:16:34 -03:00
8109c83033
Merge pull request #15643 from tkdrg/old
...
VV path edit will now use spawn-style dialogs
2016-02-21 20:12:20 -05:00
f4017da82a
Merge pull request #15617 from phil235/Holobarrier
...
Replaces holo tape with holo barrier
2016-02-21 20:06:07 -05:00
54db9ded4d
Moved janitorial sign in a new weapons/miscellaneous.dm
...
Made holosign_creator/afterattack() a bit better.
Fixed merge conflict fixing error.
Fixes typos in holosign_creator.dm
2016-02-22 01:44:53 +01:00
2ec892a1fc
Merge branch 'master' of https://github.com/tgstation/-tg-station into Holobarrier
...
Conflicts:
icons/effects/effects.dmi
2016-02-22 01:34:20 +01:00
b08f6d9c22
Merge pull request #15624 from phil235/DwarfFix
...
Fixes being able to become huge with genetics
2016-02-21 19:29:51 -05:00
9a18ce7a8e
Fixes a message mistake of mine.
2016-02-22 01:23:29 +01:00
2f688f2b64
Merge pull request #15635 from KazeEspada/barfights2
...
Bar Fights 2
2016-02-21 19:36:33 +01:00
ac7aed2cb7
Removes parentheses
...
Really? Really?
2016-02-21 10:56:57 -07:00
39d25029d6
Merge pull request #15644 from ChangelingRain/youthoughtitwasdead
...
Revenants now have an essence HUD
2016-02-21 18:48:40 +01:00
4cf728cd5e
Merge pull request #15642 from AnturK/random_things
...
Minor fixes
2016-02-21 10:21:13 -03:00
50bbd40ff4
Merge pull request #15641 from kingofkosmos/toiletgrammarfix
...
Urinal message span fix
2016-02-21 09:41:10 -03:00
3f439b211c
Abductor Airlocks
2016-02-21 00:01:54 -06:00
9b5f17a8b1
Fixes announcements, I hope
2016-02-21 00:29:58 -05:00
27704409a4
Merge pull request #15595 from KorPhaeron/techno_alchemist
...
Arrhythmic Knife
2016-02-20 17:49:35 -05:00
55d22a5d37
Merge pull request #15629 from PKPenguin321/patch-18
...
Fixes morph transforming message
2016-02-20 17:48:33 -05:00
ab658b9e24
Merge pull request #15628 from PKPenguin321/patch-13
...
[s] Fixes nasty cleanbot bug
2016-02-20 17:47:46 -05:00
40005aca32
Hope I didn't mess up here as I didn't branch off earlier changes.
2016-02-20 15:34:01 -07:00
001b575898
Merge pull request #15151 from CPTANT/laserfire
...
Laser beams may now set you on fire
2016-02-20 19:19:22 -03:00
9a33d27e05
Wooden chairs added. Inhands in WJohnston's pull. Fixed an issue with spawning to many sheets upon smashing.
2016-02-20 14:25:29 -07:00
00b10a2dc1
updates revenant objectives
2016-02-20 16:13:06 -05:00
1485297a64
Fixes dme, can't store knife
2016-02-20 14:57:06 -06:00
83ec0ed002
Merge remote-tracking branch 'refs/remotes/tgstation/master' into techno_alchemist
...
# Conflicts:
# icons/mob/inhands/items_lefthand.dmi
# icons/mob/inhands/items_righthand.dmi
2016-02-20 14:49:30 -06:00
4390482fac
Merge branch 'Shadowlight213-Soundflip' into HEAD
...
Closes #15502
2016-02-20 16:00:11 -03:00
07565ffaa5
Reverses Announcement sound pref to hopefully fix it starting off.
2016-02-20 15:59:15 -03:00
9eb1ff8274
Merge pull request #15625 from phil235/WearmaskInternalIconFix
...
Fixes internals not being turned off immediately when adjusting your mask off
2016-02-20 15:03:16 -03:00
4b7438e39f
Revenants now have toggleable nightvision.
...
Revenants now have an essence HUD.
Revenants now retain essence cap from the previous revenant, minus perfect souls.
Restructured revenant code to be less all over the place
Moved Harvesting to revenant_abilities.dm
Defile has slightly more range, but does less damage to windows.
Blight kills shrooms and vines slightly faster.
2016-02-20 13:01:25 -05:00
0c0d30a0f0
Merge pull request #15640 from tkdrg/kinder_egg_coding
...
Fixes the nar-sie event the right way.
2016-02-20 11:32:05 -06:00
ceb9af945c
Removes typo.
...
Makes Load Template verb get turf after input.
2016-02-20 18:12:20 +01:00
5f92894e70
removes firestacking
2016-02-20 16:47:39 +01:00
6563543b5f
VV path edit will now use spawn-style dialogs
2016-02-20 12:09:16 -03:00
f81e52c164
Merge pull request #15605 from phil235/StreamSpray
...
Spray bottles now have a "stream" mode toggled by clicking the bottle.
2016-02-20 11:56:33 -03:00
48e9fb731f
Adds missing ..() in SSU New
2016-02-20 15:39:15 +01:00
1a59dbaee1
Fixes Experimentor runtime
2016-02-20 15:39:15 +01:00
77ee2ded62
Renames click intercept method to avoid collision with ClickOn
2016-02-20 15:39:14 +01:00
63a6021aa7
Changes a toilet attack message span and changes few instances where using "you" is possible.
...
Fixes #15637
2016-02-20 15:53:30 +02:00
0c55904f2a
Merge pull request #15623 from Core0verload/runtime
...
Fixes a spacewalking runtime
2016-02-20 10:00:05 -03:00
a51c987ae2
Merge pull request #15589 from KorPhaeron/weather2
...
Fixes up weather performance
2016-02-20 09:31:12 -03:00
29ffc7ef16
Merge pull request #15213 from xxalpha/future
...
Kinetic accelerators automatically reload.
2016-02-20 09:06:51 -03:00
734e57828f
Fixes the nar-sie event the right way.
...
Weight 0 events still run for some stupid reason, they're just rare.
2016-02-20 08:46:02 -03:00
Robustin
Cheridan
tkdrg
Joan Lung
phil235
AnturK
KazeEspada
KorPhaeron
YotaXP
Boredone
Shadowlight213
AnturK
CPTANT
kingofkosmos