From 899274b60a8928a9a7bf9b05d61179ce8d81b613 Mon Sep 17 00:00:00 2001
From: "musketstgstation@gmail.com"
 <musketstgstation@gmail.com@316c924e-a436-60f5-8080-3fe189b3f50e>
Date: Fri, 3 Dec 2010 01:52:27 +0000
Subject: [PATCH] Hypospray added.  Holds up to 30 units, injects 10 at a time
 instantly.  Spawns in the CMO office.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@521 316c924e-a436-60f5-8080-3fe189b3f50e
---
 code/WorkInProgress/Chemistry-Tools.dm |  37 +++++++++++++++++++++++++
 icons/obj/syringe.dmi                  | Bin 644 -> 1953 bytes
 maps/tgstation.1.3.1.dmm               |  20 ++++++-------
 3 files changed, 47 insertions(+), 10 deletions(-)

diff --git a/code/WorkInProgress/Chemistry-Tools.dm b/code/WorkInProgress/Chemistry-Tools.dm
index dfadb0d5ca7..bec2a71b59e 100644
--- a/code/WorkInProgress/Chemistry-Tools.dm
+++ b/code/WorkInProgress/Chemistry-Tools.dm
@@ -637,6 +637,43 @@
 ////////////////////////////////////////////////////////////////////////////////
 /// Syringes. END
 ////////////////////////////////////////////////////////////////////////////////
+
+////////////////////////////////////////////////////////////////////////////////
+/// HYPOSPRAY
+////////////////////////////////////////////////////////////////////////////////
+
+/obj/item/weapon/reagent_containers/hypospray
+	name = "hypospray"
+	desc = "The DeForest Medical Corporation hypospray is a sterile, air-needle autoinjector for rapid administration of drugs to patients."
+	icon = 'syringe.dmi'
+	item_state = "hypo"
+	icon_state = "hypo"
+	amount_per_transfer_from_this = 10
+	flags = FPRINT | ONBELT | TABLEPASS | OPENCONTAINER
+
+/obj/item/weapon/reagent_containers/hypospray/attack_paw(mob/user as mob)
+	return src.attack_hand(user)
+	return
+
+/obj/item/weapon/reagent_containers/hypospray/New()
+	var/datum/reagents/R = new/datum/reagents(30)
+	reagents = R
+	R.my_atom = src
+	//R.add_reagent("tricordrazine", 30) //uncomment this to make it start with stuff in
+	..()
+	return
+
+/obj/item/weapon/reagent_containers/hypospray/attack(mob/M as mob, mob/user as mob)
+	if (!( istype(M, /mob) ))
+		return
+	if (reagents.total_volume)
+		user << "\red You inject [M] with the hypospray."
+		M << "\red You feel a tiny prick!"
+		if(M.reagents) reagents.trans_to(M, 10)
+		user << "\red [reagents.total_volume] units remaining in the hypospray."
+	return
+
+
 ////////////////////////////////////////////////////////////////////////////////
 /// Food.
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/icons/obj/syringe.dmi b/icons/obj/syringe.dmi
index df2b13201d885a78a717e67cc435ed7ce73aa84c..1c2b7b2cf9af8fed6c9f58364108ac11cf509ece 100644
GIT binary patch
literal 1953
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
S#|nBb;Bx5)2fSTi%D(_>RI^9`

literal 644
zcmV-~0(<?5P)<h;3K|Lk000e1NJLTq00JNY001Be0{{R39LO^V0000*P)t-sz`($h
zlal}d0460RF)=YiLqj|~JdKTw3!<kEyuvg8|3^nhA|fJMT3T>$aEXbDe}8`x)!Yf~
z_5T1f|1&fHW;4tHGsZ++O#lD@0d!JMQvg8b*k%9#0GoPLSad{Xb7OL8aCB*JZU6vy
zoKseCa&`CgQ*iP1<SI)oD$dN$Q?OMq(KF!UEYD0S$pCVUjkq{7QZv&tN+6u#lEji!
zAXCXuiHkEOv#1!zHss<=D@x2wg|Oi&3<#<)C8)xXupx$oP01u|N+uDe5aF0iB3zR~
z*q9U|Od-NGDMYv?iLfzAM3_Q^Ym#ugMp?nt&jp+e0TKVJh_bn=kN^MyMoC0LRCt{2
z*llluFcgO29$LnWbF#Vd|9|SBFThN#eps;y_Z2|QV^Y#{06{4LKsGXSJIhwWvO|tE
zNy?uqsU~7S#D1Ii#Vu-w9BFpqDmz`3+g;W$qgiuXt)*f&i`pSanxCp_Gmmz4+x$5V
zQo7p$hM5cVw@2;*e<Qe8;7mClSPNLKXSj+LIA6{cq+FX@z@~sAp@6w_8l-UUAEUkW
zyQ{C?Sqhvvr$GvL_W@MGdxO0B`WU*Yn`@_iaum+B%kuKde-Zy)D}N3E0B~4(T21Y|
zz4~BK9;3Cco2KphzCXR6&gb*T<?k<ax`A}M!IBNA{V^mPl<{9W{^Ki%nH#8ShGB>{
z(9~hInRK6DvD`MGF>M#i=Wx#3Hl8#7^W$H?e-h)5*H|9LAIEt9oP(c1haVpR00000
e00000|L+$mY#kQu6qoq`0000<MNUMnLSTZbLK;B;

diff --git a/maps/tgstation.1.3.1.dmm b/maps/tgstation.1.3.1.dmm
index ac88ba98b98..1444ebcd086 100644
--- a/maps/tgstation.1.3.1.dmm
+++ b/maps/tgstation.1.3.1.dmm
@@ -72,7 +72,7 @@
 "abt" = (/obj/machinery/camera{c_tag = "Prison Solars"; dir = 8; network = "Prison"},/obj/machinery/power/solar_control{id = "prisonsolar"; name = "Prison Solar Control"; track = 2},/obj/cable{d2 = 8; icon_state = "0-8"},/turf/simulated/floor,/area/prison/solar_control)
 "abu" = (/turf/simulated/wall/r_wall,/area/prison/cell_block/B)
 "abv" = (/obj/machinery/atmospherics/pipe/tank/air,/obj/window/reinforced/south,/turf/simulated/floor,/area/prison/cell_block/A)
-"abw" = (/obj/machinery/atmospherics/pipe/tank/air,/obj/window/reinforced/south,/obj/machinery/light/small{dir = 1},/obj/item/weapon/paper{name = "Old Note #10"; icon = 'icons/obj/weapons.dmi'; icon_state = "crumpled"; layer = 2; pixel_x = 1; pixel_y = 7; info = "<p>There is blood and ink on this parchment. The paper is horribly old and rotten. You are barely able to read out a few lines from a tangled scribble.</p><p>Three bold guardians stand small, treading closer with a crawl. Toxic fumes to one side hold, on the other thou will findest gold.</p><p>HONK!</p>"},/turf/simulated/floor,/area/prison/cell_block/A)
+"abw" = (/obj/machinery/atmospherics/pipe/tank/air,/obj/window/reinforced/south,/obj/machinery/light/small{dir = 1},/obj/item/weapon/paper{name = "Old Note #10"; icon = 'weapons.dmi'; icon_state = "crumpled"; layer = 2; pixel_x = 1; pixel_y = 7; info = "<p>There is blood and ink on this parchment. The paper is horribly old and rotten. You are barely able to read out a few lines from a tangled scribble.</p><p>Three bold guardians stand small, treading closer with a crawl. Toxic fumes to one side hold, on the other thou will findest gold.</p><p>HONK!</p>"},/turf/simulated/floor,/area/prison/cell_block/A)
 "abx" = (/obj/machinery/power/smes{charging = 1},/obj/window/reinforced,/obj/cable{icon_state = "0-2"; d2 = 2},/turf/simulated/floor,/area/prison/solar_control)
 "aby" = (/obj/machinery/power/terminal{dir = 8},/obj/machinery/door/window/westleft{dir = 2; icon_state = "left"; name = "Prison Solar Control"; req_access_txt = "1"; tag = "icon-left"},/obj/cable,/turf/simulated/floor,/area/prison/solar_control)
 "abz" = (/obj/window/reinforced,/turf/simulated/floor,/area/prison/solar_control)
@@ -1655,7 +1655,7 @@
 "aFQ" = (/obj/grille,/obj/window/reinforced/south,/obj/window/reinforced{tag = "icon-rwindow (EAST)"; icon_state = "rwindow"; dir = 4},/obj/window/reinforced{tag = "icon-rwindow (WEST)"; icon_state = "rwindow"; dir = 8},/obj/window/reinforced{tag = "icon-rwindow (NORTH)"; icon_state = "rwindow"; dir = 1},/turf/simulated/floor/plating,/area/storage/autolathe)
 "aFR" = (/obj/cable{icon_state = "1-2"; d1 = 1; d2 = 2},/obj/machinery/door/firedoor/border_only,/obj/machinery/door/airlock/maintenance{name = "Autolathe Storage"; req_access_txt = "12"},/turf/simulated/floor,/area/storage/autolathe)
 "aFS" = (/obj/closet/emcloset,/turf/simulated/floor,/area/hallway/primary/port)
-"aFT" = (/obj/table/reinforced{dir = 9; icon_state = "reinf_tabledir"; tag = "icon-reinf_tabledir (SOUTHWEST)"},/obj/item/weapon/paper{icon = 'icons/obj/weapons.dmi'; icon_state = "crumpled"; info = "<p>There is blood and ink on this parchment. The paper is horribly old and rotten. You are barely able to read out a few lines from a tangled scribble.</p><p>A body lies forever lost, stricken soundly from the past. Travel south to find the dirge, starting from the concierge.</p><p>HONK!</p>"; layer = 2; name = "Old Note #2"; pixel_x = -1},/turf/simulated/floor,/area/hallway/primary/port)
+"aFT" = (/obj/table/reinforced{dir = 9; icon_state = "reinf_tabledir"; tag = "icon-reinf_tabledir (SOUTHWEST)"},/obj/item/weapon/paper{icon = 'weapons.dmi'; icon_state = "crumpled"; info = "<p>There is blood and ink on this parchment. The paper is horribly old and rotten. You are barely able to read out a few lines from a tangled scribble.</p><p>A body lies forever lost, stricken soundly from the past. Travel south to find the dirge, starting from the concierge.</p><p>HONK!</p>"; layer = 2; name = "Old Note #2"; pixel_x = -1},/turf/simulated/floor,/area/hallway/primary/port)
 "aFU" = (/obj/table/reinforced{tag = "icon-reinf_tabledir (NORTH)"; icon_state = "reinf_tabledir"; dir = 1},/obj/machinery/camera{c_tag = "Port Hallway"; dir = 1},/turf/simulated/floor,/area/hallway/primary/port)
 "aFV" = (/obj/table/reinforced{tag = "icon-reinf_tabledir (NORTH)"; icon_state = "reinf_tabledir"; dir = 1},/turf/simulated/floor,/area/hallway/primary/port)
 "aFW" = (/obj/table/reinforced{dir = 5; icon_state = "reinf_tabledir"; tag = "icon-reinf_tabledir (SOUTHWEST)"},/turf/simulated/floor,/area/hallway/primary/port)
@@ -2162,14 +2162,14 @@
 "aPD" = (/obj/cable{icon_state = "0-4"; d2 = 4},/obj/cable,/obj/cable{icon_state = "0-2"; d2 = 2},/turf/simulated/floor,/area/crew_quarters/captain)
 "aPE" = (/obj/machinery/light_switch{pixel_y = 28},/obj/machinery/power/apc{dir = 4; name = "Captain's Quarters APC"; pixel_x = 26; pixel_y = 0},/obj/cable{d2 = 8; icon_state = "0-8"},/obj/cable{icon_state = "0-2"; d2 = 2},/turf/simulated/floor,/area/crew_quarters/captain)
 "aPF" = (/turf/simulated/wall,/area/crew_quarters/captain)
-"aPG" = (/obj/machinery/atmospherics/pipe/simple,/obj/grille,/obj/item/weapon/paper{icon = 'icons/obj/weapons.dmi'; icon_state = "crumpled"; info = "<p>There is blood and ink on this parchment. The paper is horribly old and rotten. You are barely able to read out a few lines from a tangled scribble.</p><p>Far away it sways so seldom, metal cage of ruin and boredom. In the midst of red and foil, one of six shall feed and toil.</p><p>HONK!</p>"; layer = 2; name = "Old Note #9"; pixel_x = -1; pixel_y = 4},/turf/simulated/floor/plating,/area)
+"aPG" = (/obj/machinery/atmospherics/pipe/simple,/obj/grille,/obj/item/weapon/paper{icon = 'weapons.dmi'; icon_state = "crumpled"; info = "<p>There is blood and ink on this parchment. The paper is horribly old and rotten. You are barely able to read out a few lines from a tangled scribble.</p><p>Far away it sways so seldom, metal cage of ruin and boredom. In the midst of red and foil, one of six shall feed and toil.</p><p>HONK!</p>"; layer = 2; name = "Old Note #9"; pixel_x = -1; pixel_y = 4},/turf/simulated/floor/plating,/area)
 "aPH" = (/obj/grille,/turf/simulated/floor/plating,/area)
 "aPI" = (/turf/simulated/wall/r_wall,/area/turret_protected/ai_upload)
 "aPJ" = (/obj/machinery/light/small,/obj/machinery/turretid{pixel_x = -24},/turf/simulated/floor{dir = 0; icon_state = "blue"},/area/turret_protected/ai_upload)
 "aPK" = (/obj/cable,/obj/cable{icon_state = "0-2"; d2 = 2},/obj/cable{icon_state = "0-4"; d2 = 4},/turf/simulated/floor{dir = 0; icon_state = "blue"},/area/turret_protected/ai_upload_foyer)
 "aPL" = (/obj/machinery/light/small,/obj/machinery/power/apc{dir = 4; name = "Upload Foyer APC"; pixel_x = 27; pixel_y = -2},/obj/cable{d2 = 8; icon_state = "0-8"},/turf/simulated/floor{dir = 0; icon_state = "blue"},/area/turret_protected/ai_upload_foyer)
 "aPM" = (/obj/machinery/ai_status_display{pixel_y = -28},/turf/simulated/wall/r_wall,/area/turret_protected/ai_upload_foyer)
-"aPN" = (/obj/machinery/atmospherics/pipe/simple,/obj/grille,/obj/item/weapon/paper{icon = 'icons/obj/weapons.dmi'; icon_state = "crumpled"; info = "<p>There is blood and ink on this parchment. The paper is horribly old and rotten. You are barely able to read out a few lines from a tangled scribble.</p><p>No great mystery to unfold, thy next clue is so very near to hold. Pay close attention, for what you seek is thy own reflection.</p><p>HONK!</p>"; layer = 2; name = "Old Note #8"; pixel_x = -1; pixel_y = 4},/turf/simulated/floor/plating,/area)
+"aPN" = (/obj/machinery/atmospherics/pipe/simple,/obj/grille,/obj/item/weapon/paper{icon = 'weapons.dmi'; icon_state = "crumpled"; info = "<p>There is blood and ink on this parchment. The paper is horribly old and rotten. You are barely able to read out a few lines from a tangled scribble.</p><p>No great mystery to unfold, thy next clue is so very near to hold. Pay close attention, for what you seek is thy own reflection.</p><p>HONK!</p>"; layer = 2; name = "Old Note #8"; pixel_x = -1; pixel_y = 4},/turf/simulated/floor/plating,/area)
 "aPO" = (/obj/table,/obj/item/weapon/secstorage/sbriefcase,/turf/simulated/floor,/area/crew_quarters/heads)
 "aPP" = (/obj/cable{d1 = 1; d2 = 4; icon_state = "1-4"},/turf/simulated/floor,/area/crew_quarters/heads)
 "aPQ" = (/obj/machinery/light_switch{pixel_y = 28},/obj/cable{icon_state = "4-8"; d1 = 4; d2 = 8},/turf/simulated/floor,/area/crew_quarters/heads)
@@ -2376,7 +2376,7 @@
 "aTJ" = (/turf/simulated/floor{icon_state = "dark"},/area/medical/morgue)
 "aTK" = (/obj/morgue,/turf/simulated/floor{icon_state = "dark"},/area/medical/morgue)
 "aTL" = (/obj/machinery/light{dir = 1},/obj/machinery/atmospherics/pipe/simple,/turf/simulated/floor{icon_state = "dark"},/area/medical/morgue)
-"aTM" = (/obj/machinery/atmospherics/pipe/simple{dir = 5; icon_state = "intact-f"; layer = 3},/obj/morgue,/obj/item/weapon/paper{icon = 'icons/obj/weapons.dmi'; icon_state = "crumpled"; info = "<p>There is blood and ink on this parchment. The paper is horribly old and rotten. You are barely able to read out a few lines from a tangled scribble.</p><p>In plain sight the next clue lies, hidden only by your eyes. In a dim-lit corner much West of here, between constructions oh so dear.</p><p>HONK!</p>"; layer = 2; name = "Old Note #5"; pixel_x = -1; pixel_y = 4},/turf/simulated/floor{icon_state = "dark"},/area/medical/morgue)
+"aTM" = (/obj/machinery/atmospherics/pipe/simple{dir = 5; icon_state = "intact-f"; layer = 3},/obj/morgue,/obj/item/weapon/paper{icon = 'weapons.dmi'; icon_state = "crumpled"; info = "<p>There is blood and ink on this parchment. The paper is horribly old and rotten. You are barely able to read out a few lines from a tangled scribble.</p><p>In plain sight the next clue lies, hidden only by your eyes. In a dim-lit corner much West of here, between constructions oh so dear.</p><p>HONK!</p>"; layer = 2; name = "Old Note #5"; pixel_x = -1; pixel_y = 4},/turf/simulated/floor{icon_state = "dark"},/area/medical/morgue)
 "aTN" = (/obj/machinery/alarm{pixel_y = 24},/obj/machinery/atmospherics/unary/vent_pump{dir = 8; on = 1},/turf/simulated/floor{icon_state = "dark"},/area/medical/morgue)
 "aTO" = (/obj/grille,/obj/window/reinforced/west,/obj/window/reinforced/west{tag = "icon-rwindow (EAST)"; icon_state = "rwindow"; dir = 4},/turf/simulated/floor/plating,/area/hallway/secondary/exit)
 "aTP" = (/obj/grille,/obj/window/reinforced{tag = "icon-rwindow (EAST)"; icon_state = "rwindow"; dir = 4},/obj/window/reinforced{tag = "icon-rwindow (WEST)"; icon_state = "rwindow"; dir = 8},/turf/simulated/floor/plating,/area/hallway/secondary/entry)
@@ -3035,7 +3035,7 @@
 "bgs" = (/obj/machinery/atmospherics/unary/vent_scrubber{on = 1; scrub_N2O = 1; scrub_Toxins = 1},/turf/simulated/floor{icon_state = "wood"},/area/lawoffice)
 "bgt" = (/obj/stool/chair,/turf/simulated/floor{icon_state = "wood"},/area/lawoffice)
 "bgu" = (/obj/machinery/firealarm{dir = 4; pixel_x = 24},/obj/machinery/light_switch{pixel_x = 22; pixel_y = 13},/turf/simulated/floor{icon_state = "wood"},/area/lawoffice)
-"bgv" = (/obj/machinery/light/small{dir = 1},/obj/table,/obj/machinery/camera{c_tag = "Bar West"; dir = 4; network = "SS13"},/obj/item/weapon/paper{name = "Old Note #4"; icon = 'icons/obj/weapons.dmi'; icon_state = "crumpled"; layer = 2; pixel_x = -1; pixel_y = 4; info = "<p>There is blood and ink on this parchment. The paper is horribly old and rotten. You are barely able to read out a few lines from a tangled scribble.</p><p>Lifeless bodies line the walls, onyx floor forever calls. Amidst the dull and sorrow, one of ten shall hold not hollow.</p><p>HONK!</p>"},/turf/simulated/floor{icon_state = "bar"},/area/crew_quarters/bar)
+"bgv" = (/obj/machinery/light/small{dir = 1},/obj/table,/obj/machinery/camera{c_tag = "Bar West"; dir = 4; network = "SS13"},/obj/item/weapon/paper{name = "Old Note #4"; icon = 'weapons.dmi'; icon_state = "crumpled"; layer = 2; pixel_x = -1; pixel_y = 4; info = "<p>There is blood and ink on this parchment. The paper is horribly old and rotten. You are barely able to read out a few lines from a tangled scribble.</p><p>Lifeless bodies line the walls, onyx floor forever calls. Amidst the dull and sorrow, one of ten shall hold not hollow.</p><p>HONK!</p>"},/turf/simulated/floor{icon_state = "bar"},/area/crew_quarters/bar)
 "bgw" = (/obj/cable{icon_state = "1-2"; d1 = 1; d2 = 2},/turf/simulated/floor{icon_state = "bar"},/area/crew_quarters/bar)
 "bgx" = (/obj/table/reinforced{tag = "icon-reinf_tabledir (SOUTHWEST)"; icon_state = "reinf_tabledir"; dir = 10},/turf/simulated/floor{icon_state = "bar"},/area/crew_quarters/bar)
 "bgy" = (/obj/table/reinforced{tag = "icon-reinf_tabledir (SOUTHEAST)"; icon_state = "reinf_tabledir"; dir = 6},/turf/simulated/floor{icon_state = "bar"},/area/crew_quarters/bar)
@@ -3208,7 +3208,7 @@
 "bjJ" = (/obj/stool/chair{dir = 4},/obj/cable{d1 = 1; d2 = 8; icon_state = "1-8"},/turf/simulated/floor{tag = "icon-white (WEST)"; icon_state = "white"; dir = 8},/area/cmo)
 "bjK" = (/obj/table{icon_state = "tabledir"; dir = 10},/obj/item/weapon/stamp/cmo,/turf/simulated/floor{icon_state = "white"},/area/cmo)
 "bjL" = (/obj/stool/chair{dir = 1},/obj/landmark/start{name = "Chief Medical Officer"},/turf/simulated/floor{icon_state = "white"},/area/cmo)
-"bjM" = (/obj/machinery/light{dir = 4; icon_state = "tube1"; tag = "icon-tube1 (EAST)"},/obj/machinery/atmospherics/unary/vent_scrubber{dir = 4; icon_state = "off"; on = 1; scrub_N2O = 1; scrub_Toxins = 1; tag = "icon-off (EAST)"},/obj/table{icon_state = "tabledir"; dir = 6},/turf/simulated/floor{icon_state = "white"},/area/cmo)
+"bjM" = (/obj/machinery/light{dir = 4; icon_state = "tube1"; tag = "icon-tube1 (EAST)"},/obj/machinery/atmospherics/unary/vent_scrubber{dir = 4; icon_state = "off"; on = 1; scrub_N2O = 1; scrub_Toxins = 1; tag = "icon-off (EAST)"},/obj/table{icon_state = "tabledir"; dir = 6},/obj/item/weapon/reagent_containers/hypospray,/turf/simulated/floor{icon_state = "white"},/area/cmo)
 "bjN" = (/obj/machinery/atmospherics/pipe/simple{dir = 4; icon_state = "intact-f"; layer = 3},/turf/simulated/wall/r_wall,/area/maintenance/asmaint2)
 "bjO" = (/turf/simulated/floor{dir = 4; icon_state = "chapel"},/area/chapel/main)
 "bjP" = (/obj/cable{icon_state = "1-2"; d1 = 1; d2 = 2},/turf/simulated/floor{dir = 1; icon_state = "chapel"},/area/chapel/main)
@@ -3426,7 +3426,7 @@
 "bnT" = (/obj/machinery/atmospherics/pipe/simple{dir = 5; icon_state = "intact-f"; initialize_directions = 5; layer = 3},/turf/simulated/floor/plating,/area/maintenance/asmaint2)
 "bnU" = (/obj/machinery/atmospherics/pipe/simple{dir = 4; icon_state = "intact-f"; layer = 3},/obj/machinery/meter,/turf/simulated/floor/plating,/area/maintenance/asmaint2)
 "bnV" = (/obj/machinery/atmospherics/valve{dir = 4},/turf/simulated/floor/plating,/area/maintenance/asmaint2)
-"bnW" = (/obj/machinery/atmospherics/pipe/tank/air{dir = 8; initialize_directions = 0},/obj/item/weapon/paper{name = "Old Note #1"; icon = 'icons/obj/weapons.dmi'; icon_state = "crumpled"; layer = 2; pixel_x = -7; info = "<p>There is blood and ink on this parchment. The paper is horribly old and rotten. You are barely able to read out a few lines from a tangled scribble.</p><p>If you are reading this note, I am dead and gone. I entrust to you my most prized possession. If you can find it.</p><p>Your first clue lies in a public place, across a starry gaze. Where two meet four, there you will find it stranded on the floor.<p><p>HONK!</p>"},/turf/simulated/floor/plating,/area/maintenance/asmaint2)
+"bnW" = (/obj/machinery/atmospherics/pipe/tank/air{dir = 8; initialize_directions = 0},/obj/item/weapon/paper{name = "Old Note #1"; icon = 'weapons.dmi'; icon_state = "crumpled"; layer = 2; pixel_x = -7; info = "<p>There is blood and ink on this parchment. The paper is horribly old and rotten. You are barely able to read out a few lines from a tangled scribble.</p><p>If you are reading this note, I am dead and gone. I entrust to you my most prized possession. If you can find it.</p><p>Your first clue lies in a public place, across a starry gaze. Where two meet four, there you will find it stranded on the floor.<p><p>HONK!</p>"},/turf/simulated/floor/plating,/area/maintenance/asmaint2)
 "bnX" = (/obj/grille,/obj/window/reinforced{tag = "icon-rwindow (EAST)"; icon_state = "rwindow"; dir = 4},/obj/window/reinforced{tag = "icon-rwindow (WEST)"; icon_state = "rwindow"; dir = 8},/turf/simulated/floor/plating,/area/maintenance/apmaint)
 "bnY" = (/obj/disposalpipe/segment,/obj/cable{icon_state = "1-2"; d1 = 1; d2 = 2},/turf/simulated/floor/plating,/area/maintenance/apmaint)
 "bnZ" = (/obj/item/weapon/paper{info = "For safety reasons this nuke cannot be deployed. We apologise for the inconvenience. Have a nice day."},/turf/simulated/floor,/area/construction/Storage)
@@ -3837,7 +3837,7 @@
 "bvO" = (/obj/machinery/portable_atmospherics/canister/oxygen,/obj/window/basic,/turf/simulated/floor{icon_state = "white"},/area/toxins/storage)
 "bvP" = (/turf/simulated/floor{icon_state = "white"},/area/toxins/storage)
 "bvQ" = (/obj/machinery/portable_atmospherics/canister/toxins,/obj/machinery/light{tag = "icon-tube1 (EAST)"; icon_state = "tube1"; dir = 4},/turf/simulated/floor{icon_state = "white"},/area/toxins/storage)
-"bvR" = (/obj/alien/weeds,/obj/item/weapon/paper{icon = 'icons/obj/weapons.dmi'; icon_state = "crumpled"; info = "<p>There is blood and ink on this parchment. The paper is horribly old and rotten. You are barely able to read out a few lines from a tangled scribble.</p><p>Without guidance its shelter thou shall seek, desperate please so boldly thou will speak. A hand of mares across the stars shall cut, the central steed hides a secret underneath his gut.</p><p>HONK!</p>"; layer = 2; name = "Old Note #11"; pixel_x = 1; pixel_y = 4},/turf/simulated/floor/plating,/area/maintenance/apmaint)
+"bvR" = (/obj/alien/weeds,/obj/item/weapon/paper{icon = 'weapons.dmi'; icon_state = "crumpled"; info = "<p>There is blood and ink on this parchment. The paper is horribly old and rotten. You are barely able to read out a few lines from a tangled scribble.</p><p>Without guidance its shelter thou shall seek, desperate please so boldly thou will speak. A hand of mares across the stars shall cut, the central steed hides a secret underneath his gut.</p><p>HONK!</p>"; layer = 2; name = "Old Note #11"; pixel_x = 1; pixel_y = 4},/turf/simulated/floor/plating,/area/maintenance/apmaint)
 "bvS" = (/obj/alien/weeds{tag = "icon-oldweeds1"; icon_state = "oldweeds1"},/obj/alien/facehugger{lamarr = 1; name = "Larry"},/turf/simulated/floor/plating,/area/maintenance/apmaint)
 "bvT" = (/obj/machinery/atmospherics/pipe/simple{color = "red"; dir = 6; icon_state = "intact-r"; layer = 3; level = 2},/turf/simulated/wall,/area/maintenance/asmaint)
 "bvU" = (/obj/machinery/atmospherics/pipe/simple{color = "red"; dir = 4; icon_state = "intact-r"; layer = 3; level = 2},/obj/machinery/atmospherics/pipe/simple{color = "blue"; icon_state = "intact-b"; level = 2},/turf/simulated/wall,/area/atmos)
@@ -3956,7 +3956,7 @@
 "byd" = (/obj/machinery/status_display{pixel_x = -1},/turf/simulated/wall/r_wall,/area/hallway/primary/aft)
 "bye" = (/obj/window/reinforced,/obj/machinery/atmospherics/portables_connector{dir = 4},/turf/simulated/floor{tag = "icon-arrival (WEST)"; icon_state = "arrival"; dir = 8},/area/hallway/primary/aft)
 "byf" = (/obj/machinery/atmospherics/pipe/simple{color = "cyan"; dir = 9; icon_state = "intact-c"; layer = 3; level = 2},/turf/simulated/wall,/area/maintenance/asmaint)
-"byg" = (/obj/decal/cleanable/blood/gibs{tag = "icon-gibup1"; icon_state = "gibup1"},/obj/item/weapon/paper{icon = 'icons/obj/weapons.dmi'; icon_state = "crumpled"; info = "<p>There is blood and ink on this parchment. The paper is horribly old and rotten. You are barely able to read out a few lines from a tangled scribble.</p><p>One of five is bare and white, sitting empty without delight. Music drifts across the room, drinks are passed in earnest bloom.</p><p>HONK!</p>"; layer = 2; name = "Old Note #3"; pixel_x = -1},/turf/simulated/floor/plating,/area/maintenance/asmaint)
+"byg" = (/obj/decal/cleanable/blood/gibs{tag = "icon-gibup1"; icon_state = "gibup1"},/obj/item/weapon/paper{icon = 'weapons.dmi'; icon_state = "crumpled"; info = "<p>There is blood and ink on this parchment. The paper is horribly old and rotten. You are barely able to read out a few lines from a tangled scribble.</p><p>One of five is bare and white, sitting empty without delight. Music drifts across the room, drinks are passed in earnest bloom.</p><p>HONK!</p>"; layer = 2; name = "Old Note #3"; pixel_x = -1},/turf/simulated/floor/plating,/area/maintenance/asmaint)
 "byh" = (/turf/simulated/wall,/area/atmos)
 "byi" = (/obj/machinery/atmospherics/pipe/simple{color = "blue"; icon_state = "intact-b"; level = 2},/obj/machinery/computer/general_air_control{frequency = 1443; name = "Distribution Loop Monitor"; sensors = list("air_sensor" = "Mixed Air Supply Tank", "mair_meter" = "Mixed Air Supply Transfer", "dloop_atm_meter" = "Distribution Loop - Atmos")},/turf/simulated/floor,/area/atmos)
 "byj" = (/obj/item/device/radio/intercom{dir = 1; name = "Station Intercom (General)"; pixel_y = 20},/obj/machinery/computer/general_air_control{frequency = 1441; name = "Supply Air Tank Monitor"; sensors = list("n2_sensor" = "Nitrogen", "o2_sensor" = "Oxygen", "co2_sensor" = "Carbon Dioxide", "tox_sensor" = "Toxins")},/turf/simulated/floor,/area/atmos)