cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-24 12:37:26 +01:00
Code Issues Packages Projects Releases Wiki Activity

more tweaks

Browse Source
This commit is contained in:
Fox-McCloud
2016-07-19 23:09:34 -04:00
parent 0fd1c94315
commit 517f294beb
10 changed files with 24 additions and 184 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/reagents/reagent_containers/pill.dm
+1 -14
View File
@@ -17,7 +17,7 @@
icon_state = "pill[rand(1,20)]"
/obj/item/weapon/reagent_containers/food/pill/attack_self(mob/user)
return
return
/obj/item/weapon/reagent_containers/food/pill/attack(mob/living/carbon/M, mob/user, def_zone)
if(!istype(M))
@@ -38,17 +38,6 @@
to_chat(user, "<span class='warning'>[target] is empty. Cant dissolve [src].</span>")
return
// /vg/: Logging transfers of bad things
if(target.reagents_to_log.len)
var/list/badshit=list()
for(var/bad_reagent in target.reagents_to_log)
if(reagents.has_reagent(bad_reagent))
badshit += reagents_to_log[bad_reagent]
if(badshit.len)
var/hl = "<span class='danger'>([english_list(badshit)])</span>"
message_admins("[user.name] ([user.ckey]) added [reagents.get_reagent_ids(1)] to \a [target] with [src].[hl] (<A HREF='?_src_=holder;adminplayerobservecoodjump=1;X=[user.x];Y=[user.y];Z=[user.z]'>JMP</a>)")
log_game("[user.name] ([user.ckey]) added [reagents.get_reagent_ids(1)] to \a [target] with [src].")
to_chat(user, "<span class='notify'>You dissolve [src] in [target].</span>")
reagents.trans_to(target, reagents.total_volume)
for(var/mob/O in viewers(2, user))
@@ -56,8 +45,6 @@
spawn(5)
qdel(src)
return
////////////////////////////////////////////////////////////////////////////////
/// Pills. END
////////////////////////////////////////////////////////////////////////////////