Commit Graph

1880 Commits

Author SHA1 Message Date
TheDZD 07021e506b Merge pull request #2699 from Fox-McCloud/botany-qol
Botany QoL Changes
2015-12-02 19:15:17 -05:00
Tastyfish 280fc65938 added cancel to more powers, hand tele, cleanups to others 2015-11-30 22:30:57 -05:00
Fox-McCloud 0bbd8ea8d2 Botany QoL Changes 2015-11-30 20:03:59 -05:00
Tastyfish e2f67a4260 fixed various inputs to be cancel-able 2015-11-30 01:06:20 -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
Aurorablade 1e83404b80 Merge remote-tracking branch 'refs/remotes/ParadiseSS13/master' into FixyFixy 2015-11-24 21:17:35 -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
Aurorablade 8f3727b35d silly ghosts, you do not step on glass... 2015-11-24 15:42:09 -05:00
Tigercat2000 b37d04d567 Fix tank UI bugs. 2015-11-24 07:08:02 -08: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 13efd8eeae Merge pull request #2611 from Fox-McCloud/porta-seeder
Re-Adds Portaseeder
2015-11-21 21:27:12 -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
Fox McCloud 8c1f11fb0b Merge pull request #2566 from Robertha89/master
Fixes invisible wrapping paper, sonic jackhammer not breaking walls and field surgery kit not fitting its own content
2015-11-18 21:26:23 -05:00
Robertha89 5c50d20d67 Fixes field surgical kits 2015-11-16 08:51:43 +01:00
Aurorablade bc7a0864d5 Merge remote-tracking branch 'refs/remotes/ParadiseSS13/master' into TooSpoopy 2015-11-16 01:15:41 -05:00
Tigercat2000 9186d94ba1 Merge remote-tracking branch 'upstream/master' into third_times_the_charm_questionmark
Conflicts:
	icons/mob/suit.dmi
2015-11-11 16:51:44 -08:00
Fox-McCloud bfac0b62fa Ports TG Pneumatic Cannon 2015-11-09 22:54:05 -05:00
Fox-McCloud 318c464f94 Aquarium Starter Kit 2015-11-08 07:38:09 -05:00
Tigercat2000 29f42f8b61 Merge remote-tracking branch 'upstream/master' into third_times_the_charm_questionmark
Conflicts:
	code/modules/mob/living/carbon/human/life.dm
	code/modules/mob/living/carbon/life.dm
	code/modules/mob/living/silicon/pai/life.dm
2015-11-07 20:54:24 -08:00
Aurorablade 51abacac93 Merge remote-tracking branch 'refs/remotes/ParadiseSS13/master' into TooSpoopy 2015-11-06 12:08:51 -05:00
Fox-McCloud 2335c6be9d Merge remote-tracking branch 'upstream/master' into barber-update 2015-11-06 06:30:59 -05:00
Fox-McCloud 17112cda3d barber update 2.0 2015-11-05 06:51:00 -05:00
Fox-McCloud 40a5abbb4a Barber Update 2015-11-05 02:04:46 -05:00
Fox-McCloud 4687620436 Adds Random Cigs 2015-11-04 22:47:18 -05:00
Aurorablade 600d351950 added in gib subtype 2015-11-02 20:54:34 -05:00
Aurorablade f9d96ffbf1 WIP commit
still working on the camera thing..
2015-11-01 01:19:35 -04:00
Tigercat2000 6c020780d9 Merge remote-tracking branch 'upstream/master' into third_times_the_charm_questionmark
Conflicts:
	code/modules/mob/living/carbon/human/life.dm
	code/modules/mob/living/carbon/life.dm
2015-10-29 19:29:28 -07:00
Aurorablade 570cfbe566 Spoopy 2015-10-29 12:32:38 -04:00
Tastyfish d0a16cb489 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise 2015-10-28 19:02:27 -04:00
Tastyfish 6fc9950e45 Gave space cash a proc get_total() to return value of stack, and fixed richest escapee scoreboard line to actually get bank account (was ref'ing phantom var) and get cash amount correctly. 2015-10-28 18:49:14 -04:00
Fox-McCloud a404929d16 Multiverse Sword 2015-10-21 23:59:59 -04:00
Tigercat2000 633a9e68b4 Merge remote-tracking branch 'upstream/master' into third_times_the_charm_questionmark
Conflicts:
	code/modules/mob/living/carbon/human/human.dm
	 ^ This shit is haunted. It's conflicted on two branches for 0
	 reason, the automatic merge wouldn't work on the fucking end of
	 file.
2015-10-19 16:13:51 -07:00
Fox-McCloud 33220548fc Fixes a Lipstick Runtime 2015-10-18 03:40:21 -04:00
Fox McCloud d6cb0f9075 Merge pull request #2365 from Crazylemon64/apc_autolathe
APC electronics refactor
2015-10-15 16:03:08 -04:00
Crazylemon 3c3f51401b Cuts out all the old weapon/module code
Also lets drones collect intercom electronics, and gives the autolathe
an APC electronics recipe
2015-10-13 21:13:49 -07:00
TheDZD dd97cc261d Merge pull request #2343 from Fox-McCloud/game-mode-cleanup
Removes Nations and Unused Gamemodes
2015-10-13 21:34:49 -04:00
Fox-McCloud 46f9f68f31 more de-referencing 2015-10-12 04:18:49 -04:00
Fox-McCloud 9795dc761b Removes Nations and Unused Game Modes 2015-10-11 19:51:19 -04:00
Fox-McCloud a2db4d118a why bay and tg why 2015-10-10 09:07:25 -04:00
Fox-McCloud 4c5706bc3a more...fixes 2015-10-10 08:52:35 -04:00
Fox-McCloud e17c6bde22 Another del->qdel pass 2015-10-08 16:49:10 -04:00