From 3004093a503189dfc3fc11a180dccf2efebe0ac9 Mon Sep 17 00:00:00 2001
From: Arokha Sieyes <arokha@arokha.com>
Date: Wed, 28 Feb 2018 20:03:18 -0500
Subject: [PATCH] Make syringe reuse a bad idea

Because now it can infect limbs and transfer viruses
---
 code/_macros_vr.dm                            |   3 +-
 .../objects/items/weapons/storage/boxes.dm    |   3 +-
 .../reagents/reagent_containers/syringes.dm   |   8 +-
 .../reagent_containers/syringes_vr.dm         | 117 ++++++++++++++++++
 icons/goonstation/LICENSE.md                  |   2 +
 icons/goonstation/objects/syringe.dmi         | Bin 0 -> 1855 bytes
 icons/goonstation/objects/syringe_vr.dmi      | Bin 0 -> 1478 bytes
 vorestation.dme                               |   1 +
 8 files changed, 129 insertions(+), 5 deletions(-)
 create mode 100644 code/modules/reagents/reagent_containers/syringes_vr.dm
 create mode 100644 icons/goonstation/LICENSE.md
 create mode 100644 icons/goonstation/objects/syringe.dmi
 create mode 100644 icons/goonstation/objects/syringe_vr.dmi

diff --git a/code/_macros_vr.dm b/code/_macros_vr.dm
index bf3b3bdafe..daa1123574 100644
--- a/code/_macros_vr.dm
+++ b/code/_macros_vr.dm
@@ -1 +1,2 @@
-#define isbelly(A) istype(A, /obj/belly)
\ No newline at end of file
+#define isbelly(A) istype(A, /obj/belly)
+#define isstorage(A) istype(A, /obj/item/weapon/storage)
\ No newline at end of file
diff --git a/code/game/objects/items/weapons/storage/boxes.dm b/code/game/objects/items/weapons/storage/boxes.dm
index 84a17ac9d1..64d6252a2f 100644
--- a/code/game/objects/items/weapons/storage/boxes.dm
+++ b/code/game/objects/items/weapons/storage/boxes.dm
@@ -96,7 +96,8 @@
 	name = "box of syringes"
 	desc = "A box full of syringes."
 	icon_state = "syringe"
-	starts_with = list(/obj/item/weapon/reagent_containers/syringe = 7)
+	can_hold = list(/obj/item/weapon/reagent_containers/syringe) //VOREStation Edit
+	starts_with = list(/obj/item/weapon/reagent_containers/syringe = 20) //VOREStation Edit
 
 /obj/item/weapon/storage/box/syringegun
 	name = "box of syringe gun cartridges"
diff --git a/code/modules/reagents/reagent_containers/syringes.dm b/code/modules/reagents/reagent_containers/syringes.dm
index b9191b4329..b4ccda29ec 100644
--- a/code/modules/reagents/reagent_containers/syringes.dm
+++ b/code/modules/reagents/reagent_containers/syringes.dm
@@ -160,8 +160,9 @@
 				return
 
 			var/mob/living/carbon/human/H = target
+			var/obj/item/organ/external/affected //VOREStation Edit - Moved this outside this if
 			if(istype(H))
-				var/obj/item/organ/external/affected = H.get_organ(user.zone_sel.selecting)
+				affected = H.get_organ(user.zone_sel.selecting) //VOREStation Edit - See above comment.
 				if(!affected)
 					to_chat(user, "<span class='danger'>\The [H] is missing that limb!</span>")
 					return
@@ -202,6 +203,7 @@
 			if(ismob(target))
 				var/contained = reagentlist()
 				trans = reagents.trans_to_mob(target, amount_per_transfer_from_this, CHEM_BLOOD)
+				dirty(target,affected) //VOREStation Add
 				admin_inject_log(user, target, src, contained, trans)
 			else
 				trans = reagents.trans_to_obj(target, amount_per_transfer_from_this)
@@ -214,7 +216,7 @@
 				update_icon()
 
 	return
-
+/* VOREStation Edit - See syringes_vr.dm
 /obj/item/weapon/reagent_containers/syringe/update_icon()
 	overlays.Cut()
 
@@ -241,7 +243,7 @@
 
 		filling.color = reagents.get_color()
 		overlays += filling
-
+*/
 /obj/item/weapon/reagent_containers/syringe/proc/syringestab(mob/living/carbon/target as mob, mob/living/carbon/user as mob)
 	if(istype(target, /mob/living/carbon/human))
 
diff --git a/code/modules/reagents/reagent_containers/syringes_vr.dm b/code/modules/reagents/reagent_containers/syringes_vr.dm
new file mode 100644
index 0000000000..2e8fec60f9
--- /dev/null
+++ b/code/modules/reagents/reagent_containers/syringes_vr.dm
@@ -0,0 +1,117 @@
+#define SYRINGE_CAPPED 10
+
+/obj/item/weapon/reagent_containers/syringe
+	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)
+	targets.Cut()
+	return ..()
+
+/obj/item/weapon/reagent_containers/syringe/process()
+	dirtiness = min(dirtiness + targets.len,75)
+	if(dirtiness >= 75)
+		processing_objects -= src
+	return 1
+
+/obj/item/weapon/reagent_containers/syringe/proc/dirty(var/mob/living/carbon/human/target, var/obj/item/organ/external/eo)
+	LAZYINITLIST(targets)
+
+	//We can't keep a mob reference, that's a bad idea, so instead name+ref should suffice.
+	var/hash = md5(target.real_name + "\ref[target]")
+
+	//Just once!
+	targets |= hash
+
+	//Grab any viruses they have
+	if(LAZYLEN(target.virus2.len))
+		LAZYINITLIST(viruses)
+		var/datum/disease2/disease/virus = pick(target.virus2.len)
+		viruses[hash] = virus.getcopy()
+
+	//Dirtiness should be very low if you're the first injectee. If you're spam-injecting 4 people in a row around you though,
+	//This gives the last one a 30% chance of infection.
+	if(prob(dirtiness+(targets.len-1)*10))
+		log_and_message_admins("[loc] infected [target]'s [eo.name] with \the [src].")
+		infect_limb(eo)
+
+	//75% chance to spread a virus if we have one
+	if(LAZYLEN(viruses) && prob(75))
+		var/old_hash = pick(viruses)
+		if(hash != old_hash) //Same virus you already had?
+			var/datum/disease2/disease/virus = viruses[old_hash]
+			infect_virus2(target,virus.getcopy())
+
+	if(!used)
+		processing_objects |= src
+
+/obj/item/weapon/reagent_containers/syringe/proc/infect_limb(var/obj/item/organ/external/eo)
+	src = null
+	var/weakref/limb_ref = weakref(eo)
+	spawn(rand(5 MINUTES,10 MINUTES))
+		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)
+		if(SYRINGE_CAPPED)
+			mode = SYRINGE_DRAW
+			to_chat(user,"<span class='notice'>You uncap the syringe.</span>")
+		if(SYRINGE_DRAW)
+			mode = SYRINGE_INJECT
+		if(SYRINGE_INJECT)
+			mode = SYRINGE_DRAW
+		if(SYRINGE_BROKEN)
+			return
+	update_icon()
+
+//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
+		tf.Translate(-3,0) //Could do this with pixel_x but let's just update the appearance once.
+	transform = tf
+
+	if(mode == SYRINGE_BROKEN)
+		icon_state = "broken"
+		return
+
+	if(mode == SYRINGE_CAPPED)
+		icon_state = "capped"
+		return
+
+	var/list/new_overlays = list()
+	var/rounded_vol = round(reagents.total_volume, round(reagents.maximum_volume / 3))
+	if(reagents.total_volume)
+		filling = image(icon, src, "filler[rounded_vol]")
+		filling.color = reagents.get_color()
+		new_overlays += filling
+
+	if(ismob(loc))
+		var/injoverlay
+		switch(mode)
+			if (SYRINGE_DRAW)
+				injoverlay = "draw"
+			if (SYRINGE_INJECT)
+				injoverlay = "inject"
+		new_overlays += injoverlay
+	
+	add_overlay(new_overlays)
+	icon_state = "[rounded_vol]"
+	item_state = "syringe_[rounded_vol]"
+
+#undef SYRINGE_CAPPED
diff --git a/icons/goonstation/LICENSE.md b/icons/goonstation/LICENSE.md
new file mode 100644
index 0000000000..bb6102702e
--- /dev/null
+++ b/icons/goonstation/LICENSE.md
@@ -0,0 +1,2 @@
+All files located in this directory and any subdirectories are licensed under the
+Creative Commons 3.0 BY-NC-SA license (https://creativecommons.org/licenses/by-nc-sa/3.0)
\ No newline at end of file
diff --git a/icons/goonstation/objects/syringe.dmi b/icons/goonstation/objects/syringe.dmi
new file mode 100644
index 0000000000000000000000000000000000000000..a2681222f2cf46bbdc3bc43d59e4315bce42dde2
GIT binary patch
literal 1855
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
X2H1!p_3x@5Q4Mv>-|L>|+3bG;yR?su

literal 0
HcmV?d00001

diff --git a/icons/goonstation/objects/syringe_vr.dmi b/icons/goonstation/objects/syringe_vr.dmi
new file mode 100644
index 0000000000000000000000000000000000000000..7136e09eae64fe711502058305ae9769caf13b45
GIT binary patch
literal 1478
zcmeAS@N?(olHy`uVBq!ia0vp^4Is?H1|$#LC7uRSORGX6N?cNllZ!G7N;32F7#J$%
z^j_G{*Q_9L{G;T&M~kYJ{~B*HnbGEWzwuOLhA8iZU%zBCF0HiOzWd4K_a9b2ymhaH
zf7Rtby@o$k8(Kaue3<ju%z8qBRnfBx_Az??r__`^RvcOS=*+Jf4oweodeV*+{r7Md
zvf8xRQP{DoIwnrS!)!*WtGAK-Jd2b`H#5wHdh2Exyqocx`=u$@AL%s<--@pA`^;an
zbJCH_Qy(WWFtFV5ba4!+nDch7VTN?L%rX0^4sBfl0V<1FHl2L1@LP(BmubtDWaiA3
zo+nZ&1yc-K^ycoF(!!&ADj~h&;GqdeF7UCMT4-3=R2q3M(8%T7A`radvRuT>_1@=f
z=H5HG>+(sjPqp>}%d5XH`Cq<kzQ6j*dzM$TwklNo%(%mNq+%k&6Ay+W6$VS81{qF=
zJ{ARcrU}Z7CoqJUdpDdq)FgiGVrlI9u+^38UPt9yTU#&e@9olUk32n1`Q)!{GTTbc
zihCCAo2mS!^n3A<we^SQ{Ir<MH}%22TT*7`=7DR&g10?An|3)mGV&u=E0fX8Gl|uD
z)1B?+yKjuxVt1}h_xRqerXj0Cmt4-w$<P1(#ADMwpxN>aR&)8v%FFp7M$bN5cJ=$m
zVi_431;4*~jQ2{ce!Tr29L(^I>F>F1x8J4<w=!jIon>xr-tM-TvDnJeveUi)+w!=5
zckVNP>uulXu)6ej=@ijzPcydP{(Ut|wAYP!n~dkR?N1F}|1P~>V%2Wx7I^>6#k}o;
zYx19UMBAs%6AIJQPd#Kc{j|3v!)1nl8+Gn68+_^dcKYKsJBB%|6L_C^Y}u#lzF=Sf
z{A87{XJztVzhiwh+j8EqmGduIHr{y=OfY0|1UNQfzw0j^0Apc$)%SI!5*uIdirX7^
z{OJ1ik@H{Nx381U;@HA#-2Zx)?cr-@Z5FS{f3~CYb=ZqfReSqp&YZdK*Xq@)<CX?_
zs+?c&RlcT(IewS<{2RYSx{pRiS3h~poD=usnAD@B&0^U#RrYL>^WQ(0bgeaZzw+^?
zw6wk-^GOebjM|u8jcJ>I&P@HgHi*G+9lycWud;T3|8U#<e|mh~%lc#~Bu#6ty}kbQ
z)1{X&@6_`n7}?kE=S?UpGb>5HU7^07KjHM}eSPQOf1f4i{&(?(uZ$-yE+-}lLPEq+
zFvntZU46>`-)s#3_WcT7Vw}7!&X<4g^FuqAD_e$ta9)tjUy$~9-}l4k{U6-l^!!tM
z@aKJN`z`agu}*gv%z1rv%l9AWL~ZsJv;ORye8PW@OToQ-?tA9TJw3iGy!2UY!yb$K
zrmPM5;bwhrgx~B3@-Cl$Biy?BzWtG3Ur%5A`Stbm>S^5vC0|G+R2J@YZ&LW@X3zJh
zH}70`#TSkT`7bu?|5bPTPg(qo#Y-foJYd`YR<P;xnUx&NpDziJWhq*?x#{G^?<iT$
z?|eSvBKxI5FZZmyTR3O`v6;$wwVVQT?VWG+|K8n}&=>LbtC)b`@xma6Wlfh0pLhJW
z`K8n$^A<}MMN2Ws|1EdK==EDOnciZ?nx)aygA0Ij7nr7aE&ZIB{Oss%e<AgjACIq;
z>hAkKVc~a%$5Qh8lN2W=GaN6Rr~c9A(T|Ic3WQ3H=k+HwEWTAQ{b>d)m>E1>{an^L
HB{Ts5?c1kx

literal 0
HcmV?d00001

diff --git a/vorestation.dme b/vorestation.dme
index abe395089d..d3614453eb 100644
--- a/vorestation.dme
+++ b/vorestation.dme
@@ -2482,6 +2482,7 @@
 #include "code\modules\reagents\reagent_containers\spray.dm"
 #include "code\modules\reagents\reagent_containers\spray_vr.dm"
 #include "code\modules\reagents\reagent_containers\syringes.dm"
+#include "code\modules\reagents\reagent_containers\syringes_vr.dm"
 #include "code\modules\reagents\reagent_containers\drinkingglass\drinkingglass.dm"
 #include "code\modules\reagents\reagent_containers\drinkingglass\extras.dm"
 #include "code\modules\reagents\reagent_containers\drinkingglass\glass_boxes.dm"