shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit800

Browse Source
This commit is contained in:
Ghommie
2020-06-23 03:12:49 +02:00
parent a7934f3f88 a0a4007332
commit ae053a9a08
736 changed files with 240884 additions and 242590 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/reagents/reagent_containers/pill.dm
+2 -8
View File
@@ -25,14 +25,8 @@
/obj/item/reagent_containers/pill/attack_self(mob/user)
return
/obj/item/reagent_containers/pill/get_w_volume()
switch(reagents.total_volume)
if(0 to 9.5)
return 1
if(9.5 to 25)
return DEFAULT_VOLUME_TINY
else
return DEFAULT_VOLUME_SMALL
/obj/item/reagent_containers/pill/get_w_volume() // DEFAULT_VOLUME_TINY at 25u, DEFAULT_VOLUME_SMALL at 50u
return DEFAULT_VOLUME_TINY/2 + reagents.total_volume / reagents.maximum_volume * DEFAULT_VOLUME_TINY
/obj/item/reagent_containers/pill/attack(mob/M, mob/user, def_zone)
if(!canconsume(M, user))