cyberpresidentvanellope/Polaris
1
0
Fork 0
mirror of https://github.com/PolarisSS13/Polaris.git synced 2026-08-27 07:08:22 +01:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Mechoid
2019-06-26 16:17:58 -07:00
parent 36fd0198e7 8b14c49d52
commit c2d4966cba
98 changed files with 2033 additions and 867 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/reagents/Chemistry-Machinery.dm
+6 -2
View File
@@ -127,7 +127,7 @@
data["pillSprite"] = pillsprite
data["bottleSprite"] = bottlesprite
var/P[20] //how many pill sprites there are. Sprites are taken from chemical.dmi and can be found in nano/images/pill.png
var/P[24] //how many pill sprites there are. Sprites are taken from chemical.dmi and can be found in nano/images/pill.png
for(var/i = 1 to P.len)
P[i] = i
data["pillSpritesAmount"] = P
@@ -238,7 +238,7 @@
else
pill_cube = "pill"
var/name = sanitizeSafe(input(usr,"Name:","Name your [pill_cube]!","[reagents.get_master_reagent_name()] ([amount_per_pill] units)") as null|text, MAX_NAME_LEN)
var/name = sanitizeSafe(input(usr,"Name:","Name your [pill_cube]!","[reagents.get_master_reagent_name()] ([amount_per_pill]u)") as null|text, MAX_NAME_LEN)
if(!name) //Blank name (sanitized to nothing, or left empty) or cancel
return
@@ -257,6 +257,10 @@
else //If condi is on
P.icon_state = "bouilloncube"//Reskinned monkey cube
P.desc = "A dissolvable cube."
if(P.icon_state in list("pill1", "pill2", "pill3", "pill4")) // if using greyscale, take colour from reagent
P.color = reagents.get_color()
reagents.trans_to_obj(P,amount_per_pill)
if(src.loaded_pill_bottle)
if(loaded_pill_bottle.contents.len < loaded_pill_bottle.max_storage_space)
code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Food-Drinks.dm
+2 -1
View File
@@ -1934,6 +1934,7 @@
glass_name = "cider"
glass_desc = "The second most Irish drink."
glass_special = list(DRINK_FIZZ)
// Cocktails
@@ -3287,4 +3288,4 @@
strength = 9
glass_name = "fusionnaire"
glass_desc = "A relatively new cocktail, mostly served in the bars of NanoTrasen owned stations."
glass_desc = "A relatively new cocktail, mostly served in the bars of NanoTrasen owned stations."
code/modules/reagents/dispenser/cartridge_presets.dm
+1
View File
@@ -45,6 +45,7 @@
ale spawn_reagent = "ale"
mead spawn_reagent = "mead"
bitters spawn_reagent = "bitters"
cider spawn_reagent = "cider"
// Bar, soft
ice spawn_reagent = "ice"
code/modules/reagents/dispenser/dispenser2_energy.dm
+2 -2
View File
@@ -52,11 +52,11 @@
/obj/machinery/chemical_dispenser/bar_alc
dispense_reagents = list(
"lemon_lime", "sugar", "orangejuice", "limejuice", "sodawater", "tonic", "beer", "kahlua",
"whiskey", "wine", "vodka", "gin", "rum", "tequilla", "vermouth", "cognac", "ale", "mead", "bitters"
"whiskey", "wine", "vodka", "cider", "gin", "rum", "tequilla", "vermouth", "cognac", "ale", "mead", "bitters"
)
/obj/machinery/chemical_dispenser/bar_coffee
dispense_reagents = list(
"coffee", "cafe_latte", "soy_latte", "hot_coco", "milk", "cream", "tea", "ice",
"orangejuice", "lemonjuice", "limejuice", "berryjuice", "mint"
)
)
code/modules/reagents/dispenser/dispenser_presets.dm
+2 -1
View File
@@ -111,6 +111,7 @@
/obj/item/weapon/reagent_containers/chem_disp_cartridge/tequila,
/obj/item/weapon/reagent_containers/chem_disp_cartridge/vermouth,
/obj/item/weapon/reagent_containers/chem_disp_cartridge/cognac,
/obj/item/weapon/reagent_containers/chem_disp_cartridge/cider,
/obj/item/weapon/reagent_containers/chem_disp_cartridge/ale,
/obj/item/weapon/reagent_containers/chem_disp_cartridge/mead
)
@@ -139,4 +140,4 @@
/obj/item/weapon/reagent_containers/chem_disp_cartridge/berry,
)
)
code/modules/reagents/reagent_containers/borghydro.dm
+1 -1
View File
@@ -132,7 +132,7 @@
recharge_time = 3
volume = 60
possible_transfer_amounts = list(5, 10, 20, 30)
reagent_ids = list("ale", "beer", "berryjuice", "bitters", "coffee", "cognac", "cola", "dr_gibb", "egg", "gin", "gingerale", "hot_coco", "ice", "icetea", "kahlua", "lemonjuice", "lemon_lime", "limejuice", "mead", "milk", "mint", "orangejuice", "rum", "sake", "sodawater", "soymilk", "space_up", "spacemountainwind", "specialwhiskey", "sugar", "tea", "tequilla", "tomatojuice", "tonic", "vermouth", "vodka", "water", "watermelonjuice", "whiskey", "wine")
reagent_ids = list("ale", "cider", "beer", "berryjuice", "bitters", "coffee", "cognac", "cola", "dr_gibb", "egg", "gin", "gingerale", "hot_coco", "ice", "icetea", "kahlua", "lemonjuice", "lemon_lime", "limejuice", "mead", "milk", "mint", "orangejuice", "rum", "sake", "sodawater", "soymilk", "space_up", "spacemountainwind", "specialwhiskey", "sugar", "tea", "tequilla", "tomatojuice", "tonic", "vermouth", "vodka", "water", "watermelonjuice", "whiskey", "wine")
/obj/item/weapon/reagent_containers/borghypo/service/attack(var/mob/M, var/mob/user)
return
code/modules/reagents/reagent_containers/pill.dm
+82 -72
View File
@@ -15,7 +15,7 @@
/obj/item/weapon/reagent_containers/pill/Initialize()
. = ..()
if(!icon_state)
icon_state = "pill[rand(1, 20)]"
icon_state = "pill[rand(1, 4)]" //preset pills only use colour changing or unique icons
/obj/item/weapon/reagent_containers/pill/attack(mob/M as mob, mob/user as mob)
if(M == user)
@@ -92,27 +92,29 @@
//Pills
/obj/item/weapon/reagent_containers/pill/antitox
name = "Anti-toxins pill"
desc = "Neutralizes many common toxins. Contains 25 units of Dylovene."
icon_state = "pill17"
name = "Dylovene (25u)"
desc = "Neutralizes many common toxins."
icon_state = "pill1"
/obj/item/weapon/reagent_containers/pill/antitox/Initialize()
. = ..()
reagents.add_reagent("anti_toxin", 25)
color = reagents.get_color()
/obj/item/weapon/reagent_containers/pill/tox
name = "Toxins pill"
desc = "Highly toxic." //this is cooler without "contains 50u toxin"
icon_state = "pill5"
desc = "Highly toxic."
icon_state = "pill4"
/obj/item/weapon/reagent_containers/pill/tox/Initialize()
. = ..()
reagents.add_reagent("toxin", 50)
color = reagents.get_color()
/obj/item/weapon/reagent_containers/pill/cyanide
name = "Cyanide pill"
desc = "Don't swallow this." //this is cooler without "contains 50u cyanide"
icon_state = "pill5"
name = "Strange pill"
desc = "It's marked 'KCN'. Smells vaguely of almonds."
icon_state = "pill9"
/obj/item/weapon/reagent_containers/pill/cyanide/Initialize()
. = ..()
@@ -121,186 +123,194 @@
/obj/item/weapon/reagent_containers/pill/adminordrazine
name = "Adminordrazine pill"
desc = "It's magic. We don't have to explain it." //it's space magic you don't need the quantity
icon_state = "pill15"
desc = "It's magic. We don't have to explain it."
icon_state = "pillA"
/obj/item/weapon/reagent_containers/pill/adminordrazine/Initialize()
. = ..()
reagents.add_reagent("adminordrazine", 5)
/obj/item/weapon/reagent_containers/pill/stox
name = "Sleeping pill"
desc = "Commonly used to treat insomnia. Contains 15 units of Soporific."
icon_state = "pill8"
name = "Soporific (15u)"
desc = "Commonly used to treat insomnia."
icon_state = "pill2"
/obj/item/weapon/reagent_containers/pill/stox/Initialize()
. = ..()
reagents.add_reagent("stoxin", 15)
color = reagents.get_color()
/obj/item/weapon/reagent_containers/pill/kelotane
name = "Kelotane pill"
desc = "Used to treat burns. Contains 15 units of Kelotane."
icon_state = "pill11"
name = "Kelotane (15u)"
desc = "Used to treat burns."
icon_state = "pill3"
/obj/item/weapon/reagent_containers/pill/kelotane/Initialize()
. = ..()
reagents.add_reagent("kelotane", 15)
color = reagents.get_color()
/obj/item/weapon/reagent_containers/pill/paracetamol
name = "Paracetamol pill"
desc = "Paracetamol! A painkiller for the ages. Chewables! Contains 15 units of Paracetamol."
icon_state = "pill8"
name = "Paracetamol (15u)"
desc = "Paracetamol! A painkiller for the ages. Chewables!"
icon_state = "pill3"
/obj/item/weapon/reagent_containers/pill/paracetamol/Initialize()
. = ..()
reagents.add_reagent("paracetamol", 15)
color = reagents.get_color()
/obj/item/weapon/reagent_containers/pill/tramadol
name = "Tramadol pill"
desc = "A simple painkiller. Contains 15 units of Tramadol."
icon_state = "pill8"
name = "Tramadol (15u)"
desc = "A simple painkiller."
icon_state = "pill3"
/obj/item/weapon/reagent_containers/pill/tramadol/Initialize()
. = ..()
reagents.add_reagent("tramadol", 15)
color = reagents.get_color()
/obj/item/weapon/reagent_containers/pill/methylphenidate
name = "Methylphenidate pill"
desc = "Improves the ability to concentrate. Contains 15 units of Methylphenidate."
icon_state = "pill8"
name = "Methylphenidate (15u)"
desc = "Improves the ability to concentrate."
icon_state = "pill2"
/obj/item/weapon/reagent_containers/pill/methylphenidate/Initialize()
. = ..()
reagents.add_reagent("methylphenidate", 15)
color = reagents.get_color()
/obj/item/weapon/reagent_containers/pill/citalopram
name = "Citalopram pill"
desc = "Mild anti-depressant. Contains 15 units of Citalopram."
icon_state = "pill8"
name = "Citalopram (15u)"
desc = "Mild anti-depressant."
icon_state = "pill4"
/obj/item/weapon/reagent_containers/pill/citalopram/Initialize()
. = ..()
reagents.add_reagent("citalopram", 15)
color = reagents.get_color()
/obj/item/weapon/reagent_containers/pill/dexalin
name = "Dexalin pill"
desc = "Used to treat oxygen deprivation. Contains 15 units of Dexalin."
icon_state = "pill16"
name = "Dexalin (15u)"
desc = "Used to treat oxygen deprivation."
icon_state = "pill1"
/obj/item/weapon/reagent_containers/pill/dexalin/Initialize()
. = ..()
reagents.add_reagent("dexalin", 15)
color = reagents.get_color()
/obj/item/weapon/reagent_containers/pill/dexalin_plus
name = "Dexalin Plus pill"
desc = "Used to treat extreme oxygen deprivation. Contains 15 units of Dexalin Plus."
icon_state = "pill8"
name = "Dexalin Plus (15u)"
desc = "Used to treat extreme oxygen deprivation."
icon_state = "pill2"
/obj/item/weapon/reagent_containers/pill/dexalin_plus/Initialize()
. = ..()
reagents.add_reagent("dexalinp", 15)
color = reagents.get_color()
/obj/item/weapon/reagent_containers/pill/dermaline
name = "Dermaline pill"
desc = "Used to treat burn wounds. Contains 15 units of Dermaline."
icon_state = "pill12"
name = "Dermaline (15u)"
desc = "Used to treat burn wounds."
icon_state = "pill2"
/obj/item/weapon/reagent_containers/pill/dermaline/Initialize()
. = ..()
reagents.add_reagent("dermaline", 15)
color = reagents.get_color()
/obj/item/weapon/reagent_containers/pill/dylovene
name = "Dylovene pill"
desc = "A broad-spectrum anti-toxin. Contains 15 units of Dylovene."
icon_state = "pill13"
name = "Dylovene (15u)"
desc = "A broad-spectrum anti-toxin."
icon_state = "pill1"
/obj/item/weapon/reagent_containers/pill/dylovene/Initialize()
. = ..()
reagents.add_reagent("anti_toxin", 15)
color = reagents.get_color()
/obj/item/weapon/reagent_containers/pill/inaprovaline
name = "Inaprovaline pill"
desc = "Used to stabilize patients. Contains 30 units of Inaprovaline."
icon_state = "pill20"
name = "Inaprovaline (30u)"
desc = "Used to stabilize patients."
icon_state = "pill2"
/obj/item/weapon/reagent_containers/pill/inaprovaline/Initialize()
. = ..()
reagents.add_reagent("inaprovaline", 30)
color = reagents.get_color()
/obj/item/weapon/reagent_containers/pill/bicaridine
name = "Bicaridine pill"
desc = "Used to treat physical injuries. Contains 20 units of Bicaridine."
icon_state = "pill18"
name = "Bicaridine (20u)"
desc = "Used to treat physical injuries."
icon_state = "pill2"
/obj/item/weapon/reagent_containers/pill/bicaridine/Initialize()
. = ..()
reagents.add_reagent("bicaridine", 20)
color = reagents.get_color()
/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"
name = "Spaceacillin (10u)"
desc = "A theta-lactam antibiotic. Effective against many diseases likely to be encountered in space."
icon_state = "pill3"
/obj/item/weapon/reagent_containers/pill/spaceacillin/Initialize()
. = ..()
reagents.add_reagent("spaceacillin", 15)
color = reagents.get_color()
/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"
name = "Carbon (15u)"
desc = "Used to neutralise chemicals in the stomach."
icon_state = "pill3"
/obj/item/weapon/reagent_containers/pill/carbon/Initialize()
. = ..()
reagents.add_reagent("carbon", 15)
color = reagents.get_color()
/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"
name = "Iron (15u)"
desc = "Used to aid in blood regeneration after bleeding."
icon_state = "pill1"
/obj/item/weapon/reagent_containers/pill/iron/Initialize()
. = ..()
reagents.add_reagent("iron", 15)
color = reagents.get_color()
//Not-quite-medicine
/obj/item/weapon/reagent_containers/pill/happy
name = "Happy pill"
desc = "Happy happy joy joy!" //we're not giving quantities for shady maint drugs
icon_state = "pill18"
desc = "Happy happy joy joy!"
icon_state = "pill4"
/obj/item/weapon/reagent_containers/pill/happy/Initialize()
. = ..()
reagents.add_reagent("space_drugs", 15)
reagents.add_reagent("sugar", 15)
color = reagents.get_color()
/obj/item/weapon/reagent_containers/pill/zoom
name = "Zoom pill"
desc = "Zoooom!"
icon_state = "pill18"
icon_state = "pill4"
/obj/item/weapon/reagent_containers/pill/zoom/Initialize()
. = ..()
reagents.add_reagent("impedrezene", 10)
reagents.add_reagent("synaptizine", 5)
reagents.add_reagent("hyperzine", 5)
color = reagents.get_color()
/obj/item/weapon/reagent_containers/pill/diet
name = "diet pill"
desc = "Guaranteed to get you slim!"
icon_state = "pill9"
icon_state = "pill4"
/obj/item/weapon/reagent_containers/pill/diet/Initialize()
. = ..()
reagents.add_reagent("lipozine", 2)
reagents.add_reagent("lipozine", 2)
color = reagents.get_color()