Commit Graph

114 Commits

Author SHA1 Message Date
phil235 f9f618d699 Adding the chemical reactions and recipes for the new recipes.
Changes the glasses of what? to use an overlay with reagents color.
Adding a ricepack to the kitchen cabinet and the food crate.
Adding more bowl to the dinnerware vending machine.
Adding pumpkinjuice, blumpkingjuice, cherryshake, bluecherryshake pumpkin latte, drunken blumpkin reagents.
2015-04-04 19:29:12 +02:00
Cheridan 884e9e3774 Day Who-Knows: Bar Gambling Expansion!
Space cash is stacks
Adds dealer table to map
2015-03-29 18:09:54 -05:00
Razharas a67d8339b7 Merge pull request #8414 from phil235/TablecraftVarietyFix
Fixes not being able to tablecraft recipes using differen kinds of an item
2015-03-22 05:32:43 +03:00
Razharas 2271499db7 Merge pull request #8058 from Iamgoofball/explosive
GOONCHEM 5: Pyrotechnics are finished, Toxins mostly complete
2015-03-21 09:54:11 +03:00
phil235 9b419d26f0 Fixes not being able to tablecraft recipes using different types of an item for a requirements (e.g. two types of cutlets to make a meat pizza).
Fixes mushroom requirements in tablecraft recipes appearing as "snacks" in the requirement lists.

Reduces the chem puff waiting time when spraying at short range, so it takes less time before it reacts with a turf/mob/object.
2015-03-18 20:57:30 +01:00
phil235 e3e881e6ee Merge branch 'master' of https://github.com/tgstation/-tg-station into MimanaFix
Conflicts:
	code/modules/reagents/Chemistry-Reagents/Toxin-Reagents.dm
2015-03-15 12:27:40 +01:00
Iamgoofball d0f101cd37 Merge branch 'master' of https://github.com/tgstation/-tg-station into explosive
Conflicts:
	code/modules/reagents/Chemistry-Recipes.dm
2015-03-14 21:32:13 -07:00
phil235 7ba8af5222 Fixes steel cap bug. Steel cap now growns steel logs similar to wooden logs, you use the hatchet to get rods.
Reorganizes all flashing to use the same mob proc 'flash_eyes()' (welding tool use, flashbang, flashers, laserpointers, etc).
Fixes making sandstone not stacking the result sandstones on the floor.
Sandstone, grass tile and carpet tile now look for other incomplete stack on their creation location to try to put them all in one stack (exactly like wood planks).
Fix typos.
Remove banglet var from all flashbangs, making flashbangs from clusters behave exactly like the other ones.
Renames eyecheck()proc to check_eye_prot() and moves it to mob/living level, elso creates check_ear_prot() for checking ear protection.
2015-03-10 20:30:46 +01:00
Iamgoofball 2cee886f04 whoops and shit 2015-03-08 17:02:38 -07:00
Iamgoofball 573aea927b Removes newcrit, fixes, changes, old chems now process every tick as per usual, only goonchems process every 3 ticks now. 2015-03-08 16:43:57 -07:00
Iamgoofball e6f257d413 Merge branch 'master' of https://github.com/tgstation/-tg-station into explosive
Conflicts:
	code/modules/mob/living/carbon/carbon.dm
	code/modules/mob/living/carbon/carbon_defines.dm
	code/modules/mob/living/carbon/human/life.dm
	code/modules/reagents/Chemistry-Goon-420BlazeIt.dm
	code/modules/reagents/Chemistry-Goon-Pyrotechnics.dm
2015-03-08 14:26:52 -07:00
phil235 b669f363d3 Fixes mimana not dropping mimanapeel when eaten.
Fixes typo in oat stalks
Fixes Reagent metabolization only calling the reagents on_mob_life procs once every two life().
Moving dizziness, drowsiness and jitteriness natural decreases all inside carbon/handle_regular_status_updates()
Drowzyness now drops faster when resting.
Slight adjustment to mutetoxin effect on mob.
2015-03-08 13:53:23 +01:00
phil235 d856e240c2 Merge branch 'master' of https://github.com/tgstation/-tg-station into NewPlants
Conflicts:
	icons/mob/head.dmi
2015-03-02 13:45:15 +01:00
Iamgoofball b1f60a6114 GOONCHEM 5.5: MORE TOXINS 2015-02-28 12:26:34 -08:00
Iamgoofball b95f44f235 Loads of pyrotechnics changes 2015-02-27 21:16:10 -08:00
Iamgoofball 16f319bffd I apparently added morphine to Deus. This was not intended. 2015-02-26 20:27:14 -08:00
phil235 809a1be279 Merge branch 'master' of https://github.com/tgstation/-tg-station into NewPlants
Conflicts:
	icons/mob/head.dmi
2015-02-25 18:50:42 +01:00
Razharas 4ba5161394 Merge branch 'master' of https://github.com/tgstation/-tg-station into FUCKGIT
Conflicts:
	code/modules/hydroponics/seeds.dm

Resolving dem conflicts
2015-02-25 15:17:14 +03:00
Razharas 588c79873f Merge pull request #7562 from Iamgoofball/drugs
GOONCHEM: Part 4: Pyrotechnics, Drugs, and Misc. Chemicals
2015-02-25 08:26:21 +03:00
phil235 bd870d649c Adds new plants to botany (rice, oat, blue cherries, holy melon, parsnip, geranium, lily, snap corn, blumpkin, mimana, sweet potato, vanilla, red beet) and adding two new reagents (vanilla and rice). 2015-02-22 22:10:25 +01:00
Iamgoofball e24e94544e Merge branch 'master' of https://github.com/tgstation/-tg-station into drugs
Conflicts:
	code/modules/food&drinks/food/snacks_meat.dm
	code/modules/reagents/Chemistry-Reagents/Consumable-Reagents/Food-Reagents.dm
	icons/obj/drinks.dmi
	icons/obj/food.dmi
2015-02-20 22:00:53 -08:00
Remie Richards 5fc7af7fbf attackby() now has an argument containing the parameters of the click that called it. Items placed on tables now center their icon where the user clicked. this is NOT true for racks, since racks look organised in their sprite.
Items reset their pixel_x and pixel_y values on pickup.
2015-02-19 13:02:43 +00:00
Razharas 5d0e800c3d Merge branch 'master' of https://github.com/tgstation/-tg-station into FUCKGIT
Conflicts:
	icons/turf/floors.dmi

Fixing merge conflicts
2015-02-17 20:33:52 +03:00
Cheridan 15439b8c4e Merge branch 'ObjProcessingFix' of git://github.com/phil235/-tg-station into phil235-ObjProcessingFix
Conflicts:
	code/game/gamemodes/wizard/artefact.dm
2015-02-15 10:27:50 -06:00
phil235 135293bedf Fixes object processing list by replacing "SSobj.processing.Add" by "SSobj.processing |= " to avoid having duplicated objects in the list, meaning the objects would be processed more than once per iteration.
Fixes Alien embryo processing that was processed twice.
2015-02-14 14:18:49 +01:00
Swag McYolosteinen b2d6ce5481 Merge pull request #7668 from dannno/suicidefix
Fixes #7647
2015-02-14 12:12:38 +01:00
Iamgoofball 99cab4ddcb Changes 2015-02-13 18:05:03 -08:00
Razharas 7571189a35 More vines for the god of vines
Added bluespace vines that are able to grow through walls, glass and
anything and everything
Added space-protective vines that change the space into "vineturfs"
which are basically resprited floors
Made vines be able to spread into space
Changed some vinecontroller vars, now you can adjust the speed of
spreading both by capping the max vines per tick and new-vines to
existing-vines spread ratio
Made the chance to mutate per spread be dependant on the potency of the
seed
Made the spreading speed be dependant on productivity of the seed(can be
both slower and faster then current one)
Fixed some potential runtimes with calling destroy() instead of qdel()
where needed
Removed the colon added by carn, its all checked in Enter call few lines
later anyway
I like vines
2015-02-13 01:13:13 +03:00
dannno b34c5180ae modifies and fixes suicide messages for guns and bananas 2015-02-11 22:39:11 -05:00
phil235 c70d17a8eb Rebalancing vitamin amounts in grown
Fixing some sugar amounts in 2 growns
Fixing error from metastation z2 mapfile.
2015-02-08 22:48:53 +01:00
Iamgoofball fa32a61494 Loads of new chemicals and changes 2015-02-07 21:55:21 -08:00
Iamgoofball 0864e4a8dc Merge branch 'master' of https://github.com/tgstation/-tg-station into drugs
Conflicts:
	code/modules/reagents/Chemistry-Goon-Medicine.dm
	code/modules/reagents/reagent_containers/pill.dm
	icons/obj/drinks.dmi
2015-02-07 15:46:12 -08:00
phil235 35fb458293 Merge branch 'master' of https://github.com/tgstation/-tg-station into CookingOverhaul
Conflicts:
	code/modules/food&drinks/food/snacks_other.dm
	icons/obj/drinks.dmi
2015-02-07 20:22:49 +01:00
phil235 63456ef622 Many fixes. Adding custom pizza slices. Reducing amount of icons used. Adding a changelog. 2015-02-07 03:10:32 +01:00
TheVekter ff65ec2018 Fixed "Chilli" -> "Chili" and "Coco" -> "Cocoa". Pray it passes Travis. 2015-02-06 05:22:53 -06:00
Iamgoofball f6d7823fc2 Adds muriatic, caustic, and hydrochloride to maint loot 2015-02-05 18:57:58 -08:00
phil235 3456b017b6 repo update 2015-02-05 23:00:59 +01:00
phil235 a296e8f6a1 Updating the cook book. Finishing giving filling color to growns. More fixes 2015-02-05 22:34:11 +01:00
phil235 faba71fcca Cooking overhaul: adding tablecraft food recipes, customizable food, food ingredients (from bay)
- converted the microwave recipes to tablecraft recipes
- Added customizable food (thanks iamgoofball)
- added food ingredients (from baystation)
- changing food recipes a bit (replacing stuff with the new food ingredients)
- repurpose the microwave to actually cook certain food items.
- bowl is no longer trash but a reagent_containers/glass that is used in salad/soup recipes
- Changed the hunger system a bit, sugar becomes a normal reagent again. Adding a junkiness var to foods to drain mob satiety.
- milk carton is now a condiment bottle
- slight buff to vitamin
2015-02-05 16:48:25 +01:00
dannno c4fccf2651 remove redundant message 2015-02-01 16:35:14 -05:00
dannno a8fd8d13fa how about i put you to sleep kraso
with a banana
by killing you with it
2015-02-01 16:33:50 -05:00
dannno f2ccc18c5c kill yourself with banana my friend 2015-02-01 14:19:17 -05:00
Iamgoofball b83ca5f8d1 Goon Chemistry: Addiction and Overdosing 2015-01-18 21:50:54 -08:00
Iamgoofball f3398e58a9 Removes Star Trek chemistry and transfers us to Goon Chemistry. 2015-01-16 17:21:36 -08:00
carnie a3f5e7ebfd Merge branch 'master' of https://github.com/tgstation/-tg-station into SubSystems
Conflicts:
	code/game/gamemodes/setupgame.dm
	code/modules/mob/living/carbon/human/life.dm
	code/modules/reagents/Chemistry-Machinery.dm
2015-01-04 01:52:14 +00:00
phil235 cf48bb8364 Fixes potato cell construction being broken
Fixes eggplant parmigiana recipe (it was inheriting reagent requirements from spaghetti). I changed recipes so that they never inherit items or reagents requirements from a parent recipe to make adding new recipes in each categories less prone to mistakes.
2015-01-02 18:18:26 +01:00
carnie a029a49392 SubSystem rewrite
Misc:

+Fixes unreported issue with initializing lighting on a specific zlevel

+Fixes two similar issues with moveElement and moveRange. Where fromIndex or toIndex could be adjusted incorrectly in certain conditions. Potentially causing bad-sorts, or out of bound errors.

+Rewrites listclearnulls(list/L) to no longer iterate through L.len elements for every null in the list (plus 1). i.e. went from L.len*(number_of_nulls+1) list-element reads (best-case), to L.len list-element reads (worst-case)

+New proc/getElementByVar(list/L, varname, value) which finds the first datum in a list, with a variable named varname, which equals value. You can also feed it atoms instead of lists due to the way the in operator functions.

+Fixes an unreported issue with Yota's list2text rewrite. Under certain conditions, the first element would not be converted into a string. Causing type-mismatch runtimes.

+New global map_ready variable. This is not fully implemented yet, but will be used to avoid duplicate calls to initialize() for map objects.

+All turfs now maintain references to all lights currently illuminating them. This will mean higher memory use unfortunately, due to the huge number of turfs. However, it will speed up updateAffectingLights significantly. I've used list husbandry to reduce baseline memory usage, so it shouldn't be any worse than some past atmos modifications memory-wise.

-Removed 'quadratic lighting', can add this back at some point. Sorry.

+modified the way lum() works slightly, to allow turfs to have overridden delta-lumen. i.e. space cannot be illuminated more than its default ambiance. This allowed removal of some iffy special-snowflake lighting areas implemented by somebody else.

+Lighting images in the dmi can now use arbitrary naming schemes. It is reliant on order now. This allows the dmi to be replaced by simply dropping in a new dmi.

-Removed all subtypes of /area/shuttle. Shuttles now create duplicate 'rooms' of /area/shuttle. (More on this later). This will conflict with most maps. Guide on how to fix to follow.

+All verbs/tools relating to world.tick_lag were refactored to use world.fps. However old config text for setting tick_lag will still work (it converts the value to fps for you)

+MC stats improved using smoothing. They now have their own tab so they dont get in the way when you're playing as an admin.

-removed the push_mob_back stuff due to conflicting changes. Sorry Giacom.

_OK, NOW THE ACTUAL INTERESTING STUFF_

Following systems moved over to subsystem datums:
air_master
garbage_manager
lighting_controller
process_mobs (aka Life())
nanomanager
power
sun
pipenets
AFK kick loops
shuttle_controller (aka emergency shuttle/pods), supply_shuttle and other shuttles
voting
bots
radio
diseases
events
jobs
objects
ticker

Subsystems hooks and variables should be commented fairly in-depth. If anything isn't particularly clear, please make an issue.

Many system-specific global variables have been refactored into

All tickers which previously used world.timeofday now use world.time

some subsystems can iterate before round start. this resolves the issue with votes not working pregame
2014-12-31 13:25:41 +00:00
phil235 7bd9b86652 Changes the hunger system in various ways. New hunger hud icons. Food w/o sugar can be loaded in snack vending machines by anyone. Adding two new var for mobs "satiety" and "metabolism efficiency". Rearranging datum/reagents, all "good" medical reagents are under datum/reagent/medicine/ and all food&drink reagents are under datum/reagent/consumable. Adding a pizza crate to cargo orders. Growns and cooked food are given vitamins while junk food are all given sugar. Removed some unnecessary code in Chemistry-Reagents.dm .
high satiety+fed = higher metabolism_efficiency, lower if starving. Sugar digested drains satiety and vitamin raises satiety. Negative satiety means faster nutrition drop. Positive high satiety means lower chance to spread viruses. metabolism efficiency affect metabolization speed of healing and damaging reagents and the efficiency of bodytemp stabilization via calory use.
2014-12-11 20:46:27 +01:00
Menshin 76ecd457b1 Killer tomatoes :
* Prevent killer tomato from spawning inside nullspace
* It's now impossible to eat an awakening killer tomato
* Fixed been able to spawn lots of killer tomatoes by spam clicking the tomato object

Drones :

Prevent an edge case which would lead to a client spawning as drone in null space

Brains :

Makes brainmobs qdel instead of piling up inside the brain object
2014-11-28 23:24:12 +01:00
Incoming 1212180556 Returns the missing grassclump icon
Introduces the improvements added to grass in #5253 to carpets
2014-10-18 20:58:07 -04:00