Commit Graph

532 Commits

Author SHA1 Message Date
ma44 420f83f14d Update hydroitemdefines.dm (#20101) 2016-08-25 18:26:38 -05:00
NikNakFlak fab4bcfeab Merge remote-tracking branch 'upstream/master' into makelife
Conflicts:
	code/modules/hydroponics/grown/citrus.dm
2016-08-23 17:08:36 -07:00
NikNakFlak d9ddba9361 Fixes a copypasta error 2016-08-23 16:59:10 -07:00
NikNakFlak b43ac4eb9c whoops 2016-08-22 15:25:25 -07:00
ExcessiveUseOfCobblestone ac5bde1a7f Removes Partial Credits for Already Discovered Seeds + MoneyTree Potency Edit (#19975)
* Nerfs Seeds & Money Trees

* give them the D

* REMOVE IT ALL

* Update seeds.dm
2016-08-23 09:06:59 +12:00
Cheridan d51316f7d1 Hydroponics Multiplier Insanity 2016-08-11 13:37:21 -05:00
Joan Lung 33b6445b64 Merge pull request #19730 from Ergovisavi/bonfire
Bonfires from Botany
2016-08-08 11:22:07 -04:00
Ergovisavi 28b476ab6d Bonfires from Botany 2016-08-08 04:07:18 -07:00
lordpidey 9d07476ab7 adds growth serum, puts it in fly amanita (#19654)
* adds growth serum, puts it in fly amanita

* changes reagent check to cycle check

* Growth serum now works, and if you have more than 20 units in you at a time, you will pulsate between sizes.

* Update other_reagents.dm

Removes erroneous typecast.
2016-08-05 11:58:19 +12:00
oranges 2858ad7a98 Merge pull request #19610 from Cruix/biogenerator_refactor
Biogenerator Refactor
2016-08-02 08:55:24 +12:00
ma44 7a4c553584 Tweaks saltpetre some more and fixes a bug where the self sustaining upgrade provides less nutrition when it's upgraded (#19601)
Tweaks saltpetre some more and fixes a bug where the self sustaining upgrade provides less nutrition when it's upgraded
2016-08-01 12:38:15 +12:00
unknown 1b9256857c Made biogenerator recipes into research datums.
Added the ability to upload designs into biogenerators.
Added make_reagents to design datums.
Added Biomass material.
2016-07-31 10:47:36 -04:00
ma44 b01460c2bf Update hydroponics.dm (#19575) 2016-07-30 19:35:05 -05:00
ma44 6fe50a3601 Indentation fix for #19477 (Saltpetre rounding bug fix + tweak) (#19482)
* Update hydroponics.dm

* Update hydroponics.dm

* Update hydroponics.dm
2016-07-25 22:52:48 +02:00
ma44 77efba7837 Update hydroponics.dm 2016-07-23 12:57:20 -05:00
ma44 9762ed71fe Update hydroponics.dm 2016-07-22 20:04:43 -05:00
ma44 417a103a80 Update hydroponics.dm 2016-07-22 19:47:48 -05:00
ma44 c155b71978 Update hydroponics.dm 2016-07-22 19:45:51 -05:00
PKPenguin321 50428a372c Replace istype with is_sharp
For carrot shiv creation
2016-07-18 21:45:25 -07:00
Firecage da3da71e29 Misc Botany changes. (#19240)
* Names the cannibas leaves and enables weapon/grown to be added to the smart fridge

* Gives cannabis seed packets sprites consistent with other seed packets, and so they also look different.
2016-07-11 19:11:54 +12:00
Iamgoofball 3e349b75ea Fixes Omega Weed (#19229)
* Fixes Omega Weed

well i put an extra 0 in there

* I told you it was reasonable oranges
2016-07-09 21:38:19 -04:00
Iamgoofball 5755a4180a #FEELTHEGOOF Election PR: This is what the local conservative radio said all sanders voters wanted (#19105)
Added a new plant to the game to encourage the Chef to be a more relevant job, alongside a recipe for a food related to it. Throw a cannabis leaf on a table and check the recipes list to find it.
2016-07-09 18:14:59 +12:00
Remie Richards 56a8ba1c65 Reverts accidental botany buff (#19175)
This was accidentally introduced along with Bees back in March, this value should always have been 0 by default but I made it 1 on accident, leading to all multipliers being 1 stronger than they should be (Eg: Robust Harvest went from 2x -> 3x)
2016-07-06 16:43:59 -04:00
bgobandit 10d32cd9d4 Fixes/tweaks a lot of typos/descriptions. (#18956) 2016-06-28 22:02:28 +12:00
Kyle Spier-Swenson 0d6bbbb412 stop the pills (#18703)
* RedPills Processing

Now you have to use START_PROCESSING(SSname, thing) (and STOP_PROCESSING)

* Fixes a minor bug.
2016-06-20 12:07:44 +02:00
Xhuis 7bd5dd5168 Makes cherry bombs auto-delete on explosion 2016-06-17 10:51:51 -04:00
Xhuis 6289801964 Hydroponics changes 2016-06-17 10:46:55 -04:00
oranges 8c9308acca Merge pull request #18613 from Core0verload/runtime_down
Puts down two runtimes
2016-06-17 13:40:03 +12:00
Cruix ac0bad5d61 Added priority overlay system. (#18225)
Added priority overlays to atoms, which will not be removed when overlays are cut and will always remain on top when new overlays are added. This requires everyone to use add_overlay() and cut_overlays() instead of overlays += and overlays.Cut(). These procs are found in __HELPERS/icons.dm, and the priority overlay list is found in game/atoms.dm. Everything else is replacing deprecated overlay manipulation.
2016-06-17 10:11:53 +12:00
c0 458a38cf21 Puts down two runtimes 2016-06-16 06:46:26 +03:00
oranges 9c451faa2c Merge pull request #18534 from Core0verload/ash_fix
Fixes unkillable ash drake (+ more runtime fixes)
2016-06-15 10:44:20 +12:00
c0 9fdbe269d6 More fixes 2016-06-13 12:43:25 +03:00
oranges 99620ffe76 Merge pull request #18481 from phil235/PlantsGunsShit
Moving code around
2016-06-13 00:14:29 +12:00
Jordie0608 0846d6f30d fixes fire logging bracket 2016-06-12 20:58:55 +10:00
Xhuis 25a638d6af Removes cherry bombs (#18461) 2016-06-12 02:01:16 -05:00
phil235 dccc1e60a3 Let's not forget the new files.
Also some tiny fixes, typo, and things I forgot.
2016-06-11 23:52:35 +02:00
phil235 3b8af6f5ff Fixes grille/New() not calling ..()
Blood drips icons are now in blood.dmi instead of drip.dmi (which only had the 5 drip sprites).
Moved projectiles, guns, casings and ammo boxes to be in the right files. Please don't put your gun with its projectile, ammo casing and ammo box all the same file.
I split growing.dmi into 5 smaller files so we don't get close to the 512 icon limit again. Each seed has a var to indicate which icon file to use when planted.
Fixes code for heavy pulse laser projectile to be less awful.
2016-06-11 23:18:26 +02:00
Jordie 0777916328 Merge pull request #18402 from optimumtact/flamingfunremoval
Better logging and notification of setting on fire
2016-06-11 23:53:34 +10:00
oranges bf9643563d Ensure we only log and notify admins when person is set on fire
This takes advantage of the now refactored IgniteMob returning true when
it successfully ignites the mob
2016-06-11 13:08:05 +00:00
drynwyn 14bdb5995d Removes superfluous faction adding. 2016-06-10 11:13:26 -04:00
drynwyn df6d3e6da2 Adds factions to pod people 2016-06-10 02:12:00 -04:00
Core0verload 77d70b9955 Finishes boards refactor (#18392)
This PR finishes work started in #17300 by making all the machines use apply_default_parts(src) for components initialization.

It also adds two new board sprites, one for Abductor boards and one for Ravtar boards:
board board_a board_r

There are no deconstructable Ravtar machines yet, sprites are added for future use. Abductor sprite is used only by Seed Vault's plant DNA modifier. It wasn't made by actual abductors, but it was surely made by aliens.

Boards now have a new var: def_components. It is a list containing replacement paths for default parts. For example, list(/obj/item/weapon/stock_parts/matter_bin = /obj/item/weapon/stock_parts/matter_bin/super) would make machine spawn with super matter bins instead of basic ones by default.

Console screens that were used in machines instead of glass sheets are replaced with actual glass sheets. Support for sheets as machine components was added in a previous PR
2016-06-10 13:13:33 +12:00
bgobandit 179d641c32 Plant-B-Gone and napalm now do what they should. (#18395) 2016-06-09 18:52:43 -05:00
Xhuis 68b51d88cf Hydroponics tray changes and new plants (#18366)
You can now remove all plants and weeds from a hydroponics tray by using a spade on it. This process takes five seconds.

Hydroponics trays now have a unique variable, using_irrigation, that replaces the previous iteration of irrigation hoses that used the anchored variable to track it instead.

Fixes a possible runtime error that can occur when using irrigation hoses to transfer non-water reagents (specifically nutrients, although it hasn't been tested with any other reagents).

Added meatwheat, which is mutated from normal wheat plants. It's essentially a blood-red version of wheat that can be crushed into a meat slab by activating it with an empty hand. These meatwheat clumps are slightly bloodier than normal meat, but it still works for recipes that use normal meat slabs.

Added ambrosia gaia, which is mutated from ambrosia deus. It's yellow, glows brightly, and contains only earthsblood (renamed adminordrazine). The plant is destroyed after a single harvest, and its product can be planted in an empty hydroponics tray to cause it to become self-sufficient, no longer requiring nutrients, water, or weed/pest removal. Gaia-blessed trays will glow bright yellow in comparison to normal trays, and gaia-blessed soil will turn yellow. Both will emit light.

Added cherry bombs, which are mutated from blue cherries. They're orange and have a black stem, and start with a tiny amount of black powder in them. Activating them in an empty hand will ignite them and cause them to explode after three seconds, with explosion strength varying based on potency (at the most, it's around that of a minibomb).
2016-06-09 18:40:06 +12:00
oranges 59b72ec25c Better logging and notification of setting on fire
This also logs bump fire to the gamelog incase someone ever needs to
find out who set who on fire with bumping (left out of admin
notification) as it would be very spammy
2016-06-09 06:31:23 +00:00
erwgd 9602170884 Defines plant analyzer materials 2016-06-07 19:17:30 +01:00
PKPenguin321 d3ba2473cc makes plant analyzers fit in belts again (#18324) 2016-06-06 20:01:51 -05:00
Jordie 4c8f8ae53e Merge pull request #18154 from PKPenguin321/plant-analyzer-repath
Repaths plant analyzers
2016-06-03 16:41:02 +10:00
PKPenguin321 8e88d2d329 removes obsoleted proc 2016-06-02 23:31:28 -07:00
PKPenguin321 cf71a5833f repaths plant analyzers
so they are no longer children of regular analyzers
2016-06-01 22:44:03 -07:00