TheDZD
ee9a243b92
Merge pull request #2667 from Regen1/hair_fix
...
Readds the old ponytail style
2015-11-27 17:45:03 -05:00
TheDZD
733dcac24a
Merge pull request #2663 from FalseIncarnate/master
...
Weaponized Botany Changes
2015-11-27 12:28:48 -05:00
TheDZD
c4fc723c0d
Merge pull request #2665 from Fox-McCloud/slime-potions
...
Ports over TG Sentience Potion
2015-11-27 12:27:35 -05:00
Fox-McCloud
81d3019192
fix
2015-11-26 18:28:19 -05:00
Regen
3972b3bfa3
Readds the old ponytail style
...
A lot of people seemed to miss it, and it's not like it was hurting
anyone.
(IAMSORRYFORTHEDBPROBELSDZD)
2015-11-26 21:49:20 +01:00
TheDZD
13eb0f6723
Merge pull request #2655 from Fox-McCloud/poultices
...
Adds in Aloe Vera and Comfrey and Random Seeds
2015-11-26 12:11:26 -05:00
Fox-McCloud
59a929cd34
Ports over TG Sentience Potion
2015-11-26 12:08:16 -05:00
FalseIncarnate
acc8498d62
Fruit Weapon Targetting Fix
...
Fixes fruit weapons not properly targeting the intended limb and thus
not properly checking protection from stinging.
2015-11-26 02:21:48 -05:00
FalseIncarnate
7702b5957d
Weaponized Botany Changes
...
HEAVILY nerfs spreading plants!
- Spread chance cut down by 66%
- In general, plants will spread slower, meaning they won't outpace a
goat wielding a scythe and plant-killer grenades.
- Spread distance cut down by AT LEAST 66%
- TRAIT_SPREAD 1 plants (glowshrooms) will spread to a maximum distance
of (TRAIT_POTENCY * 0.1)
- TRAIT_SPREAD 2 plants (kudzu) will spread to a maximum distance of
(TRAIT_POTENCY * 0.6) if they are vines or biomass growth_type (most
common types)
- TRAIT_SPREAD 2 that have the "worms" or "mold" growth_type will spread
to a maximum distance of (TRAIT_POTENCY * 0.3)
Buffs spreading plants!
- Spreading plants with thorns or stinging will now properly attempt to
affect anyone who walks over them!
- Wearing shoes gives you a 50% chance to avoid being affected by thorns
and stings
Rewrites stinging plant defenses and logic
- Stinging plants now will target a specific limb/body part and check
for the appropriate clothing coverage
- Spreading plant stings will only target legs and feet
- Picking up stinging fruit will only target hands
- Being hit with a stinging fruit will target the hit limb
- THICKMATERIAL clothing from hardsuits and biosuits will protect from
stings that target areas they cover
- Clothes will protect their covered areas from stings
- Protecting the head requires covering the eyes and mouth with either
the helmet or glasses/masks
- If you aren't fully protected in the target area, you get stung.
Fruit with thorns and/or stinging now properly apply their effects when
thrown or used as melee weapons
- Still requires HARM intent to use fruit as a melee weapon instead of
feeding it to the target
- Stinging fruit will check the hit area for protection
- Stinging fruit will crumble into dust if it uses up all its reagents.
- Stringing fruit still has a chance to break on hit even while it has
reagents left.
2015-11-26 01:27:21 -05:00
Fox McCloud
b1e915f266
Merge pull request #2662 from ZomgPonies/borg
...
Bunch of robutt stuff
2015-11-25 23:38:49 -05:00
Fox McCloud
4556878f96
Merge pull request #2658 from SvartaSvansen/char-setup-fix
...
Fixes a couple character setup issues
2015-11-25 23:17:21 -05:00
ZomgPonies
3cb7ec5e08
Bunch of robutt stuff
2015-11-25 22:41:09 -05:00
ZomgPonies
7b538b80a6
Fuck Race Conditions
2015-11-25 21:20:45 -05:00
TheDZD
d79c278fce
Merge pull request #2625 from Aurorablade/FixyFixy
...
[Fix] Ghost in the Swarming Shell
2015-11-25 20:06:39 -05:00
TheDZD
7048dce1a2
Merge pull request #2657 from ZomgPonies/nations6
...
Nations 2.1.3 bugfix + other bugfixes
2015-11-25 20:04:33 -05:00
TheDZD
1b5b56f1ac
Merge pull request #2656 from RudiPardieck/master
...
Fix for harm intent not working on white ui
2015-11-25 19:55:14 -05:00
ZomgPonies
8157f9e1db
To make DZD joyous
2015-11-25 19:50:55 -05:00
ZomgPonies
ca8d675a94
world.view
2015-11-25 19:41:23 -05:00
ZomgPonies
a3969051d7
Fixes HUD overlays, a runtime with borgs AND AI sec/medhuds
2015-11-25 19:30:30 -05:00
TheDZD
de1a8e4aba
Merge pull request #2650 from Regen1/more_hair
...
Adds more hair, changes one old hairstyle
2015-11-25 18:47:26 -05:00
Regen
ea79370a5c
Updates hair, adds some new hairstyles
...
Updates the old female ponytail
Old: http://puu.sh/lx6OA/690c0fc93c.png
New: http://puu.sh/lx76U/a83c6bb515.png
changes the name of the male ponytail from "Ponytail1" to Ponytail male
Changes ponytail 3 to ponytail alt
Adds the High ponytail and the Wisp
2015-11-26 00:27:24 +01:00
SvartaSvansen
3331a39cc8
Vulp tails need love.
2015-11-25 17:13:51 -05:00
SvartaSvansen
1e36372d3e
Icon names gotta match.
2015-11-25 17:08:52 -05:00
ZomgPonies
a94e4651d4
Replace one typo by another gg
2015-11-25 15:05:38 -05:00
ZomgPonies
428db7a842
Fixes enemy communications
2015-11-25 15:04:22 -05:00
ZomgPonies
e803647ac6
Fixes shield overlays
2015-11-25 12:56:46 -05:00
Fox-McCloud
a5b9f5f78e
Adds in Aloe Vera and Comfrey
2015-11-25 01:37:58 -05:00
Fox McCloud
b092cb7d45
Merge pull request #2644 from ZomgPonies/intercept
...
Allows for command reports to come from other people than centcom
2015-11-24 21:46:58 -05:00
TheDZD
0d6e53b871
Merge pull request #2639 from Fox-McCloud/relic-alteration
...
Makes Relic Spawn Different Animals
2015-11-24 21:40:05 -05:00
TheDZD
e010621101
Merge pull request #2643 from Fox-McCloud/research
...
Minor Research Tweaks
2015-11-24 21:39:40 -05:00
TheDZD
3211ba3a28
Merge pull request #2646 from Fox-McCloud/soy-sauce
...
Soy Sauce Recipe Change
2015-11-24 21:39:33 -05:00
Fox McCloud
c7ae3c0233
Merge pull request #2640 from FalseIncarnate/master
...
Random Chem Blacklists, Strange Plant Fixes
2015-11-24 21:38:22 -05:00
Aurorablade
08736da14c
yet more conflict fixes.
2015-11-24 21:33:23 -05:00
Aurorablade
1e83404b80
Merge remote-tracking branch 'refs/remotes/ParadiseSS13/master' into FixyFixy
2015-11-24 21:17:35 -05:00
Aurorablade
a8fa0e38df
Conflict fixing
2015-11-24 21:16:53 -05:00
Tastyfish
317760a7de
Merge remote-tracking branch 'upstream/master' into path_cleanups
...
Conflicts:
code/modules/examine/descriptions/atmospherics.dm
2015-11-24 18:05:01 -05:00
TheDZD
3d8ebd680a
Merge pull request #2633 from ZomgPonies/hulk
...
HULK fixes and balance
2015-11-24 16:47:35 -05:00
TheDZD
41765152a0
Merge pull request #2642 from ZomgPonies/nations5
...
Nations 2.1.2 bugfix
2015-11-24 16:45:25 -05:00
TheDZD
dcb387e61d
Merge pull request #2647 from RudiPardieck/master
...
Corrected some spelling errors in the examine descriptions
2015-11-24 16:44:37 -05:00
Aurorablade
8f3727b35d
silly ghosts, you do not step on glass...
2015-11-24 15:42:09 -05:00
ZomgPonies
fa84af4e22
Removes changes to RUN
2015-11-24 11:44:11 -05:00
Tigercat2000
b007c3cff7
Fix internals dropping exploit.
2015-11-24 07:07:52 -08:00
Certh
906d0d5a67
Tiny grammar fix
2015-11-24 14:32:48 +01:00
Certh
7d7a3dda1e
Corrected some spelling errors in the examine descriptions
2015-11-24 10:17:46 +01:00
Fox-McCloud
2ba8854329
Soy Sauce Recipe Change
2015-11-23 21:13:10 -05:00
ZomgPonies
e9df2e0627
Allows for command reports to come from other people than centcom
2015-11-23 18:13:47 -05:00
Fox-McCloud
52d277a400
Minor Research Tweaks
2015-11-23 17:29:15 -05:00
TheDZD
9afae90ee4
Merge pull request #2628 from Fox-McCloud/slime-extracts
...
TG Slime Extracts Port
2015-11-23 17:22:50 -05:00
TheDZD
56d2da55b8
Merge pull request #2629 from Fox-McCloud/fox-rest
...
Adds Fox Resting Sprite
2015-11-23 17:22:45 -05:00
ZomgPonies
0aa20e2eeb
Minor nations bug fixes
2015-11-23 14:32:48 -05:00
