mirror of
https://github.com/Aurorastation/Aurora.3.git
synced 2025-12-29 19:42:42 +00:00
Pre-spawned bottles now have transfer amount=10 as other bottles.
Added o2 skin for medibot, thanks to Cheridan. Bots now won't open firedoors (because they haven't crowbars). DNA records in medical computer now starts empty. It was too easy for crew to reveal cultists with such records. Map update: eliminated pipes-related glitch. If someone have modified map too and gets some svn conflicts - feel free to overwrite my map and notify me. I have an easy way to reapply my changes. git-svn-id: http://tgstation13.googlecode.com/svn/trunk@922 316c924e-a436-60f5-8080-3fe189b3f50e
This commit is contained in:
@@ -1215,7 +1215,6 @@
|
||||
desc = "A small bottle. Contains inaprovaline - used to stabilize patients."
|
||||
icon = 'chemical.dmi'
|
||||
icon_state = "bottle16"
|
||||
amount_per_transfer_from_this = 10
|
||||
|
||||
New()
|
||||
..()
|
||||
@@ -1226,7 +1225,6 @@
|
||||
desc = "A small bottle."
|
||||
icon = 'chemical.dmi'
|
||||
icon_state = "bottle12"
|
||||
amount_per_transfer_from_this = 5
|
||||
|
||||
New()
|
||||
..()
|
||||
@@ -1237,7 +1235,6 @@
|
||||
desc = "A small bottle."
|
||||
icon = 'chemical.dmi'
|
||||
icon_state = "bottle20"
|
||||
amount_per_transfer_from_this = 5
|
||||
|
||||
New()
|
||||
..()
|
||||
@@ -1248,7 +1245,6 @@
|
||||
desc = "A small bottle."
|
||||
icon = 'chemical.dmi'
|
||||
icon_state = "bottle20"
|
||||
amount_per_transfer_from_this = 5
|
||||
|
||||
New()
|
||||
..()
|
||||
@@ -1259,7 +1255,6 @@
|
||||
desc = "A small bottle."
|
||||
icon = 'chemical.dmi'
|
||||
icon_state = "bottle17"
|
||||
amount_per_transfer_from_this = 5
|
||||
|
||||
New()
|
||||
..()
|
||||
@@ -1271,7 +1266,6 @@
|
||||
desc = "A small bottle. Contains H13N1 flu virion culture in synthblood medium."
|
||||
icon = 'chemical.dmi'
|
||||
icon_state = "bottle3"
|
||||
amount_per_transfer_from_this = 5
|
||||
New()
|
||||
..()
|
||||
var/datum/disease/F = new /datum/disease/flu(0)
|
||||
@@ -1283,7 +1277,6 @@
|
||||
desc = "A small bottle. Contains H0NI<42 virion culture in synthblood medium."
|
||||
icon = 'chemical.dmi'
|
||||
icon_state = "bottle3"
|
||||
amount_per_transfer_from_this = 5
|
||||
New()
|
||||
..()
|
||||
var/datum/disease/F = new /datum/disease/pierrot_throat(0)
|
||||
@@ -1295,7 +1288,6 @@
|
||||
desc = "A small bottle. Contains XY-rhinovirus culture in synthblood medium."
|
||||
icon = 'chemical.dmi'
|
||||
icon_state = "bottle3"
|
||||
amount_per_transfer_from_this = 5
|
||||
New()
|
||||
..()
|
||||
var/datum/disease/F = new /datum/disease/cold(0)
|
||||
@@ -1323,7 +1315,6 @@
|
||||
desc = "A small bottle. Contains Gravitokinetic Bipotential SADS- culture in synthblood medium."//Or simply - General BullShit
|
||||
icon = 'chemical.dmi'
|
||||
icon_state = "bottle3"
|
||||
amount_per_transfer_from_this = 5
|
||||
New()
|
||||
..()
|
||||
var/datum/disease/F = new /datum/disease/fake_gbs(0)
|
||||
@@ -1351,7 +1342,6 @@
|
||||
desc = "A small bottle. Contains Cryptococcus Cosmosis culture in synthblood medium."
|
||||
icon = 'chemical.dmi'
|
||||
icon_state = "bottle3"
|
||||
amount_per_transfer_from_this = 5
|
||||
New()
|
||||
..()
|
||||
var/datum/disease/F = new /datum/disease/brainrot(0)
|
||||
@@ -1363,7 +1353,6 @@
|
||||
desc = "A small bottle. Contains a small dosage of Fukkos Miracos."
|
||||
icon = 'chemical.dmi'
|
||||
icon_state = "bottle3"
|
||||
amount_per_transfer_from_this = 5
|
||||
New()
|
||||
..()
|
||||
var/datum/disease/F = new /datum/disease/magnitis(0)
|
||||
@@ -1376,7 +1365,6 @@
|
||||
desc = "A small bottle. Contains a sample of Rincewindus Vulgaris."
|
||||
icon = 'chemical.dmi'
|
||||
icon_state = "bottle3"
|
||||
amount_per_transfer_from_this = 5
|
||||
New()
|
||||
..()
|
||||
var/datum/disease/F = new /datum/disease/wizarditis(0)
|
||||
|
||||
@@ -671,7 +671,7 @@ Auto Patrol: []"},
|
||||
spawn(0)
|
||||
if ((istype(M, /obj/machinery/door)) && (!isnull(src.botcard)))
|
||||
var/obj/machinery/door/D = M
|
||||
if (D.check_access(src.botcard))
|
||||
if (!istype(D, /obj/machinery/door/firedoor) && D.check_access(src.botcard))
|
||||
D.open()
|
||||
src.frustration = 0
|
||||
else if ((istype(M, /mob/living/)) && (!src.anchored))
|
||||
|
||||
@@ -20,7 +20,7 @@
|
||||
var/obj/machinery/camera/cam = null
|
||||
var/list/botcard_access = list(access_medical, access_morgue, access_medlab, access_robotics)
|
||||
var/obj/item/weapon/reagent_containers/glass/reagent_glass = null //Can be set to draw from this for reagents.
|
||||
var/skin = null //Set to "tox" or "ointment" for the other two firstaid kits.
|
||||
var/skin = null //Set to "tox", "ointment" or "o2" for the other two firstaid kits.
|
||||
var/frustration = 0
|
||||
var/path[] = new()
|
||||
var/mob/living/carbon/patient = null
|
||||
@@ -518,7 +518,7 @@
|
||||
spawn(0)
|
||||
if ((istype(M, /obj/machinery/door)) && (!isnull(src.botcard)))
|
||||
var/obj/machinery/door/D = M
|
||||
if (D.check_access(src.botcard))
|
||||
if (!istype(D, /obj/machinery/door/firedoor) && D.check_access(src.botcard))
|
||||
D.open()
|
||||
src.frustration = 0
|
||||
else if ((istype(M, /mob/living/)) && (!src.anchored))
|
||||
@@ -590,6 +590,8 @@
|
||||
A.skin = "ointment"
|
||||
else if(istype(src,/obj/item/weapon/storage/firstaid/toxin))
|
||||
A.skin = "tox"
|
||||
else if(istype(src,/obj/item/weapon/storage/firstaid/o2))
|
||||
A.skin = "o2"
|
||||
|
||||
A.loc = user
|
||||
if (user.r_hand == S)
|
||||
|
||||
@@ -643,7 +643,7 @@ Auto Patrol: []"},
|
||||
spawn(0)
|
||||
if ((istype(M, /obj/machinery/door)) && (!isnull(src.botcard)))
|
||||
var/obj/machinery/door/D = M
|
||||
if (D.check_access(src.botcard))
|
||||
if (!istype(D, /obj/machinery/door/firedoor) && D.check_access(src.botcard))
|
||||
D.open()
|
||||
src.frustration = 0
|
||||
else if ((istype(M, /mob/living/)) && (!src.anchored))
|
||||
|
||||
@@ -292,7 +292,7 @@ mob/new_player
|
||||
G.fields["p_stat"] = "Active"
|
||||
G.fields["m_stat"] = "Stable"
|
||||
M.fields["b_type"] = text("[]", H.b_type)
|
||||
M.fields["b_dna"] = H.dna.unique_enzymes
|
||||
M.fields["b_dna"] = "" //H.dna.unique_enzymes //nope. Scan them yourself, detective.
|
||||
M.fields["mi_dis"] = "None"
|
||||
M.fields["mi_dis_d"] = "No minor disabilities have been declared."
|
||||
M.fields["ma_dis"] = "None"
|
||||
|
||||
Reference in New Issue
Block a user