cyberpresidentvanellope/Polaris
1
0
Fork 0
mirror of https://github.com/PolarisSS13/Polaris.git synced 2025-12-24 17:11:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'dev' into ofChemistryAndStuff

Browse Source 
Conflicts:
	code/game/objects/effects/chem/chemsmoke.dm
	code/modules/customitems/item_defines.dm
	code/modules/projectiles/guns/launcher/syringe_gun.dm
	code/modules/reagents/Chemistry-Holder.dm
	code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Toxins.dm
	code/modules/reagents/reagent_containers/food/drinks.dm
	code/modules/reagents/reagent_containers/pill.dm
	maps/exodus-1.dmm
This commit is contained in:
Kelenius
2015-05-15 11:28:05 +03:00
parent fedd0342a0 876b5ee94d
commit 10915eae24
468 changed files with 7273 additions and 9076 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
code/modules/reagents/reagent_containers.dm
View File

@@ -102,6 +102,11 @@
H << "<span class='notice'>You have a monitor for a head, where do you think you're going to put that?</span>"
return 1
var/obj/item/blocked = H.check_mouth_coverage()
if(blocked)
user << "<span class='warning'>\The [blocked] is in the way!</span>"
return
self_feed_message(user)
reagents.trans_to_mob(user, amount_per_transfer_from_this, CHEM_INGEST)
feed_sound(user)
@@ -113,6 +118,11 @@
H << "<span class='notice'>They have a monitor for a head, where do you think you're going to put that?</span>"
return
var/obj/item/blocked = H.check_mouth_coverage()
if(blocked)
user << "<span class='warning'>\The [blocked] is in the way!</span>"
return
other_feed_message_start(user, target)
if(!do_mob(user, target))