Commit Graph

95 Commits

Author SHA1 Message Date
Lo6a4evskiy
ab6fb1ab36 Refactor using slot_equipment_priority 2015-12-29 17:59:56 +04:00
Lo6a4evskiy
62d4bd604d Refactor quick-equip verb 2015-12-12 16:29:24 +04:00
AnturK
e36853d7c9 Convert bots to simple animals - Updated 7.0 2015-11-26 22:06:07 +01:00
Razharas
f87d72571e Merge pull request #12420 from phil235/TransferAmountChange
Set Transfer Amount for reagent containers now uses attack_self() instead of object verb
2015-10-17 18:06:39 +03:00
phil235
dce2027d01 Changing the transfer amount of all reagent containers (beaker, bucket, glass) is now done by clicking them, similar to spray. Reagent dispensers (watertank, fueltank, pepperspray dispenser) no longer have their own transfer amounts and use the reagent container's transfer amount instead (except for sprays which get 50u for faster refilling).
Removed object verb "Set Amount per transfer from this" for both reagent containers and reagent dispensers.
2015-10-16 01:07:10 +02:00
Xhuis
713a0b99ef Buffs melee resistance on the TACTICAL BUCKETS 2015-10-14 21:58:15 -04:00
Xhuis
14c21cf2a2 Allows you to equip buckets as hats 2015-10-14 21:51:42 -04:00
phil235
832e650ffc Trashbag can pick up ammo casings and reagent_containers/food/drinks again.
Dipping a lit cigarette into a reagent container heats up the liquid (like every other heat sources) and only unlit cigarette can be dipped to absorb the liquids now.
2015-10-08 01:26:55 +02:00
xxalpha
655b1a77c7 Replaced refactored is_hot() to be an atom proc. 2015-09-24 01:12:38 +01:00
bear1ake
f697ae90f5 removes a bunch of .0 2015-09-10 20:57:30 +09:00
phil235
677b24ab68 derp 2015-07-23 13:12:00 +02:00
phil235
9fab0f3641 Fixes beaker feeding not calling the right volume for the ingestion reaction.
Same fix for ninja suit adrenalin boost.
Simplifies reagent_containers/glass/attackby() a bit.
2015-07-23 13:05:53 +02:00
phil235
236215b03c Fixes damp rag smothering 2015-07-16 17:20:08 +02:00
duncathan
ae417d2a03 Merge branch 'master' of https://github.com/tgstation/-tg-station into atmosrefactor2
Conflicts:
	code/ATMOSPHERICS/atmospherics.dm
	code/ATMOSPHERICS/components/binary_devices/binary_atmos_base.dm
	code/ATMOSPHERICS/components/binary_devices/passive_gate.dm
	code/ATMOSPHERICS/components/binary_devices/pump.dm
	code/ATMOSPHERICS/components/binary_devices/volume_pump.dm
	code/ATMOSPHERICS/components/trinary_devices/filter.dm
	code/ATMOSPHERICS/components/trinary_devices/mixer.dm
	code/ATMOSPHERICS/components/trinary_devices/trinary_base.dm
	code/ATMOSPHERICS/components/unary_devices/Freezer.dm
	code/ATMOSPHERICS/components/unary_devices/cryo.dm
	code/ATMOSPHERICS/components/unary_devices/unary_base.dm
	code/ATMOSPHERICS/components/unary_devices/vent_scrubber.dm
	code/modules/events/vent_clog.dm
	code/modules/mob/living/carbon/human/species.dm
	config/admins.txt
2015-07-16 04:27:25 -06:00
Firecage
4688c2c969 Fixes proc arguments 2015-07-15 23:52:35 +02:00
duncathan
e074fb7856 makes air flow; fixes EVERYTHING 2015-07-11 18:45:19 -06:00
MrStonedOne
a262f9aac7 Attack logging tweaks
Removed the "feature" to have something log in an atom's vv attack log, but not the file attack log. all attack log items will go to the file as well as vv.

Replaced all hard coded src.name/name for attack log's object argument with an actual object (src) except where it made more sense not to.

All attack logging *should* happen AFTER damage is applied now.

Removed the confusing attack entry for when a changeling stings another changeling.

Tweaked how punch attack logs worked
2015-07-08 23:14:37 -07:00
kingofkosmos
1c52df23b5 Merge branch 'master' of https://github.com/tgstation/-tg-station into beakerdrink
Conflicts:
	code/modules/reagents/reagent_containers/glass.dm
2015-07-05 10:14:33 +03:00
Ikarrus
38dc0890c8 Spillable var instead of checking for OPENCONTAINER as that flag encompasses a lot more than necessary. 2015-07-04 08:54:04 -06:00
kingofkosmos
5c40d74aac Merge branch 'master' of https://github.com/tgstation/-tg-station into beakerdrink
Conflicts:
	code/modules/reagents/reagent_containers/glass.dm
2015-07-04 10:56:27 +03:00
kingofkosmos
46cab301fc Added splashing to drinking glasses. Added drinking and feeding to beakers. 2015-07-04 09:44:23 +03:00
Ikarrus
4d1760ca74 Fixes Beakers unable to transfer their reagents to other objects the mob is holding. 2015-07-02 21:30:01 -06:00
Razharas
572121ecc4 Merge pull request #10244 from Ikarrus/workplacesafety
Workplace "Accidents"
2015-07-03 05:05:36 +03:00
kingofkosmos
4af6c0b466 Added drinking glass splashing. Added beaker drinking and splashing which doesn't work at this moment. 2015-07-02 21:26:41 +03:00
Ikarrus
07bf0fd953 You can splash yourself with reagent glasses now 2015-07-01 12:01:58 -06:00
xxalpha
cfb5e724b6 Material container, all items can have materials, wake me up
cant wake up

go to sleep debug
2015-07-01 03:34:47 +01:00
Ikarrus
8c1fde7947 Squashed Commits 2015-06-28 22:38:55 -06:00
Ikarrus
454348759d Workplace "Accidents"
- Slipping while carrying items in your hand may cause ~accidents~
  - 30% chance to attack yourself
  - 30% chance to attack the floor
  - 30% chance to throw the item towards the direction you're facing
- Throwing reagent containers such as drinks or beakers may spill their contents onto whatever they hit
2015-06-28 18:19:11 -06: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
phil235
ccd4137a9d Merge pull request #8974 from kingofkosmos/mopbucket
Mopping with just a bucket
2015-06-06 13:18:07 +02:00
kingofkosmos
6b58fb55fa Unnecessary isprox-check removed. 2015-06-03 19:03:38 +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
kingofkosmos
9bfe79b760 Everything under one bucket/attackby 2015-05-22 15:48:09 +03:00
kingofkosmos
dcbb071c22 missed a spanclass 2015-05-01 09:34:54 +03:00
kingofkosmos
8eec4c9199 Mop can now be wetted in the sink. 2015-04-29 20:19:41 +03:00
kingofkosmos
1f5cb56ff7 Bucket's attackby-procs combined. 2015-04-29 18:45:45 +03:00
kingofkosmos
c41b90451c Mopping can be done also with a bucket. 2015-04-29 18:41:04 +03:00
kingofkosmos
72749392d8 span classes removed from visible.messages 2015-04-24 20:50:51 +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
Iamgoofball
7fa33e5b50 Removes chem piles due to exploit.
I'd fix it in the black powder files but @phil235 has them on hold.

Merge ASAP
2015-04-17 16:58:19 -07:00
Iamgoofball
434265afa0 Reagent Decals 2: Black Powder Boogaloo 2015-03-22 02:04:31 -07:00
Cheridan
ecb3a4e08f Merge pull request #8236 from phil235/DoughChange
Dough change
2015-03-13 15:34:39 -05:00
Remie Richards
f6e4c1518d A restructure/removal/cleanup of Ninja Code 2015-03-09 20:43:56 +00:00
phil235
bc091234ee Changes egg breaking to use reagent_containers/glass/attackby() (fix issue with custom egg salad)
You can only break eggs on glass containers (beaker,bucket,bowl,etc)
2015-03-09 19:43:39 +01:00
phil235
bb10824737 Improvised heating fix: Fixes dough recipe from egg + 15u flour beaker.
Adds a limit to how hot the beaker reagents can be heated. (no hotter than the heat source)
moving reagent_containers/attackby() to reagents/reagent_containers.dm for better visibility.
2015-03-03 22:35:11 +01:00
Delimusca
747ebbc78d added improvised heating 2015-02-28 20:51:39 -07: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
Jordie0608
4a82ff1564 Merge branch 'master' of https://github.com/tgstation/-tg-station into timeforanewnew()
Conflicts:
	code/modules/reagents/reagent_containers/bottle.dm
	code/modules/reagents/reagent_containers/pill.dm
	code/modules/reagents/reagent_containers/syringes.dm
2015-01-21 16:54:40 +11:00
pudl
e78e3e5118 adds reserve tanks of the 4 basic chems, brute medkits, and brute medbots. 2015-01-20 23:16:21 -06:00
Jordie0608
679b03e6e9 WIP reagent container spawning refactor 2015-01-17 18:19:17 +11:00