Merge remote-tracking branch 'refs/remotes/ParadiseSS13/master' into space-ruin-number-one

2026-08-27 22:17:32 +01:00 · 2018-10-21 15:17:31 +01:00
parent beeaf0b0e7 921b0a0a73
commit 370b662628
12 changed files with 70 additions and 7 deletions
@@ -18,8 +18,8 @@ addons:

 env:
  global:
-    - BYOND_MAJOR="511"
-    - BYOND_MINOR="1385"
+    - BYOND_MAJOR="512"
+    - BYOND_MINOR="1454"
    - BYOND_MACRO_COUNT=4
  matrix:
    - DM_MAPFILE="cyberiad"
@@ -220,6 +220,16 @@ GLOBAL_LIST_INIT(uplink_items, subtypesof(/datum/uplink_item))
 	cost = 5
 	job = list("Chief Medical Officer", "Medical Doctor", "Geneticist", "Psychiatrist",	"Chemist", "Paramedic", "Coroner", "Virologist")

+//Virology
+
+/datum/uplink_item/jobspecific/viral_injector
+	name = "Viral Injector"
+	desc = "A modified hypospray disguised as a functional pipette. The pipette can infect victims with viruses upon injection."
+	reference = "VI"
+	item = /obj/item/reagent_containers/dropper/precision/viral_injector
+	cost = 3
+	job = list("Virologist")
+
 /datum/uplink_item/jobspecific/cat_grenade
 	name = "Feral Cat Delivery Grenade"
 	desc = "The feral cat delivery grenade contains 8 dehydrated feral cats in a similar manner to dehydrated monkeys, which, upon detonation, will be rehydrated by a small reservoir of water contained within the grenade. These cats will then attack anything in sight."
@@ -361,7 +361,7 @@
 		dat+= "<HEAD><TITLE>Suit storage unit: Maintenance panel</TITLE></HEAD>"
 		dat+= "<B>Maintenance panel controls</B><HR>"
 		dat+= "<font color ='grey'>The panel is ridden with controls, button and meters, labeled in strange signs and symbols that <BR>you cannot understand. Probably the manufactoring world's language.<BR> Among other things, a few controls catch your eye.<BR><BR>"
-		dat+= text("A small dial with a arrow embroidered on it. It's pointing towards a gauge that reads [].<BR> <font color='blue'><A href='?src=[UID()];toggleUV=1'> Turn towards []</A><BR>",(uv_super ? "15nm" : "185nm"),(uv_super ? "185nm" : "15nm") )
+		dat+= text("A small dial with an arrow embroidered on it. It's pointing towards a gauge that reads [].<BR> <font color='blue'><A href='?src=[UID()];toggleUV=1'> Turn towards []</A><BR>",(uv_super ? "15nm" : "185nm"),(uv_super ? "185nm" : "15nm") )
 		dat+= text("A thick old-style button, with 2 grimy LED lights next to it. The [] LED is on.<BR><font color ='blue'><A href='?src=[UID()];togglesafeties=1'>Press button</a></font>",(safeties ? "<font color='green'><B>GREEN</B></font>" : "<font color='red'><B>RED</B></font>"))
 		dat+= "<HR><BR><A href='?src=[user.UID()];mach_close=suit_storage_unit'>Close panel</A>"
 	else if(uv) //The thing is running its cauterisation cycle. You have to wait.
@@ -551,10 +551,10 @@
 		update_flags |= M.AdjustEyeBlurry(-1, FALSE)
 		update_flags |= M.AdjustEarDamage(-1, FALSE)
 	if(prob(50))
-		update_flags |= M.CureNearsighted(FALSE)
+		update_flags |= M.CureNearsighted()
 	if(prob(30))
-		update_flags |= M.CureBlind(FALSE)
-		update_flags |= M.SetEyeBlind(0, FALSE)
+		update_flags |= M.CureBlind()
+		update_flags |= M.SetEyeBlind(0)
 	if(M.ear_damage <= 25)
 		if(prob(30))
 			M.SetEarDeaf(0)
@@ -108,4 +108,37 @@
 	icon_state = "pipette"
 	amount_per_transfer_from_this = 1
 	possible_transfer_amounts = list(0.1, 0.2, 0.3, 0.4, 0.5, 0.6, 0.7, 0.8, 0.9, 1)
-	volume = 1
+	volume = 1
+
+//Syndicate item. Virus transmitting mini hypospray
+/obj/item/reagent_containers/dropper/precision/viral_injector
+
+/obj/item/reagent_containers/dropper/precision/viral_injector/attack(mob/living/M, mob/living/user, def_zone)
+	if(M.can_inject(user, 1))
+		to_chat(user, "<span class='warning'>You stab [M] with the [src].</span>")
+		if(reagents.total_volume && M.reagents)
+			var/list/injected = list()
+			for(var/datum/reagent/R in reagents.reagent_list)
+				injected += R.name
+				var/datum/reagent/blood/B = R
+
+				if(istype(B) && B.data["viruses"])
+					var/virList = list()
+					for(var/dis in B.data["viruses"])
+						var/datum/disease/D = dis
+						var/virusData = D.name
+						var/english_symptoms = list()
+						var/datum/disease/advance/A = D
+						if(A)
+							for(var/datum/symptom/S in A.symptoms)
+								english_symptoms += S.name
+							virusData += " ([english_list(english_symptoms)])"
+						virList += virusData
+					var/str = english_list(virList)
+					add_attack_logs(user, M, "Infected with [str].") 
+					
+				reagents.reaction(M, INGEST, reagents.total_volume)
+				reagents.trans_to(M, 1)
+
+			var/contained = english_list(injected)
+			add_attack_logs(user, M, "Injected with [src] containing ([contained])")
@@ -0,0 +1,4 @@
+author: "Farie82"
+delete-after: True
+changes: 
+  - rscadd: "Added the Viral Injector. A virologist specific traitor item that acts like a sleepy pen but can transfer viruses. It's disguised as a functional pipette."
@@ -0,0 +1,4 @@
+author: "tigercat2000"
+delete-after: True
+changes: 
+  - rscadd: "We're going 512 boisssssssssssssss"
@@ -0,0 +1,4 @@
+author: "Purpose"
+delete-after: True
+changes: 
+  - spellcheck: "Fixes grammatical error in the suit storage unit"
@@ -0,0 +1,4 @@
+author: "Farie82"
+delete-after: True
+changes: 
+  - bugfix: "Oculine now updates the blindness status correctly"
@@ -0,0 +1,4 @@
+author: "Shazbot194"
+delete-after: True
+changes: 
+  - bugfix: "all north facing in hand icons for flags."