Commit Graph

7806 Commits

Author SHA1 Message Date
Tenebrosity
0851b341da - Removes the throwtapsound var from items. It was unnecessary.
- Thrown items play throwhitsound on impact. If no throwhitsound is defined, they play hitsound instead. If that isn't defined, they play genhit.ogg. The latter fixes \#2508. The volume of the sound is dependant on the item's throwforce and/or weight class.

- Adds 15 throwforce to the fireaxe, which previously had only 1.
2014-01-29 10:51:14 +13:00
fleure
6908a7194b Merge pull request #2501 from Tenebrosity/fallsounds
Adds sounds to falling over
2014-01-28 11:44:49 -08:00
fleure
6568ac61c8 Merge pull request #2516 from metaglog/condiment_fix
Fixes the names of reagents inside condiment bottles.
2014-01-28 03:52:26 -08:00
Tastyfish
7c021aafd7 Merge branch 'master' of https://github.com/tgstation/-tg-station into crates 2014-01-26 22:56:56 -05:00
Tastyfish
eb5c37beb8 Fixed the issue with newscasters where putting a single quote (') into the title of a channel broke posting messages to the channel due to mismatch of html encoding schemes. 2014-01-26 22:30:48 -05:00
fleure
bd85a001fc Merge pull request #2404 from Razharas/LingTransformFix
Ling transform fix
2014-01-26 12:34:56 -08:00
fleure
7009c447f1 Merge pull request #2393 from Balrog-was-here/inb4gambittraitor
[MAP] Syndicate playing cards and deck style support for playing cards
2014-01-26 12:19:11 -08:00
fleure
484b31ccea Merge pull request #2457 from Giacom/dart_fix
Fixes #2456 and new Add Reagent varedit option.
2014-01-26 11:06:46 -08:00
Balrog
461415430e Merge remote-tracking branch 'origin/master' into inb4gambittraitor
Conflicts:
	icons/obj/toy.dmi
2014-01-26 14:02:35 -05:00
fleure
fba7c32a5c Merge pull request #2455 from Rolan7/Issue297_Gib_Fix
Issue 297 Gibbing in pipes fix
2014-01-26 10:56:26 -08:00
Balrog
c5a2f28a47 Refactored card vars. Fixed some broken card deck instances on the map. 2014-01-26 13:55:57 -05:00
fleure
aed37f1498 Merge pull request #2425 from adrix89/Seer_change
see_invisible rework  in life
2014-01-26 10:45:26 -08:00
fleure
0b18696390 Merge pull request #2505 from Incoming5643/avastyeblobies
Blob Zombies
2014-01-26 10:18:31 -08:00
fleure
9cd4d36db9 Merge pull request #2495 from Jordie0608/bluecarpareslower
Holocarp, like normal but cooler and less corpsey.
2014-01-26 09:46:53 -08:00
fleure
5291fa4df6 Merge pull request #2450 from Cheridan/Magic
Husking someone as a changeling will now display the victim's notes.
2014-01-26 09:44:56 -08:00
metaglog
f0b063bbc4 Fixes the names of reagents inside condiment bottles. 2014-01-26 16:25:33 +01:00
Incoming
8f5bfaf872 The GiaPull™ 2014-01-25 16:47:32 -05:00
Incoming
e3e48ee9e1 Blob Zombies!
Blob spores that pass over the dead will now couple with the corpses to create blob zombies that are stronger and more resiliant than the spore alone. Should the blob zombie fall the original corpse is recovered and just as cloneable as it was before infection. These are simple animals not under the control of anyone.

Blob zombies will occur automatically if a blob finds a corpse under it and it's not already a zombie. Blob zombies have a base 80 health (normal blobs have 40) and gain additional health if the host body is wearing armor. They don't however actually gain the normal benefits of wearing the armor.

Blob zombies attack for 10 to 15 damage per strike, as opposed to the paltry 2 to 4 a hostless spore does.

Why this is good for the overmind:
The overmind cannot directly command the creation of zombies but can rally spores to a corpse's location to largely assure it will happen by itself. Blob zombies still follow rally spore commands and still count towards a factory blobs spore limit. As previously shown they're far more robust than spores and also deny the crew the ability to clone the victim until the zombie is defeated.

Why this is good for the crew:
Remember when the warden kamakazied the blob at the start of the round only to be engulfed and killed with the entire armory in his backpack? You can get those guns back now, because the warden's corpse will soon be moving to a very recoverable location! This also promotes not letting people die pointlessly to the blob or at least dragging corpses away from the blob (and hopefully to genetics) so they can't be infected.
2014-01-25 12:24:01 -05:00
Ergovisavi
cc738f7dcd Merge branch 'master' of https://github.com/tgstation/-tg-station into Gibtonium 2014-01-24 16:33:51 -08:00
fleure
8660698ce0 Merge pull request #2444 from Miauw62/somebodyfinallydoessomethingaboutnewlingsuckingpleaselickmyfeetnow
Adds changeling arm blades
2014-01-24 12:49:05 -08:00
fleure
5a4441831e Merge pull request #2473 from Giacom/reagent_mix_alpha
Reagents can now mix their alpha color.
2014-01-24 11:53:42 -08:00
fleure
277a33c184 Merge pull request #2482 from Tenebrosity/throwsounds
Thrown objects play throwhitsound
2014-01-24 11:37:06 -08:00
fleure
e8573cc416 Merge pull request #2373 from RobRichards1997/14/01/2014-Bug-Fixes
Robotic Repair Missing fixes [Fixes #2326]
2014-01-24 11:17:54 -08:00
fleure
7abb6d1af4 Merge pull request #2484 from Giacom/bloody_hands_so_real
You can now properly clean your hands of blood. Fixes #2258.
2014-01-24 11:15:32 -08:00
Jordie0608
b143783881 Holocarp, like normal but cooler and less corpsey. 2014-01-25 04:11:10 +11:00
Tenebrosity
5965772782 Adds sounds to falling over
Resting and buckling are still silent.
2014-01-24 15:12:24 +13:00
Tenebrosity
e4739afc44 Item throwtapsound var for forceless objects 2014-01-23 23:07:24 +13:00
Tenebrosity
b77434b1cb Items now have a throwhitsound var
If throwhitsound isn't defined, a thrown item calls the hitsound
instead. If that isn't defined, no sound is played.

Circular saw now calls pierce.ogg as its throwhitsound instead of its
hitsound.
2014-01-23 16:37:54 +13:00
EuroNumbers
31d4f16e62 Fixes incompabilities of ban DB with Linux system
ALWAYS USE LOWERCASE
2014-01-22 23:58:57 +01:00
Giacomand
4b51e6d386 Merge branch 'master' of https://github.com/tgstation/-tg-station into pr/2371 2014-01-22 20:01:11 +00:00
Giacomand
6a497b98ad Added the SetEmagged proc, for cyborgs, and replaced code to use it.
Added get_inactive_modules and get_usable_modules procs to use while looping through the cyborg's modules.
The cyborg's storage screen will now shrink if there is an empty row.
Added a new on_emag proc for modules, which is called when the module is emagged. Miner borgs use it to replace their borg drill for a diamond one.
Fixes a runtime where there is no client to update the hud.
Fixes a bug where if you emag a cyborg with no module and when they choose a miner they do not receive their diamond drill.
2014-01-22 20:00:39 +00:00
Giacomand
86d4d5307a You can now properly clean your hands of blood. Fixes #2258.
When you touch an item, to spread the blood, it would take the "bloody_hands" to 0; which is checked if true while you wash your hands. I limited it to only go down to 1, so it will still be true unless you wash your hands.
Fixed an issue where blood_DNA was being cleared before the blood_hands variable was being set to 0. Now you can properly hide your bloody hands with gloves and when you take them off the hands will still be bloody.
Removed an unused variable.
Set the bloody_hands_mob to null where it was appropriate.
The amount of blood you can transfer to other items, when you touch them, will be a little random for variety.
Revive() will now heal your hallos damage.
2014-01-22 17:42:36 +00:00
Miauw
4bdffc2dc3 Merge branch 'master' of https://github.com/tgstation/-tg-station into somebodyfinallydoessomethingaboutnewlingsuckingpleaselickmyfeetnow
Conflicts:
	icons/mob/items_lefthand.dmi
	icons/mob/items_righthand.dmi
2014-01-22 17:01:20 +01:00
fleure
da5ef34c29 Merge pull request #2461 from JJRcop/nuke-toy-tweaks
Nuke toy tweaks
2014-01-22 07:52:13 -08:00
Tenebrosity
da8838d411 Throw impacts play the thrown object's hitsound 2014-01-23 02:29:39 +13:00
Cheridan
290180dec8 Merge pull request #2387 from MrPerson/Animation_OLD
Mobs use animate() to rotate
2014-01-21 20:39:12 -08:00
Cheridan
b583b83608 Merge pull request #2466 from Incoming5643/slimetime
Slime refactoring fixes
2014-01-21 20:17:00 -08:00
Incoming
eb8454006f Fixes dark purple, dark blue, and light pink slimes not working right because of their spaces 2014-01-21 20:00:30 -05:00
MrPerson
9058921972 Merge branch 'master' of https://github.com/tgstation/-tg-station into Animation_OLD
Conflicts:
	code/game/objects/items/weapons/shields.dm
	code/modules/events/ninja.dm
	code/modules/mob/living/carbon/human/update_icons.dm

No more cloakers, no more cloak_stacks. Also removed that silly "I'll make an icon and then make an image of that icon" bullshit.
2014-01-21 15:19:27 -08:00
Pete Goodfellow
9a8edff524 Merge fix. Updated to MetaStation.v39B.II.dmm 2014-01-21 21:57:10 +00:00
JJRcop
36ec9cbb6b Nuke toy no longer uses process and instead uses sleep
I don't know what I was thinking with the process, oh well!
2014-01-21 16:52:10 -05:00
Pete Goodfellow
d80719c330 Merge branch 'tg-mapchange' of github.com:Mloc/-tg-station into mapsss
Conflicts:
	_maps/RandomZLevels/fileList.txt
	_maps/map_files/MetaStation.v39A.III.dmm
	maps/MetaStation.v39A.III.dmm
	maps/MetaStation.v39B.II.dmm
	tgstation.dme
2014-01-21 21:50:32 +00:00
JJRcop
0e45022798 Resolved more conflicts with drying rack before being pulled
Conflicts:
	code/modules/hydroponics/seeds.dm
	icons/mob/items_lefthand.dmi
	icons/mob/items_righthand.dmi
	icons/obj/hydroponics.dmi
Readded missing file changes to icons/obj/harvest.dmi
2014-01-21 13:01:53 -05:00
Giacomand
f71cc6fde1 Reagents can now mix their alpha color.
Changed water to a grey very transparent colour, so real. This also means when you water down reagents you can see them becoming very transparent, extra real!
Changed the plasma reagent's colour to look a little better.
Changed the icon of the reagent filling overlays so that they didn't mess up the colours so much.
Added a new "invisible powder" reagent which you can get by grinding the mime's crayon, this powder has no colour and has no alpha.
2014-01-21 16:06:28 +00:00
Robson Richards
1ff14a5fcf Adds item_heal_robotic() - a way for items to trigger robotic limb heal procs without copy-paste 2014-01-21 07:38:46 +00:00
Incoming
bb767ead76 Another minor fix to the slime refactor commit. Splitting adult slimes weren't surviving correctly. Revive to the rescue. 2014-01-20 23:08:59 -05:00
Ergovisavi
c1fa50976b Merge branch 'master' of https://github.com/tgstation/-tg-station into Gibtonium 2014-01-20 17:48:38 -08:00
Cheridan
e0680a509e Merge pull request #2449 from Razharas/SlimesAndWindows
Fixes metr-err- i mean slimes
2014-01-20 17:25:31 -08:00
Incoming
a0752b8665 Fixes an oversight in slime reproduction 2014-01-20 18:20:12 -05:00
Rolan7
5d931d70ef Larvae who chestburst while their host is swallowed are now properly added to stomach_contents, so they can be regurgitated. As are the gibs from the gibbing.
Tidied up the loop in alien_powers.dm
2014-01-20 15:43:43 -05:00