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
e933220a36
Don't need \the with [src]
2016-02-21 19:53:53 -06:00
bde19dd8d4
paper cutters
2016-02-21 19:28:05 -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
1263e341a3
Adds a "Cursed Heart", a heart where you have to manually pump blood or you die.
2016-02-22 01:03:53 +00: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
583c2c3dea
Fixes
2016-02-21 15:46:16 -08:00
91839f5f70
Action buttons will now only update when needed instead of every Life().
...
The action buttons now update their icon instantly.
Fixes versions of pickup(),equipped() and dropped not calling the parent.
Fixes drone not being able to remove a defib from their storage.
You can now cycle the mime mask by clicking it in your hand.
The action buttons for hardsuit and hooded suits now only appears when you're wearing the suit.
Created two mob helper procs getBeltSlot() and getBackSlot().
Created /datum/species/proc/on_species_loss() to handle stuff when our race change, currently only used by jelly and slime race to remove their exotic blood from our reagents and to remove slime people's action buttons.
2016-02-22 00:34:59 +01:00
54e14878b1
Nerf the defib heavily
2016-02-22 10:10:32 +13:00
5daae812f7
Chameleon PDA, fixes
2016-02-21 12:04:38 -08:00
3e067441cd
Fixes hivelord core healing
2016-02-21 20:46:29 +01:00
b8a62ea54b
removes an unnecessary s
2016-02-21 19:28:49 +00: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
c8c0f5294f
Sanitizes a bunch of num inputs to be integers
...
This is mostly to plug href exploits causing wacky stuff like NaN.
2016-02-21 12:15:37 -03: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
89f07f0ab3
Chameleon Kit
2016-02-21 01:11:17 -08:00
576bc689bb
Merge branch 'master' of https://github.com/tgstation/-tg-station into PARANOIA
2016-02-20 22:13:10 -08:00
5d5d2427f4
temp
2016-02-20 22:12:25 -08: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
97feffe43c
Removes compile error
2016-02-20 22:07:02 -05:00
d3472dd45e
Minor refactor to girder code.
2016-02-20 22:04:46 -05:00
b4b3d5bc27
Fixes #15621
2016-02-20 21:50:59 -05:00
a3dc65bc74
Added projectile vomiting symptom.
2016-02-20 21:32:03 -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
d2c433d147
update
2016-02-20 17:10:06 -05: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
f0554d432d
Excess whitespace removal
2016-02-20 15:22:27 -06:00
0acaebb844
Cursed Revolver
2016-02-20 15:20:12 -06: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
Cheridan
Cheridan
tkdrg
Joan Lung
Remie Richards
phil235
AndrewJacksonThe2nd
oranges
AnturK
CosmicScientist
AnturK
KazeEspada
KorPhaeron
YotaXP
Mike Long
Boredone
Fox-McCloud
Shadowlight213