Commit Graph

269 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
Iamgoofball a8ec1c76df Merge branch 'master' of https://github.com/tgstation/-tg-station into graphics
Conflicts:
	code/ATMOSPHERICS/atmospherics.dm
	code/game/machinery/computer/computer.dm
	code/game/objects/items/weapons/explosives.dm
	code/game/objects/structures/crates_lockers/closets/fireaxe.dm
	code/game/objects/structures/musician.dm
	code/game/objects/structures/tables_racks.dm
	code/game/objects/structures/window.dm
2015-06-23 12:54:26 -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
phil235 e6dcabf245 Merge pull request #9960 from xxalpha/bass
Put drop_item() calls inside ifs. Replaced some drop_item() with unEq…
2015-06-18 15:50:35 +02:00
xxalpha b2e84a0d3c Put drop_item() calls inside ifs. Replaced some drop_item() with unEquip( 2015-06-14 20:11:40 +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
Iamgoofball c2256d41fc BAR NOW SHOWS UP ON THE OBJECT YOU'RE INTERACTING WITH 2015-06-13 13:58:08 -07:00
Cheridan 96f14d49bf Merge pull request #9806 from kingofkosmos/blendershake
Blender, food processor and gibber shaking when processing.
2015-06-11 10:58:38 -05:00
kingofkosmos 7a952b9310 Merge branch 'master' of https://github.com/tgstation/-tg-station into blendershake
Conflicts:
	code/modules/food&drinks/kitchen machinery/gibber.dm
	code/modules/food&drinks/kitchen machinery/processor.dm
2015-06-10 20:48:22 +03:00
kingofkosmos 0933012ff6 Combined the two offset-lines into one line. 2015-06-10 19:43:45 +03:00
kingofkosmos 607ed1cbb8 Made all shakeys shake around themselves instead of shaking only to the right. Added shaking to blender's juicing process. Simplified the return-to-its-normal-spot line. 2015-06-10 19:43:44 +03:00
kingofkosmos 292c14eafb Made shaking faster. Added shaking to monkey recycler. Added juicer.ogg to the gibber. 2015-06-10 19:43:44 +03:00
kingofkosmos 06e98a1e86 Blender, food processor and gibber shaking when processing. 2015-06-10 19:43:44 +03:00
Iamgoofball f992eb1af0 Adds feedback gathering for a hell of a lot more things. 2015-06-09 21:52:46 -07:00
Iamgoofball 988ff28734 adds panel open icons for the new buildables 2015-06-07 03:55:28 -07:00
Iamgoofball 8aa79e1f1c fixes and changes 2015-06-06 18:40:38 -07:00
Iamgoofball 2ffbd75e08 whoops 2015-06-06 14:17:25 -07:00
Iamgoofball 21e4ae4b93 insert time for gibber now effected by upgrades, fixes, RECYCLER NOW MORE EFFICIENT 2015-06-06 13:28:59 -07:00
Iamgoofball 3c1a0dd0d5 SMARTFRIDGE, SEED EXTRACTOR, and MONKEY RECYCLER are now buildable. ORE REDEMPTION MACHINE can now be upgraded. 2015-06-06 12:47:11 -07:00
Iamgoofball e1cfbdaed4 RECYCLER AND HOLOGRAPH PADS ARE BUILDABLE and bugfixes 2015-06-06 01:35:01 -07:00
Iamgoofball b65c7a36df Upgrade Update: Bluespace Boogaloo 2015-06-05 23:56:09 -07:00
Cheridan ed8dffca94 Merge pull request #9721 from Jordie0608/callingspicyfoodwickeddoesntmakesensetome
Bugfix: Witticism depleted editon
2015-06-03 09:49:51 -05:00
Firecage f79e0fc1aa Updates more paths, for example obj/stuff to /obj/stuff 2015-05-31 17:48:33 +02:00
Jordie0608 03ab08112f animated foam pistol shoots proper darts, no generic surgery, augmented eyesight gives nightvision and reagents in admincookie 2015-05-31 18:25:34 +10:00
Firecage 84e8690ec6 merge conflict fix 2015-05-31 02:45:46 +02:00
Firecage 3a826fe13c Changes alot of datum/ to /datum/ 2015-05-31 02:40:54 +02:00
Cheridan cbb91c601f Merge pull request #9616 from Jordie0608/ifhuamnityexpandstoanothersolarsystemwewillhavetorenamesunglasses
Bugfix goes Forth+1
2015-05-24 23:39:40 -05:00
Cheridan ad8750eeb7 Merge pull request #9615 from phil235/RuntimesFixes
Runtime fixes and stuff.
2015-05-24 19:40:53 -05:00
Jordie0608 8c10127e1f fixes noshield flag and movable occupied processors 2015-05-24 22:52:28 +10:00
phil235 f643769ef4 Fixes some runtimes with bluespace artillery, handcuffs on simple animals, lobby music start, stunbaton attack, kitchen bowl update_icon, particle accelerator admin log message, and plasmaman spec_life(). 2015-05-23 22:34:04 +02: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 8329b10890 Merge branch 'master' of https://github.com/tgstation/-tg-station into bugsarethemotheroffeatures 2015-05-20 01:16:16 +10:00
phil235 579cc5b38e Merge pull request #9502 from MartiUK/issue9492
Fix microwave cleaning typo.
2015-05-16 19:11:18 +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
Martin Kemp 092c8238c0 Fixed cleaning microwave typo.
Fixes #9492.
2015-05-15 12:05:02 +01:00
Jordie0608 339f892ad2 corgi collar, facehugger and icecreamsandwich fix 2015-05-14 22:29:53 +10:00
Samuel Rowe c8ea983267 More 2015-05-07 11:20:14 +12: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
Cheridan 36df27ad53 Merge pull request #9205 from phil235/SpiderKnifeFixes
Spiders and kitchen tool fixes
2015-04-29 08:23:10 -05:00
TheVekter 6e6aa1d35d Makes Hooch use UE as a catalyst, fixes map issues (I hope) 2015-04-27 23:38:26 -05:00
phil235 752032628f Remove kitchen/utensil/spoon. Changes /kitchen/utensil stuff to simply be /kitchen.
Butchering spiders now is done in one step, not leg after leg. Changed simple_animal/harvest proc.
Kitchen knives are now weapon/kitchen/knife.
Fixes eating omelette with fork.
Changed some code to use is_sharp() instead of multiple type checks (spacevines and leather code).
Removes utensil/knife (we already have kitchen/knife).
2015-04-27 23:54:28 +02:00
TheVekter 36a8405056 Fixes #9184 and #9122 2015-04-27 00:54:55 -05:00
kingofkosmos de280c72b5 Removed some more spans from visible messages. 2015-04-24 21:06:59 +03:00
kingofkosmos a7bd5f93e1 "You hear something" set to italics. 2015-04-24 21:06:16 +03:00
kingofkosmos 1d14471d00 Ellipses to waiting messages. Warning-spanclasses to failing messages with an exclamation mark. 2015-04-24 20:50:50 +03:00