Commit Graph

20 Commits

Author SHA1 Message Date
Fox-McCloud
0dbea7621f The Great Del() Cull of 2015 2015-07-09 02:48:34 -04:00
ZomgPonies
e056abfb82 3/3 port done 2015-05-25 20:16:34 -04:00
FalseIncarnate
db9d9fc647 Botany / Xenobotany Update
Largely a port of https://github.com/Baystation12/Baystation12/pull/8038
(Credit to Zuhayr for his hard work on botany)

Breakdown of the port:
- Plant traits have been expanded drastically
- You want a bio-luminescent tomato that explodes into a cloud of acid
when thrown or stepped on? Or maybe a corn vine that entangles people
and injects them with mannitol and it's harvests that can be used as a
battery? Totally possible.
- Adds new random seeds! Replaces the egg-plant seed in the exotic seeds
crate from cargo with 2 of these.
- Literally random, they have randomly generated stats, chemicals, and
traits. Great for researching, and/or wasting cargo's supply points.
- Plant analyzers can now print off the last scan they recorded, meaning
you can distribute copies of the report to validate your claims of
having the dankest weed on station.
- Potatoes, carrots, watermelons, soybeans, and pumpkins can all be
sliced/diced/carved with ANY sharp object, such as knives, hatchets,
glass shards, and e-swords.
- This should give the chef a bit more room to make it look like he
actually is doing the work by slicing up fries by hand. The processor
still also works.
- New reagent: Wood Pulp
- Currently has no use in recipes, but any plant with this reagent in it
can be chopped into planks with a hatchet. Did someone order some
Ambrosia Deus planks?
- Also, vines with woodpulp are dense. You have been warned.

Now onto the stuff I did in addition to the stuff from Bay.
- Fixed typos where plasma was mistakenly called "phoron" in the port.
(Sorry bay)
- Replaced bay's botany mutation chances with our tiered mutation
system.
- Re-re-added tobacco, space tobacco, tea aspera, tea astra, coffee
arabica, and coffee robusta.
- Re-enabled the rolling of joints
- Made it possible to hand-roll cigarettes from tobacco / space tobacco.
(A requested / promised addition)
- Just like with joints, it will inherit any chems in the tobacco, has
the same reagent capacity as a joint, but looks and smokes like a cig
(lasts as long as the cigarettes) with a different name/description to
differentiate it from pre-made cigs.
- Corn can now be juiced in the grinder, in addition to grinding it.
Grinding corn will result in it's contained reagents (like corn starch),
while juicing corn will result in corn oil.
- Re-added the additional plant analyzer information when scanning trays
(displays age, weed level, etc)

Also cleaned up the recipes_microwave.dm file, removing the commented
out recipes that were distributed to the other machines during the
Kitchen Overhaul. Shortens the file a bit and makes it more readable.

I probably forgot stuff, so I will add things as I remember them / they
get pointed out.
2015-05-09 06:00:24 -04:00
Markolie
672305e034 Adds a "params" parameter to attackby(), so it keeps track of pixel_x and pixel_y among other things 2015-02-22 22:12:11 +01:00
DZD
fbd9c367c0 NODROP flag addition & handling
- Purges canremove
- Implements functionality for NODROP flag, replaces canremove
- Refactors mob inventory unequipping.
2015-02-18 13:22:41 -05:00
giacomand@gmail.com
b00c0c2a9f -New sprites APC sprites by TankNut!
-New wraith sprites by TankNut!
-Decreased flare duration, again(!)
-Made a based interact proc and changed the updateDialog to call that instead of attack_hand. This caused issues with the APC and getting the power cell out of it. I then changed all machines that had their own defined proc (that was everywhere)


git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5001 316c924e-a436-60f5-8080-3fe189b3f50e
2012-11-03 14:45:29 +00:00
giacomand@gmail.com
6a2d78bc94 -Killed the updateDialog lag. I added a check to see if there were any mobs to update, if not it will stop checking until a user uses the machine again. I had to replace all the machine = src and machine = null with procs to help make it manageable. I believe this is one of the culprits causing the server to lag as the round goes on, as more players will interact with machines.
-Atmos delay is now based on active players, to help fight lag for massive player rounds.

-Changed some for(blah in world) loops to use the correct lists.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4958 316c924e-a436-60f5-8080-3fe189b3f50e
2012-10-25 19:15:51 +00:00
elly1989@rocketmail.com
4073ac9b00 Replaced all 'file.extension' references with 'relativepath/file.extension' using a script by thvortex of ss13-daedalus.
All credits to the author for this handy little script.
I Committed the modified python script to tool directory. Although it needs to be in the root folder of your repo to work.

To notice the improved compile times, in dreammaker go to Build > Preferences > and untick "automatically set file_dir for subfolders"

If this commit inteferes with any large projects just revert it, do your thing, then rerun the script. Easy-peasy.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4488 316c924e-a436-60f5-8080-3fe189b3f50e
2012-08-18 16:33:40 +00:00
petethegoat@gmail.com
0970e6c55d Standardised reagent colour mixing a little bit. Fixes issue 785.
Changed the path of large beakers, so they're actually a subtype of beaker (wtf)

Moved new_year.dm to unused.
Updated Carn's sequential master controller to not have tension stuff, for potential live testing.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4444 316c924e-a436-60f5-8080-3fe189b3f50e
2012-08-16 18:33:34 +00:00
sieve32@gmail.com
459c558898 -Make holodeck eswords a child of obj/item/weapon/holo instead of regular eswords, clumsy check removed as a result, and you can no longer do things like cutting through walls or doors or what have you. (Fixes Issue 665)
-Redid icons to be more optimized at compile by setting icon = 'icons/folder/icon.dmi' instead of just icon = 'icon.dmi', meaning that Dream Maker doesn't have to search through every single file for every single .dmi. This shouldn't lead to any errors because of how I went about it, plus the fact that Dream Maker would have freaked out if I screwed something up. Also moved around 2 icons that weren't sorted well.

r4146 compile time: 1 minute, 40 seconds
r4147 compile time: 45 seconds

[VGTG]

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4147 316c924e-a436-60f5-8080-3fe189b3f50e
2012-07-23 00:48:51 +00:00
petethegoat@gmail.com
a80e46c078 Fixed issue 222.
Improved closet/secure closet/crate code a bit. (Updated the paths on the map.)

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2585 316c924e-a436-60f5-8080-3fe189b3f50e
2011-12-01 20:02:43 +00:00
mport2004@gmail.com
17ed3899c4 Fixed the map/code issues that the body bags caused.
/obj/effects is now /obj/effect.
/obj/station_objects is now /obj/structure.
Did a bit of minor blob work. 
The Bay 12 body bags were replaced with closets because having two sets of code that do almost the same thing is silly.
Changed back a few of the last jobproc edits as the remove from list before assign was a check to see if the mob was fucked up and if it was remove it so we did not check it again as it would still be fucked up.
The medbay/tox monkeys names are random once more.  More random name monkeys will help with changeling and clean up the observe/mob menus.


git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2324 316c924e-a436-60f5-8080-3fe189b3f50e
2011-10-03 10:28:57 +00:00
baloh.matevz
e8c6b08419 - Object tree grouped a bit more.
Two new categories were made: station_objects and effects. station_objects, which I'm sure someone will want renamed to 'structures' contains the objects which don't need process() or power code.

Effects contains objects which are either landmarks, triggers, spawners or decal.

Screenshot:
http://www.kamletos.si/new%20object%20tree.PNG

I didn't notice any bugs, but with a revision editing 276 files of byond code, you never know.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2323 316c924e-a436-60f5-8080-3fe189b3f50e
2011-10-03 06:54:28 +00:00
Daelith.Rhedynfre@gmail.com
d35df18cd4 -Fixed a couple typos
-Changed the cook book sprite

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2205 316c924e-a436-60f5-8080-3fe189b3f50e
2011-09-15 06:53:45 +00:00
firecage@hotmail.com
2fa096add2 Note: This will be the last mundane plant for a LONG time. Next shall be various mutations, fantasy, sci-fi and custom plants.
Hydro can now grow cocoa trees and harvest cocoa pods.

The chef can process the cocoa pods into cocoa and process that into chocolate bars. He can also put the chocolate bars into the blender to get crushed chocolate, which the barman can use.

Lemon, watermelon, poison berry juice and crushed chocolate is added to the reagents list.

Barman can now also serve a chocolate drink. He can also now serve Lemon, Watermelon and Poison berry juice as drinks.

Poison Berry was made a mutation of berries.

Nurse uniform was now also fully fixed.

PS. Poison berry was added to the juicer machine as well.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@1833 316c924e-a436-60f5-8080-3fe189b3f50e
2011-07-10 23:14:57 +00:00
firecage@hotmail.com
bd0877f420 Added the following to hydro. Limes, Oranges, Lemons, Grass, Sugarcane and Poison Berries.
Made sugarcane able to be processed into sugar and also made sugarcane and whitebeet be able to be grinded into liqued sugar.

Made oranges, limes, watermelon slices and lemons able to be made into juice via the juicer.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@1821 316c924e-a436-60f5-8080-3fe189b3f50e
2011-07-10 12:18:19 +00:00
baloh.matevz
a4b4117e17 - Redesigned QM office
- Cargo bay now has a second ordering console there so cargo techs aren't utterly useless
- Mining camera computer now uses the proper sprite ingame too, not just in the editor.
- Mining camera computer now actually displays the mining level's cameras.
- Mining office access level removed from ID computer and the map.
- Clicking on paper now examines is (displays it's text)
- To rename paper pick it up and use the 'rename paper' verb
- Rad suit crate spawn order switched so it spawns suit-helmet-suit-helmet-... to make dressing slightly easier (you don't need to use move to top or drag stuff out)
- blabla crate renamed to juice crate. (I hope to never see a 'blabla' thing in committed code again!)

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@1772 316c924e-a436-60f5-8080-3fe189b3f50e
2011-07-05 16:27:56 +00:00
tronaldnwn@hotmail.com
a6959b2e69 hydroponics
- Bananas can now be grown (they are now snack/grown/banana)
- Sunflowers can now be grown and harvested (very limited use till I add in some seed recipes). Smack people with them for a unique message.
- Both seeds are loaded into the seed vendor (for now), vendor is alphabetized.
- New seeds added to either of the seed crates.
- Move hydroponic items out of the weapon.dm and into hydroponics.dm

Nuclear Agents
- They have a little S symbol by their head now, that only other Agents can see.

Other
- Optical Material Scanners are blue goggles now, rather than a blind fold.

Map update was just to update all the bananas on clown planet to the new "grown" item path.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@1525 316c924e-a436-60f5-8080-3fe189b3f50e
2011-05-04 06:27:36 +00:00
morikou@gmail.com
b06cc3ee34 Two new microwave recipes:
- Tele Bacon: Requires one piece of meat and a remote signaler. It is delicious and may allow 

people to teleport to your location.
- Banana Phone: Requires a banana, a radio, and 5 units of psilocybin. Basically an edible radio. Eat at your own risk (MAY CAUSE HOMICIDAL URGES, NOT LIKE THAT IS ANYTHING UNUSUAL).

On a totally unrelated note:
- Banana Phone (full version of the song, not the short loop version) can now be played via the "Banana Phone" fun admin command. It only runs once.
- Fixed a potential runtime error in the juicer code.

DRINKS!
- Potato juice added, produced from putting a potato in a juicer.
- 10 Potato Juice + 2 Enzyme = Vodka
- 5 coffee + 5 sugar + 2 enzyme = Kahlua

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@1484 316c924e-a436-60f5-8080-3fe189b3f50e
2011-04-21 17:52:16 +00:00
rastaf.zero@gmail.com
9b2e9c3420 Fixed bugs:
Players now cannot rejoin the game if their mobs were gibbed/burned while they were disconnected.
Cremating/gibbing for meat now counts as death with triggering log records, gamemode checks, sql reports, etc.
Fixed some bugs with enabling verb ghostize().
Fixed bug with DNA Machine popping out from the protolathe.
Fixed bug with tuning RSD.
Added juicer:
	berry -> berry juice
	banana -> banana juice
	tomato -> tomato juice
	carrot -> carrot juice
Bug your botanists for getting better potence for more juice.
Juicer can be pulled, chef can give it to barmen or botanists.
Blender changed a bit:
	tomato -> ketchup
	corn -> corn oil
	soy beans -> soy milk
	any food -> nutriments and contained reagents.
Sound for the juicer found at http://www.freesound.org/samplesViewSingle.php?id=98053, edited by Nikie.
You can eject ingredients from the microwave. However, you cannot get back your reagents, they will be lost and can make microwave dirty.
Essence of Banana was renamed to Banana Juice.
Added Carrot Juice. Heals eyes much slower than imidazoline.
Carrots now contain imidazoline (however, carrot cake contains more imidazoline).
Potency for peppers, tomatoes, carrots and druggy mushrooms should work now.
New cocktail "Bahama mama": 2 rum,  2 orangejuice, limejuice, ice.
Changed recipe for soy sauce: 4 soy milk + 1 acid.


git-svn-id: http://tgstation13.googlecode.com/svn/trunk@1477 316c924e-a436-60f5-8080-3fe189b3f50e
2011-04-20 14:44:13 +00:00