Commit Graph

64 Commits

Author SHA1 Message Date
phil235 e8d3deafab Merge branch 'master' of https://github.com/tgstation/-tg-station into AcidFix
Conflicts:
	code/modules/clothing/masks/gasmask.dm
2015-06-28 15:22:21 +02:00
Ikarrus 8759f56f6f Squashed Commits 2015-06-27 00:09:16 -06:00
phil235 a029f2852a Merge branch 'master' of https://github.com/tgstation/-tg-station into AcidFix
Conflicts:
	code/modules/reagents/Chemistry-Reagents/Blob-Reagents.dm
2015-06-24 21:15:09 +02:00
Iamgoofball 33b9fc3a2c Update bottle.dm 2015-06-24 10:32:55 -07:00
phil235 b0cd6d34b1 Lots of work on acids, smoke, foam, reagents reaction() proc.
- fixed the fraction argument in reaction(...., INGESTED, fraction) so the proper amounts of each reagent react, not all of it.
- slight optimization of datum/reagents/reaction()
- small optimization /datum/reagent/proc/reaction_mob
- the smoke's reagents no longer do direct transfer upon crossed()/move() but uses "reagents.reaction( mob, TOUCH)" only.
- fixes no ingesting smoke if it's in the dark.
- removed block gas smoke effect flag from clown mask and other non "actual" gas mask.
- refactor how protection against touched chems being absorbed is done. get_permeability_protection() to get that protection. No more

simple RNG get touched or not, now the amount that touches you depends on your protection and the volume in question.
- changes acid_act to take volume into account.
- chem_smoke now uses process() just like foam, we remove the reaction from crossed() and Move(), it's only done in process() now.
- optimization of effect/smoke, OOP! And now all smoke effects use objprocessing instead of shitty sleep/spawn
- removed mob var/coughedtime.
- add a volume check to item/acid_act(), there's a threshold to be able to melt and then a probability to melt (acidpwr&volume).
- greatly lowered the amount of reagent in the smoke from dead blobspore (so the volume isn't enough for melting)
- human/acid_act(): damage to limbs depends on acidpwr&volume.
- fixes metalfoam not working.
- smoke powder: only one start() call.
- Amound of smoke objects depends on amount of smoke recipe created.
- Adds an argument to add_reagent() to block automatic call of handle_reaction()
- When using reagents/proc/trans_to(), reactions are now only handled after every reagent is transfered and not before.
- Amount of smoke objects depends on amount of smoke reagent created.
- radius of foam reaction depends on amount of foam reagent created.
- The amount of other reagents inside the smoke/foam decides the life expectancy of the effect.
- The amount of reagents in each small smoke cloud/foam cell depends on the amount of other reagents in the initial reaction but also

how much smoke/foam was created (more smoke means dilution of the reagents).
- smoke/foam's reagent reaction on mob decreases the life expectancy of the effect (to avoid reagent duplication)
- The amount of reagent reacting with atoms is less if the life expectancy is high.(to avoid reagent duplication)
- The amount of movement from the smoke now depends on the number of smoke clouds created.
- removing some useless code in chem_grenade/prime().
- When calling human/acid_act(), item acid melting chance lowers after each each successful melt in the list, some of the acid is

"used" to melt that item so the next items have a lower chance to melt (to make melting every clothing harder).
- remove the banned reagent list from sprays, not needed anymore now that acid is nerfed.
- chem_grenade reaction, if there's no reagent left after reaction (smoke/foam/etc, reagents cleared) you don't get the steam effect

and immediate reaction with all atoms around the grenade explosion. (Fixes foam cleaner grenade deleting bloodstains around it as soon

as the grenade explodes, even if the foam hasn't reached the tile yet).
- melted storage items now drop their content instead of deleting everything.
2015-06-22 00:35:24 +02:00
Remie Richards f15c81d527 Caps armour to 90% damage reduction, bai bai invincibility, Adds armour_penetration variable to /item, counted for melee weapon and gun combat, Xenomorphs also have 10 armour_penetration per attack. 2015-06-18 20:36:36 +01:00
kingofkosmos c8d79e7034 Removed unnecessary spaces in these situations:
"span class = '" changed to "span class='"
"'> " changed to "'>"
2015-06-14 12:13:19 +03:00
phil235 ec6e318343 Fixes extinguisher (w/safety off) spraying water when placed on a table.
Fixes runtime when putting beaker in autolathe.
Fixes spray can empty message appearing when placing it on a table.
Fixes experimentor manual not having a title.
Fixes runtime with engine goggles updating nearby objects visibility.
Fixes runtime when looking at picture from the AI camera.
Updating the 'can_be_placed_into' list for items so their afterattack don't do anything when placing them in experimentor, autolathe, destructive analyzer.
Fixes soap starting to clean the table when placed on it.
Fixes drinking glasses having capitalized names.
2015-05-23 16:03:48 +02:00
Jordie0608 2b9c8ac98c fixes autolathe making stacks, fuel > welding fuel, fixes some non-blue medical icons 2015-05-17 01:58:46 +10:00
Samuel Rowe 98fedd31c7 Fix 2015-05-07 11:13:40 +12:00
Samuel Rowe 76bcddca8c Spelling and grammar fixes
Just cleaning up the desc's so it is more immersive.
2015-05-04 18:13:33 +12:00
kingofkosmos de280c72b5 Removed some more spans from visible messages. 2015-04-24 21:06:59 +03:00
phil235 e6e0143ec5 Merge branch 'master' of https://github.com/tgstation/-tg-station into FoodRecipes2
Conflicts:
	_maps/map_files/MiniStation/MiniStation.dmm
	_maps/map_files/MiniStation/z2.dmm
	code/game/objects/structures/crates_lockers/closets/secure/freezer.dm
2015-04-08 19:36:49 +02:00
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
phil235 9396253eb8 Fixes alien and simple animal being unable to attack porta_turret (like the AI turrets). Making a take_damage() proc to update the turret's health.
Fixes porta_turret being broken by severity = 1 explosion and deleted by severity = 3 instead of the other way around.

Fixes soda can being named 'drink' in tablecraft window.
2015-03-31 00:09:55 +02:00
phil235 efdbdef49f Fix mistake in bottle hitting message. 2015-03-23 14:27:52 +01:00
Swag McYolosteinen daffcdf075 Merge pull request #7987 from phil235/SugarSatietyRemoval
Remove sugar satiety effect
2015-03-02 18:17:40 +01:00
Cheridan 2be30eb89e Merge pull request #8083 from Delimusca/getochemboyz
added improvised heating
2015-03-02 08:58:12 -06:00
Delimusca 747ebbc78d added improvised heating 2015-02-28 20:51:39 -07:00
TheVekter f6e18e9e45 Re-adds the shot glass sprites. 2015-02-27 17:14:50 -06:00
phil235 fa0e5344ef Removes sugar effects. 2015-02-27 19:01:32 +01:00
TheVekter fa00cee00c Fixes that damn typo FOR REAL THIS TIME 2015-02-18 11:53:20 -06:00
Cheridan 2817785936 Merge pull request #7718 from TheVekter/shotglasseshowdotheywork
Re-adds Toxins Special and B-52 to glasses.
2015-02-14 18:33:00 -06:00
TheVekter cd916eb1d9 Re-adds Toxins Special and B-52 to glasses. Oops. 2015-02-13 18:34:58 -06:00
phil235 549b71a487 Merge branch 'master' of https://github.com/tgstation/-tg-station into CookingOverhaul
Conflicts:
	icons/obj/drinks.dmi

Fixing a couple typos. Making sure all eggs used in tablecraft recipes are boiled
2015-02-11 16:13:04 +01:00
TheVekter 3861126c2c Reverts drunkenness changes per #7439
Fixes a typo
Makes players drink full shot no matter how much is in glass
2015-02-10 15:54:15 -06:00
TheVekter 2b346676c1 Moved shotglasses back to drinkingglass.dm. Again.
Added a bunch more iconstates for each drink in the booze-o-mat. Any drink the shot doesn't recognize comes up as a "shot of... what?"
2015-02-10 11:50:28 -06:00
TheVekter f26ceabf3a Made Toxins Special and B-52 exclusive to shot glasses.
Tweaked drunkenness to make it less effective at lower booze levels, but moreso at higher.
Changelog.
2015-02-10 02:21:50 -06:00
TheVekter 24ed9dd3e0 Wow apparently I broke the tequila sprite 2015-02-10 00:22:22 -06:00
TheVekter f49abb5117 Adds multiple drinks to the shotglass list so they can be mixed within.
Re-adds bottle of booze that got removed in a merge conflict a while back.
2015-02-09 18:25:03 -06:00
TheVekter ba18c0e925 Adds sprites and iconstates for shot glass. 2015-02-09 17:38:23 -06:00
TheVekter e728185a49 Fixes shot glass sprite changing when something's poured in (TEMP FIX) 2015-02-09 16:55:11 -06: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
TheVekter 78c5c66afb Note: Compile before you commit ffs 2015-02-07 00:31:12 -06:00
TheVekter 4fb8b34ee0 Merge remote-tracking branch 'remotes/upstream/master' into changesafecontents
Conflicts:
	code/modules/food&drinks/drinks/drinks/bottle.dm
2015-02-07 00:18:39 -06:00
TheVekter 4e2b2fe20c Adds new top-shelf vodka to the safe (also there's a bottle hidden on the station see if you can find it~) 2015-02-06 02:29:23 -06:00
TheVekter 98465ea1dd Adds the new rare Vodka to the game and to the Safe. 2015-02-06 00:21:02 -06:00
TheVekter 4074037954 Adds shot glasses to the game. 2015-02-05 20:48:34 -06:00
TheVekter 9bc2137815 man fuck typos
Whoops, might wanna update on my end before changing a path.

Fixed typo 'Tequilla'.
2015-02-05 15:43:09 -06: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
Jordie0608 3d2da1b350 Fixed runtiming commas 2015-01-19 20:15:01 +11:00
Jordie0608 a643ecdfcc Food and drinks refactor 2015-01-19 18:06:15 +11:00
phil235 778a10688d Fixes feeding messages that was showing the attacker's message to the victim. 2015-01-14 19:57:39 +01:00
phil235 d5a7d82959 Fixes a lot of "the the" in messages. 2014-12-16 22:59:55 +01:00
phil235 f87da5939a Making nutrition level values into defines.
Adding a changelog.
Snack vending machine's chef compartment is locked with kitchen access but can be emagged or hacked.
Adding feedback message for the user when its metabolism_efficiency changes.
Negative satiety can make you jitter a little bit at times. (probability linked to your satiety)
2014-12-13 17:15:35 +01:00
phil235 f9dff2f626 Balancing nutrition and fixing some nutrition stuff that I had missed. 2014-12-12 13:59:31 +01: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
Swag McYolosteinen 6f5b2cf7ea Merge pull request #6224 from fleure/gargleblaster
Changes Gargle Blaster description
2014-12-06 10:28:23 +01:00
Cheridan f909d59d1a Merge pull request #6130 from phil235/AttackMsgStandardizedFormat
Standardizing attack messages to always show the attacker first
2014-12-04 12:45:31 -06:00
fleure 571e3a4487 Changes Gargle Blaster description 2014-12-04 18:03:50 +00:00