diff --git a/code/modules/nifsoft/software/13_soulcatcher.dm b/code/modules/nifsoft/software/13_soulcatcher.dm
index dfa9e87246..672710a07c 100644
--- a/code/modules/nifsoft/software/13_soulcatcher.dm
+++ b/code/modules/nifsoft/software/13_soulcatcher.dm
@@ -89,7 +89,7 @@
var/mob/living/carbon/brain/caught_soul/CS = brainmob
to_chat(CS,"\[\icon[nif.big_icon]NIF\] [sender_name] speaks, \"[message]\"")
- log_nsay(message,nif.human.real_name,src)
+ log_nsay(message,nif.human.real_name,sender)
proc/emote_into(var/message, var/mob/living/sender, var/mob/eyeobj)
var/sender_name = eyeobj ? eyeobj.name : sender.name
@@ -105,7 +105,7 @@
var/mob/living/carbon/brain/caught_soul/CS = brainmob
to_chat(CS,"\[\icon[nif.big_icon]NIF\] [sender_name] [message]")
- log_nme(message,nif.human.real_name,src)
+ log_nme(message,nif.human.real_name,sender)
proc/show_settings(var/mob/living/carbon/human/H)
set waitfor = FALSE
diff --git a/code/modules/reagents/reagent_containers/syringes.dm b/code/modules/reagents/reagent_containers/syringes.dm
index 28b06a862d..26ae0c8a36 100644
--- a/code/modules/reagents/reagent_containers/syringes.dm
+++ b/code/modules/reagents/reagent_containers/syringes.dm
@@ -203,13 +203,13 @@
var/contained = reagentlist()
while(reagents.total_volume)
if(ismob(target))
- trans += reagents.trans_to_mob(target, amount_per_transfer_from_this, CHEM_BLOOD)
+ trans += reagents.trans_to_mob(target, amount_per_transfer_from_this, CHEM_BLOOD)
else
trans += reagents.trans_to_obj(target, amount_per_transfer_from_this)
update_icon()
if(!reagents.total_volume || !do_after(user,cycle_time,target))
break
-
+
if (reagents.total_volume <= 0 && mode == SYRINGE_INJECT)
mode = SYRINGE_DRAW
update_icon()
@@ -220,7 +220,7 @@
else
to_chat(user, "The syringe is empty.")
- dirty(target,affected) //VOREStation Add
+// dirty(target,affected) //VOREStation Add
return
/* VOREStation Edit - See syringes_vr.dm
diff --git a/code/modules/reagents/reagent_containers/syringes_vr.dm b/code/modules/reagents/reagent_containers/syringes_vr.dm
index 3f012a257a..c04bcafcaf 100644
--- a/code/modules/reagents/reagent_containers/syringes_vr.dm
+++ b/code/modules/reagents/reagent_containers/syringes_vr.dm
@@ -4,19 +4,17 @@
icon = 'icons/goonstation/objects/syringe_vr.dmi'
mode = SYRINGE_CAPPED //Override
var/used = FALSE
- var/dirtiness = 0
var/list/targets
- var/list/datum/disease2/disease/viruses
/obj/item/weapon/reagent_containers/syringe/initialize()
. = ..()
update_icon()
/obj/item/weapon/reagent_containers/syringe/Destroy()
- qdel_null_list(viruses)
+// qdel_null_list(viruses)
LAZYCLEARLIST(targets)
return ..()
-
+/*
/obj/item/weapon/reagent_containers/syringe/process()
dirtiness = min(dirtiness + targets.len,75)
if(dirtiness >= 75)
@@ -63,7 +61,7 @@
var/obj/item/organ/external/found_limb = limb_ref.resolve()
if(istype(found_limb))
eo.germ_level += INFECTION_LEVEL_ONE+30
-
+*/
//Allow for capped syringe mode
/obj/item/weapon/reagent_containers/syringe/attack_self(mob/user as mob)
switch(mode)
@@ -78,10 +76,10 @@
return
update_icon()
-//Allow for capped syringes
+//Allow for capped syringes
/obj/item/weapon/reagent_containers/syringe/update_icon()
cut_overlays(src)
-
+
var/matrix/tf = matrix()
if(isstorage(loc))
tf.Turn(-90) //Vertical for storing compact-ly
@@ -111,7 +109,7 @@
if (SYRINGE_INJECT)
injoverlay = "inject"
new_overlays += injoverlay
-
+
add_overlay(new_overlays)
icon_state = "[rounded_vol]"
item_state = "syringe_[rounded_vol]"
diff --git a/icons/atmos/vent_pump.dmi b/icons/atmos/vent_pump.dmi
index 0cff6a8ffa..e0f84f6dad 100644
Binary files a/icons/atmos/vent_pump.dmi and b/icons/atmos/vent_pump.dmi differ
diff --git a/icons/atmos/vent_scrubber.dmi b/icons/atmos/vent_scrubber.dmi
index 6b365d36c0..8464359631 100644
Binary files a/icons/atmos/vent_scrubber.dmi and b/icons/atmos/vent_scrubber.dmi differ