Commit Graph

4914 Commits

Author SHA1 Message Date
Fox-McCloud
0bbd8ea8d2 Botany QoL Changes 2015-11-30 20:03:59 -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
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
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
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
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
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
a462fb21e0 Minor fixes. 2015-11-23 12:18:35 -05:00
Aurorablade
677b38304d well this escalated quickly 2015-11-22 23:16:30 -05:00
ZomgPonies
8093818847 Adds action figures 2015-11-22 19:48:38 -05:00
Tastyfish
85d651b781 refactored datum/effect/system because it was a complete mess 2015-11-22 19:43:01 -05:00
ZomgPonies
ac38463ce6 changed update_icons to update_mutations 2015-11-22 18:52:57 -05:00
ZomgPonies
3d7004af3d HULK fixes 2015-11-22 14:35:37 -05:00
Fox-McCloud
3662431862 Fixes Wood Amounts 2015-11-21 22:57:23 -05:00
TheDZD
740e5304fd Merge pull request #2613 from ZomgPonies/nations2
Nations 2.1
2015-11-21 22:20:39 -05:00
Fox McCloud
be192d6037 Merge pull request #2624 from Tastyfish/atmos_radios
Gave LSS's engineering channel on SB radios, fixed turbine exhaust pump
2015-11-21 21:27:24 -05:00
TheDZD
13efd8eeae Merge pull request #2611 from Fox-McCloud/porta-seeder
Re-Adds Portaseeder
2015-11-21 21:27:12 -05:00
Tastyfish
83f8ba9b72 Gave atmos techs access to :e on station bounced radios 2015-11-21 16:04:19 -05:00
ZomgPonies
66202ff4b6 Bugfixes 2015-11-21 10:46:16 -05:00
Tigercat2000
d2ea2ae2e1 Fix pAI interface (somewhat) 2015-11-20 21:23:31 -08:00
TheDZD
0e33b7b65e Merge pull request #2610 from Fox-McCloud/bags-and-qol
Chemistry and Bio-Bags and Xenobio QoL
2015-11-20 20:45:15 -05:00
TheDZD
c338c094fa Merge pull request #2602 from Fox-McCloud/sofas-and-barber-chairs
Adds in Ability to Makes Sofas and Barber Chairs
2015-11-20 19:46:53 -05:00
TheDZD
bbab399d6e Merge pull request #2599 from Fox-McCloud/thanksgiving-food
Thanksgiving Update
2015-11-20 19:46:47 -05:00
ZomgPonies
bd0dd2ab4b Added Peacekeeper borgs, removing thermals, giving them blue eyes, etc 2015-11-20 19:21:39 -05:00
ZomgPonies
589239f3cd Make combat borg shield only need inv to be active 2015-11-20 19:04:49 -05:00
ZomgPonies
b8b7075780 Typo 2015-11-20 18:38:06 -05:00
ZomgPonies
d3db1a7fe9 Combat borg shields block flashes when active 2015-11-20 18:36:04 -05:00
Fox-McCloud
3e4059728f Re-Adds Portaseeder 2015-11-20 00:26:51 -05:00
Fox-McCloud
edf2bfc4fc Chemistry and Bio-Bags and Xenobio QoL 2015-11-19 20:38:07 -05:00
TheDZD
bcdcfe728b Merge pull request #2603 from Fox-McCloud/rcs-exploit-fix
Fixes RCS Teleport Exploit
2015-11-19 20:14:07 -05:00