Commit Graph
31 Commits
Author SHA1 Message Date
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
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
Mechoid 4a7ea5086a Seed Vendors are hackable. 2018-05-18 20:57:55 -07: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 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
SunnyDaiseandAtermonera 1f80c3336d Onions, Food and Plant Tweaks (#4629)
* Onyonyon

* Fixes Potato's and adds Changelog.
2018-01-27 16:53:54 -08:00
killer653 468e73c7f3 Polaris sync 2017-08-06 19:07:17 -04:00
Neerti 99eb6f9404 Updates Tools
Adds toolspeed var, which is a multiplier on how 'fast' the tool works.  0.5 means it goes twice as fast.
Adds usesound var, which determines what sound is used when a tool is being used.
Changes a lot of code to use those two vars instead.
Adds 'ayyy' tools, which are ported from /tg/'s abductor gamemode.  They're currently admin only but I might make them obtainable by xenoarch later.
Adds powertools, also from /tg/.  CE starts with them in a new toolbelt that spawns in their locker, ported from (you guessed it) /tg/.
Changes welder sprites to look nicer, ported yet again from /tg/.  Modified the blue welder slightly so it can be the electric welder sprite.
Adds various sounds from /tg/, for tools and welders.
2017-08-03 04:49:23 -04:00
Arokha Sieyes 06ab089bb2 Eris Vending Machine Sprites 2017-04-23 17:56:43 -04:00
Serithi 8ad6f5e626 Properly alphabetizes lavender in the vending machines. 2016-07-11 20:16:56 -07:00
Serithi c4df745933 Better formatting. 2016-05-25 17:45:48 -07:00
Serithi b7158b5acd Apparently i added the seeds to the wrong seed vendor file. Hoooopefully this is all that's needed now. 2016-05-25 17:24:22 -07:00
Datraen beda3185eb Reverts the second mob clean up because of incomplete implementation.
This caused an error that would then cause machinery to hang on the server, and was reproduced successfully.
2016-05-04 00:24:55 -04:00
Kelenius df5a0d7941 Mob inventory cleanup
Replaces three item removal procs with one
Adds a proc to delete an item on the mob
2016-03-24 01:23:08 +03:00
Datraen 05a29f8f3a [BOTANY] Fixes plant storage nutrient check
Reported only high, low or none with previous system.
2015-09-06 16:42:58 -04:00
PsiOmega f760d44127 Merge remote-tracking branch 'upstream/master' into dev
Conflicts:
	code/game/objects/items/weapons/candle.dm
	code/modules/paperwork/paper.dm
2015-04-28 08:43:31 +02:00
Kelenius 159ad76fab Fixes #8998 2015-04-27 08:06:21 +03:00
PsiOmega 1ae0ad6d92 Updates the atom_pool, now datum_pool, to handle any datum object.
Makes the garbage collector similarly robust. Continues the whole Destroy/qdel porting.
2015-04-24 09:59:05 +02:00
mwerezak 01ce8d4a1f Fixes #8696
Fixes #8696, and updates other usages of drop_item() where appropriate.
2015-03-31 20:30:06 -04:00
Zuhayr 7cbe2c94fb Fixes #8388 2015-03-17 19:19:28 +10:30
Zuhayr 0b2ca42600 Tweaks. 2015-02-21 20:56:55 +10:30
Zuhayr 8fb5836e4f Generalized fruit products properly. 2015-02-13 03:52:46 +10:30
Zuhayr c5e2feb5f1 Merge with dev. 2015-02-05 20:24:06 +10:30
Zuhayr 5a1980aabd Updated seed storage to use trait procs. 2015-02-04 22:19:37 +10:30
Zuhayr 09b9500486 Compile fixes. Seed storage is still broken. 2015-02-04 22:00:07 +10:30
Kelenius 9edb5751fb Adds tobacco and maps in drying racks 2015-02-03 22:24:49 +03:00
Kelenius 746e1acf8d Added variety (uid) field to seed vendors 2015-01-17 20:52:06 +03:00
Kelenius 31768af22f Removes the now useless New() 2015-01-12 09:43:18 +03:00
Kelenius d66857757a Replaces seed vendors with seed storages 2015-01-12 09:36:04 +03:00