Commit Graph
10396 Commits
Author SHA1 Message Date
TheDZD f39d78af1d Merge pull request #2702 from ZomgPonies/nations221
Nations 2.2.1
2015-12-01 15:03:35 -05:00
ZomgPonies c7608bdacf Forgot a spare world 2015-12-01 03:44:51 -05:00
ZomgPonies 6e194ca5cf Fixed bugs 2015-12-01 03:29:46 -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
Fox-McCloud a3f7fe2c00 removed max() 2015-11-30 02:15:46 -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
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 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
Fox-McCloud ee93c40799 Small Cash Update 2015-11-28 15:40:20 -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
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 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 57fafeea47 random seeds 2015-11-25 23:12:44 -05:00
ZomgPonies 3cb7ec5e08 Bunch of robutt stuff 2015-11-25 22:41:09 -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 b0c3369af0 Fixes meteor gamemode 2015-11-25 12:57:10 -05:00
Fox-McCloud 52d13d6035 more tweaks 2015-11-25 02:42:13 -05:00
Fox-McCloud a5b9f5f78e Adds in Aloe Vera and Comfrey 2015-11-25 01:37:58 -05:00
Fox-McCloud 6e4817fdce Merge remote-tracking branch 'upstream/master' into plushies 2015-11-24 21:34:29 -05:00
Aurorablade 1e83404b80 Merge remote-tracking branch 'refs/remotes/ParadiseSS13/master' into FixyFixy 2015-11-24 21:17:35 -05:00
TheDZD 0f48177082 Merge pull request #2637 from Tastyfish/path_cleanups
Cleaned up /datum/effect/system paths & some bad path defines
2015-11-24 19:59:46 -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 8ee8eb0234 Merge pull request #2636 from ZomgPonies/action
Adds action figure toys
2015-11-24 17:13:38 -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
Aurorablade 8f3727b35d silly ghosts, you do not step on glass... 2015-11-24 15:42:09 -05:00
Certh 80f64e73df Fixed text error when using blueprints 2015-11-24 16:19:11 +01:00
Tigercat2000 b37d04d567 Fix tank UI bugs. 2015-11-24 07:08:02 -08:00
Certh 1ce08fee64 Tiny grammar fix 2015-11-24 16:03:16 +01:00
ZomgPonies 0a318a445f Makes them spawn randomly in the arcade machines 2015-11-23 21:55:20 -05:00
Fox-McCloud d38e48f74c oops 2015-11-23 21:23:14 -05:00
Fox-McCloud f21b29f260 Adds Plushise--Arcade Changes 2015-11-23 20:54:41 -05:00
ZomgPonies 01b8abb030 Forgot to call parent 2015-11-23 16:03:56 -05:00
ZomgPonies ca7103090b Compile fix 2015-11-23 15:33:41 -05:00
ZomgPonies 259e6eaeac Barber goes to Servicion 2015-11-23 15:17:42 -05:00
ZomgPonies 7879aefeeb Removes access requirements from all station doors on kickoff 2015-11-23 15:15:06 -05:00
ZomgPonies 0aa20e2eeb Minor nations bug fixes 2015-11-23 14:32:48 -05:00