Commit Graph

19150 Commits

Author SHA1 Message Date
Tastyfish
280fc65938 added cancel to more powers, hand tele, cleanups to others 2015-11-30 22:30:57 -05:00
Tastyfish
897313844b Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into inputfix
Conflicts:
	code/modules/mob/living/silicon/robot/life.dm
2015-11-30 21:54:22 -05:00
TheDZD
6ed7724946 Merge pull request #2691 from Fox-McCloud/radiation-nerf
Rad Sickness Fix
2015-11-30 21:46:00 -05:00
Fox-McCloud
f215983fc5 fix not balance 2015-11-30 21:37:41 -05:00
TheDZD
aca9cf1650 Merge pull request #2694 from tigercat2000/fixes
Borg death fixes, human cleanup, carbon life tweaks
2015-11-30 19:46:54 -05:00
TheDZD
ff415212bf Merge pull request #2686 from ZomgPonies/nations22
Nations 2.2 -- Bookkeeping Boogaloo
2015-11-30 19:22:04 -05:00
TheDZD
42845228bb Merge pull request #2684 from Tastyfish/nanomaps
fixed nanoui maps positioning stuff wrong, atmos control having any alarms
2015-11-30 19:19:44 -05:00
Tigercat2000
b474b72ce5 Borg death fixes, human cleanup, carbon life tweaks 2015-11-30 07:16:35 -08:00
Aurorablade
2f28c537c4 Removes Null 2015-11-30 07:46:06 -05:00
Fox-McCloud
a3f7fe2c00 removed max() 2015-11-30 02:15:46 -05:00
Aurorablade
8b39fa3bb1 Fixes custom enemy communications 2015-11-30 01:25:12 -05:00
Tastyfish
b2abdd34c1 added input cancelling to pda msg, chemmaster ops, borg mod selection 2015-11-30 01:06:21 -05:00
Tastyfish
1627c6b124 made AI tracking cancel-able, fixed folder labelling 2015-11-30 01:06:21 -05:00
Tastyfish
e2f67a4260 fixed various inputs to be cancel-able 2015-11-30 01:06:20 -05:00
ZomgPonies
6988ea6624 Missing brackets 2015-11-29 23:25:32 -05:00
Fox-McCloud
4b35bdb3fa Rad Sickness Nerf 2015-11-29 21:26:26 -05:00
ZomgPonies
172cdef1cc Typo fix 2015-11-29 20:27:46 -05:00
ZomgPonies
a765d4587b Add the ability to choose a heir and for heir to takeover 2015-11-29 19:52:31 -05:00
ZomgPonies
127e0027e8 Clean up procs 2015-11-29 18:55:49 -05:00
ZomgPonies
9dca503d5b Ability for leaders to pick rank names for themselves and members 2015-11-29 18:30:02 -05:00
Tastyfish
559491810a fixed nanoui maps positioning stuff wrong, atmos control having any items 2015-11-29 17:50:17 -05:00
ZomgPonies
958c1dfcda Added one-time ability for leaders to rename nation 2015-11-29 17:29:15 -05:00
ZomgPonies
bb470d2955 Kickoff Nation leader picking 2015-11-29 16:56:11 -05:00
TheDZD
a915a5a0fb Merge pull request #2675 from Fox-McCloud/dwarves
Re-Adds Dwarf Mutation
2015-11-29 15:35:06 -05:00
TheDZD
6a558196ca Merge pull request #2678 from Fox-McCloud/mob-faction-fixes
Simple Animal Faction Fixes
2015-11-29 15:34:58 -05:00
TheDZD
a2f6204a8b Merge pull request #2679 from Fox-McCloud/cash-update
Small Cash Update
2015-11-29 15:34:48 -05:00
Fox McCloud
37520dac7a Merge pull request #2676 from FalseIncarnate/master
Item Plants, Grown Weapons, Botany Fixes/Changes
2015-11-29 15:31:45 -05:00
FalseIncarnate
a3570a36c9 Grammar Fixes, Less Shouting (still praising)
Converting a novaflower to it's weapon form now has only a 10% chance to
actually make you shout "PRAISE THE SUN!"
- Rest assured though, that you will still be praising the sun
internally when doing this even if you don't shout it.

Fixes some grammar mistakes on the cashpod results.
2015-11-28 17:22:01 -05:00
Fox-McCloud
ee93c40799 Small Cash Update 2015-11-28 15:40:20 -05:00
Fox-McCloud
36d5b7636f Simple Animal Faction Fixes 2015-11-28 14:28:27 -05:00
FalseIncarnate
f2c530a580 Item Plants, Grown Weapons, Botany Fixes/Changes
Botany plants can grow preset items, mobs, or fruit
- Turns out that the code for mob harvestables could be used almost
unchanged to support item harvestables
- Changed some variable names to better reflect this

Re-introduces the Egg Plant!
- Grow eggs to throw at the security officer who confiscated your
ambrosia!
- Mutant species of Eggplants
- Exactly the same as eggs laid by chickens, except they shouldn't hatch

Adjusts code and logic order to avoid a conflict with TRAIT_SPREAD
fruits that can be converted into other items
- Grass, aloe, and comfrey were either unable to be converted or unable
to be planted outside a tray if they had TRAIT_SPREAD due to logic
ordering
- You must now be in DISARM intent to plant spreading fruits
- Being in HELP or GRAB will attempt to convert the fruit into a
poultice or other item as appropriate.
- If the plant does not have TRAIT_SPREAD, you may also use DISARM to
accomplish this

Adds Money Trees!
- Literally grows money-filled fruit called Cashpods
- Fruit contains gold and silver reagents, or can be turned into space
cash by using it in-hand like grass or aloe
- Value of the resulting space cash is related to potency. Higher
potency = higher dosh!
- Eating the fruit doesn't give you money, but may fill you with guilt
(not really).
- Mutant species of lemons.
- When life gives you lemons...

Adds the ability to convert sunflowers and novaflowers into their
"weapon" forms
- Done exactly the same as converting grass, aloe, comfrey, or cashpods
(use in-hand on help/grab intent)
- Sunflower conversion is silent, though the item description changes
- Novaflower conversion is not silent. You'll know when it happens.
- Hitting someone with a sunflower (weapon form) or novaflower (weapon
form) will assault both parties with a green and yellow message. FLOWER
POWER!
- Hitting someone with a novaflower (weapon form) will increase their
body temperature, and may cause burns as a result
- Picking up a novaflower (weapon form) without gloves will cause burns,
but doesn't drop the flower.

COMPLETELY DELETES the code\objects\items\weapons\hydroponics.dm file
- This file was 90% commented out already, and I moved the remaining
code into code\modules\hydroponics\grown_inedible.dm for organization
- This affects the .dme by removing a single line as the file is no
longer included.
2015-11-28 02:56:59 -05:00
Fox-McCloud
c788811ae2 Re-Adds Dwarf Mutation 2015-11-28 01:29:47 -05:00
Fox McCloud
dfd7b410cb Revert "Readds the old ponytail style" 2015-11-27 23:31:09 -05:00
Fox McCloud
0b429d8538 Merge pull request #2673 from TheDZD/fixes
Assorted Fixes
2015-11-27 19:53:35 -05:00
TheDZD
2bf228d0fd - Fixes #2669
- Re-orders code in simple_animal/vox.dm death() to be the same as it was previously, so that the Vox Armalis actually display a visible_message on death.
2015-11-27 18:43:01 -05:00
TheDZD
dc94291235 - Fixes DNA injectors causing runtimes when injecting mobs with a null DNA var.
- Fixes statues and vox armalis simple_animal mobs causing infinite loops and crashing the mob controller on death.
- Fixes heavy lasers (and a few other unused projectiles) rotating incorrectly.
2015-11-27 18:23:39 -05:00
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
6e52aa2750 blocks statues 2015-11-27 01:43:11 -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
05e849a830 Merge pull request #2654 from Fox-McCloud/small-map-tweaks
Small Map Tweaks
2015-11-26 12:11:29 -05: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
Fox-McCloud
57fafeea47 random seeds 2015-11-25 23:12:44 -05:00