426 Commits

Author SHA1 Message Date
JesusChristItsJasonBourne 96cc1cbcec removed extra comma 2019-09-26 11:43:23 +10:00
JesusChristItsJasonBourne 355a186862 vine blacklist update
blacklists certain chems from spawning with vines upon request
2019-09-25 20:28:44 +10:00
JesusChristItsJasonBourne 84494b2165 vines blacklist update
made vines not spawn with certain chems for various reasons, all of this was upon request.
2019-09-25 20:19:35 +10:00
Razgriz e5c4a9ef76 Merge pull request #766 from Shadowfire117/derg,coon,wah,sprites
Plant mutation buff
2019-08-18 14:06:08 -07:00
Shadowfire ba78a3f0e3 Plant mutation buff
Making bioluminescence twice as strong, now plants should be able to provide some light if they got some potency
2019-08-18 20:23:03 +02:00
Shadowfire 1ea99a5666 changes to space vines, additional ranged mob behaviour and three plant mobs
Thanks to Razgriz and Dragonhark for coding most of the three plant mobs; piranha plant, spitter and pitcher plant, and Skits for providing the sprites.

I have with help finished the mobs with spitter stunning victims for other plants to eat, pitcher heals when having a meal and both it and spitter produces soyelent which can have fture possible uses!
If the stars align and a space vine has the carnivorous trait and enough potency, it has a chance to spawn these mobs when spreading!
additionally theres now two new variables, one that makes ranged mob stop targeting unconscious victims and another that makes mobs immune to entangling and attacking vines!
2019-08-06 23:53:25 +02:00
TheFurryFeline 74e83772f0 Copy-Pasta Fix 2019-06-03 19:19:11 -04:00
TheFurryFeline e3e442e9b0 Infinite Frame Fixy
Ports https://github.com/Citadel-Station-13/Citadel-Station-13-RP/pull/855 to fix runtimes for several machinery objects.
2019-06-03 18:14:44 -04:00
Shadowfire117 0401850c06 Meatwheat and quality of life for biogenerator thanks to virgo devs getting the idea to make crew able to produce cream and more milk and meat at once. 2019-03-18 20:58:25 +01:00
Shadowfire117 0773bce709 Further revamp of mutation of plants! This time there's a risk of plants to be able to produce/consume gases! They can also alter temperature in the room. Oh, did I mention that there's a chance for plants to evolve and produce random reagents? Fancy that! ((Disclaimer, this might be balanced depending on reception by community)) 2019-03-18 19:53:01 +01:00
Shadowfire117 90aa9a9ff5 This time we got 4 new plants and 2 new chemicals!
We got voltato which is a potato mutant that produces 200 V for all, then we have the solarflower which is a sunflower mutant that glows and can be planted anywhere, perfect for mood lights and blackout! Then we have two lavender mutants, milk dew that produces milk and sweet breeze that produces Serazine!
The two new chems are Serazine that is a mild anti toxin that can be used to enhance drugs, which at the current time is bicaridine with some tungsten added in to produce the other new chem called Alizine that is double as effective as bicaridine, though it sadly cant cure internal bleeding when overdosing patients :c
2019-03-17 20:34:34 +01:00
Nadyr 92e9488ddb -Tea seed did not show up in seed vendor so also added to the vr version. It's unclear which one is used.
-Removed tea mush from the rolled tea leaf as this shouldn't be in the final product.
-Fixed flavor text on new tea beverages in glasses.
2019-03-10 11:46:43 -05:00
Nadyr 015a861ea4 Added a tea plant for green tea recipe (and further planned recipes). Seed added to seed_storage.dm. 2019-03-10 10:53:35 -05:00
Vollybally 63cdf2b6da Merge pull request #433 from Shadowfire117/master
removing debug messages from plant mutations ;-;
2019-02-22 10:18:38 -05:00
Shadowfire117 ec20798def removing debug messages from plant mutations ;-; 2019-02-22 15:20:22 +01:00
Vollybally fc80a0229c Merge pull request #427 from Shadowfire117/master
Feeder
2019-02-21 14:42:38 -05:00
Shadowfire117 a8d69beacf fix 2019-02-21 20:15:05 +01:00
Shadowfire117 f8dd0b814c Changes to plant mutation to make it possible to get interesting traits, and also small decrease in loss of potency due to mutations. 2019-02-21 18:35:02 +01:00
Sharkmare e843bcc0d6 Seed grown symxes insta die
Game why are you treating them like dinae stop
2019-02-19 10:46:42 +01:00
Shadowfire117 cec81ea1fb Sit on my face! No wait! Thats the name of the new drink I was asked to make! Also we now have peanut extract from peanuts, giving the nuts more purpose in life and allowing new kinds of recipes to be made! 2019-02-18 11:22:47 +01:00
Sharkmare ba19aa5080 Unification Process 2019-02-08 12:54:27 +01:00
IgnusVam 9adb62b120 - Finalizes up a new variant of synx
- Gives the AI a new sprite as well
- Egg
2019-02-07 13:11:01 -07:00
Sharkmare a74c728599 Adding a new Seed type with plans for something
Wont be a new mutation.
Wont be obtainable outside special means.
No this adds nothing for XenoBotany
2019-02-07 12:01:59 +01:00
Sharkmare 4eb075b3fc balance 2019-02-04 11:23:44 +01:00
Sharkmare 6d6776271c The dark lord of beans the black bean
All th ebenefits of the 3 bean types but in a fraction of the quanitity
Have one plant produce all or 3 plants, 3plants is objectively better but blacksapbeans are easy to care for
2019-02-04 11:16:06 +01:00
Sharkmare 057d594e18 Making the soyboys proud
Added the bluesapbean.
Gonna move this to its own file int he future
2019-02-04 09:55:47 +01:00
Sharkmare fb5d2326f5 Update seed_datums.dm 2019-02-04 09:41:24 +01:00
Sharkmare 3aa607a895 Made Soybeans viable in this meta
Gave soybeans a new mutation, the sapbeans.
Yes they are like soybeans but instead of beans they contain a glowy coloured substance.

No you should not eat them.... maybe i dunno be my guest i guess.
This makes Purplesap and orangesap items available and is my intended fix.
2019-02-04 09:40:25 +01:00
lbnesquik a398376a62 BEES. 2019-01-19 20:53:44 +01:00
AnonymousHybi bff9f560f7 Replaced all blue font with a custom colour 2019-01-18 15:14:32 +00:00
Sharkmare d1ce6b14f3 Adds a watermelon full of water and FallingApples
WaterWaterMelon contains: **Water**
Fallingapple, Apples that simply harvest themselves but are worse than regular ones.
2018-12-24 10:51:45 +01:00
Anewbe 978fdd2842 Merge pull request #5309 from Heroman3003/melon-fix
Fixed fruit salad not being make-able
2018-05-29 14:35:57 -04:00
Arokha Sieyes 2d89d63c09 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into aro-sync-05-27-2018
# Conflicts:
#	code/game/objects/structures/crates_lockers/closets/l3closet.dm
#	code/game/objects/structures/crates_lockers/closets/secure/engineering.dm
#	code/game/objects/structures/crates_lockers/closets/secure/medical.dm
#	code/game/objects/structures/crates_lockers/closets/secure/scientist.dm
#	code/game/objects/structures/crates_lockers/closets/secure/security.dm
#	code/game/objects/structures/crates_lockers/closets/utility_closets.dm
#	maps/southern_cross/structures/closets/misc.dm
#	maps/submaps/surface_submaps/wilderness/DoomP.dmm
#	vorestation.dme
2018-05-27 19:26:12 -04:00
Arokha Sieyes 6b42df0685 Merge branch 'master' of https://github.com/VOREStation/Polaris into aro-sync-05-25-2018
# Conflicts:
#	code/__defines/misc.dm
#	code/controllers/master_controller.dm
#	code/game/machinery/computer3/computers/card.dm
#	code/game/objects/items/devices/communicator/UI.dm
#	code/game/objects/items/stacks/medical.dm
#	code/game/objects/structures/signs.dm
#	code/modules/admin/admin_verbs.dm
#	code/modules/client/client defines.dm
#	code/modules/client/client procs.dm
#	code/modules/clothing/clothing.dm
#	code/modules/clothing/under/accessories/holster.dm
#	code/modules/events/radiation_storm.dm
#	code/modules/mining/machine_processing.dm
#	code/modules/mob/living/carbon/human/species/station/prometheans.dm
#	code/modules/mob/living/living.dm
#	code/modules/mob/living/simple_animal/animals/bear.dm
#	code/modules/mob/living/simple_animal/animals/cat.dm
#	code/modules/mob/living/simple_animal/animals/parrot.dm
#	code/modules/mob/mob.dm
#	code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Core.dm
#	code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Food-Drinks.dm
#	code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Medicine.dm
#	code/modules/reagents/reagent_dispenser.dm
#	config/example/config.txt
#	html/changelogs/.all_changelog.yml
#	interface/skin.dmf
#	maps/southern_cross/southern_cross-1.dmm
#	vorestation.dme
2018-05-25 13:23:47 -04:00
Mechoid 4a7ea5086a Seed Vendors are hackable. 2018-05-18 20:57:55 -07:00
Neerti be73b8c36a for(var/bad_code in world)
Removes a very large amount of world loops.
Adds a macro to painlessly generate a global list, and the needed code to modify the list when an object is made or deleted automatically.
Cleans up some commented out code.
2018-04-29 17:55:04 -04:00
Arokha Sieyes 6c686e6a2f Merge branch 'master' of https://github.com/PolarisSS13/Polaris into aro-sync-04252018
# Conflicts:
#	README.md
#	code/game/jobs/job/job.dm
#	code/modules/client/preference_setup/loadout/loadout_utility.dm
#	code/modules/mob/living/carbon/human/examine.dm
#	code/modules/mob/living/carbon/human/npcs.dm
#	code/modules/mob/living/carbon/human/species/station/prometheans.dm
#	html/changelogs/.all_changelog.yml
#	maps/RandomZLevels/Academy.dmm
#	maps/RandomZLevels/beach.dmm
#	maps/RandomZLevels/blackmarketpackers.dmm
#	maps/RandomZLevels/challenge.dmm
#	maps/RandomZLevels/example.dmm
#	maps/RandomZLevels/jungle.dmm
#	maps/RandomZLevels/listeningpost.dmm
#	maps/RandomZLevels/spacebattle.dmm
#	maps/RandomZLevels/stationCollision.dmm
#	maps/RandomZLevels/wildwest.dmm
#	maps/RandomZLevels/zresearchlabs.dmm
#	maps/northern_star/polaris-1.dmm
#	maps/southern_cross/southern_cross-1.dmm
#	maps/southern_cross/southern_cross-3.dmm
#	maps/southern_cross/southern_cross-6.dmm
#	maps/southern_cross/southern_cross-7.dmm
#	maps/submaps/surface_submaps/mountains/CrashedMedShuttle1.dmm
#	maps/submaps/surface_submaps/plains/Boathouse.dmm
#	maps/submaps/surface_submaps/wilderness/Blackshuttledown.dmm
#	maps/submaps/surface_submaps/wilderness/Boombase.dmm
#	maps/submaps/surface_submaps/wilderness/DJOutpost1.dmm
#	maps/submaps/surface_submaps/wilderness/DecoupledEngine.dmm
#	maps/submaps/surface_submaps/wilderness/Drugden.dmm
#	maps/submaps/surface_submaps/wilderness/Rockybase.dmm
#	maps/submaps/surface_submaps/wilderness/Shack1.dmm
#	maps/virgo/virgo-6.dmm
#	vorestation.dme
2018-04-25 17:23:33 -04:00
Cerebulon 818ff82c4d Fixes pumpkins and watermelon sprites 2018-04-21 06:08:20 +01:00
Leshana 6756c5a483 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into polaris-sync-2018-03-30
# Conflicts:
#	.travis.yml
#	code/ATMOSPHERICS/components/unary/outlet_injector.dm
#	code/__defines/_planes+layers.dm
#	code/__defines/chemistry.dm
#	code/__defines/mobs.dm
#	code/_helpers/mobs.dm
#	code/_onclick/hud/robot.dm
#	code/game/area/areas.dm
#	code/game/machinery/computer/supply.dm
#	code/game/machinery/cryopod.dm
#	code/game/machinery/doors/airlock.dm
#	code/game/objects/items/devices/communicator/UI.dm
#	code/game/objects/items/devices/communicator/messaging.dm
#	code/game/sound.dm
#	code/game/supplyshuttle.dm
#	code/game/turfs/flooring/flooring_decals.dm
#	code/modules/admin/admin.dm
#	code/modules/client/preference_setup/occupation/occupation.dm
#	code/modules/events/event_container.dm
#	code/modules/mob/dead/observer/observer.dm
#	code/modules/mob/language/language.dm
#	code/modules/mob/living/carbon/human/human.dm
#	code/modules/mob/living/carbon/human/human_powers.dm
#	code/modules/mob/living/carbon/human/life.dm
#	code/modules/mob/living/carbon/human/species/species_shapeshift.dm
#	code/modules/mob/living/living.dm
#	code/modules/mob/living/living_powers.dm
#	code/modules/mob/living/say.dm
#	code/modules/mob/living/simple_animal/animals/bear.dm
#	code/modules/mob/living/simple_animal/animals/cat.dm
#	code/modules/mob/living/simple_animal/animals/parrot.dm
#	code/modules/mob/logout.dm
#	code/modules/mob/mob_helpers.dm
#	code/modules/organs/organ.dm
#	code/modules/organs/organ_icon.dm
#	code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Medicine.dm
#	code/modules/reagents/reagent_containers/syringes.dm
#	code/modules/shuttles/shuttle.dm
#	html/changelogs/.all_changelog.yml
#	maps/RandomZLevels/wildwest.dm
#	maps/southern_cross/items/clothing/sc_head.dm
#	maps/southern_cross/southern_cross-1.dmm
#	vorestation.dme
2018-03-31 09:20:59 -04:00
Aronai Sieyes 7d3aec96fd Arranges lots of things into planes (#5072)
* Rearranges a billion things into planes

* Make cryotubes fancy

* Update Travis

* Fix hiding logic
2018-03-28 12:59:12 -07:00
Cyantime 208092e068 Adds onions to the seed vender 2018-02-26 18:57:32 +00:00
Leshana 5847319443 Update every initialize() proc to return an initialize hint.
* Yes, all of them.
* Also did a few corrections to redundant New() and broken Destroy() along the way
* Renamed the turf_initializer.initialize() proc to InitializeTurf to avoid confusion.
* Subsumed /area/proc/initialize into /atom/proc/initialize() - Made /area's LateInitialize to get same behavior as before.
2018-02-05 15:50:13 -05:00
Leshana 44dc4b7286 Implement SSatoms
* Moves proc/initialize() from being on /atom/movable, /are and /turf/simulated to being on /atom - Now turfs can initialize too
* Added the SSatoms subsystem which controls initialization of atoms at roundstart and during normal conditions.
* Disabled the old auto_init = 0 behavior, ALL atoms should get initialized() called on them now.
* Refactored the way initialize() is called during /New() to utilize SSatoms instead of SScreation
* Removed SScreation, as it was only a stop-gap until SSatoms could be ported.
* Updated the maploader to inform SSatoms when it is loading maps instead of SScreation.
* Updated the template map loader to use SSatoms to perform initTemplateBounds
* Renamed 'initialized' var in seed_storage to deconflict.
* Removed usage of auto_init = 0, replaced with a no-op initialize() proc for atoms that don't need initialization.
2018-02-05 15:50:06 -05:00
Leshana cef001bf2a Update every initialize() proc to return an initialize hint.
* Yes, all of them.
* Also did a few corrections to redundant New() and broken Destroy() along the way
* Renamed the turf_initializer.initialize() proc to InitializeTurf to avoid confusion.
* Subsumed /area/proc/initialize into /atom/proc/initialize() - Made /area's LateInitialize to get same behavior as before.
2018-02-03 01:00:57 -05:00
Leshana ef73c090ab Implement SSatoms
* Moves proc/initialize() from being on /atom/movable, /are and /turf/simulated to being on /atom - Now turfs can initialize too
* Added the SSatoms subsystem which controls initialization of atoms at roundstart and during normal conditions.
* Disabled the old auto_init = 0 behavior, ALL atoms should get initialized() called on them now.
* Refactored the way initialize() is called during /New() to utilize SSatoms instead of SScreation
* Removed SScreation, as it was only a stop-gap until SSatoms could be ported.
* Updated the maploader to inform SSatoms when it is loading maps instead of SScreation.
* Updated the template map loader to use SSatoms to perform initTemplateBounds
* Renamed 'initialized' var in seed_storage to deconflict.
* Removed usage of auto_init = 0, replaced with a no-op initialize() proc for atoms that don't need initialization.
2018-02-03 00:59:06 -05:00
Leshana 27c3272821 Merge remote-tracking branch 'upstream-polaris/master' into polaris-sync-2018-01-27
# Conflicts:
#	code/ZAS/_docs.dm
#	code/__defines/mobs.dm
#	code/game/turfs/flooring/flooring_decals.dm
#	code/game/turfs/simulated/walls.dm
#	code/modules/client/preference_setup/loadout/loadout_utility.dm
#	code/modules/lore_codex/codex.dm
#	code/modules/mob/living/life.dm
#	code/modules/mob/living/living_defines.dm
#	maps/southern_cross/southern_cross-1.dmm
#	maps/southern_cross/southern_cross-3.dmm
#	maps/southern_cross/southern_cross-6.dmm
#	maps/southern_cross/southern_cross-7.dmm
#	maps/southern_cross/southern_cross_jobs.dm
#	vorestation.dme
2018-01-27 23:08:53 -05:00
SunnyDaise 1f80c3336d Onions, Food and Plant Tweaks (#4629)
* Onyonyon

* Fixes Potato's and adds Changelog.
2018-01-27 16:53:54 -08:00
Cyantime 3b71498ddc Fixes potato reagentID (#4637)
* Vodka can be produced again
2018-01-27 16:52:40 -08:00
Abbie Fland 78a1781c8f Fixes rare empty gene_mask
Gene masks (like for plant genes) used unpadded num2hex on a random
number 0-255. This had the (technically ok) result of masks for values
1-15 being a single character but also had the (not ok) result of the
mask for value 0 being the empty string. This only happened to 1/256 of
genes, so was easy to miss.

This change pads all of them to 2 characters so this issue won't happen
and to line things up nice.
2018-01-21 23:59:37 +00:00
Leshana 3c3dac7102 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into polaris-sync-2018-01-19
# Conflicts:
#	code/_onclick/hud/hud.dm
#	code/modules/clothing/glasses/glasses.dm
#	code/modules/mob/living/carbon/human/update_icons.dm
#	maps/southern_cross/southern_cross-1.dmm
#	maps/southern_cross/southern_cross-3.dmm
#	maps/southern_cross/southern_cross-6.dmm
#	vorestation.dme
2018-01-19 17:52:25 -05:00