cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-08-23 12:08:28 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/PolarisSS13/Polaris into sync2018

Browse Source 
# Conflicts:
#	code/game/objects/structures/signs.dm
#	code/modules/mob/living/carbon/human/human.dm
#	code/modules/mob/living/carbon/human/species/station/station.dm
#	code/modules/mob/living/carbon/human/species/virtual_reality/avatar.dm
#	code/modules/mob/living/carbon/human/update_icons.dm
#	code/modules/organs/organ_icon.dm
#	maps/southern_cross/southern_cross-1.dmm
#	maps/southern_cross/southern_cross-3.dmm
#	maps/southern_cross/southern_cross-6.dmm
#	vorestation.dme
This commit is contained in:
Arokha Sieyes
2017-12-26 23:07:58 -05:00
parent b13cf41ff9 522a3b5f98
commit d998f36c38
72 changed files with 16321 additions and 15298 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/reagents/reagent_containers/pill.dm
+60 -50
View File
@@ -24,29 +24,29 @@
if(istype(M, /mob/living/carbon/human))
var/mob/living/carbon/human/H = M
if(!H.check_has_mouth())
user << "Where do you intend to put \the [src]? You don't have a mouth!"
to_chat(user, "Where do you intend to put \the [src]? You don't have a mouth!")
return
var/obj/item/blocked = H.check_mouth_coverage()
if(blocked)
user << "<span class='warning'>\The [blocked] is in the way!</span>"
to_chat(user, "<span class='warning'>\The [blocked] is in the way!</span>")
return
M << "<span class='notice'>You swallow \the [src].</span>"
M.drop_from_inventory(src) //icon update
if(reagents.total_volume)
reagents.trans_to_mob(M, reagents.total_volume, CHEM_INGEST)
qdel(src)
return 1
to_chat(M, "<span class='notice'>You swallow \the [src].</span>")
M.drop_from_inventory(src) //icon update
if(reagents.total_volume)
reagents.trans_to_mob(M, reagents.total_volume, CHEM_INGEST)
qdel(src)
return 1
else if(istype(M, /mob/living/carbon/human))
var/mob/living/carbon/human/H = M
if(!H.check_has_mouth())
user << "Where do you intend to put \the [src]? \The [H] doesn't have a mouth!"
to_chat(user, "Where do you intend to put \the [src]? \The [H] doesn't have a mouth!")
return
var/obj/item/blocked = H.check_mouth_coverage()
if(blocked)
user << "<span class='warning'>\The [blocked] is in the way!</span>"
to_chat(user, "<span class='warning'>\The [blocked] is in the way!</span>")
return
user.visible_message("<span class='warning'>[user] attempts to force [M] to swallow \the [src].</span>")
@@ -63,7 +63,7 @@
user.attack_log += text("\[[time_stamp()]\] <font color='red'>Fed [name] to [key_name(M)] Reagents: [contained]</font>")
msg_admin_attack("[key_name_admin(user)] fed [key_name_admin(M)] with [name] Reagents: [contained] (INTENT: [uppertext(user.a_intent)]) (<A HREF='?_src_=holder;adminplayerobservecoodjump=1;X=[user.x];Y=[user.y];Z=[user.z]'>JMP</a>)")
if(reagents.total_volume)
if(reagents && reagents.total_volume)
reagents.trans_to_mob(M, reagents.total_volume, CHEM_INGEST)
qdel(src)
@@ -76,9 +76,9 @@
if(target.is_open_container() && target.reagents)
if(!target.reagents.total_volume)
user << "<span class='notice'>[target] is empty. Can't dissolve \the [src].</span>"
to_chat(user, "<span class='notice'>[target] is empty. Can't dissolve \the [src].</span>")
return
user << "<span class='notice'>You dissolve \the [src] in [target].</span>"
to_chat(user, "<span class='notice'>You dissolve \the [src] in [target].</span>")
user.attack_log += text("\[[time_stamp()]\] <font color='red'>Spiked \a [target] with a pill. Reagents: [reagentlist()]</font>")
msg_admin_attack("[user.name] ([user.ckey]) spiked \a [target] with a pill. Reagents: [reagentlist()] (INTENT: [uppertext(user.a_intent)]) (<A HREF='?_src_=holder;adminplayerobservecoodjump=1;X=[user.x];Y=[user.y];Z=[user.z]'>JMP</a>)")
@@ -98,7 +98,7 @@
//Pills
/obj/item/weapon/reagent_containers/pill/antitox
name = "Anti-toxins pill"
desc = "Neutralizes many common toxins."
desc = "Neutralizes many common toxins. Contains 25 units of Dylovene."
icon_state = "pill17"
/obj/item/weapon/reagent_containers/pill/antitox/New()
@@ -108,7 +108,7 @@
/obj/item/weapon/reagent_containers/pill/tox
name = "Toxins pill"
desc = "Highly toxic."
desc = "Highly toxic." //this is cooler without "contains 50u toxin"
icon_state = "pill5"
/obj/item/weapon/reagent_containers/pill/tox/New()
@@ -118,7 +118,7 @@
/obj/item/weapon/reagent_containers/pill/cyanide
name = "Cyanide pill"
desc = "Don't swallow this."
desc = "Don't swallow this." //this is cooler without "contains 50u cyanide"
icon_state = "pill5"
/obj/item/weapon/reagent_containers/pill/cyanide/New()
@@ -128,7 +128,7 @@
/obj/item/weapon/reagent_containers/pill/adminordrazine
name = "Adminordrazine pill"
desc = "It's magic. We don't have to explain it."
desc = "It's magic. We don't have to explain it." //it's space magic you don't need the quantity
icon_state = "pill16"
/obj/item/weapon/reagent_containers/pill/adminordrazine/New()
@@ -137,7 +137,7 @@
/obj/item/weapon/reagent_containers/pill/stox
name = "Sleeping pill"
desc = "Commonly used to treat insomnia."
desc = "Commonly used to treat insomnia. Contains 15 units of Soporific."
icon_state = "pill8"
/obj/item/weapon/reagent_containers/pill/stox/New()
@@ -147,7 +147,7 @@
/obj/item/weapon/reagent_containers/pill/kelotane
name = "Kelotane pill"
desc = "Used to treat burns."
desc = "Used to treat burns. Contains 15 units of Kelotane."
icon_state = "pill11"
/obj/item/weapon/reagent_containers/pill/kelotane/New()
@@ -157,7 +157,7 @@
/obj/item/weapon/reagent_containers/pill/paracetamol
name = "Paracetamol pill"
desc = "Tylenol! A painkiller for the ages. Chewables!"
desc = "Paracetamol! A painkiller for the ages. Chewables! Contains 15 units of Paracetamol."
icon_state = "pill8"
/obj/item/weapon/reagent_containers/pill/paracetamol/New()
@@ -167,7 +167,7 @@
/obj/item/weapon/reagent_containers/pill/tramadol
name = "Tramadol pill"
desc = "A simple painkiller."
desc = "A simple painkiller. Contains 15 units of Tramadol."
icon_state = "pill8"
/obj/item/weapon/reagent_containers/pill/tramadol/New()
@@ -177,7 +177,7 @@
/obj/item/weapon/reagent_containers/pill/methylphenidate
name = "Methylphenidate pill"
desc = "Improves the ability to concentrate."
desc = "Improves the ability to concentrate. Contains 15 units of Methylphenidate."
icon_state = "pill8"
/obj/item/weapon/reagent_containers/pill/methylphenidate/New()
@@ -187,7 +187,7 @@
/obj/item/weapon/reagent_containers/pill/citalopram
name = "Citalopram pill"
desc = "Mild anti-depressant."
desc = "Mild anti-depressant. Contains 15 units of Citalopram."
icon_state = "pill8"
/obj/item/weapon/reagent_containers/pill/citalopram/New()
@@ -195,19 +195,9 @@
reagents.add_reagent("citalopram", 15)
/obj/item/weapon/reagent_containers/pill/inaprovaline
name = "Inaprovaline pill"
desc = "Used to stabilize patients."
icon_state = "pill20"
/obj/item/weapon/reagent_containers/pill/inaprovaline/New()
..()
reagents.add_reagent("inaprovaline", 30)
/obj/item/weapon/reagent_containers/pill/dexalin
name = "Dexalin pill"
desc = "Used to treat oxygen deprivation."
desc = "Used to treat oxygen deprivation. Contains 15 units of Dexalin."
icon_state = "pill16"
/obj/item/weapon/reagent_containers/pill/dexalin/New()
@@ -217,7 +207,7 @@
/obj/item/weapon/reagent_containers/pill/dexalin_plus
name = "Dexalin Plus pill"
desc = "Used to treat extreme oxygen deprivation."
desc = "Used to treat extreme oxygen deprivation. Contains 15 units of Dexalin Plus."
icon_state = "pill8"
/obj/item/weapon/reagent_containers/pill/dexalin_plus/New()
@@ -227,7 +217,7 @@
/obj/item/weapon/reagent_containers/pill/dermaline
name = "Dermaline pill"
desc = "Used to treat burn wounds."
desc = "Used to treat burn wounds. Contains 15 units of Dermaline."
icon_state = "pill12"
/obj/item/weapon/reagent_containers/pill/dermaline/New()
@@ -237,7 +227,7 @@
/obj/item/weapon/reagent_containers/pill/dylovene
name = "Dylovene pill"
desc = "A broad-spectrum anti-toxin."
desc = "A broad-spectrum anti-toxin. Contains 15 units of Dylovene."
icon_state = "pill13"
/obj/item/weapon/reagent_containers/pill/dylovene/New()
@@ -247,7 +237,7 @@
/obj/item/weapon/reagent_containers/pill/inaprovaline
name = "Inaprovaline pill"
desc = "Used to stabilize patients."
desc = "Used to stabilize patients. Contains 30 units of Inaprovaline."
icon_state = "pill20"
/obj/item/weapon/reagent_containers/pill/inaprovaline/New()
@@ -257,7 +247,7 @@
/obj/item/weapon/reagent_containers/pill/bicaridine
name = "Bicaridine pill"
desc = "Used to treat physical injuries."
desc = "Used to treat physical injuries. Contains 20 units of Bicaridine."
icon_state = "pill18"
/obj/item/weapon/reagent_containers/pill/bicaridine/New()
@@ -265,9 +255,39 @@
reagents.add_reagent("bicaridine", 20)
/obj/item/weapon/reagent_containers/pill/spaceacillin
name = "Spaceacillin pill"
desc = "A theta-lactam antibiotic. Effective against many diseases likely to be encountered in space. Contains 15 units of Spaceacillin."
icon_state = "pill19"
/obj/item/weapon/reagent_containers/pill/spaceacillin/New()
..()
reagents.add_reagent("spaceacillin", 15)
/obj/item/weapon/reagent_containers/pill/carbon
name = "Carbon pill"
desc = "Used to neutralise chemicals in the stomach. Contains 15 units of Carbon."
icon_state = "pill7"
/obj/item/weapon/reagent_containers/pill/carbon/New()
..()
reagents.add_reagent("carbon", 15)
/obj/item/weapon/reagent_containers/pill/iron
name = "Iron pill"
desc = "Used to aid in blood regeneration after bleeding. Contains 15 units of Iron."
icon_state = "pill4"
/obj/item/weapon/reagent_containers/pill/iron/New()
..()
reagents.add_reagent("iron", 15)
//Not-quite-medicine
/obj/item/weapon/reagent_containers/pill/happy
name = "Happy pill"
desc = "Happy happy joy joy!"
desc = "Happy happy joy joy!" //we're not giving quantities for shady maint drugs
icon_state = "pill18"
/obj/item/weapon/reagent_containers/pill/happy/New()
@@ -287,16 +307,6 @@
reagents.add_reagent("synaptizine", 5)
reagents.add_reagent("hyperzine", 5)
/obj/item/weapon/reagent_containers/pill/spaceacillin
name = "Spaceacillin pill"
desc = "Contains antiviral agents."
icon_state = "pill19"
/obj/item/weapon/reagent_containers/pill/spaceacillin/New()
..()
reagents.add_reagent("spaceacillin", 15)
/obj/item/weapon/reagent_containers/pill/diet
name = "diet pill"
desc = "Guaranteed to get you slim!"