844530baff
Cuts magboots cost, reduces useless comments
...
Merge conflict solve attempt #1
changelog
Cuts gadget prices across the board
Squashes commits
2015-07-22 17:09:10 +01:00
2d6585fe47
Merge pull request #10714 from Cheridan/miauw_you_butthead
...
Character Limit Fix
2015-07-20 09:26:51 +02:00
1c05fbcf6a
Merge pull request #10450 from phil235/MechRefactoring
...
Mech code refactor
2015-07-20 02:00:11 -05:00
b2f9be0e29
Merge pull request #10689 from tgstation/revert-10345-HoSArm
...
Revert "[BALANCE] HoS/ERT/DS Armour Buff | Revolver Armour Piercing"
2015-07-20 02:09:38 -03:00
bcaefd28a2
Merge pull request #10675 from phil235/SlaughterDemonFixes
...
Slaughter demon fixes and Summoning limit
2015-07-19 23:24:51 -05:00
a3b0ff8aa0
Merge pull request #10603 from xxalpha/smoothballs
...
Removed spawn from smooth() proc.
2015-07-19 18:56:02 -05:00
39f6962642
Character Limit Fix
...
#9902 replaced /proc/strip_html_properly but the new code didn't actually have the character length check that the proc had.
I don't know if trim() is the best place for it or to put it in its own proc but I assume this was Miauw's intent because he is passing max_length into it.
2015-07-19 17:06:47 -05:00
81255953c7
Merge pull request #10690 from duncathan/atmoshotfixes
...
Fixes manual valve sprites and n2o scrubbing AND ventcrawling too now
2015-07-19 22:45:54 +02:00
7be382cd7f
fixes ventcrawling; minor cleanup of a couple other things
2015-07-19 13:13:51 -06:00
001dd150e0
Merge pull request #10655 from MMMiracles/TWANG
...
Adds a 'TWANG' sound effect for guitars
2015-07-19 13:34:40 -04:00
2d3c289234
Merge pull request #10642 from MMMiracles/flukeops
...
removes conspiracy theory
2015-07-19 13:31:54 -04:00
b96c98d1b6
Merge pull request #10709 from cdepatie/patch-1
...
saving atmos one letter at a time
2015-07-19 13:30:25 -04:00
a2f338cabf
Merge pull request #10343 from GunHog/Borgie_Lights
...
[Review] Cyborg headlamps!
2015-07-19 19:26:09 +02:00
687bfb2f71
Merge pull request #10094 from KorPhaeron/multiverse
...
Multiverse Sword Artefact/"There Can Be Only Me" admin verb (Ready to Merge)
2015-07-19 19:19:05 +02:00
fd833342cf
Removes processing from multisword
...
Thanks Miauw
2015-07-19 12:08:47 -05:00
b5131b49dd
saving atmos one letter at a time
...
fixes a typo that prevents the nanoUI coming up when interacting with the gas mixer
2015-07-19 12:28:41 -04:00
0f244730bc
Merge pull request #10626 from Ikarrus/lizardmov
...
AI Module Updates
2015-07-19 18:06:06 +02:00
1ba58674c7
Multiverse fixes, objective tweaks, no traitor status for clones
2015-07-19 08:55:05 -05:00
da804d3a28
Improves code
...
- Links lamp button to the borg's mob for simpler updating.
- Changes intensity formula to some sort of...modulo thing that somehow
works.
2015-07-19 02:04:11 -05:00
c8a1b71bd9
Support Shadowling Veil (again)
...
- Re-add veil support.
2015-07-18 22:10:45 -05:00
f4407871ab
Merge remote-tracking branch 'remotes/upstream/master' into Borgie_Lights
...
Conflicts:
code/game/gamemodes/shadowling/shadowling_abilities.dm
2015-07-18 21:56:25 -05:00
e305dafdfa
Additional tweaks
...
- Now supports Shadowling's Veil ability.
- Fixed lamp button not updating properly when forcibly disabled.
- (Poorly) fixed cyborg eyes not glowing after recovering from a stun.
2015-07-18 21:39:31 -05:00
b194b1e4af
the comment in filters too, why not
2015-07-18 14:45:48 -06:00
104c1349a1
fixes manual valve sprites and n2o scrubbing
2015-07-18 14:22:53 -06:00
d39a2ef5db
Revert "[BALANCE] HoS/ERT/DS Armour Buff | Revolver Armour Piercing"
2015-07-18 07:51:17 -05:00
97f9d909f1
Merge pull request #10606 from optimumtact/remove_singularity_for_teg
...
Remove the singularity from box and meta, replaced with TEG setups
2015-07-17 22:26:23 -05:00
57b05f5a18
Merge pull request #10493 from phil235/SmokeFoamBuff
...
Foam&Smoke buff, some tweaks to sorium/ldm effect, plus some fixes.
2015-07-18 03:45:38 +01:00
e4c8928de1
Merge pull request #10656 from phil235/DroneBuckleDropFix
...
Fixes buckled drones dropping what they're holding in their hands
2015-07-17 21:40:32 -05:00
4981cc19cb
Merge pull request #10599 from RemieRichards/ChangelingBuffs
...
Changeling Buff
2015-07-17 21:35:03 -05:00
77c4ad733d
Merge pull request #10593 from MrStonedOne/LifeSupportFailureCheckOxygenLevelsAtOnce
...
Scrubber Re-balance
2015-07-17 19:51:42 -05:00
9394e570ae
Merge pull request #10643 from KorPhaeron/soundfix
...
Fixes sounds cutting out halfway
2015-07-18 00:03:23 +01:00
f4b267ac74
Fixed scrubbers runtiming
2015-07-17 15:48:21 -07:00
9e8440988d
Merge pull request #10677 from duncathan/atmoshotfixes
...
Fixes heaters/freezers and cryo tubes
2015-07-17 23:06:22 +02:00
a4a7c21744
Merge pull request #10653 from phil235/Fixarino
...
Three simple fixes again
2015-07-17 15:49:41 -05:00
242c3e9f2f
Merge pull request #10634 from Iamgoofball/patch-101
...
Buffs the Bioterror Chem Sprayer
2015-07-17 15:43:08 -05:00
423abf3355
fixes heaters/freezers and cryo tubes
2015-07-17 14:39:59 -06:00
41890b2845
Merge pull request #10637 from phil235/ShowerBurnFix
...
Shower Fix
2015-07-17 15:34:29 -05:00
ec2bd1d268
Merge pull request #10633 from phil235/DrinkingGlassPourFix
...
Some simple fixes
2015-07-17 15:22:20 -05:00
76ee0a3e1a
Fixes typo in a slaughter demon message.
...
Fixes slaughter demon icon upon being admin healed/revived.
Add the limit var to datum/spellbook_entry to limit the amount of times it can be bought by the wizard. It's currently only used to limit wizard from summoning more than 3 slaughter demons.
2015-07-17 21:36:58 +02:00
4eedf27627
Makes SWAT helmets space-proof again.
2015-07-17 14:59:47 -04:00
2f255406ac
Gives the large portable scrubber 3x3 scurbbing power
...
Also fixes portable scrubbers a bit
Conflicts:
code/ATMOSPHERICS/components/unary_devices/vent_scrubber.dm
2015-07-16 20:13:02 -07:00
bcbd4da656
Merge branch 'master' of https://github.com/tgstation/-tg-station into lizardmov
...
Resolved Conflicts:
code/game/objects/items/weapons/AI_modules.dm
2015-07-16 20:10:20 -06:00
ed1d1c1919
Merge pull request #10620 from AnturK/mimic_fixes
...
Morph Fixes
2015-07-17 00:27:59 +02:00
f1a2385443
Morph Fixes
2015-07-16 21:50:11 +02:00
0f37ac3c14
Merge pull request #10601 from xxalpha/nightmaregoggles
...
Fixed t-ray goggles not updating pipes&cables correctly.
2015-07-16 19:52:22 +02:00
7cd4a09ed7
Merge pull request #10592 from AlexanderUlanH/tables
...
Brings Tabling in line with newer stuns
2015-07-16 19:38:14 +02:00
9463dd7e70
Merge pull request #10613 from Ikarrus/rwindow-heat
...
Reinforced windows and windoors are a bit more resistant to fires and blasts
2015-07-16 18:42:45 +02:00
3537d754b3
Merge pull request #10345 from Steelpoint/HoSArm
...
[BALANCE] HoS/ERT/DS Armour Buff | Revolver Armour Piercing
2015-07-16 11:29:22 -04:00
a93dde3034
Merge pull request #10384 from Steelpoint/GasMask
...
[BALANCE] Reduces Weight Size of Sechailer Gas Mask
2015-07-16 11:25:13 -04:00
236215b03c
Fixes damp rag smothering
2015-07-16 17:20:08 +02:00
Dorsisdwarf
Swag McYolosteinen
Cheridan
Aranclanos
Cheridan
phil235
duncathan
WJohn
KorPhaeron
Caden Depatie
GunHog
Remie Richards
MrStonedOne
phil235
MMMiracles
Ikarrus
AnturK