" //ADMINVERBS -/client/proc/investigate_show( subject in list("hrefs","notes","ntsl","singulo","wires","telesci", "gravity", "records", "cargo") ) +/client/proc/investigate_show( subject in list("hrefs","notes","ntsl","singulo","wires","telesci", "gravity", "records", "cargo", "supermatter") ) set name = "Investigate" set category = "Admin" if(!holder) return switch(subject) - if("singulo", "ntsl", "wires", "telesci", "gravity", "records", "cargo") //general one-round-only stuff + if("singulo", "ntsl", "wires", "telesci", "gravity", "records", "cargo", "supermatter") //general one-round-only stuff var/F = investigate_subject2file(subject) if(!F) src << "Error: admin_investigate: [INVESTIGATE_DIR][subject] is an invalid path or cannot be accessed." diff --git a/code/modules/admin/verbs/debug.dm b/code/modules/admin/verbs/debug.dm index 59024f59a11..914fbef7c0d 100644 --- a/code/modules/admin/verbs/debug.dm +++ b/code/modules/admin/verbs/debug.dm @@ -847,7 +847,7 @@ var/global/list/g_fancy_list_of_types = null if("centcom commander") M.equip_to_slot_or_del(new /obj/item/clothing/under/rank/centcom_commander(M), slot_w_uniform) - M.equip_to_slot_or_del(new /obj/item/clothing/suit/armor/bulletproof(M), slot_wear_suit) + M.equip_to_slot_or_del(new /obj/item/clothing/suit/armor(M), slot_wear_suit) M.equip_to_slot_or_del(new /obj/item/clothing/shoes/combat/swat(M), slot_shoes) M.equip_to_slot_or_del(new /obj/item/clothing/gloves/combat(M), slot_gloves) M.equip_to_slot_or_del(new /obj/item/device/radio/headset/headset_cent(M), slot_ears) @@ -989,7 +989,7 @@ var/global/list/g_fancy_list_of_types = null spawn(30) for(var/obj/machinery/the_singularitygen/G in world) if(G.anchored) - var/obj/machinery/singularity/S = new /obj/machinery/singularity(get_turf(G), 50) + var/obj/singularity/S = new /obj/singularity(get_turf(G), 50) // qdel(G) S.energy = 1750 S.current_size = 7 diff --git a/code/modules/admin/verbs/possess.dm b/code/modules/admin/verbs/possess.dm index 773e475b9f4..0947155158c 100644 --- a/code/modules/admin/verbs/possess.dm +++ b/code/modules/admin/verbs/possess.dm @@ -2,7 +2,7 @@ set name = "Possess Obj" set category = "Object" - if(istype(O,/obj/machinery/singularity)) + if(istype(O,/obj/singularity)) if(config.forbid_singulo_possession) usr << "It is forbidden to possess singularities." return diff --git a/code/modules/awaymissions/corpse.dm b/code/modules/awaymissions/corpse.dm index 5636219f233..841c66b5e3a 100644 --- a/code/modules/awaymissions/corpse.dm +++ b/code/modules/awaymissions/corpse.dm @@ -255,7 +255,7 @@ /obj/effect/landmark/corpse/commander name = "Commander" corpseuniform = /obj/item/clothing/under/rank/centcom_commander - corpsesuit = /obj/item/clothing/suit/armor/bulletproof + corpsesuit = /obj/item/clothing/suit/armor corpseradio = /obj/item/device/radio/headset/heads/captain corpseglasses = /obj/item/clothing/glasses/eyepatch corpsemask = /obj/item/clothing/mask/cigarette/cigar/cohiba diff --git a/code/modules/awaymissions/maploader/reader.dm b/code/modules/awaymissions/maploader/reader.dm index 7ef70f87ae2..381b167fb6e 100644 --- a/code/modules/awaymissions/maploader/reader.dm +++ b/code/modules/awaymissions/maploader/reader.dm @@ -2,6 +2,9 @@ //SS13 Optimized Map loader ////////////////////////////////////////////////////////////// +//global datum that will preload variables on atoms instanciation +var/global/dmm_suite/preloader/_preloader = null + /** * Construct the model map and control the loading process @@ -163,7 +166,7 @@ //first instance the /area and remove it from the members list index = members.len var/atom/instance - var/dmm_suite/preloader/_preloader = new(members_attributes[index])//preloader for assigning set variables on atom creation + _preloader = new(members_attributes[index])//preloader for assigning set variables on atom creation instance = locate(members[index]) instance.contents.Add(locate(xcrd,ycrd,zcrd)) @@ -191,34 +194,6 @@ T = UT index++ - - //Replace the previous part of the code with this if it's unsafe to assume tiles have ALWAYS an /area AND a /turf - /*while(members.len > 0) - var/length = members.len - var/member = members[length] - - if(ispath(member,/area)) - var/atom/instance - var/dmm_suite/preloader/_preloader = new(members_attributes[length]) - - instance = locate(member) - instance.contents.Add(locate(xcrd,ycrd,zcrd)) - - if(_preloader && instance) - _preloader.load(instance) - - members.Remove(member) - continue - - else if(ispath(member,/turf)) - instance_atom(member,members_attributes[length],xcrd,ycrd,zcrd) - members.Remove(member) - continue - - else - break - */ - //finally instance all remainings objects/mobs for(index=1,index < first_turf_index,index++) instance_atom(members[index],members_attributes[index],xcrd,ycrd,zcrd) @@ -230,11 +205,11 @@ //Instance an atom at (x,y,z) and gives it the variables in attributes /dmm_suite/proc/instance_atom(var/path,var/list/attributes, var/x, var/y, var/z) var/atom/instance - var/dmm_suite/preloader/_preloader = new(attributes) + _preloader = new(attributes, path) - instance = new path (locate(x,y,z), _preloader)//first preloader pass + instance = new path (locate(x,y,z))//first preloader pass - if(_preloader && instance)//second preloader pass, as some variables may have been reset/changed by New() + if(_preloader && instance)//second preloader pass, for those atoms that don't ..() in New() _preloader.load(instance) return instance @@ -242,9 +217,9 @@ //text trimming (both directions) helper proc //optionally removes quotes before and after the text (for variable name) /dmm_suite/proc/trim_text(var/what as text,var/trim_quotes=0) - while(length(what) && (findtext(what," ",1,2)))// || findtext(what,quote,1,2))) + while(length(what) && (findtext(what," ",1,2))) what=copytext(what,2,0) - while(length(what) && (findtext(what," ",length(what),0)))// || findtext(what,quote,length(what),0))) + while(length(what) && (findtext(what," ",length(what),0))) what=copytext(what,1,length(what)) if(trim_quotes) while(length(what) && (findtext(what,quote,1,2))) @@ -298,14 +273,18 @@ else if(isnum(text2num(trim_right))) trim_right = text2num(trim_right) - //Check for file - else if(copytext(trim_right,1,2) == "'") - trim_right = file(copytext(trim_right,2,length(trim_right))) + //Check for null + else if(trim_right == "null") + trim_right = null //Check for list else if(copytext(trim_right,1,5) == "list") trim_right = text2list(copytext(trim_right,6,length(trim_right))) + //Check for file + else if(copytext(trim_right,1,2) == "'") + trim_right = file(copytext(trim_right,2,length(trim_right))) + to_return[trim_left] = trim_right else//simple var @@ -323,10 +302,11 @@ placed.opacity = 1 placed.underlays += turfs_underlays -//atom creation method that preloads variables before creation -/atom/New(atom/loc, dmm_suite/preloader/_dmm_preloader) - if(istype(_dmm_preloader, /dmm_suite/preloader)) - _dmm_preloader.load(src) +//atom creation method that preloads variables at creation +/atom/New() + if(_preloader && (src.type == _preloader.target_path))//in case the instanciated atom is creating other atoms in New() + _preloader.load(src) + . = ..() ////////////////// @@ -336,12 +316,15 @@ /dmm_suite/preloader parent_type = /datum var/list/attributes + var/target_path -/dmm_suite/preloader/New(list/the_attributes) +/dmm_suite/preloader/New(var/list/the_attributes, var/path) .=..() if(!the_attributes.len) Del() + return attributes = the_attributes + target_path = path /dmm_suite/preloader/proc/load(atom/what) for(var/attribute in attributes) diff --git a/code/modules/awaymissions/mission_code/Academy.dm b/code/modules/awaymissions/mission_code/Academy.dm index eb91c32bfe1..1e1f03457ac 100644 --- a/code/modules/awaymissions/mission_code/Academy.dm +++ b/code/modules/awaymissions/mission_code/Academy.dm @@ -22,15 +22,15 @@ //Academy Items -/obj/machinery/singularity/academy +/obj/singularity/academy dissipate = 0 move_self = 0 grav_pull = 1 -/obj/machinery/singularity/academy/admin_investigate_setup() +/obj/singularity/academy/admin_investigate_setup() return -/obj/machinery/singularity/academy/process() +/obj/singularity/academy/process() eat() if(prob(1)) mezzer() diff --git a/code/modules/awaymissions/mission_code/stationCollision.dm b/code/modules/awaymissions/mission_code/stationCollision.dm index cb0ab5087df..b8cfb519a50 100644 --- a/code/modules/awaymissions/mission_code/stationCollision.dm +++ b/code/modules/awaymissions/mission_code/stationCollision.dm @@ -159,21 +159,21 @@ var/sc_safecode5 = "[rand(0,9)]" /* * Modified Nar-Sie */ -/obj/machinery/singularity/narsie/sc_Narsie +/obj/singularity/narsie/sc_Narsie desc = "Your body becomes weak and your feel your mind slipping away as you try to comprehend what you know can't be possible." move_self = 0 //Contianed narsie does not move! grav_pull = 0 //Contained narsie does not pull stuff in! - + var/uneatable = list(/turf/space, /obj/effect/overlay, /mob/living/simple_animal/construct) //Override this to prevent no adminlog runtimes and admin warnings about a singularity without containment -/obj/machinery/singularity/narsie/sc_Narsie/admin_investigate_setup() +/obj/singularity/narsie/sc_Narsie/admin_investigate_setup() return -/obj/machinery/singularity/narsie/sc_Narsie/process() +/obj/singularity/narsie/sc_Narsie/process() eat() if(prob(25)) mezzer() -/obj/machinery/singularity/narsie/sc_Narsie/consume(var/atom/A) +/obj/singularity/narsie/sc_Narsie/consume(var/atom/A) if(is_type_in_list(A, uneatable)) return 0 if (istype(A,/mob/living)) @@ -194,5 +194,5 @@ var/sc_safecode5 = "[rand(0,9)]" T.ChangeTurf(/turf/space) return -/obj/machinery/singularity/narsie/sc_Narsie/ex_act() +/obj/singularity/narsie/sc_Narsie/ex_act() return \ No newline at end of file diff --git a/code/modules/clothing/clothing.dm b/code/modules/clothing/clothing.dm index 3c54a472e40..31c9d545afd 100644 --- a/code/modules/clothing/clothing.dm +++ b/code/modules/clothing/clothing.dm @@ -348,7 +348,7 @@ atom/proc/generate_female_clothing(index,t_color,icon) flags |= (visor_flags) flags_inv |= (visor_flags_inv) icon_state = initial(icon_state) - usr << "You pull the [src] down." + usr << "You pull \the [src] down." flash_protect = initial(flash_protect) tint = initial(tint) else @@ -356,7 +356,7 @@ atom/proc/generate_female_clothing(index,t_color,icon) flags &= ~(visor_flags) flags_inv &= ~(visor_flags_inv) icon_state = "[initial(icon_state)]up" - usr << "You push the [src] up." + usr << "You push \the [src] up." flash_protect = 0 tint = 0 diff --git a/code/modules/clothing/glasses/hud.dm b/code/modules/clothing/glasses/hud.dm index e703f49756e..1935d89d50f 100644 --- a/code/modules/clothing/glasses/hud.dm +++ b/code/modules/clothing/glasses/hud.dm @@ -11,7 +11,7 @@ H.add_hud_to(user) /obj/item/clothing/glasses/hud/dropped(mob/living/carbon/human/user) - if(user.glasses == src) + if(istype(user) && user.glasses == src) var/datum/atom_hud/H = huds[hud_type] H.remove_hud_from(user) diff --git a/code/modules/clothing/gloves/ninja.dm b/code/modules/clothing/gloves/ninja.dm index 3ec928c9e29..0b05f32fb8d 100644 --- a/code/modules/clothing/gloves/ninja.dm +++ b/code/modules/clothing/gloves/ninja.dm @@ -46,65 +46,39 @@ if(!proximity) // todo: you could add ninja stars or computer hacking here return 0 - // Move an AI into and out of things - if(istype(A,/mob/living/silicon/ai)) - if(suit.s_control) - A.add_fingerprint(H) - suit.transfer_ai("AICORE", "NINJASUIT", A, H) - return 1 - else - H << "ERROR: \black Remote access channel disabled." - return 0 - - if(istype(A,/obj/structure/AIcore/deactivated)) - if(suit.s_control) - A.add_fingerprint(H) - suit.transfer_ai("INACTIVE","NINJASUIT",A, H) - return 1 - else - H << "ERROR: \black Remote access channel disabled." - return 0 - if(istype(A,/obj/machinery/computer/aifixer)) - if(suit.s_control) - A.add_fingerprint(H) - suit.transfer_ai("AIFIXER","NINJASUIT",A, H) - return 1 - else - H << "ERROR: \black Remote access channel disabled." - return 0 + A.add_fingerprint(H) // steal energy from powered things if(istype(A,/mob/living/silicon/robot)) - A.add_fingerprint(H) drain("CYBORG",A,suit) return 1 + if(istype(A,/obj/machinery/power/apc)) - A.add_fingerprint(H) drain("APC",A,suit) return 1 + if(istype(A,/obj/structure/cable)) - A.add_fingerprint(H) drain("WIRE",A,suit) return 1 + if(istype(A,/obj/structure/grille)) var/obj/structure/cable/C = locate() in A.loc if(C) drain("WIRE",C,suit) return 1 + if(istype(A,/obj/machinery/power/smes)) - A.add_fingerprint(H) drain("SMES",A,suit) return 1 + if(istype(A,/obj/mecha)) - A.add_fingerprint(H) drain("MECHA",A,suit) return 1 - // download research - if(istype(A,/obj/machinery/computer/rdconsole)) - A.add_fingerprint(H) + if(istype(A,/obj/machinery/computer/rdconsole)) // download research drain("RESEARCH",A,suit) return 1 + if(istype(A,/obj/machinery/r_n_d/server)) A.add_fingerprint(H) var/obj/machinery/r_n_d/server/S = A @@ -116,3 +90,15 @@ drain("RESEARCH",A,suit) return 1 + //do AI transfers + if(istype(A,/mob/living/silicon/ai)) + suit.NAI.transfer_ai("AICORE", "AICARD", A, H) + return 1 + + if(istype(A,/obj/structure/AIcore/deactivated)) + suit.NAI.transfer_ai("INACTIVE","AICARD",A, H) + return 1 + + if(istype(A,/obj/machinery/computer/aifixer)) + suit.NAI.transfer_ai("AIFIXER","AICARD",A, H) + return 1 diff --git a/code/modules/clothing/head/helmet.dm b/code/modules/clothing/head/helmet.dm index b08f66c0c61..e91317052e5 100644 --- a/code/modules/clothing/head/helmet.dm +++ b/code/modules/clothing/head/helmet.dm @@ -32,14 +32,14 @@ flags |= (visor_flags) flags_inv |= (visor_flags_inv) icon_state = initial(icon_state) - usr << "You pull the [src] down." + usr << "You pull \the [src] down." usr.update_inv_head(0) else up = !up flags &= ~(visor_flags) flags_inv &= ~(visor_flags_inv) icon_state = "[initial(icon_state)]up" - usr << "You push the [src] up." + usr << "You push \the [src] up." usr.update_inv_head(0) /obj/item/clothing/head/helmet/swat @@ -54,6 +54,13 @@ max_heat_protection_temperature = SPACE_HELM_MAX_TEMP_PROTECT strip_delay = 80 +/obj/item/clothing/head/helmet/bulletproof + name = "tactical helmet" + desc = "An advanced helmet designed to protect against traditional projectile weaponry and explosives." + icon_state = "bulletproof" + armor = list(melee = 25, bullet = 60, laser = 25, energy = 10, bomb = 40, bio = 0, rad = 0) + strip_delay = 70 + /obj/item/clothing/head/helmet/swat/syndicate name = "blood-red helmet" desc = "An extremely robust, space-worthy helmet that lacks a visor to allow for goggle usage underneath. Property of Gorlex Marauders." diff --git a/code/modules/clothing/head/jobs.dm b/code/modules/clothing/head/jobs.dm index 1a25b642c24..256138f8beb 100644 --- a/code/modules/clothing/head/jobs.dm +++ b/code/modules/clothing/head/jobs.dm @@ -44,7 +44,6 @@ name = "detective's fedora" desc = "There's only one man who can sniff out the dirty stench of crime, and he's likely wearing this hat." icon_state = "detective" - allowed = list(/obj/item/weapon/reagent_containers/food/snacks/candy_corn, /obj/item/weapon/pen) armor = list(melee = 50, bullet = 5, laser = 25, energy = 10, bomb = 0, bio = 0, rad = 0) //Mime @@ -74,16 +73,11 @@ armor = list(melee = 60, bullet = 5, laser = 25, energy = 10, bomb = 25, bio = 0, rad = 0) strip_delay = 60 -/obj/item/clothing/head/warden/drill - name = "warden's drill hat" - desc = "A robust drill hat for the Warden. For keeping the officers and prisoners in line." - icon_state = "wardendrill" - /obj/item/clothing/head/beret/sec name = "security beret" - desc = "A robust beret with the security insignia emblazoned on it. For officers that are more inclined towards style than safety." + desc = "A robust beret with the security insignia emblazoned on it. Uses reinforced fabric to offer sufficent protection." icon_state = "beret_badge" - armor = list(melee = 30, bullet = 5, laser = 15, energy = 10, bomb = 0, bio = 0, rad = 0) + armor = list(melee = 30, bullet = 25, laser = 25, energy = 10, bomb = 0, bio = 0, rad = 0) strip_delay = 60 /obj/item/clothing/head/beret/sec/navyhos @@ -95,6 +89,8 @@ name = "warden's beret" desc = "A special beret with the Warden's insignia emblazoned on it. For wardens with class." icon_state = "wardenberet" + armor = list(melee = 60, bullet = 5, laser = 25, energy = 10, bomb = 25, bio = 0, rad = 0) + strip_delay = 60 /obj/item/clothing/head/beret/sec/navyofficer desc = "A special beret with the security insignia emblazoned on it. For officers with class." diff --git a/code/modules/clothing/head/soft_caps.dm b/code/modules/clothing/head/soft_caps.dm index 54e63a1f1d3..56423b8cf80 100644 --- a/code/modules/clothing/head/soft_caps.dm +++ b/code/modules/clothing/head/soft_caps.dm @@ -90,5 +90,11 @@ desc = "It's a robust baseball hat in tasteful red colour." icon_state = "secsoft" item_color = "sec" - armor = list(melee = 30, bullet = 5, laser = 5, energy = 15, bomb = 0, bio = 0, rad = 0) - strip_delay = 60 \ No newline at end of file + armor = list(melee = 30, bullet = 25, laser = 25, energy = 10, bomb = 0, bio = 0, rad = 0) + strip_delay = 60 + +/obj/item/clothing/head/soft/emt + name = "EMT cap" + desc = "It's a baseball hat with a dark turquoise color and a reflective cross on the top." + icon_state = "emtsoft" + item_color = "emtsoft" \ No newline at end of file diff --git a/code/modules/clothing/masks/gasmask.dm b/code/modules/clothing/masks/gasmask.dm index 304b0d0e72b..c94d60b75a7 100644 --- a/code/modules/clothing/masks/gasmask.dm +++ b/code/modules/clothing/masks/gasmask.dm @@ -235,12 +235,12 @@ temp_message[H] = ninjaspeak(temp_message[H]) pick_list -= H message = list2text(temp_message, " ") - message = replacetext(message, "o", "¤") - message = replacetext(message, "p", "þ") - message = replacetext(message, "l", "£") - message = replacetext(message, "s", "§") - message = replacetext(message, "u", "µ") - message = replacetext(message, "b", "ß") + message = replacetext(message, "o", "?") + message = replacetext(message, "p", "?") + message = replacetext(message, "l", "?") + message = replacetext(message, "s", "?") + message = replacetext(message, "u", "?") + message = replacetext(message, "b", "?") return message diff --git a/code/modules/clothing/spacesuits/ninja.dm b/code/modules/clothing/spacesuits/ninja.dm index 5aa48fa2b6f..47d2d3aede6 100644 --- a/code/modules/clothing/spacesuits/ninja.dm +++ b/code/modules/clothing/spacesuits/ninja.dm @@ -3,7 +3,6 @@ name = "ninja hood" icon_state = "s-ninja" item_state = "s-ninja_mask" - allowed = list(/obj/item/weapon/stock_parts/cell) armor = list(melee = 60, bullet = 50, laser = 30,energy = 15, bomb = 30, bio = 30, rad = 25) strip_delay = 12 unacidable = 1 @@ -56,8 +55,11 @@ var/a_boost = 3.0//Number of adrenaline boosters. //Onboard AI related variables. - var/mob/living/silicon/ai/AI//If there is an AI inside the suit. + + var/obj/item/device/aicard/NAI //Integrated intellicard. + var/obj/item/device/paicard/pai//A slot for a pAI device + var/obj/effect/overlay/hologram//Is the AI hologram on or off? Visible only to the wearer of the suit. This works by attaching an image to a blank overlay. - var/flush = 0//If an AI purge is in progress. + var/s_control = 1//If user in control of the suit. diff --git a/code/modules/clothing/suits/armor.dm b/code/modules/clothing/suits/armor.dm index 4f1d67a1e1a..a665e594809 100644 --- a/code/modules/clothing/suits/armor.dm +++ b/code/modules/clothing/suits/armor.dm @@ -6,16 +6,24 @@ heat_protection = CHEST|GROIN max_heat_protection_temperature = ARMOR_MAX_TEMP_PROTECT strip_delay = 60 - put_on_delay = 60 + put_on_delay = 40 /obj/item/clothing/suit/armor/vest name = "armor" - desc = "An armored vest that protects against some damage." + desc = "A slim armored vest that protects against most types of damage." icon_state = "armor" item_state = "armor" blood_overlay_type = "armor" armor = list(melee = 50, bullet = 15, laser = 50, energy = 10, bomb = 25, bio = 0, rad = 0) +/obj/item/clothing/suit/armor/vest/alt + name = "armor" + desc = "An armored vest that protects against most types of damage. This is a civilian variant." + icon_state = "armoralt" + item_state = "armoralt" + blood_overlay_type = "armor" + armor = list(melee = 50, bullet = 15, laser = 50, energy = 10, bomb = 25, bio = 0, rad = 0) + /obj/item/clothing/suit/armor/hos name = "armored greatcoat" desc = "A greatcoat enchanced with a special alloy for some protection and style for those with a commanding presence." @@ -27,7 +35,6 @@ cold_protection = CHEST|GROIN|LEGS|ARMS heat_protection = CHEST|GROIN|LEGS|ARMS strip_delay = 80 - put_on_delay = 40 /obj/item/clothing/suit/armor/hos/trenchcoat name = "armored trenchoat" @@ -36,16 +43,21 @@ item_state = "hostrench" flags_inv = 0 strip_delay = 80 - put_on_delay = 40 /obj/item/clothing/suit/armor/vest/warden name = "warden's jacket" - desc = "An armored jacket with silver rank pips and livery." + desc = "A navy-blue armored jacket with blue shoulder designations and '/Warden/' stitched into one of the chest pockets." icon_state = "warden_jacket" item_state = "armor" body_parts_covered = CHEST|GROIN|ARMS cold_protection = CHEST|GROIN|ARMS|HANDS heat_protection = CHEST|GROIN|ARMS|HANDS + strip_delay = 70 + +/obj/item/clothing/suit/armor/vest/warden/alt + name = "warden's armored jacket" + desc = "A red jacket with silver rank pips and body armor strapped on top." + icon_state = "warden_alt" /obj/item/clothing/suit/armor/vest/capcarapace name = "captain's carapace" @@ -61,36 +73,33 @@ desc = "A suit of armor with heavy padding to protect against melee attacks. Looks like it might impair movement." icon_state = "riot" item_state = "swat_suit" - body_parts_covered = CHEST|GROIN|LEGS|FEET|ARMS|HANDS slowdown = 1 - armor = list(melee = 80, bullet = 10, laser = 10, energy = 10, bomb = 0, bio = 0, rad = 0) - flags_inv = HIDEJUMPSUIT + body_parts_covered = CHEST|GROIN|LEGS|FEET|ARMS|HANDS cold_protection = CHEST|GROIN|LEGS|FEET|ARMS|HANDS heat_protection = CHEST|GROIN|LEGS|FEET|ARMS|HANDS + armor = list(melee = 80, bullet = 10, laser = 10, energy = 10, bomb = 0, bio = 0, rad = 0) + flags_inv = HIDEJUMPSUIT strip_delay = 80 - put_on_delay = 80 + put_on_delay = 60 /obj/item/clothing/suit/armor/bulletproof - name = "bulletproof vest" - desc = "A vest that excels in protecting the wearer against high-velocity solid projectiles." + name = "bulletproof armor" + desc = "A bulletproof vest that excels in protecting the wearer against traditional projectile weaponry and explosives to a minor extent." icon_state = "bulletproof" item_state = "armor" blood_overlay_type = "armor" - armor = list(melee = 10, bullet = 80, laser = 10, energy = 10, bomb = 0, bio = 0, rad = 0) - strip_delay = 40 - put_on_delay = 40 - + armor = list(melee = 25, bullet = 80, laser = 10, energy = 10, bomb = 40, bio = 0, rad = 0) + strip_delay = 70 + put_on_delay = 50 /obj/item/clothing/suit/armor/laserproof name = "ablative armor vest" - desc = "A vest that excels in protecting the wearer against energy projectiles." + desc = "A vest that excels in protecting the wearer against energy projectiles, as well as occasionally reflecting them." icon_state = "armor_reflec" item_state = "armor_reflec" blood_overlay_type = "armor" armor = list(melee = 10, bullet = 10, laser = 80, energy = 50, bomb = 0, bio = 0, rad = 0) reflect_chance = 40 - strip_delay = 40 - put_on_delay = 40 /obj/item/clothing/suit/armor/laserproof/IsReflect(var/def_zone) var/hit_reflect_chance = reflect_chance @@ -99,7 +108,6 @@ if (prob(hit_reflect_chance)) return 1 - /obj/item/clothing/suit/armor/vest/det_suit name = "armor" desc = "An armored vest with a detective's badge on it." diff --git a/code/modules/clothing/suits/wiz_robe.dm b/code/modules/clothing/suits/wiz_robe.dm index 5ddf605de07..2aecf9f789b 100644 --- a/code/modules/clothing/suits/wiz_robe.dm +++ b/code/modules/clothing/suits/wiz_robe.dm @@ -38,6 +38,11 @@ icon_state = "magus" item_state = "magus" +/obj/item/clothing/head/wizard/santa + name = "Santa's hat" + desc = "Ho ho ho. Merrry X-mas!" + icon_state = "santahat" + flags = BLOCKHAIR /obj/item/clothing/suit/wizrobe name = "wizard robe" @@ -86,6 +91,12 @@ item_state = "magusred" +/obj/item/clothing/suit/wizrobe/santa + name = "Santa's suit" + desc = "Festive!" + icon_state = "santa" + item_state = "santa" + /obj/item/clothing/suit/wizrobe/fake name = "wizard robe" desc = "A rather dull blue robe meant to mimick real wizard robes." @@ -113,4 +124,4 @@ gas_transfer_coefficient = 1 permeability_coefficient = 1 armor = list(melee = 0, bullet = 0, laser = 0, energy = 0, bomb = 0, bio = 0, rad = 0) - unacidable = 0 \ No newline at end of file + unacidable = 0 diff --git a/code/modules/clothing/under/jobs/security.dm b/code/modules/clothing/under/jobs/security.dm index 658c78b3698..bb6be40c422 100644 --- a/code/modules/clothing/under/jobs/security.dm +++ b/code/modules/clothing/under/jobs/security.dm @@ -8,21 +8,22 @@ /* * Security */ -/obj/item/clothing/under/rank/warden - desc = "It's made of a slightly sturdier material than standard jumpsuits, to allow for more robust protection. It has the word \"Warden\" written on the shoulders." - name = "warden's jumpsuit" - icon_state = "warden" - item_state = "r_suit" - item_color = "warden" + +/obj/item/clothing/under/rank/security + name = "security suit" + desc = "A formal security suit for officers complete with nanotrasen belt buckle." + icon_state = "security" + item_state = "gy_suit" + item_color = "security" armor = list(melee = 10, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 0, rad = 0) strip_delay = 50 -/obj/item/clothing/under/rank/security - name = "security officer's jumpsuit" - desc = "It's made of a slightly sturdier material than standard jumpsuits, to allow for robust protection." - icon_state = "security" - item_state = "r_suit" - item_color = "secred" +/obj/item/clothing/under/rank/warden + name = "warden's suit" + desc = "A formal security suit for the warden with blue desginations and '/Warden/' stiched into the shoulders." + icon_state = "warden" + item_state = "gy_suit" + item_color = "warden" armor = list(melee = 10, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 0, rad = 0) strip_delay = 50 @@ -38,27 +39,25 @@ armor = list(melee = 10, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 0, rad = 0) strip_delay = 50 -/obj/item/clothing/under/det/grey +/obj/item/clothing/under/rank/det/grey name = "noir suit" desc = "A hard-boiled private investigator's grey suit, complete with tie clip." icon_state = "greydet" item_state = "greydet" item_color = "greydet" - armor = list(melee = 10, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 0, rad = 0) /* * Head of Security */ /obj/item/clothing/under/rank/head_of_security - desc = "It's a jumpsuit worn by those few with the dedication to achieve the position of \"Head of Security\". It has additional armor to protect the wearer." - name = "head of security's jumpsuit" + name = "head of security's suit" + desc = "A security suit decorated for those few with the dedication to achieve the position of Head of Security." icon_state = "hos" - item_state = "r_suit" - item_color = "hosred" + item_state = "gy_suit" + item_color = "hos" armor = list(melee = 10, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 0, rad = 0) strip_delay = 60 - /* * Navy uniforms */ @@ -82,4 +81,4 @@ name = "warden's uniform" icon_state = "wardenblueclothes" item_state = "wardenblueclothes" - item_color = "wardenblueclothes" + item_color = "wardenblueclothes" \ No newline at end of file diff --git a/code/modules/clothing/under/miscellaneous.dm b/code/modules/clothing/under/miscellaneous.dm index 29c9356fd69..88cc52f77bd 100644 --- a/code/modules/clothing/under/miscellaneous.dm +++ b/code/modules/clothing/under/miscellaneous.dm @@ -334,28 +334,28 @@ fitted = 0 can_adjust = 0 -/obj/item/clothing/under/captainformal - name = "captain's formal uniform" - desc = "A captain's formal-wear, for special occasions." - icon_state = "captain_formal" +/obj/item/clothing/under/captainparade + name = "captain's parade uniform" + desc = "A captain's luxury-wear, for special occasions." + icon_state = "captain_parade" item_state = "by_suit" - item_color = "captain_formal" + item_color = "captain_parade" can_adjust = 0 -/obj/item/clothing/under/hosformalmale - name = "head of security's formal uniform" - desc = "A male head of security's formal-wear, for special occasions." - icon_state = "hos_formal_male" +/obj/item/clothing/under/hosparademale + name = "head of security's parade uniform" + desc = "A male head of security's luxury-wear, for special occasions." + icon_state = "hos_parade_male" item_state = "r_suit" - item_color = "hos_formal_male" + item_color = "hos_parade_male" can_adjust = 0 -/obj/item/clothing/under/hosformalfem - name = "head of security's formal uniform" - desc = "A female head of security's formal-wear, for special occasions." - icon_state = "hos_formal_fem" +/obj/item/clothing/under/hosparadefem + name = "head of security's parade uniform" + desc = "A female head of security's luxury-wear, for special occasions." + icon_state = "hos_parade_fem" item_state = "r_suit" - item_color = "hos_formal_fem" + item_color = "hos_parade_fem" fitted = 0 can_adjust = 0 @@ -375,3 +375,50 @@ item_color = "black_tango" fitted = 0 can_adjust = 0 + +/obj/item/clothing/under/stripeddress + name = "striped dress" + desc = "Fashion in space." + icon_state = "striped_dress" + item_state = "stripeddress" + item_color = "striped_dress" + fitted = 0 + can_adjust = 0 + +/obj/item/clothing/under/sailordress + name = "sailor dress" + desc = "Formal wear for a leading lady." + icon_state = "sailor_dress" + item_state = "sailordress" + item_color = "sailor_dress" + fitted = 0 + can_adjust = 0 + +/obj/item/clothing/under/redeveninggown + name = "red evening gown" + desc = "Fancy dress for space bar singers." + icon_state = "red_evening_gown" + item_state = "redeveninggown" + item_color = "red_evening_gown" + fitted = 0 + can_adjust = 0 + +/obj/item/clothing/under/maid + name = "maid costume" + desc = "Maid in China." + icon_state = "maid" + item_state = "maid" + item_color = "maid" + body_parts_covered = CHEST|GROIN + fitted = 0 + can_adjust = 0 + +/obj/item/clothing/under/janimaid + name = "maid uniform" + desc = "A simple maid uniform for housekeeping." + icon_state = "janimaid" + item_state = "janimaid" + item_color = "janimaid" + body_parts_covered = CHEST|GROIN + fitted = 0 + can_adjust = 0 diff --git a/code/modules/clothing/under/pants.dm b/code/modules/clothing/under/pants.dm new file mode 100644 index 00000000000..db060397c5a --- /dev/null +++ b/code/modules/clothing/under/pants.dm @@ -0,0 +1,83 @@ +/obj/item/clothing/under/pants + gender = PLURAL + body_parts_covered = GROIN|LEGS + fitted = 0 + can_adjust = 0 + +/obj/item/clothing/under/pants/classicjeans + name = "classic jeans" + desc = "You feel cooler already." + icon_state = "jeansclassic" + item_color = "jeansclassic" + +/obj/item/clothing/under/pants/mustangjeans + name = "Must Hang jeans" + desc = "Made in the finest space jeans factory this side of Alpha Centauri." + icon_state = "jeansmustang" + item_color = "jeansmustang" + +/obj/item/clothing/under/pants/blackjeans + name = "black jeans" + desc = "Only for those who can pull it off." + icon_state = "jeansblack" + item_color = "jeansblack" + +/obj/item/clothing/under/pants/youngfolksjeans + name = "Young Folks jeans" + desc = "For those tired of boring old jeans. Relive the passion of your youth!" + icon_state = "jeansyoungfolks" + item_color = "jeansyoungfolks" + +/obj/item/clothing/under/pants/white + name = "white pants" + desc = "Plain white pants. Boring." + icon_state = "whitepants" + item_color = "whitepants" + +/obj/item/clothing/under/pants/red + name = "red pants" + desc = "Bright red pants. Overflowing with personality." + icon_state = "redpants" + item_color = "redpants" + +/obj/item/clothing/under/pants/black + name = "black pants" + desc = "These pants are dark, like your soul." + icon_state = "blackpants" + item_color = "blackpants" + +/obj/item/clothing/under/pants/tan + name = "tan pants" + desc = "Some tan pants. You look like a white collar worker with these on." + icon_state = "tanpants" + item_color = "tanpants" + +/obj/item/clothing/under/pants/blue + name = "blue pants" + desc = "Stylish blue pants. These go well with a lot of clothes." + icon_state = "bluepants" + item_color = "bluepants" + +/obj/item/clothing/under/pants/track + name = "track pants" + desc = "A pair of track pants, for the athletic." + icon_state = "trackpants" + item_color = "trackpants" + +/obj/item/clothing/under/pants/jeans + name = "jeans" + desc = "A nondescript pair of tough blue jeans." + icon_state = "jeans" + item_color = "jeans" + +/obj/item/clothing/under/pants/khaki + name = "khaki pants" + desc = "A pair of dust beige khaki pants." + icon_state = "khaki" + item_color = "khaki" + +/obj/item/clothing/under/pants/camo + name = "camo pants" + desc = "A pair of woodland camouflage pants. Probably not the best choice for a space station." + icon_state = "camopants" + item_color = "camopants" diff --git a/code/modules/clothing/under/ties.dm b/code/modules/clothing/under/ties.dm index 92c6e97985a..1520f2cfcf7 100644 --- a/code/modules/clothing/under/ties.dm +++ b/code/modules/clothing/under/ties.dm @@ -154,8 +154,8 @@ /obj/item/clothing/tie/armband name = "red armband" desc = "An fancy red armband!" - icon_state = "red" - item_color = "red" + icon_state = "redband" + item_color = "redband" /obj/item/clothing/tie/armband/deputy name = "security deputy armband" @@ -164,35 +164,116 @@ /obj/item/clothing/tie/armband/cargo name = "cargo bay guard armband" desc = "An armband, worn by the station's security forces to display which department they're assigned to. This one is brown." - icon_state = "cargo" - item_color = "cargo" + icon_state = "cargoband" + item_color = "cargoband" /obj/item/clothing/tie/armband/engine name = "engineering guard armband" desc = "An armband, worn by the station's security forces to display which department they're assigned to. This one is orange with a reflective strip!" - icon_state = "engie" - item_color = "engie" + icon_state = "engieband" + item_color = "engieband" /obj/item/clothing/tie/armband/science name = "science guard armband" desc = "An armband, worn by the station's security forces to display which department they're assigned to. This one is purple." - icon_state = "rnd" - item_color = "rnd" + icon_state = "rndband" + item_color = "rndband" /obj/item/clothing/tie/armband/hydro name = "hydroponics guard armband" desc = "An armband, worn by the station's security forces to display which department they're assigned to. This one is green and blue." - icon_state = "hydro" - item_color = "hydro" + icon_state = "hydroband" + item_color = "hydroband" /obj/item/clothing/tie/armband/med name = "medical guard armband" desc = "An armband, worn by the station's security forces to display which department they're assigned to. This one is white." - icon_state = "med" - item_color = "med" + icon_state = "medband" + item_color = "medband" /obj/item/clothing/tie/armband/medblue name = "medical guard armband" desc = "An armband, worn by the station's security forces to display which department they're assigned to. This one is white and blue." - icon_state = "medblue" - item_color = "medblue" \ No newline at end of file + icon_state = "medblueband" + item_color = "medblueband" + +/////////// +//SCARVES// +/////////// + +/obj/item/clothing/tie/scarf + name = "scarf" + desc = "A stylish scarf. The perfect winter accessory for those with a keen fashion sense, and those who just can't handle a cold breeze on their necks." + +/obj/item/clothing/tie/scarf/red + name = "red scarf" + icon_state = "redscarf" + item_color = "redscarf" + +/obj/item/clothing/tie/scarf/green + name = "green scarf" + icon_state = "greenscarf" + item_color = "greenscarf" + +/obj/item/clothing/tie/scarf/darkblue + name = "dark blue scarf" + icon_state = "darkbluescarf" + item_color = "darkbluescarf" + +/obj/item/clothing/tie/scarf/purple + name = "purple scarf" + icon_state = "purplescarf" + item_color = "purplescarf" + +/obj/item/clothing/tie/scarf/yellow + name = "yellow scarf" + icon_state = "yellowscarf" + item_color = "yellowscarf" + +/obj/item/clothing/tie/scarf/orange + name = "orange scarf" + icon_state = "orangescarf" + item_color = "orangescarf" + +/obj/item/clothing/tie/scarf/lightblue + name = "light blue scarf" + icon_state = "lightbluescarf" + item_color = "lightbluescarf" + +/obj/item/clothing/tie/scarf/white + name = "white scarf" + icon_state = "whitescarf" + item_color = "whitescarf" + +/obj/item/clothing/tie/scarf/black + name = "black scarf" + icon_state = "blackscarf" + item_color = "blackscarf" + +/obj/item/clothing/tie/scarf/zebra + name = "zebra scarf" + icon_state = "zebrascarf" + item_color = "zebrascarf" + +/obj/item/clothing/tie/scarf/christmas + name = "christmas scarf" + icon_state = "christmasscarf" + item_color = "christmasscarf" + +//The three following scarves don't have the scarf subtype +//This is because Ian can equip anything from that subtype +//However, these 3 don't have corgi versions of their sprites +/obj/item/clothing/tie/stripedredscarf + name = "striped red scarf" + icon_state = "stripedredscarf" + item_color = "stripedredscarf" + +/obj/item/clothing/tie/stripedgreenscarf + name = "striped green scarf" + icon_state = "stripedgreenscarf" + item_color = "stripedgreenscarf" + +/obj/item/clothing/tie/stripedbluescarf + name = "striped blue scarf" + icon_state = "stripedbluescarf" + item_color = "stripedbluescarf" diff --git a/code/modules/crafting/recipes.dm b/code/modules/crafting/recipes.dm index 6a53af52426..c1eb8f03c3b 100644 --- a/code/modules/crafting/recipes.dm +++ b/code/modules/crafting/recipes.dm @@ -38,7 +38,7 @@ /obj/item/robot_parts/r_leg = 1, /obj/item/stack/sheet/metal = 5, /obj/item/stack/cable_coil = 5, - /obj/item/weapon/gun/energy/taser = 1, + /obj/item/weapon/gun/energy/gun/advtaser = 1, /obj/item/weapon/stock_parts/cell = 1, /obj/item/device/assembly/prox_sensor = 1, /obj/item/robot_parts/r_arm = 1) @@ -117,6 +117,16 @@ tools = list(/obj/item/weapon/screwdriver) time = 5 +/datum/table_recipe/frag12 + name = "FRAG-12 Shell" + result = /obj/item/ammo_casing/shotgun/frag12 + reqs = list(/obj/item/ammo_casing/shotgun/techshell = 1, + /datum/reagent/glycerol = 5, + /datum/reagent/toxin/acid = 5, + /datum/reagent/toxin/acid/polyacid = 5,) + tools = list(/obj/item/weapon/screwdriver) + time = 5 + /datum/table_recipe/ishotgun name = "Improvised Shotgun" result = /obj/item/weapon/gun/projectile/revolver/doublebarrel/improvised diff --git a/code/modules/events/holiday/xmas.dm b/code/modules/events/holiday/xmas.dm index 3c93432b541..63c52779fa7 100644 --- a/code/modules/events/holiday/xmas.dm +++ b/code/modules/events/holiday/xmas.dm @@ -77,4 +77,75 @@ icon_state = "xmashat" desc = "A crappy paper hat that you are REQUIRED to wear." flags_inv = 0 - armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 0, rad = 0) \ No newline at end of file + armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 0, rad = 0) + +/datum/round_event_control/santa + name = "Santa is coming to town! (Christmas)" + holidayID = "Xmas" + typepath = /datum/round_event/santa + weight = 150 + max_occurrences = 1 + earliest_start = 20000 + +/datum/round_event/santa + var/mob/living/carbon/human/santa //who is our santa? + +/datum/round_event/santa/announce() + priority_announce("Santa is coming to town!", "Unknown Transmission") + +/datum/round_event/santa/start() + for(var/mob/M in dead_mob_list) + spawn(0) + var/response = alert(M, "Santa is coming to town! Do you want to be santa?", "Ho ho ho!", "Yes", "No") + if(response == "Yes" && M && M.client && M.stat == DEAD && !santa) + santa = new /mob/living/carbon/human(pick(blobstart)) + M.mind.transfer_to(santa) + santa.key = M.key + + santa.real_name = "Santa Claus" + santa.name = "Santa Claus" + santa.mind.name = "Santa Claus" + santa.mind.assigned_role = "Santa" + santa.mind.special_role = "Santa" + + santa.hair_style = "Long Hair" + santa.facial_hair_style = "Full Beard" + santa.hair_color = "FFF" + santa.facial_hair_color = "FFF" + + santa.equip_to_slot_or_del(new /obj/item/clothing/under/color/red, slot_w_uniform) + santa.equip_to_slot_or_del(new /obj/item/clothing/suit/space/santa, slot_wear_suit) + santa.equip_to_slot_or_del(new /obj/item/clothing/head/santa, slot_head) + santa.equip_to_slot_or_del(new /obj/item/clothing/mask/breath, slot_wear_mask) + santa.equip_to_slot_or_del(new /obj/item/clothing/gloves/red, slot_gloves) + santa.equip_to_slot_or_del(new /obj/item/clothing/shoes/sneakers/red, slot_shoes) + santa.equip_to_slot_or_del(new /obj/item/weapon/tank/emergency_oxygen/double, slot_belt) + santa.equip_to_slot_or_del(new /obj/item/device/radio/headset/heads/captain, slot_ears) + santa.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack/santabag, slot_back) + santa.equip_to_slot_or_del(new /obj/item/device/flashlight, slot_r_store) //most blob spawn locations are really dark. + + var/obj/item/weapon/card/id/gold/santacard = new(santa) + santacard.update_label("Santa Claus", "Santa") + var/datum/job/captain/J = new/datum/job/captain + santacard.access = J.get_access() + santa.equip_to_slot_or_del(santacard, slot_wear_id) + + santa.update_icons() + + var/obj/item/weapon/storage/backpack/bag = santa.back + var/obj/item/weapon/a_gift/gift = new(santa) + while(bag.can_be_inserted(gift, 1)) + bag.handle_item_insertion(gift, 1) + gift = new(santa) + + var/datum/objective/santa_objective = new() + santa_objective.explanation_text = "Bring joy and presents to the station!" + santa_objective.completed = 1 //lets cut our santas some slack. + santa_objective.owner = santa.mind + santa.mind.objectives += santa_objective + santa.mind.spell_list += new /obj/effect/proc_holder/spell/aoe_turf/conjure/presents + var/obj/effect/proc_holder/spell/targeted/area_teleport/teleport/telespell = new(santa) + telespell.clothes_req = 0 //santa robes aren't actually magical. + santa.mind.spell_list += telespell //does the station have chimneys? WHO KNOWS! + + M << "You are Santa! Your objective is to bring joy to the people on this station. You can conjure more presents using a spell, and there are several presents in your bag." diff --git a/code/modules/events/ninja.dm b/code/modules/events/ninja.dm index 961a2d771d9..725cf620a18 100644 --- a/code/modules/events/ninja.dm +++ b/code/modules/events/ninja.dm @@ -172,7 +172,7 @@ Ninja.internals.icon_state = "internal1" if(Ninja.mind != Mind) //something has gone wrong! - ERROR("The ninja wasn't assigned the right mind. ;ç;") + ERROR("The ninja wasn't assigned the right mind. ;ç;") Ninja << sound('sound/effects/ninja_greeting.ogg') //so ninja you probably wouldn't even know if you were made one @@ -404,17 +404,17 @@ ________________________________________________________________________________ U:gloves.item_state = "s-ninjan" else if(U.mind.special_role!="Space Ninja") - U << "\red fÄTaL ÈÈRRoR: 382200-*#00CÖDE RED\nUNAU†HORIZED USÈ DETÈC†††eD\nCoMMÈNCING SUB-R0U†IN3 13...\nTÈRMInATING U-U-USÈR..." + U << "\red fÄTaL ÈÈRRoR: 382200-*#00CÖDE RED\nUNAU†HORIZED USÈ DETÈC†††eD\nCoMMÈNCING SUB-R0U†IN3 13...\nTÈRMInATING U-U-USÈR..." U.gib() return 0 if(!istype(U:head, /obj/item/clothing/head/helmet/space/space_ninja)) - U << "ERROR: 100113 \black UNABLE TO LOCATE HEAD GEAR\nABORTING..." + U << "ERROR: 100113 UNABLE TO LOCATE HEAD GEAR\nABORTING..." return 0 if(!istype(U:shoes, /obj/item/clothing/shoes/space_ninja)) - U << "ERROR: 122011 \black UNABLE TO LOCATE FOOT GEAR\nABORTING..." + U << "ERROR: 122011 UNABLE TO LOCATE FOOT GEAR\nABORTING..." return 0 if(!istype(U:gloves, /obj/item/clothing/gloves/space_ninja)) - U << "ERROR: 110223 \black UNABLE TO LOCATE HAND GEAR\nABORTING..." + U << "ERROR: 110223 UNABLE TO LOCATE HAND GEAR\nABORTING..." return 0 affecting = U @@ -570,7 +570,7 @@ ________________________________________________________________________________ U.incorporeal_move = 0 kamikaze = 0 k_unlock = 0 - U << "Disengaging mode...\n\blackCODE NAME: KAMIKAZE" + U << "Disengaging mode...\nCODE NAME: KAMIKAZE" //=======//AI VERBS//=======// @@ -587,295 +587,6 @@ ________________________________________________________________________________ s_control = 1 -//=======//OLD & UNUSED//=======// - -/* - -Deprecated. get_dir() does the same thing. Still a nice proc. -Returns direction that the mob or whomever should be facing in relation to the target. -This proc does not grant absolute direction and is mostly useful for 8dir sprite positioning. -I personally used it with getline() to great effect. -/proc/get_dir_to(turf/start,turf/end)//N - var/xdiff = start.x - end.x//The sign is important. - var/ydiff = start.y - end.y - - var/direction_x = xdiff<1 ? 4:8//East - west - var/direction_y = ydiff<1 ? 1:2//North - south - var/direction_xy = xdiff==0 ? -4:0//If x is the same, subtract 4. - var/direction_yx = ydiff==0 ? -1:0//If y is the same, subtract 1. - var/direction_f = direction_x+direction_y+direction_xy+direction_yx//Finally direction tally. - direction_f = direction_f==0 ? 1:direction_f//If direction is 0(same spot), return north. Otherwise, direction. - - return direction_f - -Alternative and inferior method of calculating spideros. -var/temp = num2text(spideros) -var/return_to = copytext(temp, 1, (length(temp)))//length has to be to the length of the thing because by default it's length+1 -spideros = text2num(return_to)//Maximum length here is 6. Use (return_to, X) to specify larger strings if needed. - -//Old way of draining from wire. -/obj/item/clothing/gloves/space_ninja/proc/drain_wire() - set name = "Drain From Wire" - set desc = "Drain energy directly from an exposed wire." - set category = "Ninja Equip" - - var/obj/structure/cable/attached - var/mob/living/carbon/human/U = loc - if(candrain&&!draining) - var/turf/T = U.loc - if(isturf(T) && istype(T, /turf/simulated/floor/plating) - attached = locate() in T - if(!attached) - U << "\red Warning: no exposed cable available." - else - U << "\blue Connecting to wire, stand still..." - if(do_after(U,50)&&!isnull(attached)) - drain("WIRE",attached,U:wear_suit,src) - else - U << "\red Procedure interrupted. Protocol terminated." - return - -I've tried a lot of stuff but adding verbs to the AI while inside an object, inside another object, did not want to work properly. -This was the best work-around I could come up with at the time. Uses objects to then display to panel, based on the object spell system. -Can be added on to pretty easily. - -BYOND fixed the verb bugs so this is no longer necessary. I prefer verb panels. - -/obj/item/clothing/suit/space/space_ninja/proc/grant_AI_verbs() - var/obj/effect/proc_holder/ai_return_control/A_C = new(AI) - var/obj/effect/proc_holder/ai_hack_ninja/B_C = new(AI) - var/obj/effect/proc_holder/ai_instruction/C_C = new(AI) - new/obj/effect/proc_holder/ai_holo_clear(AI) - AI.proc_holder_list += A_C - AI.proc_holder_list += B_C - AI.proc_holder_list += C_C - - s_control = 0 - -/obj/item/clothing/suit/space/space_ninja/proc/remove_AI_verbs() - var/obj/effect/proc_holder/ai_return_control/A_C = locate() in AI - var/obj/effect/proc_holder/ai_hack_ninja/B_C = locate() in AI - var/obj/effect/proc_holder/ai_instruction/C_C = locate() in AI - var/obj/effect/proc_holder/ai_holo_clear/D_C = locate() in AI - qdel(A_C) - qdel(B_C) - qdel(C_C) - qdel(D_C) - AI.proc_holder_list = list() - verbs += /obj/item/clothing/suit/space/space_ninja/proc/deinit - verbs += /obj/item/clothing/suit/space/space_ninja/proc/spideros - verbs += /obj/item/clothing/suit/space/space_ninja/proc/stealth - - s_control = 1 - -//Workaround -/obj/effect/proc_holder/ai_holo_clear - name = "Clear Hologram" - desc = "Stops projecting the current holographic image." - panel = "AI Ninja Equip" - density = 0 - opacity = 0 - - -/obj/effect/proc_holder/ai_holo_clear/Click() - var/obj/item/clothing/suit/space/space_ninja/S = loc.loc//This is so stupid but makes sure certain things work. AI.SUIT - qdel(S.hologram.i_attached) - qdel(S.hologram) - var/obj/effect/proc_holder/ai_holo_clear/D_C = locate() in S.AI - S.AI.proc_holder_list -= D_C - return - -/obj/effect/proc_holder/ai_instruction//Let's the AI know what they can do. - name = "Instructions" - desc = "Displays a list of helpful information." - panel = "AI Ninja Equip" - density = 0 - opacity = 0 - -/obj/effect/proc_holder/ai_instruction/Click() - loc << "The menu you are seeing will contain other commands if they become available.\nRight click a nearby turf to display an AI Hologram. It will only be visible to you and your host. You can move it freely using normal movement keys--it will disappear if placed too far away." - -/obj/effect/proc_holder/ai_hack_ninja//Generic proc holder to make sure the two verbs below work propely. - name = "Hack SpiderOS" - desc = "Hack directly into the Black Widow(tm) neuro-interface." - panel = "AI Ninja Equip" - density = 0 - opacity = 0 - -/obj/effect/proc_holder/ai_hack_ninja/Click()//When you click on it. - var/obj/item/clothing/suit/space/space_ninja/S = loc.loc - S.hack_spideros() - return - -/obj/effect/proc_holder/ai_return_control - name = "Relinquish Control" - desc = "Return control to the user." - panel = "AI Ninja Equip" - density = 0 - opacity = 0 - -/obj/effect/proc_holder/ai_return_control/Click() - var/mob/living/silicon/ai/A = loc - var/obj/item/clothing/suit/space/space_ninja/S = A.loc - A << browse(null, "window=hack spideros")//Close window - A << "You have seized your hacking attempt. [S.affecting] has regained control." - S.affecting << "UPDATE: [A.real_name] has ceased hacking attempt. All systems clear." - S.remove_AI_verbs() - return -*/ - -//=======//DEBUG//=======// -/* -/obj/item/clothing/suit/space/space_ninja/proc/display_verb_procs() -//DEBUG -//Does nothing at the moment. I am trying to see if it's possible to mess around with verbs as variables. - //for(var/P in verbs) -// if(P.set.name) -// usr << "[P.set.name], path: [P]" - return - - -Most of these are at various points of incomplete. - -/mob/verb/grant_object_panel() - set name = "Grant AI Ninja Verbs Debug" - set category = "Ninja Debug" - var/obj/effect/proc_holder/ai_return_control/A_C = new(src) - var/obj/effect/proc_holder/ai_hack_ninja/B_C = new(src) - usr:proc_holder_list += A_C - usr:proc_holder_list += B_C - -mob/verb/remove_object_panel() - set name = "Remove AI Ninja Verbs Debug" - set category = "Ninja Debug" - var/obj/effect/proc_holder/ai_return_control/A = locate() in src - var/obj/effect/proc_holder/ai_hack_ninja/B = locate() in src - usr:proc_holder_list -= A - usr:proc_holder_list -= B - qdel(A)//First. - qdel(B)//Second, to keep the proc going. - return - -/client/verb/grant_verb_ninja_debug1(var/mob/M in view()) - set name = "Grant AI Ninja Verbs Debug" - set category = "Ninja Debug" - - M.verbs += /mob/living/silicon/ai/verb/ninja_return_control - M.verbs += /mob/living/silicon/ai/verb/ninja_spideros - return - -/client/verb/grant_verb_ninja_debug2(var/mob/living/carbon/human/M in view()) - set name = "Grant Back Ninja Verbs" - set category = "Ninja Debug" - - M.wear_suit.verbs += /obj/item/clothing/suit/space/space_ninja/proc/deinit - M.wear_suit.verbs += /obj/item/clothing/suit/space/space_ninja/proc/spideros - return - -/obj/proc/grant_verb_ninja_debug3(var/mob/living/silicon/ai/A as mob) - set name = "Grant AI Ninja Verbs" - set category = "null" - set hidden = 1 - A.verbs -= /obj/item/clothing/suit/space/space_ninja/proc/deinit - A.verbs -= /obj/item/clothing/suit/space/space_ninja/proc/spideros - return - -/mob/verb/get_dir_to_target(var/mob/M in oview()) - set name = "Get Direction to Target" - set category = "Ninja Debug" - - world << "DIR: [get_dir_to(src.loc,M.loc)]" - return -// -/mob/verb/kill_self_debug() - set name = "DEBUG Kill Self" - set category = "Ninja Debug" - - src:death() - -/client/verb/switch_client_debug() - set name = "DEBUG Switch Client" - set category = "Ninja Debug" - - mob = mob:loc:loc - -/mob/verb/possess_mob(var/mob/M in oview()) - set name = "DEBUG Possess Mob" - set category = "Ninja Debug" - - client.mob = M - -/client/verb/switcharoo(var/mob/M in oview()) - set name = "DEBUG Switch to AI" - set category = "Ninja Debug" - - var/mob/last_mob = mob - mob = M - last_mob:wear_suit:AI:key = key -// -/client/verb/ninjaget(var/mob/M in oview()) - set name = "DEBUG Ninja GET" - set category = "Ninja Debug" - - mob = M - M.gib() - space_ninja() - -/mob/verb/set_debug_ninja_target() - set name = "Set Debug Target" - set category = "Ninja Debug" - - ninja_debug_target = src//The target is you, brohime. - world << "Target: [src]" - -/mob/verb/hack_spideros_debug() - set name = "Debug Hack Spider OS" - set category = "Ninja Debug" - - var/mob/living/silicon/ai/A = loc:AI - if(A) - if(!A.key) - A.client.mob = loc:affecting - else - loc:affecting:client:mob = A - return - -//Tests the net and what it does. -/mob/verb/ninjanet_debug() - set name = "Energy Net Debug" - set category = "Ninja Debug" - - var/obj/effect/energy_net/E = new /obj/effect/energy_net(loc) - E.layer = layer+1//To have it appear one layer above the mob. - stunned = 10//So they are stunned initially but conscious. - anchored = 1//Anchors them so they can't move. - E.affecting = src - spawn(0)//Parallel processing. - E.process(src) - return - -I made this as a test for a possible ninja ability (or perhaps more) for a certain mob to see hallucinations. -The thing here is that these guys have to be coded to do stuff as they are simply images that you can't even click on. -That is why you attached them to objects. -/mob/verb/TestNinjaShadow() - set name = "Test Ninja Ability" - set category = "Ninja Debug" - - if(client) - var/safety = 4 - for(var/turf/T in oview(5)) - if(prob(20)) - var/current_clone = image('icons/mob/mob.dmi',T,"s-ninja") - safety-- - spawn(0) - src << current_clone - spawn(300) - qdel(current_clone) - spawn while(!isnull(current_clone)) - step_to(current_clone,src,1) - sleep(5) - if(safety<=0) break - return */ //Alternate ninja speech replacement. /*This text is hilarious but also absolutely retarded. @@ -1377,12 +1088,13 @@ ________________________________________________________________________________ reagent_id == "radium" ? reagents.add_reagent(reagent_id, r_maxamount+(a_boost*a_transfer)) : reagents.add_reagent(reagent_id, r_maxamount)//It will take into account radium used for adrenaline boosting. cell = new/obj/item/weapon/stock_parts/cell/high//The suit should *always* have a battery because so many things rely on it. cell.charge = 9000//Starting charge should not be higher than maximum charge. It leads to problems with recharging. + NAI = new(src) //ninja intellicard /obj/item/clothing/suit/space/space_ninja/Destroy() if(affecting)//To make sure the window is closed. affecting << browse(null, "window=hack spideros") if(AI)//If there are AIs present when the ninja kicks the bucket. - killai() + killai(NAI) if(hologram)//If there is a hologram qdel(hologram.i_attached)//Delete it and the attached image. qdel(hologram) @@ -1395,15 +1107,18 @@ ________________________________________________________________________________ qdel(n_shoes) qdel(src) -/obj/item/clothing/suit/space/space_ninja/proc/killai(mob/living/silicon/ai/A = AI) - if(A.client) - A << "Self-erase protocol dete-- *bzzzzz*" - A << browse(null, "window=hack spideros") - AI = null - A.death(1)//Kill, deleting mob. - qdel(A) + + +/obj/item/clothing/suit/space/space_ninja/proc/killai(var/obj/item/device/aicard/NAI) + for(var/mob/living/silicon/ai/A in src) + if(A.client) + A << "Self-erase protocol dete-- *bzzzzz*" + A << browse(null, "window=hack spideros") + NAI.flush = 1 return + + //=======//SUIT VERBS//=======// //Verbs link to procs because verb-like procs have a bug which prevents their use if the arguments are not readily referenced. @@ -1459,10 +1174,10 @@ ________________________________________________________________________________ //Let's check for some safeties. if(s_initialized&&!affecting) terminate()//Kills the suit and attached objects. if(!s_initialized) return//When turned off the proc stops. - if(AI&&AI.stat==2)//If there is an AI and it's ded. Shouldn't happen without purging, could happen. - if(!s_control) - ai_return_control()//Return control to ninja if the AI was previously in control. - killai()//Delete AI. + for(var/mob/living/silicon/ai/A in NAI) + if(A&&A.stat==2)//If there is an AI and it's ded. Shouldn't happen without purging, could happen. + if(!s_control) + ai_return_control()//Return control to ninja if the AI was previously in control. //Now let's do the normal processing. if(s_coold) s_coold--//Checks for ability s_cooldown first. @@ -1504,7 +1219,7 @@ ________________________________________________________________________________ U << "Extending neural-net interface...\nNow monitoring brain wave pattern..." if(3) if(U.stat==2||U.health<=0) - U << "FĆAL �Rr�R: 344--93#�&&21 BR��N |/|/aV� PATT$RN RED\nA-A-aB�rT�NG..." + U << "FĆAL �Rr�R: 344--93#�&&21 BR��N |/|/aV� PATT$RN RED\nA-A-aB�rT�NG..." unlock_suit() break lock_suit(U,1)//Check for icons. @@ -1525,9 +1240,9 @@ ________________________________________________________________________________ if(!U.mind||U.mind.assigned_role!="MODE")//Your run of the mill persons shouldn't know what it is. Or how to turn it on. U << "You do not understand how this suit functions. Where the heck did it even come from?" else if(s_initialized) - U << "The suit is already functioning. \black Please report this bug." + U << "The suit is already functioning. Please report this bug." else - U << "ERROR: \black You cannot use this function at this time." + U << "ERROR: You cannot use this function at this time." return //=======//DEINITIALIZE//=======// @@ -1536,12 +1251,12 @@ ________________________________________________________________________________ if(affecting==loc&&!s_busy) var/mob/living/carbon/human/U = affecting if(!s_initialized) - U << "The suit is not initialized. \black Please report this bug." + U << "The suit is not initialized. Please report this bug." return if(alert("Are you certain you wish to remove the suit? This will take time and remove all abilities.",,"Yes","No")=="No") return - if(s_busy||flush) - U << "ERROR: \black You cannot use this function at this time." + if(s_busy || NAI.flush) + U << "ERROR: You cannot use this function at this time." return s_busy = 1 for(var/i = 0,i<7,i++) @@ -1721,7 +1436,7 @@ ________________________________________________________________________________
Master /N
- "}//This has always bothered me but not anymore! + "} if(5) - var/laws dat += "
AI Control:
"
- //var/mob/living/silicon/ai/A = AI
- if(AI)//If an AI exists.
- dat += "Stored AI: [A.name]" - dat += "System integrity: [(A.health+100)/2]%
" + if(NAI) + NAI.attack_self(display_to) //Just accesses the integrated Intellicard. If an AI is in control of the suit then I guess it can interact with its own card. How meta. - //I personally think this makes things a little more fun. Ninjas can override all but law 0. - //if (A.laws.zeroth) - // laws += "
Laws:
- [laws]
- *Override Laws*
" - else - dat += "Purge in progress...
" - dat += " [A.control_disabled ? "Enable" : "Disable"] Wireless Activity" if(6) dat += {"
Activate Abilities:
@@ -1857,7 +1539,7 @@ ________________________________________________________________________________
U.electrocute_act(damage, src,0.1,1)//The last argument is a safety for the human proc that checks for gloves.
cell.charge -= damage
else
- A << "ERROR: \black Not enough energy remaining."
+ A << "ERROR: Not enough energy remaining."
if("Message")
var/obj/item/device/pda/P = locate(href_list["target"])
@@ -1918,7 +1600,7 @@ ________________________________________________________________________________
for(var/i, i<4, i++)
switch(i)
if(0)
- U << "Engaging mode...\n\blackCODE NAME: KAMIKAZE"
+ U << "Engaging mode...\nCODE NAME: KAMIKAZE"
if(1)
U << "Re-routing power nodes... \nUnlocking limiter..."
if(2)
@@ -1932,7 +1614,7 @@ ________________________________________________________________________________
return
sleep(s_delay)
else
- U << "ERROR: \black Unable to initiate mode."
+ U << "ERROR: Unable to initiate mode."
else
U << browse(null, "window=spideros")
s_busy = 0
@@ -1954,7 +1636,7 @@ ________________________________________________________________________________
t_disk.loc = T
t_disk = null
else
- U << "ERROR: \black Could not eject disk."
+ U << "ERROR: Could not eject disk."
if("Copy to Disk")
var/datum/tech/current_data = locate(href_list["target"])
@@ -1975,7 +1657,7 @@ ________________________________________________________________________________
pai.loc = T
pai = null
else
- U << "ERROR: \black Could not eject pAI card."
+ U << "ERROR: Could not eject pAI card."
if("Override AI Laws")
var/law_zero = A.laws.zeroth//Remembers law zero, if there is one.
@@ -1996,25 +1678,25 @@ ________________________________________________________________________________
if(AI==A)
switch(i)
if(0)
- A << "WARNING: \black purge procedure detected. \nNow hacking host..."
- U << "WARNING: HACKING AT��TEMP� IN PR0GRESs!"
+ A << "WARNING: purge procedure detected. \nNow hacking host..."
+ U << "WARNING: HACKING AT��TEMP� IN PR0GRESs!"
spideros = 0
k_unlock = 0
U << browse(null, "window=spideros")
if(1)
A << "Disconnecting neural interface..."
- U << "WAR�NING: �R�O0�Gr�--S 2&3%"
+ U << "WAR�NING: �R�O0�Gr�--S 2&3%"
if(2)
A << "Shutting down external protocol..."
- U << "WARNING: P����RֆGr�5S 677^%"
+ U << "WARNING: P����RֆGr�5S 677^%"
cancel_stealth()
if(3)
A << "Connecting to kernel..."
- U << "WARNING: �R�r�R_404"
+ U << "WARNING: �R�r�R_404"
A.control_disabled = 0
if(4)
A << "Connection established and secured. Menu updated."
- U << "W�r#nING: #%@!!WȆ|_4�54@ \nUn�B88l3 T� L�-�o-L�CaT2 ##$!�RN�0..%.."
+ U << "W�r#nING: #%@!!WȆ|_4�54@ \nUn�B88l3 T� L�-�o-L�CaT2 ##$!�RN�0..%.."
grant_AI_verbs()
return
sleep(s_delay)
@@ -2022,7 +1704,7 @@ ________________________________________________________________________________
s_busy = 0
U << "Hacking attempt disconnected. Resuming normal operation."
else
- flush = 1
+ NAI.flush = 1
A.suiciding = 1
A << "Your core files are being purged! This is the end..."
spawn(0)
@@ -2031,9 +1713,9 @@ ________________________________________________________________________________
A.adjustOxyLoss(2)
A.updatehealth()
sleep(10)
- killai()
+ killai(NAI)
U << "Artificial Intelligence was terminated. Rebooting..."
- flush = 0
+ NAI.flush = 0
if("Wireless AI")
A.control_disabled = !A.control_disabled
@@ -2058,19 +1740,21 @@ ________________________________________________________________________________
hologram.invisibility = 101//So that it doesn't show up, ever. This also means one could attach a number of images to a single obj and display them differently to differnet people.
hologram.anchored = 1//So it cannot be dragged by space wind and the like.
hologram.dir = get_dir(T,affecting.loc)
- var/image/I = image(AI.holo_icon,hologram)//Attach an image to object.
- hologram.i_attached = I//To attach the image in order to later reference.
- AI << I
- affecting << I
- affecting << "An image flicks to life nearby. It appears visible to you only."
- verbs += /obj/item/clothing/suit/space/space_ninja/proc/ai_holo_clear
+ for(var/mob/living/silicon/ai/A in NAI)
+ var/image/I = image(A.holo_icon,hologram)//Attach an image to object.
+ hologram.i_attached = I//To attach the image in order to later reference.
+ A << I
+ affecting << I
+ affecting << "An image flicks to life nearby. It appears visible to you only."
- ai_holo_process()//Move to initialize
+ verbs += /obj/item/clothing/suit/space/space_ninja/proc/ai_holo_clear
+
+ ai_holo_process()//Move to initialize
else
- AI << "ERROR: \black Image feed in progress."
+ AI << "ERROR: Image feed in progress."
else
- AI << "ERROR: \black Unable to project image."
+ AI << "ERROR: Unable to project image."
return
/obj/item/clothing/suit/space/space_ninja/proc/ai_holo_process()
@@ -2120,11 +1804,13 @@ ________________________________________________________________________________
set category = "AI Ninja Equip"
set src = usr.loc
- AI << browse(null, "window=spideros")//Close window
- AI << "You have seized your hacking attempt. [affecting.real_name] has regained control."
- affecting << "UPDATE: [AI.real_name] has ceased hacking attempt. All systems clear."
- remove_AI_verbs()
+ for(var/mob/living/silicon/ai/A in NAI)
+ AI << browse(null, "window=spideros")//Close window
+ AI << "You have seized your hacking attempt. [affecting.real_name] has regained control."
+ affecting << "UPDATE: [A.real_name] has ceased hacking attempt. All systems clear."
+
+ remove_AI_verbs()
return
//=======//GENERAL SUIT PROCS//=======//
@@ -2135,7 +1821,7 @@ ________________________________________________________________________________
if(s_control)
I:transfer_ai("NINJASUIT","AICARD",src,U)
else
- U << "ERROR: \black Remote access channel disabled."
+ U << "ERROR: Remote access channel disabled."
return//Return individually so that ..() can run properly at the end of the proc.
else if(istype(I, /obj/item/device/paicard) && !pai)//If it's a pai card.
U:drop_item()
@@ -2190,7 +1876,7 @@ ________________________________________________________________________________
TD.stored = null
U << "Data analyzed and updated. Disk erased."
else
- U << "ERROR: \black Procedure interrupted. Process terminated."
+ U << "ERROR: Procedure interrupted. Process terminated."
else
I.loc = src
t_disk = I
@@ -2256,7 +1942,7 @@ ________________________________________________________________________________
user << "There are [s_bombs] smoke bomb\s remaining."
user << "There are [a_boost] adrenaline booster\s remaining."
else
- user << "�rr�R �a��a�� No-�-� f��N� 3RR�r"
+ user << "�rr�R �a��a�� No-�-� f��N� 3RR�r"
/*
===================================================================================
@@ -2405,7 +2091,7 @@ ________________________________________________________________________________
for(var/datum/tech/analyzing_data in A:files.known_tech)
if(current_data.id==analyzing_data.id)
if(analyzing_data.level>current_data.level)
- U << "Database: \black UPDATED."
+ U << "Database: UPDATED."
current_data.level = analyzing_data.level
break//Move on to next.
else break//Otherwise, quit processing.
@@ -2617,7 +2303,7 @@ It is possible to destroy the net by the occupant or someone else.
for(var/mob/O in viewers(src, 3))
O.show_message("[M.name] was recovered from the energy net!", 1, "You hear a grunt.", 2)
if(!isnull(master))//As long as they still exist.
- master << "ERROR: \black unable to initiate transport protocol. Procedure terminated."
+ master << "ERROR: unable to initiate transport protocol. Procedure terminated."
qdel(src)
return
@@ -2631,7 +2317,7 @@ It is possible to destroy the net by the occupant or someone else.
if(isnull(M)||M.loc!=loc)//If mob is gone or not at the location.
if(!isnull(master))//As long as they still exist.
- master << "ERROR: \black unable to locate \the [mob_name]. Procedure terminated."
+ master << "ERROR: unable to locate \the [mob_name]. Procedure terminated."
qdel(src)//Get rid of the net.
return
@@ -2667,7 +2353,7 @@ It is possible to destroy the net by the occupant or someone else.
O.show_message("[M] vanished!", 1, "You hear sparks flying!", 2)
if(!isnull(master))//As long as they still exist.
- master << "SUCCESS: \black transport procedure of \the [affecting] complete."
+ master << "SUCCESS: transport procedure of \the [affecting] complete."
M.anchored = 0//Important.
diff --git a/code/modules/food&drinks/drinks/drinks.dm b/code/modules/food&drinks/drinks/drinks.dm
index dc975701a3f..9f064b53481 100644
--- a/code/modules/food&drinks/drinks/drinks.dm
+++ b/code/modules/food&drinks/drinks/drinks.dm
@@ -28,6 +28,10 @@
return 0
if(M == user)
+ if(src.reagents.has_reagent("sugar") && M.satiety < -150 && M.nutrition > NUTRITION_LEVEL_STARVING + 50 )
+ M << "You don't feel like drinking any more sugary drink at the moment."
+ return 0
+
M << "You swallow a gulp of [src]."
if(reagents.total_volume)
reagents.reaction(M, INGEST)
@@ -191,6 +195,7 @@
/obj/item/weapon/reagent_containers/food/drinks/h_chocolate/New()
..()
reagents.add_reagent("hot_coco", 30)
+ reagents.add_reagent("sugar", 5)
src.pixel_x = rand(-10.0, 10)
src.pixel_y = rand(-10.0, 10)
diff --git a/code/modules/food&drinks/drinks/drinks/bottle.dm b/code/modules/food&drinks/drinks/drinks/bottle.dm
index b5ef66b0700..5b63c23a921 100644
--- a/code/modules/food&drinks/drinks/drinks/bottle.dm
+++ b/code/modules/food&drinks/drinks/drinks/bottle.dm
@@ -101,7 +101,7 @@
//The reagents in the bottle splash all over the target, thanks for the idea Nodrak
if(src.reagents)
for(var/mob/O in viewers(user, null))
- O.show_message(text("The contents of the [src] splashes all over [target]!"), 1)
+ O.show_message(text("The contents of \the [src] splashes all over [target]!"), 1)
src.reagents.reaction(target, TOUCH)
//Finally, smash the bottle. This kills (del) the bottle.
diff --git a/code/modules/food&drinks/food/condiment.dm b/code/modules/food&drinks/food/condiment.dm
index fc56ece94a4..948445dc33b 100644
--- a/code/modules/food&drinks/food/condiment.dm
+++ b/code/modules/food&drinks/food/condiment.dm
@@ -42,7 +42,10 @@
return 0
if(M == user)
- M << "You swallow some of contents of the [src]."
+ if(src.reagents.has_reagent("sugar") && M.satiety < -150 && M.nutrition > NUTRITION_LEVEL_STARVING + 50 )
+ M << "You don't feel like drinking any more sugary food at the moment."
+ return 0
+ M << "You swallow some of contents of \the [src]."
if(reagents.total_volume)
reagents.reaction(M, INGEST)
spawn(5)
diff --git a/code/modules/food&drinks/food/snacks.dm b/code/modules/food&drinks/food/snacks.dm
index 3cdea87cb8e..1dc37168afa 100644
--- a/code/modules/food&drinks/food/snacks.dm
+++ b/code/modules/food&drinks/food/snacks.dm
@@ -49,8 +49,15 @@
if(!canconsume(M, user))
return 0
+ var/fullness = M.nutrition + 10
+ for(var/datum/reagent/consumable/C in M.reagents.reagent_list) //we add the nutrition value of what we're currently digesting
+ fullness += C.nutriment_factor * C.volume / C.metabolization_rate
+
if(M == user) //If you're eating it yourself.
- var/fullness = M.nutrition + (M.reagents.get_reagent_amount("nutriment") * 25)
+ if(src.reagents.has_reagent("sugar") && M.satiety < -150 && M.nutrition > NUTRITION_LEVEL_STARVING + 50 )
+ M << "You don't feel like eating any more sugary food at the moment."
+ return 0
+
if(wrapped)
M << "You can't eat wrapped food!"
return 0
@@ -58,19 +65,18 @@
M << "You hungrily [eatverb] some of \the [src] and gobble it down!"
else if(fullness > 50 && fullness < 150)
M << "You hungrily begin to [eatverb] \the [src]."
- else if(fullness > 150 && fullness < 350)
+ else if(fullness > 150 && fullness < 500)
M << "You [eatverb] \the [src]."
- else if(fullness > 350 && fullness < 550)
+ else if(fullness > 500 && fullness < 600)
M << "You unwillingly [eatverb] a bit of \the [src]."
- else if(fullness > (550 * (1 + M.overeatduration / 2000))) // The more you eat - the more you can eat
+ else if(fullness > (600 * (1 + M.overeatduration / 2000))) // The more you eat - the more you can eat
M << "You cannot force any more of \the [src] to go down your throat."
return 0
else
if(! (isslime(M) || isbrain(M)) ) //If you're feeding it to someone else.
- var/fullness = M.nutrition + (M.reagents.get_reagent_amount("nutriment") * 25)
if(wrapped)
return 0
- if(fullness <= (550 * (1 + M.overeatduration / 1000)))
+ if(fullness <= (600 * (1 + M.overeatduration / 1000)))
M.visible_message("[user] attempts to feed [M] [src].", \
"[user] attempts to feed [M] [src].")
else
@@ -78,7 +84,8 @@
"[user] cannot force anymore of [src] down [M]'s throat!")
return 0
- if(!do_mob(user, M)) return
+ if(!do_mob(user, M))
+ return
add_logs(user, M, "fed", object="[reagentlist(src)]")
M.visible_message("[user] forces [M] to eat [src].", \
"[user] feeds [M] to eat [src].")
@@ -182,10 +189,10 @@
if(isanimal(M))
if(iscorgi(M))
if(bitecount == 0 || prob(50))
- M.emote("me", 1, "nibbles away at the [src]")
+ M.emote("me", 1, "nibbles away at \the [src]")
bitecount++
if(bitecount >= 5)
- var/sattisfaction_text = pick("burps from enjoyment", "yaps for more", "woofs twice", "looks at the area where the [src] was")
+ var/sattisfaction_text = pick("burps from enjoyment", "yaps for more", "woofs twice", "looks at the area where \the [src] was")
if(sattisfaction_text)
M.emote("me", 1, "[sattisfaction_text]")
qdel(src)
@@ -253,6 +260,7 @@
/obj/item/weapon/reagent_containers/food/snacks/sliceable/cheesewheel/New()
..()
reagents.add_reagent("nutriment", 20)
+ reagents.add_reagent("vitamin", 5)
bitesize = 2
/obj/item/weapon/reagent_containers/food/snacks/cheesewedge
diff --git a/code/modules/food&drinks/food/snacks_bread.dm b/code/modules/food&drinks/food/snacks_bread.dm
index 793dd7f1e9f..62d53a71605 100644
--- a/code/modules/food&drinks/food/snacks_bread.dm
+++ b/code/modules/food&drinks/food/snacks_bread.dm
@@ -9,6 +9,7 @@
/obj/item/weapon/reagent_containers/food/snacks/sliceable/store/meatbread/New()
..()
reagents.add_reagent("nutriment", 30)
+ reagents.add_reagent("vitamin", 5)
bitesize = 2
/obj/item/weapon/reagent_containers/food/snacks/meatbreadslice
@@ -28,6 +29,7 @@
/obj/item/weapon/reagent_containers/food/snacks/sliceable/store/xenomeatbread/New()
..()
reagents.add_reagent("nutriment", 30)
+ reagents.add_reagent("vitamin", 5)
bitesize = 2
/obj/item/weapon/reagent_containers/food/snacks/xenomeatbreadslice
@@ -48,6 +50,7 @@
..()
reagents.add_reagent("nutriment", 30)
reagents.add_reagent("toxin", 15)
+ reagents.add_reagent("vitamin", 5)
bitesize = 2
/obj/item/weapon/reagent_containers/food/snacks/spidermeatbreadslice
@@ -91,6 +94,7 @@
/obj/item/weapon/reagent_containers/food/snacks/sliceable/store/tofubread/New()
..()
reagents.add_reagent("nutriment", 30)
+ reagents.add_reagent("vitamin", 5)
bitesize = 2
/obj/item/weapon/reagent_containers/food/snacks/tofubreadslice
@@ -130,6 +134,7 @@
/obj/item/weapon/reagent_containers/food/snacks/sliceable/store/creamcheesebread/New()
..()
reagents.add_reagent("nutriment", 20)
+ reagents.add_reagent("vitamin", 5)
bitesize = 2
/obj/item/weapon/reagent_containers/food/snacks/creamcheesebreadslice
@@ -149,4 +154,5 @@
reagents.add_reagent("nutriment", 6)
reagents.add_reagent("blackpepper", 1)
reagents.add_reagent("sodiumchloride", 1)
+ reagents.add_reagent("vitamin", 1)
bitesize = 3
diff --git a/code/modules/food&drinks/food/snacks_burgers.dm b/code/modules/food&drinks/food/snacks_burgers.dm
index 268f0502894..d44f466a7d5 100644
--- a/code/modules/food&drinks/food/snacks_burgers.dm
+++ b/code/modules/food&drinks/food/snacks_burgers.dm
@@ -6,6 +6,7 @@
/obj/item/weapon/reagent_containers/food/snacks/burger/New()
..()
reagents.add_reagent("nutriment", 6)
+ reagents.add_reagent("vitamin", 1)
bitesize = 2
/obj/item/weapon/reagent_containers/food/snacks/burger/human
@@ -27,6 +28,7 @@
/obj/item/weapon/reagent_containers/food/snacks/burger/fish/New()
..()
reagents.add_reagent("carpotoxin", 3)
+ reagents.add_reagent("vitamin", 3)
bitesize = 3
/obj/item/weapon/reagent_containers/food/snacks/burger/tofu
@@ -42,6 +44,7 @@
/obj/item/weapon/reagent_containers/food/snacks/burger/roburger/New()
..()
reagents.add_reagent("nanites", 2)
+ reagents.add_reagent("vitamin", 5)
/obj/item/weapon/reagent_containers/food/snacks/burger/roburgerbig
name = "roburger"
@@ -52,6 +55,7 @@
/obj/item/weapon/reagent_containers/food/snacks/burger/roburgerbig/New()
..()
reagents.add_reagent("nanites", 100)
+ reagents.add_reagent("vitamin", 20)
bitesize = 0.1
/obj/item/weapon/reagent_containers/food/snacks/burger/xeno
@@ -81,6 +85,7 @@
/obj/item/weapon/reagent_containers/food/snacks/burger/brain/New()
..()
reagents.add_reagent("alkysine", 6)
+ reagents.add_reagent("vitamin", 3)
/obj/item/weapon/reagent_containers/food/snacks/burger/ghost
name = "ghost burger"
@@ -176,10 +181,12 @@
/obj/item/weapon/reagent_containers/food/snacks/burger/jelly/slime/New()
..()
reagents.add_reagent("slimejelly", 5)
+ reagents.add_reagent("vitamin", 3)
/obj/item/weapon/reagent_containers/food/snacks/burger/jelly/cherry/New()
..()
reagents.add_reagent("cherryjelly", 5)
+ reagents.add_reagent("vitamin", 3)
/obj/item/weapon/reagent_containers/food/snacks/burger/superbite
name = "super bite burger"
diff --git a/code/modules/food&drinks/food/snacks_cake.dm b/code/modules/food&drinks/food/snacks_cake.dm
index 76163b4723b..e74d7a0d951 100644
--- a/code/modules/food&drinks/food/snacks_cake.dm
+++ b/code/modules/food&drinks/food/snacks_cake.dm
@@ -8,8 +8,9 @@
/obj/item/weapon/reagent_containers/food/snacks/sliceable/store/carrotcake/New()
..()
- reagents.add_reagent("nutriment", 25)
+ reagents.add_reagent("nutriment", 20)
reagents.add_reagent("imidazoline", 10)
+ reagents.add_reagent("vitamin", 5)
bitesize = 2
/obj/item/weapon/reagent_containers/food/snacks/carrotcakeslice
@@ -28,8 +29,9 @@
/obj/item/weapon/reagent_containers/food/snacks/sliceable/store/braincake/New()
..()
- reagents.add_reagent("nutriment", 25)
+ reagents.add_reagent("nutriment", 20)
reagents.add_reagent("alkysine", 10)
+ reagents.add_reagent("vitamin", 5)
bitesize = 2
/obj/item/weapon/reagent_containers/food/snacks/braincakeslice
@@ -48,7 +50,8 @@
/obj/item/weapon/reagent_containers/food/snacks/sliceable/store/cheesecake/New()
..()
- reagents.add_reagent("nutriment", 25)
+ reagents.add_reagent("nutriment", 20)
+ reagents.add_reagent("vitamin", 5)
bitesize = 2
/obj/item/weapon/reagent_containers/food/snacks/cheesecakeslice
@@ -68,6 +71,7 @@
/obj/item/weapon/reagent_containers/food/snacks/sliceable/store/plaincake/New()
..()
reagents.add_reagent("nutriment", 20)
+ reagents.add_reagent("vitamin", 5)
/obj/item/weapon/reagent_containers/food/snacks/plaincakeslice
name = "vanilla cake slice"
@@ -86,6 +90,7 @@
/obj/item/weapon/reagent_containers/food/snacks/sliceable/store/orangecake/New()
..()
reagents.add_reagent("nutriment", 20)
+ reagents.add_reagent("vitamin", 5)
/obj/item/weapon/reagent_containers/food/snacks/orangecakeslice
name = "orange cake slice"
@@ -104,6 +109,7 @@
/obj/item/weapon/reagent_containers/food/snacks/sliceable/store/limecake/New()
..()
reagents.add_reagent("nutriment", 20)
+ reagents.add_reagent("vitamin", 5)
/obj/item/weapon/reagent_containers/food/snacks/limecakeslice
name = "lime cake slice"
@@ -122,6 +128,7 @@
/obj/item/weapon/reagent_containers/food/snacks/sliceable/store/lemoncake/New()
..()
reagents.add_reagent("nutriment", 20)
+ reagents.add_reagent("vitamin", 5)
/obj/item/weapon/reagent_containers/food/snacks/lemoncakeslice
name = "lemon cake slice"
@@ -140,6 +147,7 @@
/obj/item/weapon/reagent_containers/food/snacks/sliceable/store/chocolatecake/New()
..()
reagents.add_reagent("nutriment", 20)
+ reagents.add_reagent("vitamin", 5)
/obj/item/weapon/reagent_containers/food/snacks/chocolatecakeslice
name = "chocolate cake slice"
@@ -159,6 +167,7 @@
..()
reagents.add_reagent("nutriment", 20)
reagents.add_reagent("sprinkles", 10)
+ reagents.add_reagent("vitamin", 5)
bitesize = 3
/obj/item/weapon/reagent_containers/food/snacks/birthdaycakeslice
@@ -177,7 +186,8 @@
/obj/item/weapon/reagent_containers/food/snacks/sliceable/store/applecake/New()
..()
- reagents.add_reagent("nutriment", 15)
+ reagents.add_reagent("nutriment", 20)
+ reagents.add_reagent("vitamin", 5)
/obj/item/weapon/reagent_containers/food/snacks/applecakeslice
name = "apple cake slice"
diff --git a/code/modules/food&drinks/food/snacks_egg.dm b/code/modules/food&drinks/food/snacks_egg.dm
index fccf13f8e11..00a9825d034 100644
--- a/code/modules/food&drinks/food/snacks_egg.dm
+++ b/code/modules/food&drinks/food/snacks_egg.dm
@@ -21,6 +21,7 @@
/obj/item/weapon/reagent_containers/food/snacks/egg/New()
..()
reagents.add_reagent("nutriment", 1)
+ reagents.add_reagent("vitamin", 1)
/obj/item/weapon/reagent_containers/food/snacks/egg/throw_impact(atom/hit_atom)
..()
@@ -120,6 +121,8 @@
reagents.remove_reagent("nutriment", 1)
if(reagents.total_volume <= 0)
qdel(src)
+ return
+ ..()
/obj/item/weapon/reagent_containers/food/snacks/benedict
name = "eggs benedict"
@@ -129,4 +132,5 @@
/obj/item/weapon/reagent_containers/food/snacks/benedict/New()
..()
reagents.add_reagent("nutriment", 6)
+ reagents.add_reagent("vitamin", 4)
bitesize = 3
diff --git a/code/modules/food&drinks/food/snacks_meat.dm b/code/modules/food&drinks/food/snacks_meat.dm
index 2402a138050..fa03921b1e2 100644
--- a/code/modules/food&drinks/food/snacks_meat.dm
+++ b/code/modules/food&drinks/food/snacks_meat.dm
@@ -12,7 +12,6 @@
/obj/item/weapon/reagent_containers/food/snacks/cubancarp/New()
..()
reagents.add_reagent("nutriment", 6)
- reagents.add_reagent("carpotoxin", 3)
reagents.add_reagent("capsaicin", 3)
bitesize = 3
@@ -25,7 +24,8 @@
..()
eatverb = pick("bite","chew","choke down","gnaw","swallow","chomp")
reagents.add_reagent("nutriment", 3)
- reagents.add_reagent("carpotoxin", 3)
+ reagents.add_reagent("carpotoxin", 2)
+ reagents.add_reagent("vitamin", 2)
bitesize = 6
/obj/item/weapon/reagent_containers/food/snacks/carpmeat/imitation
@@ -40,7 +40,6 @@
/obj/item/weapon/reagent_containers/food/snacks/fishfingers/New()
..()
reagents.add_reagent("nutriment", 4)
- reagents.add_reagent("carpotoxin", 3)
bitesize = 3
/obj/item/weapon/reagent_containers/food/snacks/fishandchips
@@ -51,7 +50,6 @@
/obj/item/weapon/reagent_containers/food/snacks/fishandchips/New()
..()
reagents.add_reagent("nutriment", 6)
- reagents.add_reagent("carpotoxin", 3)
bitesize = 3
////////////////////////////////////////////MEATS AND ALIKE////////////////////////////////////////////
@@ -86,6 +84,7 @@
..()
reagents.add_reagent("nutriment", 12)
reagents.add_reagent("hyperzine", 5)
+ reagents.add_reagent("vitamin", 2)
src.bitesize = 3
/obj/item/weapon/reagent_containers/food/snacks/xenomeat
@@ -96,6 +95,7 @@
/obj/item/weapon/reagent_containers/food/snacks/xenomeat/New()
..()
reagents.add_reagent("nutriment", 3)
+ reagents.add_reagent("vitamin", 1)
src.bitesize = 3
/obj/item/weapon/reagent_containers/food/snacks/spidermeat
@@ -107,6 +107,7 @@
..()
reagents.add_reagent("nutriment", 3)
reagents.add_reagent("toxin", 3)
+ reagents.add_reagent("vitamin", 1)
bitesize = 3
/obj/item/weapon/reagent_containers/food/snacks/spiderleg
@@ -139,6 +140,7 @@
/obj/item/weapon/reagent_containers/food/snacks/faggot/New()
..()
reagents.add_reagent("nutriment", 3)
+ reagents.add_reagent("vitamin", 1)
bitesize = 2
/obj/item/weapon/reagent_containers/food/snacks/sausage
@@ -150,6 +152,7 @@
..()
eatverb = pick("bite","chew","nibble","deep throat","gobble","chomp")
reagents.add_reagent("nutriment", 6)
+ reagents.add_reagent("vitamin", 1)
bitesize = 2
@@ -162,6 +165,7 @@
/obj/item/weapon/reagent_containers/food/snacks/wingfangchu/New()
..()
reagents.add_reagent("nutriment", 6)
+ reagents.add_reagent("vitamin", 2)
bitesize = 2
/obj/item/weapon/reagent_containers/food/snacks/human/kebab
@@ -205,9 +209,10 @@
/obj/item/weapon/reagent_containers/food/snacks/meatsteak/New()
..()
- reagents.add_reagent("nutriment", 4)
+ reagents.add_reagent("nutriment", 6)
reagents.add_reagent("sodiumchloride", 1)
reagents.add_reagent("blackpepper", 1)
+ reagents.add_reagent("vitamin", 1)
bitesize = 3
/obj/item/weapon/reagent_containers/food/snacks/monkeycube
diff --git a/code/modules/food&drinks/food/snacks_other.dm b/code/modules/food&drinks/food/snacks_other.dm
index 4a4380cfeea..e2a19d059ce 100644
--- a/code/modules/food&drinks/food/snacks_other.dm
+++ b/code/modules/food&drinks/food/snacks_other.dm
@@ -24,6 +24,7 @@
reagents.add_reagent("nutriment", 3)
reagents.add_reagent("sugar", 2)
reagents.add_reagent("coco", 2)
+ reagents.add_reagent("vitamin", 1)
/obj/item/weapon/reagent_containers/food/snacks/chocolatebar/attack_self(mob/user)
if(wrapped)
@@ -51,6 +52,7 @@
/obj/item/weapon/reagent_containers/food/snacks/hugemushroomslice/New()
..()
reagents.add_reagent("nutriment", 3)
+ reagents.add_reagent("vitamin", 1)
src.bitesize = 3
@@ -165,6 +167,7 @@
..()
reagents.add_reagent("nutriment", 3)
reagents.add_reagent("imidazoline", 3)
+ reagents.add_reagent("vitamin", 2)
bitesize = 2
/obj/item/weapon/reagent_containers/food/snacks/candiedapple
@@ -175,6 +178,7 @@
/obj/item/weapon/reagent_containers/food/snacks/candiedapple/New()
..()
reagents.add_reagent("nutriment", 3)
+ reagents.add_reagent("sugar", 3)
bitesize = 3
/*
diff --git a/code/modules/food&drinks/food/snacks_pastry.dm b/code/modules/food&drinks/food/snacks_pastry.dm
index 1c55584b00b..af97eab4323 100644
--- a/code/modules/food&drinks/food/snacks_pastry.dm
+++ b/code/modules/food&drinks/food/snacks_pastry.dm
@@ -14,6 +14,7 @@
..()
reagents.add_reagent("nutriment", 3)
reagents.add_reagent("sprinkles", 1)
+ reagents.add_reagent("sugar", 2)
src.bitesize = 3
if(prob(30))
src.icon_state = "donut2"
@@ -28,6 +29,7 @@
..()
reagents.add_reagent("nutriment", 2)
reagents.add_reagent("sprinkles", 1)
+ reagents.add_reagent("sugar", 1)
bitesize = 10
switch(rand(1,10))
if(1)
@@ -67,6 +69,7 @@
reagents.add_reagent("nutriment", 3)
reagents.add_reagent("sprinkles", 1)
reagents.add_reagent("berryjuice", 5)
+ reagents.add_reagent("vitamin", 1)
if(prob(30))
icon_state = "jdonut2"
name = "Frosted Jelly Donut"
@@ -83,6 +86,7 @@
reagents.add_reagent("nutriment", 3)
reagents.add_reagent("sprinkles", 1)
reagents.add_reagent("slimejelly", 5)
+ reagents.add_reagent("vitamin", 1)
bitesize = 5
if(prob(30))
icon_state = "jdonut2"
@@ -100,6 +104,7 @@
reagents.add_reagent("nutriment", 3)
reagents.add_reagent("sprinkles", 1)
reagents.add_reagent("cherryjelly", 5)
+ reagents.add_reagent("vitamin", 1)
if(prob(30))
icon_state = "jdonut2"
name = "Frosted Jelly Donut"
@@ -150,6 +155,7 @@
/obj/item/weapon/reagent_containers/food/snacks/waffles/New()
..()
reagents.add_reagent("nutriment", 8)
+ reagents.add_reagent("vitamin", 1)
bitesize = 2
/obj/item/weapon/reagent_containers/food/snacks/soylentgreen
@@ -161,6 +167,7 @@
/obj/item/weapon/reagent_containers/food/snacks/soylentgreen/New()
..()
reagents.add_reagent("nutriment", 10)
+ reagents.add_reagent("vitamin", 1)
bitesize = 2
/obj/item/weapon/reagent_containers/food/snacks/soylenviridians
@@ -172,6 +179,7 @@
/obj/item/weapon/reagent_containers/food/snacks/soylenviridians/New()
..()
reagents.add_reagent("nutriment", 10)
+ reagents.add_reagent("vitamin", 1)
bitesize = 2
/obj/item/weapon/reagent_containers/food/snacks/rofflewaffles
@@ -184,6 +192,7 @@
..()
reagents.add_reagent("nutriment", 8)
reagents.add_reagent("mushroomhallucinogen", 8)
+ reagents.add_reagent("vitamin", 2)
bitesize = 4
////////////////////////////////////////////OTHER////////////////////////////////////////////
@@ -202,20 +211,11 @@
name = "\improper Donk-pocket"
desc = "The food of choice for the seasoned traitor."
icon_state = "donkpocket"
- var/warm = 0
/obj/item/weapon/reagent_containers/food/snacks/donkpocket/New()
..()
reagents.add_reagent("nutriment", 4)
-/obj/item/weapon/reagent_containers/food/snacks/donkpocket/proc/cooltime() //Not working, derp?
- if(warm)
- spawn(4200) //ew
- warm = 0
- reagents.del_reagent("tricordrazine")
- name = initial(name)
- return
-
/obj/item/weapon/reagent_containers/food/snacks/fortunecookie
name = "fortune cookie"
desc = "A true prophecy in each cookie!"
@@ -248,12 +248,11 @@
if(prob(10))
name = "exceptional plump helmet biscuit"
desc = "Microwave is taken by a fey mood! It has cooked an exceptional plump helmet biscuit!"
- reagents.add_reagent("nutriment", 8)
+ reagents.add_reagent("nutriment", 3)
reagents.add_reagent("tricordrazine", 5)
- bitesize = 2
- else
- reagents.add_reagent("nutriment", 5)
- bitesize = 2
+ reagents.add_reagent("nutriment", 5)
+ reagents.add_reagent("vitamin", 1)
+ bitesize = 2
/obj/item/weapon/reagent_containers/food/snacks/appletart
name = "golden apple streusel tart"
@@ -265,6 +264,7 @@
..()
reagents.add_reagent("nutriment", 8)
reagents.add_reagent("gold", 5)
+ reagents.add_reagent("vitamin", 4)
bitesize = 3
/obj/item/weapon/reagent_containers/food/snacks/cracker
@@ -285,6 +285,7 @@
..()
reagents.add_reagent("nutriment", 6)
reagents.add_reagent("ketchup", 3)
+ reagents.add_reagent("vitamin", 3)
bitesize = 3
/obj/item/weapon/reagent_containers/food/snacks/meatbun
@@ -295,6 +296,7 @@
/obj/item/weapon/reagent_containers/food/snacks/meatbun/New()
..()
reagents.add_reagent("nutriment", 6)
+ reagents.add_reagent("vitamin", 2)
bitesize = 6
/obj/item/weapon/reagent_containers/food/snacks/sugarcookie
@@ -304,6 +306,6 @@
/obj/item/weapon/reagent_containers/food/snacks/sugarcookie/New()
..()
- reagents.add_reagent("nutriment", 2)
- reagents.add_reagent("sugar", 5)
+ reagents.add_reagent("nutriment", 3)
+ reagents.add_reagent("sugar", 3)
bitesize = 2
\ No newline at end of file
diff --git a/code/modules/food&drinks/food/snacks_pie.dm b/code/modules/food&drinks/food/snacks_pie.dm
index 7cb7c79d9a7..7894ea3c301 100644
--- a/code/modules/food&drinks/food/snacks_pie.dm
+++ b/code/modules/food&drinks/food/snacks_pie.dm
@@ -9,6 +9,7 @@
..()
reagents.add_reagent("nutriment", 4)
reagents.add_reagent("banana",5)
+ reagents.add_reagent("vitamin", 2)
bitesize = 3
/obj/item/weapon/reagent_containers/food/snacks/pie/throw_impact(atom/hit_atom)
@@ -27,6 +28,7 @@
..()
reagents.add_reagent("nutriment", 4)
reagents.add_reagent("berryjuice", 5)
+ reagents.add_reagent("vitamin", 2)
bitesize = 3
/obj/item/weapon/reagent_containers/food/snacks/meatpie
@@ -38,6 +40,7 @@
/obj/item/weapon/reagent_containers/food/snacks/meatpie/New()
..()
reagents.add_reagent("nutriment", 10)
+ reagents.add_reagent("vitamin", 5)
bitesize = 2
/obj/item/weapon/reagent_containers/food/snacks/tofupie
@@ -49,6 +52,7 @@
/obj/item/weapon/reagent_containers/food/snacks/tofupie/New()
..()
reagents.add_reagent("nutriment", 10)
+ reagents.add_reagent("vitamin", 2)
bitesize = 2
/obj/item/weapon/reagent_containers/food/snacks/amanita_pie
@@ -61,7 +65,8 @@
reagents.add_reagent("nutriment", 5)
reagents.add_reagent("amatoxin", 3)
reagents.add_reagent("mushroomhallucinogen", 1)
- bitesize = 3
+ reagents.add_reagent("vitamin", 4)
+ bitesize = 4
/obj/item/weapon/reagent_containers/food/snacks/plump_pie
name = "plump pie"
@@ -73,12 +78,11 @@
if(prob(10))
name = "exceptional plump pie"
desc = "Microwave is taken by a fey mood! It has cooked an exceptional plump pie!"
- reagents.add_reagent("nutriment", 8)
reagents.add_reagent("tricordrazine", 5)
- bitesize = 2
- else
- reagents.add_reagent("nutriment", 8)
- bitesize = 2
+
+ reagents.add_reagent("nutriment", 8)
+ reagents.add_reagent("vitamin", 4)
+ bitesize = 2
/obj/item/weapon/reagent_containers/food/snacks/xemeatpie
name = "xeno-pie"
@@ -89,6 +93,7 @@
/obj/item/weapon/reagent_containers/food/snacks/xemeatpie/New()
..()
reagents.add_reagent("nutriment", 10)
+ reagents.add_reagent("vitamin", 5)
bitesize = 2
/obj/item/weapon/reagent_containers/food/snacks/applepie
@@ -99,6 +104,7 @@
/obj/item/weapon/reagent_containers/food/snacks/applepie/New()
..()
reagents.add_reagent("nutriment", 4)
+ reagents.add_reagent("vitamin", 2)
bitesize = 3
/obj/item/weapon/reagent_containers/food/snacks/cherrypie
@@ -109,6 +115,7 @@
/obj/item/weapon/reagent_containers/food/snacks/cherrypie/New()
..()
reagents.add_reagent("nutriment", 4)
+ reagents.add_reagent("vitamin", 2)
bitesize = 3
/obj/item/weapon/reagent_containers/food/snacks/sliceable/pumpkinpie
@@ -121,6 +128,7 @@
/obj/item/weapon/reagent_containers/food/snacks/sliceable/pumpkinpie/New()
..()
reagents.add_reagent("nutriment", 15)
+ reagents.add_reagent("vitamin", 3)
/obj/item/weapon/reagent_containers/food/snacks/pumpkinpieslice
name = "pumpkin pie slice"
diff --git a/code/modules/food&drinks/food/snacks_pizza.dm b/code/modules/food&drinks/food/snacks_pizza.dm
index f8e003172dd..66a1ec7b98f 100644
--- a/code/modules/food&drinks/food/snacks_pizza.dm
+++ b/code/modules/food&drinks/food/snacks_pizza.dm
@@ -13,8 +13,9 @@
/obj/item/weapon/reagent_containers/food/snacks/sliceable/pizza/margherita/New()
..()
- reagents.add_reagent("nutriment", 40)
+ reagents.add_reagent("nutriment", 30)
reagents.add_reagent("tomatojuice", 6)
+ reagents.add_reagent("vitamin", 5)
bitesize = 2
/obj/item/weapon/reagent_containers/food/snacks/margheritaslice
@@ -32,8 +33,9 @@
/obj/item/weapon/reagent_containers/food/snacks/sliceable/pizza/meatpizza/New()
..()
- reagents.add_reagent("nutriment", 50)
+ reagents.add_reagent("nutriment", 40)
reagents.add_reagent("tomatojuice", 6)
+ reagents.add_reagent("vitamin", 8)
bitesize = 2
/obj/item/weapon/reagent_containers/food/snacks/meatpizzaslice
@@ -51,7 +53,8 @@
/obj/item/weapon/reagent_containers/food/snacks/sliceable/pizza/mushroompizza/New()
..()
- reagents.add_reagent("nutriment", 35)
+ reagents.add_reagent("nutriment", 30)
+ reagents.add_reagent("vitamin", 5)
bitesize = 2
/obj/item/weapon/reagent_containers/food/snacks/mushroompizzaslice
@@ -69,9 +72,10 @@
/obj/item/weapon/reagent_containers/food/snacks/sliceable/pizza/vegetablepizza/New()
..()
- reagents.add_reagent("nutriment", 30)
+ reagents.add_reagent("nutriment", 25)
reagents.add_reagent("tomatojuice", 6)
reagents.add_reagent("imidazoline", 12)
+ reagents.add_reagent("vitamin", 5)
bitesize = 2
/obj/item/weapon/reagent_containers/food/snacks/vegetablepizzaslice
@@ -235,3 +239,23 @@
update_icon()
return
..()
+
+/obj/item/pizzabox/margherita/New()
+ pizza = new /obj/item/weapon/reagent_containers/food/snacks/sliceable/pizza/margherita(src)
+ boxtag = "Margherita Deluxe"
+ update_icon()
+
+/obj/item/pizzabox/vegetable/New()
+ pizza = new /obj/item/weapon/reagent_containers/food/snacks/sliceable/pizza/vegetablepizza(src)
+ boxtag = "Gourmet Vegatable"
+ update_icon()
+
+/obj/item/pizzabox/mushroom/New()
+ pizza = new /obj/item/weapon/reagent_containers/food/snacks/sliceable/pizza/mushroompizza(src)
+ boxtag = "Mushroom Special"
+ update_icon()
+
+/obj/item/pizzabox/meat/New()
+ pizza = new /obj/item/weapon/reagent_containers/food/snacks/sliceable/pizza/meatpizza(src)
+ boxtag = "Meatlover's Supreme"
+ update_icon()
\ No newline at end of file
diff --git a/code/modules/food&drinks/food/snacks_salad.dm b/code/modules/food&drinks/food/snacks_salad.dm
index 8b8cb86b799..3b0ad13e3cb 100644
--- a/code/modules/food&drinks/food/snacks_salad.dm
+++ b/code/modules/food&drinks/food/snacks_salad.dm
@@ -12,6 +12,7 @@
eatverb = pick("crunch","devour","nibble","gnaw","gobble","chomp")
reagents.add_reagent("nutriment", 8)
reagents.add_reagent("tricordrazine", 8)
+ reagents.add_reagent("vitamin", 6)
bitesize = 3
/obj/item/weapon/reagent_containers/food/snacks/herbsalad
@@ -23,6 +24,7 @@
/obj/item/weapon/reagent_containers/food/snacks/herbsalad/New()
..()
reagents.add_reagent("nutriment", 8)
+ reagents.add_reagent("vitamin", 2)
bitesize = 3
/obj/item/weapon/reagent_containers/food/snacks/validsalad
@@ -35,4 +37,5 @@
..()
reagents.add_reagent("nutriment", 8)
reagents.add_reagent("doctorsdelight", 5)
+ reagents.add_reagent("vitamin", 2)
bitesize = 3
\ No newline at end of file
diff --git a/code/modules/food&drinks/food/snacks_sandwichtoast.dm b/code/modules/food&drinks/food/snacks_sandwichtoast.dm
index 7ca43af1f4a..3b086bf6194 100644
--- a/code/modules/food&drinks/food/snacks_sandwichtoast.dm
+++ b/code/modules/food&drinks/food/snacks_sandwichtoast.dm
@@ -8,6 +8,7 @@
/obj/item/weapon/reagent_containers/food/snacks/sandwich/New()
..()
reagents.add_reagent("nutriment", 6)
+ reagents.add_reagent("vitamin", 1)
bitesize = 2
/obj/item/weapon/reagent_containers/food/snacks/toastedsandwich
@@ -31,6 +32,7 @@
/obj/item/weapon/reagent_containers/food/snacks/grilledcheese/New()
..()
reagents.add_reagent("nutriment", 7)
+ reagents.add_reagent("vitamin", 1)
bitesize = 2
/obj/item/weapon/reagent_containers/food/snacks/jellysandwich
@@ -47,10 +49,12 @@
/obj/item/weapon/reagent_containers/food/snacks/jellysandwich/slime/New()
..()
reagents.add_reagent("slimejelly", 5)
+ reagents.add_reagent("vitamin", 2)
/obj/item/weapon/reagent_containers/food/snacks/jellysandwich/cherry/New()
..()
reagents.add_reagent("cherryjelly", 5)
+ reagents.add_reagent("vitamin", 2)
/obj/item/weapon/reagent_containers/food/snacks/icecreamsandwich
name = "icecream sandwich"
@@ -72,6 +76,7 @@
/obj/item/weapon/reagent_containers/food/snacks/notasandwich/New()
..()
reagents.add_reagent("nutriment", 6)
+ reagents.add_reagent("vitamin", 6)
bitesize = 2
/obj/item/weapon/reagent_containers/food/snacks/jelliedtoast
@@ -88,10 +93,12 @@
/obj/item/weapon/reagent_containers/food/snacks/jelliedtoast/cherry/New()
..()
reagents.add_reagent("cherryjelly", 5)
+ reagents.add_reagent("vitamin", 2)
/obj/item/weapon/reagent_containers/food/snacks/jelliedtoast/slime/New()
..()
reagents.add_reagent("slimejelly", 5)
+ reagents.add_reagent("vitamin", 2)
/obj/item/weapon/reagent_containers/food/snacks/twobread
name = "two bread"
@@ -101,4 +108,5 @@
/obj/item/weapon/reagent_containers/food/snacks/twobread/New()
..()
reagents.add_reagent("nutriment", 2)
+ reagents.add_reagent("vitamin", 2)
bitesize = 3
diff --git a/code/modules/food&drinks/food/snacks_soup.dm b/code/modules/food&drinks/food/snacks_soup.dm
index 05bf0568838..f9aa75f6eb9 100644
--- a/code/modules/food&drinks/food/snacks_soup.dm
+++ b/code/modules/food&drinks/food/snacks_soup.dm
@@ -10,6 +10,7 @@
eatverb = pick("slurp","sip","suck","inhale","drink")
reagents.add_reagent("nutriment", 8)
reagents.add_reagent("water", 5)
+ reagents.add_reagent("vitamin", 4)
bitesize = 5
/obj/item/weapon/reagent_containers/food/snacks/slimesoup
@@ -22,6 +23,7 @@
eatverb = pick("slurp","sip","suck","inhale","drink")
reagents.add_reagent("slimejelly", 5)
reagents.add_reagent("water", 10)
+ reagents.add_reagent("vitamin", 5)
bitesize = 5
/obj/item/weapon/reagent_containers/food/snacks/bloodsoup
@@ -35,6 +37,7 @@
reagents.add_reagent("nutriment", 2)
reagents.add_reagent("blood", 10)
reagents.add_reagent("water", 5)
+ reagents.add_reagent("vitamin", 5)
bitesize = 5
/obj/item/weapon/reagent_containers/food/snacks/clownstears
@@ -48,6 +51,7 @@
reagents.add_reagent("nutriment", 4)
reagents.add_reagent("banana", 5)
reagents.add_reagent("water", 10)
+ reagents.add_reagent("vitamin", 8)
bitesize = 5
/obj/item/weapon/reagent_containers/food/snacks/vegetablesoup
@@ -61,6 +65,7 @@
eatverb = pick("slurp","sip","suck","inhale","drink")
reagents.add_reagent("nutriment", 8)
reagents.add_reagent("water", 5)
+ reagents.add_reagent("vitamin", 5)
bitesize = 5
/obj/item/weapon/reagent_containers/food/snacks/nettlesoup
@@ -75,6 +80,7 @@
reagents.add_reagent("nutriment", 8)
reagents.add_reagent("water", 5)
reagents.add_reagent("tricordrazine", 5)
+ reagents.add_reagent("vitamin", 5)
bitesize = 5
/obj/item/weapon/reagent_containers/food/snacks/mysterysoup
@@ -137,6 +143,7 @@
if(prob(25))
desc = "A wish come true!"
reagents.add_reagent("nutriment", 8)
+ reagents.add_reagent("vitamin", 1)
/obj/item/weapon/reagent_containers/food/snacks/hotchili
name = "hot chili"
@@ -147,9 +154,10 @@
/obj/item/weapon/reagent_containers/food/snacks/hotchili/New()
..()
eatverb = pick("slurp","sip","suck","inhale","drink")
- reagents.add_reagent("nutriment", 6)
- reagents.add_reagent("capsaicin", 3)
+ reagents.add_reagent("nutriment", 5)
+ reagents.add_reagent("capsaicin", 1)
reagents.add_reagent("tomatojuice", 2)
+ reagents.add_reagent("vitamin", 2)
bitesize = 5
@@ -162,9 +170,10 @@
/obj/item/weapon/reagent_containers/food/snacks/coldchili/New()
..()
eatverb = pick("slurp","sip","suck","inhale","drink")
- reagents.add_reagent("nutriment", 6)
- reagents.add_reagent("frostoil", 3)
+ reagents.add_reagent("nutriment", 5)
+ reagents.add_reagent("frostoil", 1)
reagents.add_reagent("tomatojuice", 2)
+ reagents.add_reagent("vitamin", 2)
bitesize = 5
/obj/item/weapon/reagent_containers/food/snacks/monkeysdelight
@@ -179,7 +188,8 @@
reagents.add_reagent("banana", 5)
reagents.add_reagent("blackpepper", 1)
reagents.add_reagent("sodiumchloride", 1)
- bitesize = 6
+ reagents.add_reagent("vitamin", 5)
+ bitesize = 4
/obj/item/weapon/reagent_containers/food/snacks/tomatosoup
name = "tomato soup"
@@ -192,6 +202,7 @@
eatverb = pick("slurp","sip","suck","inhale","drink")
reagents.add_reagent("nutriment", 5)
reagents.add_reagent("tomatojuice", 10)
+ reagents.add_reagent("vitamin", 3)
bitesize = 3
/obj/item/weapon/reagent_containers/food/snacks/milosoup
@@ -205,6 +216,7 @@
eatverb = pick("slurp","sip","suck","inhale","drink")
reagents.add_reagent("nutriment", 8)
reagents.add_reagent("water", 5)
+ reagents.add_reagent("vitamin", 3)
bitesize = 4
/obj/item/weapon/reagent_containers/food/snacks/mushroomsoup
@@ -217,6 +229,7 @@
..()
eatverb = pick("slurp","sip","suck","inhale","drink")
reagents.add_reagent("nutriment", 8)
+ reagents.add_reagent("vitamin", 4)
bitesize = 3
/obj/item/weapon/reagent_containers/food/snacks/beetsoup
@@ -230,4 +243,5 @@
eatverb = pick("slurp","sip","suck","inhale","drink")
name = pick("borsch","bortsch","borstch","borsh","borshch","borscht")
reagents.add_reagent("nutriment", 8)
+ reagents.add_reagent("vitamin", 4)
bitesize = 2
diff --git a/code/modules/food&drinks/food/snacks_spaghetti.dm b/code/modules/food&drinks/food/snacks_spaghetti.dm
index 5b73364e628..0d6224a080c 100644
--- a/code/modules/food&drinks/food/snacks_spaghetti.dm
+++ b/code/modules/food&drinks/food/snacks_spaghetti.dm
@@ -7,6 +7,7 @@
/obj/item/weapon/reagent_containers/food/snacks/spaghetti/New()
..()
reagents.add_reagent("nutriment", 1)
+ reagents.add_reagent("vitamin", 1)
bitesize = 1
/obj/item/weapon/reagent_containers/food/snacks/boiledspaghetti
@@ -18,6 +19,7 @@
/obj/item/weapon/reagent_containers/food/snacks/boiledspaghetti/New()
..()
reagents.add_reagent("nutriment", 2)
+ reagents.add_reagent("vitamin", 1)
bitesize = 2
/obj/item/weapon/reagent_containers/food/snacks/pastatomato
@@ -30,6 +32,7 @@
..()
reagents.add_reagent("nutriment", 6)
reagents.add_reagent("tomatojuice", 10)
+ reagents.add_reagent("vitamin", 4)
bitesize = 4
/obj/item/weapon/reagent_containers/food/snacks/copypasta
@@ -42,7 +45,8 @@
..()
reagents.add_reagent("nutriment", 12)
reagents.add_reagent("tomatojuice", 20)
- bitesize = 1
+ reagents.add_reagent("vitamin", 8)
+ bitesize = 4
/obj/item/weapon/reagent_containers/food/snacks/meatballspaghetti
name = "spaghetti and meatballs"
@@ -53,7 +57,8 @@
/obj/item/weapon/reagent_containers/food/snacks/meatballspaghetti/New()
..()
reagents.add_reagent("nutriment", 8)
- bitesize = 2
+ reagents.add_reagent("vitamin", 4)
+ bitesize = 3
/obj/item/weapon/reagent_containers/food/snacks/spesslaw
name = "spesslaw"
@@ -63,7 +68,8 @@
/obj/item/weapon/reagent_containers/food/snacks/spesslaw/New()
..()
reagents.add_reagent("nutriment", 8)
- bitesize = 2
+ reagents.add_reagent("vitamin", 6)
+ bitesize = 3
/obj/item/weapon/reagent_containers/food/snacks/eggplantparm
name = "eggplant parmigiana"
@@ -74,4 +80,5 @@
/obj/item/weapon/reagent_containers/food/snacks/eggplantparm/New()
..()
reagents.add_reagent("nutriment", 6)
+ reagents.add_reagent("vitamin", 2)
bitesize = 2
diff --git a/code/modules/food&drinks/food/snacks_vend.dm b/code/modules/food&drinks/food/snacks_vend.dm
index 465c33d925e..404d9eeae3b 100644
--- a/code/modules/food&drinks/food/snacks_vend.dm
+++ b/code/modules/food&drinks/food/snacks_vend.dm
@@ -22,7 +22,8 @@
/obj/item/weapon/reagent_containers/food/snacks/sosjerky/New()
..()
- reagents.add_reagent("nutriment", 4)
+ reagents.add_reagent("nutriment", 1)
+ reagents.add_reagent("sugar", 3)
bitesize = 2
/obj/item/weapon/reagent_containers/food/snacks/chips
@@ -33,7 +34,8 @@
/obj/item/weapon/reagent_containers/food/snacks/chips/New()
..()
- reagents.add_reagent("nutriment", 3)
+ reagents.add_reagent("nutriment", 1)
+ reagents.add_reagent("sugar", 3)
bitesize = 1
/obj/item/weapon/reagent_containers/food/snacks/no_raisin
@@ -44,7 +46,8 @@
/obj/item/weapon/reagent_containers/food/snacks/no_raisin/New()
..()
- reagents.add_reagent("nutriment", 6)
+ reagents.add_reagent("nutriment", 2)
+ reagents.add_reagent("sugar", 4)
/obj/item/weapon/reagent_containers/food/snacks/spacetwinkie
name = "space twinkie"
@@ -64,7 +67,8 @@
/obj/item/weapon/reagent_containers/food/snacks/cheesiehonkers/New()
..()
- reagents.add_reagent("nutriment", 4)
+ reagents.add_reagent("nutriment", 1)
+ reagents.add_reagent("sugar", 3)
bitesize = 2
/obj/item/weapon/reagent_containers/food/snacks/syndicake
diff --git a/code/modules/food&drinks/recipes/microwave/recipes_pastry.dm b/code/modules/food&drinks/recipes/microwave/recipes_pastry.dm
index f4a37c243bb..b7621899467 100644
--- a/code/modules/food&drinks/recipes/microwave/recipes_pastry.dm
+++ b/code/modules/food&drinks/recipes/microwave/recipes_pastry.dm
@@ -71,31 +71,10 @@
/datum/recipe/donkpocket
reagents = list("flour" = 5)
items = list(
- /obj/item/weapon/reagent_containers/food/snacks/faggot,
+ /obj/item/weapon/reagent_containers/food/snacks/faggot
)
- result = /obj/item/weapon/reagent_containers/food/snacks/donkpocket //SPECIAL
- proc/warm_up(var/obj/item/weapon/reagent_containers/food/snacks/donkpocket/being_cooked)
- being_cooked.warm = 1
- being_cooked.reagents.add_reagent("tricordrazine", 5)
- being_cooked.bitesize = 6
- being_cooked.name = "Warm " + being_cooked.name
- being_cooked.cooltime()
- make_food(var/obj/container as obj)
- var/obj/item/weapon/reagent_containers/food/snacks/donkpocket/being_cooked = ..(container)
- warm_up(being_cooked)
- return being_cooked
+ result = /obj/item/weapon/reagent_containers/food/snacks/donkpocket
-/datum/recipe/donkpocket/warm
- reagents = list() //This is necessary since this is a child object of the above recipe and we don't want donk pockets to need flour
- items = list(
- /obj/item/weapon/reagent_containers/food/snacks/donkpocket
- )
- result = /obj/item/weapon/reagent_containers/food/snacks/donkpocket //SPECIAL
- make_food(var/obj/container as obj)
- var/obj/item/weapon/reagent_containers/food/snacks/donkpocket/being_cooked = locate() in container
- if(being_cooked && !being_cooked.warm)
- warm_up(being_cooked)
- return being_cooked
////////////////////////////////////////////////MUFFINS////////////////////////////////////////////////
diff --git a/code/modules/hydroponics/grown.dm b/code/modules/hydroponics/grown.dm
index 0a38aabdf7a..8ed4ebc18e1 100644
--- a/code/modules/hydroponics/grown.dm
+++ b/code/modules/hydroponics/grown.dm
@@ -103,6 +103,7 @@
/obj/item/weapon/reagent_containers/food/snacks/grown/corn/add_juice()
if(..())
reagents.add_reagent("nutriment", 1 + round((potency / 10), 1))
+ reagents.add_reagent("vitamin", 1 + round((potency / 10), 1))
bitesize = 1 + round(reagents.total_volume / 2, 1)
@@ -116,7 +117,7 @@
/obj/item/weapon/reagent_containers/food/snacks/grown/cherries/add_juice()
if(..())
reagents.add_reagent("nutriment", 1 + round((potency / 15), 1))
- reagents.add_reagent("sugar", 1 + round((potency / 15), 1))
+ reagents.add_reagent("sugar", 1 + round((potency / 50), 1))
bitesize = 1 + round(reagents.total_volume / 2, 1)
@@ -156,6 +157,7 @@
/obj/item/weapon/reagent_containers/food/snacks/grown/potato/add_juice()
if(..())
reagents.add_reagent("nutriment", 1 + round((potency / 10), 1))
+ reagents.add_reagent("vitamin", 1 + round((potency / 10), 1))
bitesize = reagents.total_volume
/obj/item/weapon/reagent_containers/food/snacks/grown/potato/attackby(obj/item/weapon/W as obj, mob/user as mob)
@@ -184,7 +186,8 @@
/obj/item/weapon/reagent_containers/food/snacks/grown/grapes/add_juice()
if(..())
reagents.add_reagent("nutriment", 1 + round((potency / 10), 1))
- reagents.add_reagent("sugar", 1 + round((potency / 5), 1))
+ reagents.add_reagent("sugar", 1 + round((potency / 40), 1))
+ reagents.add_reagent("vitamin", 1 + round((potency / 10), 1))
bitesize = 1 + round(reagents.total_volume / 2, 1)
/obj/item/weapon/reagent_containers/food/snacks/grown/grapes/green
@@ -208,6 +211,7 @@
/obj/item/weapon/reagent_containers/food/snacks/grown/cabbage/add_juice()
if(..())
reagents.add_reagent("nutriment", 1 + round((potency / 10), 1))
+ reagents.add_reagent("vitamin", 1 + round((potency / 10), 1))
bitesize = 1 + round(reagents.total_volume / 2, 1)
@@ -221,6 +225,7 @@
/obj/item/weapon/reagent_containers/food/snacks/grown/berries/add_juice()
if(..())
reagents.add_reagent("nutriment", 1 + round((potency / 10), 1))
+ reagents.add_reagent("vitamin", 1 + round((potency / 10), 1))
bitesize = 1 + round(reagents.total_volume / 2, 1)
/obj/item/weapon/reagent_containers/food/snacks/grown/berries/poison
@@ -318,6 +323,7 @@
reagents.add_reagent("kelotane", 1 + round(potency / 8, 1))
reagents.add_reagent("bicaridine", 1 + round(potency / 10, 1))
reagents.add_reagent("toxin", 1 + round(potency / 10, 1))
+ reagents.add_reagent("vitamin", 1 + round((potency / 20), 1))
/obj/item/weapon/reagent_containers/food/snacks/grown/ambrosia/deus
@@ -332,6 +338,7 @@
reagents.add_reagent("synaptizine", 1 + round(potency / 8, 1))
reagents.add_reagent("hyperzine", 1 + round(potency / 10, 1))
reagents.add_reagent("space_drugs", 1 + round(potency / 10, 1))
+ reagents.add_reagent("vitamin", 1 + round((potency / 10), 1))
/obj/item/weapon/reagent_containers/food/snacks/grown/apple
@@ -344,6 +351,7 @@
if(..())
reagents.maximum_volume = 20
reagents.add_reagent("nutriment", 1 + round((potency / 10), 1))
+ reagents.add_reagent("vitamin", 1 + round((potency / 20), 1))
bitesize = reagents.maximum_volume // Always eat the apple in one
@@ -386,6 +394,7 @@
/obj/item/weapon/reagent_containers/food/snacks/grown/watermelon/add_juice()
if(..())
reagents.add_reagent("nutriment", 1 + round((potency / 6), 1))
+ reagents.add_reagent("vitamin", 1 + round((potency / 10), 1))
bitesize = 1 + round(reagents.total_volume / 2, 1)
/obj/item/weapon/reagent_containers/food/snacks/grown/pumpkin
@@ -397,6 +406,7 @@
/obj/item/weapon/reagent_containers/food/snacks/grown/pumpkin/add_juice()
if(..())
reagents.add_reagent("nutriment", 1 + round((potency / 6), 1))
+ reagents.add_reagent("vitamin", 1 + round((potency / 10), 1))
bitesize = 1 + round(reagents.total_volume / 2, 1)
/obj/item/weapon/reagent_containers/food/snacks/grown/pumpkin/attackby(obj/item/weapon/W as obj, mob/user as mob)
@@ -417,6 +427,7 @@
/obj/item/weapon/reagent_containers/food/snacks/grown/citrus/add_juice()
if(..())
reagents.add_reagent("nutriment", 1 + round((potency / 20), 1))
+ reagents.add_reagent("vitamin", 1 + round((potency / 10), 1))
bitesize = 1 + round(reagents.total_volume / 2, 1)
/obj/item/weapon/reagent_containers/food/snacks/grown/citrus/lime
@@ -447,6 +458,7 @@
/obj/item/weapon/reagent_containers/food/snacks/grown/whitebeet/add_juice()
if(..())
reagents.add_reagent("nutriment", round((potency / 20), 1))
+ reagents.add_reagent("vitamin", 1 + round((potency / 20), 1))
reagents.add_reagent("sugar", 1 + round((potency / 5), 1))
bitesize = 1 + round(reagents.total_volume / 2, 1)
@@ -461,7 +473,9 @@
/obj/item/weapon/reagent_containers/food/snacks/grown/banana/add_juice()
if(..())
+ reagents.add_reagent("nutriment", 1 + round((potency / 50), 1))
reagents.add_reagent("banana", 1 + round((potency / 10), 1))
+ reagents.add_reagent("vitamin", 1 + round((potency / 20), 1))
bitesize = 5
/obj/item/weapon/reagent_containers/food/snacks/grown/chili
@@ -474,6 +488,7 @@
if(..())
reagents.add_reagent("nutriment", 1 + round((potency / 25), 1))
reagents.add_reagent("capsaicin", 3+round(potency / 5, 1))
+ reagents.add_reagent("vitamin", 1 + round((potency / 25), 1))
bitesize = 1 + round(reagents.total_volume / 2, 1)
/obj/item/weapon/reagent_containers/food/snacks/grown/chili/attackby(var/obj/item/O as obj, var/mob/user as mob)
@@ -491,6 +506,7 @@
/obj/item/weapon/reagent_containers/food/snacks/grown/icepepper/add_juice()
..()
reagents.add_reagent("nutriment", 1 + round((potency / 50), 1))
+ reagents.add_reagent("vitamin", 1 + round((potency / 50), 1))
reagents.add_reagent("frostoil", 3+round(potency / 5, 1))
bitesize = 1 + round(reagents.total_volume / 2, 1)
@@ -546,6 +562,7 @@
/obj/item/weapon/reagent_containers/food/snacks/grown/eggplant/add_juice()
if(..())
reagents.add_reagent("nutriment", 1 + round((potency / 10), 1))
+ reagents.add_reagent("vitamin", 1 + round((potency / 20), 1))
bitesize = 1 + round(reagents.total_volume / 2, 1)
@@ -581,6 +598,7 @@ obj/item/weapon/reagent_containers/food/snacks/grown/shell/eggy/add_juice()
/obj/item/weapon/reagent_containers/food/snacks/grown/soybeans/add_juice()
if(..())
reagents.add_reagent("nutriment", 1 + round((potency / 20), 1))
+ reagents.add_reagent("vitamin", 1 + round((potency / 10), 1))
bitesize = 1 + round(reagents.total_volume / 2, 1)
/obj/item/weapon/reagent_containers/food/snacks/grown/koibeans
@@ -593,6 +611,7 @@ obj/item/weapon/reagent_containers/food/snacks/grown/shell/eggy/add_juice()
if(..())
reagents.add_reagent("nutriment", 1 + round((potency / 30), 1))
reagents.add_reagent("carpotoxin", 1 + round((potency / 20), 1))
+ reagents.add_reagent("vitamin", 1 + round((potency / 10), 1))
bitesize = 1 + round(reagents.total_volume / 2, 1)
/obj/item/weapon/reagent_containers/food/snacks/grown/moonflower
@@ -606,6 +625,7 @@ obj/item/weapon/reagent_containers/food/snacks/grown/shell/eggy/add_juice()
if(..())
reagents.add_reagent("nutriment", 1 + round((potency / 50), 1))
reagents.add_reagent("moonshine", 1 + round((potency / 10), 1))
+ reagents.add_reagent("vitamin", 1 + round((potency / 50), 1))
bitesize = 1 + round(reagents.total_volume / 2, 1)
//tomaters
@@ -619,6 +639,7 @@ obj/item/weapon/reagent_containers/food/snacks/grown/shell/eggy/add_juice()
/obj/item/weapon/reagent_containers/food/snacks/grown/tomato/add_juice()
if(..())
reagents.add_reagent("nutriment", 1 + round((potency / 10), 1))
+ reagents.add_reagent("vitamin", 1 + round((potency / 10), 1))
bitesize = 1 + round(reagents.total_volume / 2, 1)
/obj/item/weapon/reagent_containers/food/snacks/grown/tomato/proc/squish(atom/target)
@@ -808,6 +829,7 @@ obj/item/weapon/reagent_containers/food/snacks/grown/shell/eggy/add_juice()
/obj/item/weapon/reagent_containers/food/snacks/grown/carrot/add_juice()
if(..())
reagents.add_reagent("nutriment", 1 + round((potency / 20), 1))
+ reagents.add_reagent("vitamin", 1 + round((potency / 20), 1))
reagents.add_reagent("imidazoline", 3+round(potency / 5, 1))
bitesize = 1 + round(reagents.total_volume / 2, 1)
@@ -895,6 +917,7 @@ obj/item/weapon/reagent_containers/food/snacks/grown/shell/eggy/add_juice()
/obj/item/weapon/reagent_containers/food/snacks/grown/mushroom/plumphelmet/add_juice()
..()
reagents.add_reagent("nutriment", 2+round((potency / 10), 1))
+ reagents.add_reagent("vitamin", 1 + round((potency / 20), 1))
bitesize = 1 + round(reagents.total_volume / 2, 1)
@@ -1040,6 +1063,7 @@ obj/item/weapon/reagent_containers/food/snacks/grown/shell/eggy/add_juice()
/obj/item/weapon/reagent_containers/food/snacks/grown/coffee/add_juice()
if(..())
reagents.add_reagent("coffeepowder", 1 + round((potency / 10), 2))
+ reagents.add_reagent("vitamin", 1 + round((potency / 10), 1))
bitesize = 1 + round(reagents.total_volume / 2, 1)
/obj/item/weapon/reagent_containers/food/snacks/grown/coffee/arabica
@@ -1067,6 +1091,7 @@ obj/item/weapon/reagent_containers/food/snacks/grown/shell/eggy/add_juice()
/obj/item/weapon/reagent_containers/food/snacks/grown/tobacco/add_juice()
if(..())
reagents.add_reagent("nutriment", 1 + round((potency / 40), 1))
+ reagents.add_reagent("vitamin", 1 + round((potency / 40), 1))
/obj/item/weapon/reagent_containers/food/snacks/grown/tobacco_space
@@ -1089,6 +1114,7 @@ obj/item/weapon/reagent_containers/food/snacks/grown/shell/eggy/add_juice()
/obj/item/weapon/reagent_containers/food/snacks/grown/tea/add_juice()
if(..())
reagents.add_reagent("teapowder", 1 + round((potency / 10), 2))
+ reagents.add_reagent("vitamin", 1 + round((potency / 20), 1))
/obj/item/weapon/reagent_containers/food/snacks/grown/tea/aspera
diff --git a/code/modules/hydroponics/growninedible.dm b/code/modules/hydroponics/growninedible.dm
index 168c7c15f76..02e1160db2c 100644
--- a/code/modules/hydroponics/growninedible.dm
+++ b/code/modules/hydroponics/growninedible.dm
@@ -67,7 +67,7 @@
/obj/item/weapon/grown/log/attackby(obj/item/weapon/W as obj, mob/user as mob)
..()
if(istype(W, /obj/item/weapon/circular_saw) || istype(W, /obj/item/weapon/hatchet) || (istype(W, /obj/item/weapon/twohanded/fireaxe) && W:wielded) || istype(W, /obj/item/weapon/melee/energy))
- user.show_message("You make planks out of the [src]!", 1)
+ user.show_message("You make planks out of \the [src]!", 1)
for(var/i = 0,i < 2,i++)
var/obj/item/stack/sheet/mineral/wood/NG = new (user.loc)
for (var/obj/item/stack/sheet/mineral/wood/G in user.loc)
@@ -83,7 +83,7 @@
if(is_type_in_list(W,accepted))
var/obj/item/weapon/reagent_containers/food/snacks/grown/leaf = W
if(leaf.dry)
- user.show_message("You wrap the [W] around the log, turning it into a torch!")
+ user.show_message("You wrap \the [W] around the log, turning it into a torch!")
var/obj/item/device/flashlight/flare/torch/T = new /obj/item/device/flashlight/flare/torch(user.loc)
usr.unEquip(W)
usr.put_in_active_hand(T)
diff --git a/code/modules/hydroponics/hydroponics.dm b/code/modules/hydroponics/hydroponics.dm
index 3ab6a0b24eb..fb5b32efcc9 100644
--- a/code/modules/hydroponics/hydroponics.dm
+++ b/code/modules/hydroponics/hydroponics.dm
@@ -721,12 +721,12 @@ obj/machinery/hydroponics/attackby(var/obj/item/O as obj, var/mob/user as mob)
if(anchored == 2)
playsound(src.loc, 'sound/items/Screwdriver.ogg', 50, 1)
anchored = 1
- user << "You unscrew the [src]'s hoses."
+ user << "You unscrew \the [src]'s hoses."
else if(anchored == 1)
playsound(src.loc, 'sound/items/Screwdriver.ogg', 50, 1)
anchored = 2
- user << "You screw in the [src]'s hoses."
+ user << "You screw in \the [src]'s hoses."
for(var/obj/machinery/hydroponics/h in range(1,src))
spawn()
diff --git a/code/modules/library/lib_items.dm b/code/modules/library/lib_items.dm
index 4fff75a6bac..084a4fa4c03 100644
--- a/code/modules/library/lib_items.dm
+++ b/code/modules/library/lib_items.dm
@@ -174,7 +174,9 @@
/obj/item/weapon/book/attack_self(mob/user)
if(is_blind(user))
return
-
+ if(ismonkey(user))
+ user << "You skim through the book but can't comprehend any of it."
+ return
if(dat)
user << browse("Penned by [author]. " + "[dat]", "window=book[window_size != null ? ";size=[window_size]" : ""]") user.visible_message("[user] opens a book titled \"[title]\" and begins reading intently.") diff --git a/code/modules/mining/equipment_locker.dm b/code/modules/mining/equipment_locker.dm index 3748818c031..4874f04a838 100644 --- a/code/modules/mining/equipment_locker.dm +++ b/code/modules/mining/equipment_locker.dm @@ -474,7 +474,7 @@ /obj/item/weapon/resonator/proc/CreateResonance(var/target, var/creator) if(cooldown <= 0) - playsound(src,'sound/effects/stealthoff.ogg',50,1) + playsound(src,'sound/weapons/resonator_fire.ogg',50,1) var/obj/effect/resonance/R = new /obj/effect/resonance(get_turf(target)) R.creator = creator cooldown = 1 @@ -507,7 +507,7 @@ return if(istype(proj_turf, /turf/simulated/mineral)) var/turf/simulated/mineral/M = proj_turf - playsound(src,'sound/effects/sparks4.ogg',50,1) + playsound(src,'sound/weapons/resonator_blast.ogg',50,1) M.gets_drilled() spawn(5) qdel(src) @@ -518,7 +518,7 @@ name = "strong resonance field" resonance_damage = 45 spawn(50) - playsound(src,'sound/effects/sparks4.ogg',50,1) + playsound(src,'sound/weapons/resonator_blast.ogg',50,1) if(creator) for(var/mob/living/L in src.loc) add_logs(creator, L, "used a resonator field on", object="resonator") diff --git a/code/modules/mining/mine_items.dm b/code/modules/mining/mine_items.dm index 847e3397eeb..06f2257e50a 100644 --- a/code/modules/mining/mine_items.dm +++ b/code/modules/mining/mine_items.dm @@ -69,9 +69,13 @@ w_class = 4.0 m_amt = 3750 //one sheet, but where can you make them? var/digspeed = 40 //moving the delay to an item var so R&D can make improved picks. --NEO + var/list/digsound = list('sound/effects/picaxe1.ogg','sound/effects/picaxe2.ogg','sound/effects/picaxe3.ogg') origin_tech = "materials=1;engineering=1" attack_verb = list("hit", "pierced", "sliced", "attacked") +/obj/item/weapon/pickaxe/proc/playDigSound() + playsound(src, pick(digsound),20,1) + /obj/item/weapon/pickaxe/silver name = "silver pickaxe" icon_state = "spickaxe" @@ -85,17 +89,32 @@ icon_state = "handdrill" item_state = "jackhammer" digspeed = 30 + digsound = list('sound/weapons/drill.ogg') + hitsound = 'sound/weapons/drill.ogg' origin_tech = "materials=2;powerstorage=3;engineering=2" desc = "Yours is the drill that will pierce through the rock walls." +/obj/item/weapon/pickaxe/drill/diamonddrill //When people ask about the badass leader of the mining tools, they are talking about ME! making it a child of drill to stop copypasta + name = "diamond mining drill" + icon_state = "diamonddrill" + digspeed = 5 //Digs through walls, girders, and can dig up sand + origin_tech = "materials=6;powerstorage=4;engineering=5" + desc = "Yours is the drill that will pierce the heavens!" + /obj/item/weapon/pickaxe/jackhammer name = "sonic jackhammer" icon_state = "jackhammer" item_state = "jackhammer" digspeed = 15 //faster than drill, but cannot dig origin_tech = "materials=3;powerstorage=2;engineering=2" + digsound = list('sound/weapons/sonic_jackhammer.ogg') + hitsound = 'sound/weapons/sonic_jackhammer.ogg' desc = "Cracks rocks with sonic blasts, perfect for clearing large areas of rock." +/obj/item/weapon/pickaxe/jackhammer/borgdrill // making it a parrent of jackhammer to prevent copypasta + name = "cyborg mining drill" + desc = "" + /obj/item/weapon/pickaxe/gold name = "golden pickaxe" icon_state = "gpickaxe" @@ -111,6 +130,8 @@ w_class = 3.0 //it is smaller than the pickaxe damtype = "fire" digspeed = 20 //Can slice though normal walls, all girders, or be used in reinforced wall deconstruction/ light thermite on fire + digsound = list('sound/weapons/plasma_cutter.ogg') + hitsound = 'sound/weapons/plasma_cutter.ogg' origin_tech = "materials=4;plasmatech=3;engineering=3" desc = "A rock cutter that uses bursts of hot plasma. You could use it to cut limbs off of xenos! Or, you know, mine stuff." @@ -122,20 +143,9 @@ origin_tech = "materials=6;engineering=4" desc = "A pickaxe with a diamond pick head, this is just like minecraft." -/obj/item/weapon/pickaxe/diamonddrill //When people ask about the badass leader of the mining tools, they are talking about ME! - name = "diamond mining drill" - icon_state = "diamonddrill" - item_state = "jackhammer" - digspeed = 5 //Digs through walls, girders, and can dig up sand - origin_tech = "materials=6;powerstorage=4;engineering=5" - desc = "Yours is the drill that will pierce the heavens!" -/obj/item/weapon/pickaxe/borgdrill - name = "cyborg mining drill" - icon_state = "jackhammer" - item_state = "jackhammer" - digspeed = 15 - desc = "" + + /*****************************Shovel********************************/ diff --git a/code/modules/mining/mine_turfs.dm b/code/modules/mining/mine_turfs.dm index 92e6a091471..018f6e491ed 100644 --- a/code/modules/mining/mine_turfs.dm +++ b/code/modules/mining/mine_turfs.dm @@ -371,13 +371,13 @@ new /mob/living/simple_animal/hostile/asteroid/hivelord(T) return -/turf/simulated/mineral/attackby(obj/item/weapon/W as obj, mob/user as mob) +/turf/simulated/mineral/attackby(var/obj/item/weapon/pickaxe/P as obj, mob/user as mob) if (!user.IsAdvancedToolUser()) usr << "You don't have the dexterity to do this!" return - if (istype(W, /obj/item/weapon/pickaxe)) + if (istype(P, /obj/item/weapon/pickaxe)) var/turf/T = user.loc if (!( istype(T, /turf) )) return @@ -388,13 +388,14 @@ return */ //Watch your tabbing, microwave. --NEO - if(last_act+W:digspeed > world.time)//prevents message spam + if(last_act+P.digspeed > world.time)//prevents message spam return last_act = world.time user << "You start picking." - playsound(user, 'sound/weapons/Genhit.ogg', 20, 1) + //playsound(user, 'sound/weapons/Genhit.ogg', 20, 1) + P.playDigSound() - if(do_after(user,W:digspeed)) + if(do_after(user,P.digspeed)) user << "You finish cutting into the rock." gets_drilled() else @@ -420,6 +421,7 @@ if (src.mineralName == "Bananium") new /obj/item/weapon/ore/bananium(src) var/turf/simulated/floor/plating/asteroid/airless/N = ChangeTurf(/turf/simulated/floor/plating/asteroid/airless) + playsound(src, 'sound/effects/break_stone.ogg', 50, 1) //beautiful destruction N.fullUpdateMineralOverlays() return @@ -507,7 +509,7 @@ return /turf/simulated/floor/plating/asteroid/attackby(obj/item/weapon/W as obj, mob/user as mob) - + //note that this proc does not call ..() if(!W || !user) return 0 @@ -521,7 +523,7 @@ return user << "You start digging." - playsound(src, 'sound/effects/rustle1.ogg', 50, 1) //russle sounds sounded better + playsound(src, 'sound/effects/shovel_dig.ogg', 50, 1) //FUCK YO RUSTLE I GOT'S THE DIGS SOUND HERE sleep(40) if ((user.loc == T && user.get_active_hand() == W)) @@ -539,14 +541,14 @@ return user << "You start digging." - playsound(src, 'sound/effects/rustle1.ogg', 50, 1) //russle sounds sounded better + playsound(src, 'sound/effects/shovel_dig.ogg', 50, 1) //FUCK YO RUSTLE I GOT'S THE DIGS SOUND HERE sleep(30) if ((user.loc == T && user.get_active_hand() == W)) user << "You dug a hole." gets_dug() - if ((istype(W,/obj/item/weapon/pickaxe/diamonddrill)) || (istype(W,/obj/item/weapon/pickaxe/borgdrill))) + if ((istype(W,/obj/item/weapon/pickaxe/drill/diamonddrill)) || (istype(W,/obj/item/weapon/pickaxe/jackhammer/borgdrill))) var/turf/T = user.loc if (!( istype(T, /turf) )) return @@ -556,7 +558,7 @@ return user << "You start digging." - playsound(src, 'sound/effects/rustle1.ogg', 50, 1) //russle sounds sounded better + playsound(src, 'sound/effects/shovel_dig.ogg', 50, 1) //FUCK YO RUSTLE I GOT'S THE DIGS SOUND HERE sleep(0) if ((user.loc == T && user.get_active_hand() == W)) @@ -570,10 +572,6 @@ O.attackby(W,user) return - else - ..(W,user) - return - /turf/simulated/floor/plating/asteroid/proc/gets_dug() if(dug) return diff --git a/code/modules/mining/ores_coins.dm b/code/modules/mining/ores_coins.dm index d168bb0444e..fa1b079478e 100644 --- a/code/modules/mining/ores_coins.dm +++ b/code/modules/mining/ores_coins.dm @@ -152,7 +152,7 @@ if(triggered_by_explosive) log_game("An explosion has primed a [name] for detonation at [A.name]([bombturf.x],[bombturf.y],[bombturf.z])") else - user.visible_message("[user] strikes the [src], causing a chain reaction!") + user.visible_message("[user] strikes \the [src], causing a chain reaction!") log_game("[key_name(usr)] has primed a [name] for detonation at [A.name]([bombturf.x],[bombturf.y],[bombturf.z])") spawn(det_time) if(primed) diff --git a/code/modules/mob/dead/observer/observer.dm b/code/modules/mob/dead/observer/observer.dm index f7da665c052..703d4b577e0 100644 --- a/code/modules/mob/dead/observer/observer.dm +++ b/code/modules/mob/dead/observer/observer.dm @@ -301,3 +301,13 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp return 0 usr.visible_message("[src] points to [A]") return 1 + +/mob/dead/observer/verb/view_manfiest() + set name = "View Crew Manifest" + set category = "Ghost" + + var/dat + dat += "
Crew Manifest
" + dat += data_core.get_manifest() + + src << browse(dat, "window=manifest;size=370x420;can_close=1") \ No newline at end of file diff --git a/code/modules/mob/living/carbon/alien/special/facehugger.dm b/code/modules/mob/living/carbon/alien/special/facehugger.dm index f854529c8e1..4860105322b 100644 --- a/code/modules/mob/living/carbon/alien/special/facehugger.dm +++ b/code/modules/mob/living/carbon/alien/special/facehugger.dm @@ -228,7 +228,7 @@ var/const/MAX_ACTIVE_TIME = 400 return /proc/CanHug(var/mob/M) - if(!M) + if(!istype(M)) return 0 if(M.stat == DEAD) return 0 diff --git a/code/modules/mob/living/carbon/human/examine.dm b/code/modules/mob/living/carbon/human/examine.dm index 3115d55e8c7..7afecfeac37 100644 --- a/code/modules/mob/living/carbon/human/examine.dm +++ b/code/modules/mob/living/carbon/human/examine.dm @@ -222,10 +222,10 @@ msg += "[t_He] looks a little soaked.\n" - if(nutrition < 100) + if(nutrition < NUTRITION_LEVEL_STARVING - 50) msg += "[t_He] [t_is] severely malnourished.\n" - else if(nutrition >= 500) - if(user.nutrition < 100) + else if(nutrition >= NUTRITION_LEVEL_FAT) + if(user.nutrition < NUTRITION_LEVEL_STARVING - 50) msg += "[t_He] [t_is] plump and delicious looking - Like a fat little piggy. A tasty piggy.\n" else msg += "[t_He] [t_is] quite chubby.\n" diff --git a/code/modules/mob/living/carbon/human/life.dm b/code/modules/mob/living/carbon/human/life.dm index 6985cf97e93..47a9f6ff3c4 100644 --- a/code/modules/mob/living/carbon/human/life.dm +++ b/code/modules/mob/living/carbon/human/life.dm @@ -242,10 +242,10 @@ if(nutrition >= 2) //If we are very, very cold we'll use up quite a bit of nutriment to heat us up. nutrition -= 2 var/body_temperature_difference = 310.15 - bodytemperature - bodytemperature += max((body_temperature_difference / BODYTEMP_AUTORECOVERY_DIVISOR), BODYTEMP_AUTORECOVERY_MINIMUM) + bodytemperature += max((body_temperature_difference * metabolism_efficiency / BODYTEMP_AUTORECOVERY_DIVISOR), BODYTEMP_AUTORECOVERY_MINIMUM) if(260.15 to 360.15) var/body_temperature_difference = 310.15 - bodytemperature - bodytemperature += body_temperature_difference / BODYTEMP_AUTORECOVERY_DIVISOR + bodytemperature += body_temperature_difference * metabolism_efficiency / BODYTEMP_AUTORECOVERY_DIVISOR if(360.15 to INFINITY) //360.15 is 310.15 + 50, the temperature where you start to feel effects. //We totally need a sweat system cause it totally makes sense...~ var/body_temperature_difference = 310.15 - bodytemperature diff --git a/code/modules/mob/living/carbon/human/species.dm b/code/modules/mob/living/carbon/human/species.dm index a0cb006913b..bf71ff8d60f 100644 --- a/code/modules/mob/living/carbon/human/species.dm +++ b/code/modules/mob/living/carbon/human/species.dm @@ -400,17 +400,42 @@ H.update_inv_w_uniform(0) H.update_inv_wear_suit() - // nutrition decrease + // nutrition decrease and satiety if (H.nutrition > 0 && H.stat != 2) - H.nutrition = max (0, H.nutrition - HUNGER_FACTOR) + var/hunger_rate = HUNGER_FACTOR + if(H.satiety > 0) + H.satiety-- + if(H.satiety < 0) + H.satiety++ + if(prob(round(-H.satiety/40))) + H.Jitter(5) + hunger_rate = 5 * HUNGER_FACTOR + H.nutrition = max (0, H.nutrition - hunger_rate) - if (H.nutrition > 450) + + if (H.nutrition > NUTRITION_LEVEL_FULL) if(H.overeatduration < 600) //capped so people don't take forever to unfat H.overeatduration++ else if(H.overeatduration > 1) H.overeatduration -= 2 //doubled the unfat rate + //metabolism change + if(H.nutrition > NUTRITION_LEVEL_FAT) + H.metabolism_efficiency = 1 + else if(H.nutrition > NUTRITION_LEVEL_FED && H.satiety > 80) + if(H.metabolism_efficiency != 1.25) + H << "You feel vigorous." + H.metabolism_efficiency = 1.25 + else if(H.nutrition < NUTRITION_LEVEL_STARVING + 50) + if(H.metabolism_efficiency != 0.8) + H << "You feel sluggish." + H.metabolism_efficiency = 0.8 + else + if(H.metabolism_efficiency == 1.25) + H << "You no longer feel vigorous." + H.metabolism_efficiency = 1 + if (H.drowsyness) H.drowsyness-- H.eye_blurry = max(2, H.eye_blurry) @@ -536,11 +561,18 @@ if(H.nutrition_icon) switch(H.nutrition) - if(450 to INFINITY) H.nutrition_icon.icon_state = "nutrition0" - if(350 to 450) H.nutrition_icon.icon_state = "nutrition1" - if(250 to 350) H.nutrition_icon.icon_state = "nutrition2" - if(150 to 250) H.nutrition_icon.icon_state = "nutrition3" - else H.nutrition_icon.icon_state = "nutrition4" + if(NUTRITION_LEVEL_FULL to INFINITY) + H.nutrition_icon.icon_state = "nutritionFAT" + if(NUTRITION_LEVEL_WELL_FED to NUTRITION_LEVEL_FULL) + H.nutrition_icon.icon_state = "nutrition0" + if(NUTRITION_LEVEL_FED to NUTRITION_LEVEL_WELL_FED) + H.nutrition_icon.icon_state = "nutrition1" + if(NUTRITION_LEVEL_HUNGRY to NUTRITION_LEVEL_FED) + H.nutrition_icon.icon_state = "nutrition2" + if(NUTRITION_LEVEL_STARVING to NUTRITION_LEVEL_HUNGRY) + H.nutrition_icon.icon_state = "nutrition3" + else + H.nutrition_icon.icon_state = "nutrition4" if(H.pressure) H.pressure.icon_state = "pressure[H.pressure_alert]" @@ -651,7 +683,7 @@ if(J.allow_thrust(0.01, H)) hasjetpack = 1 var/grav = has_gravity(H) - + if(!grav && !hasjetpack) mspeed += 1 //Slower space without jetpack diff --git a/code/modules/mob/living/carbon/human/species_types.dm b/code/modules/mob/living/carbon/human/species_types.dm index 99cb7f8eece..b11cc7d147c 100644 --- a/code/modules/mob/living/carbon/human/species_types.dm +++ b/code/modules/mob/living/carbon/human/species_types.dm @@ -82,7 +82,7 @@ H.adjustFireLoss(rand(5,15)) H.show_message("The radiation beam singes you!") if(/obj/item/projectile/energy/florayield) - H.nutrition = min(H.nutrition+30, 500) + H.nutrition = min(H.nutrition+30, NUTRITION_LEVEL_FULL) return /* @@ -103,14 +103,14 @@ if(A.lighting_use_dynamic) light_amount = min(10,T.lighting_lumcount) - 5 else light_amount = 5 H.nutrition += light_amount - if(H.nutrition > 500) - H.nutrition = 500 + if(H.nutrition > NUTRITION_LEVEL_FULL) + H.nutrition = NUTRITION_LEVEL_FULL if(light_amount > 2) //if there's enough light, heal H.heal_overall_damage(1,1) H.adjustToxLoss(-1) H.adjustOxyLoss(-1) - if(H.nutrition < 200) + if(H.nutrition < NUTRITION_LEVEL_STARVING + 50) H.take_overall_damage(2,0) /* diff --git a/code/modules/mob/living/carbon/slime/life.dm b/code/modules/mob/living/carbon/slime/life.dm index 46136f4ecf9..7520989692c 100644 --- a/code/modules/mob/living/carbon/slime/life.dm +++ b/code/modules/mob/living/carbon/slime/life.dm @@ -347,10 +347,10 @@ if(issilicon(L) && (rabid || attacked)) // They can't eat silicons, but they can glomp them in defence targets += L // Possible target found! - if(istype(L, /mob/living/carbon/human) && dna) //Ignore slime(wo)men + if(istype(L, /mob/living/carbon/human)) //Ignore slime(wo)men var/mob/living/carbon/human/H = L if(H.dna) - if(/mob/living/carbon/slime in H.dna.species.ignored_by) + if(src.type in H.dna.species.ignored_by) continue if(!L.canmove) // Only one slime can latch on at a time. diff --git a/code/modules/mob/living/damage_procs.dm b/code/modules/mob/living/damage_procs.dm index 10cb6ac53d6..1292a0cf675 100644 --- a/code/modules/mob/living/damage_procs.dm +++ b/code/modules/mob/living/damage_procs.dm @@ -64,7 +64,7 @@ return 1 -/mob/living/proc/apply_effects(var/stun = 0, var/weaken = 0, var/paralyze = 0, var/irradiate = 0, var/stutter = 0, var/eyeblur = 0, var/drowsy = 0, var/blocked = 0) +/mob/living/proc/apply_effects(var/stun = 0, var/weaken = 0, var/paralyze = 0, var/irradiate = 0, var/stutter = 0, var/eyeblur = 0, var/drowsy = 0, var/stamina = 0, var/blocked = 0) if(blocked >= 100) return 0 if(stun) apply_effect(stun, STUN, blocked) if(weaken) apply_effect(weaken, WEAKEN, blocked) @@ -73,4 +73,5 @@ if(stutter) apply_effect(stutter, STUTTER, blocked) if(eyeblur) apply_effect(eyeblur, EYE_BLUR, blocked) if(drowsy) apply_effect(drowsy, DROWSY, blocked) + if(stamina) apply_effect(stamina, STAMINA, blocked) return 1 \ No newline at end of file diff --git a/code/modules/mob/living/living.dm b/code/modules/mob/living/living.dm index f9d4fe588e5..b4d6f44b902 100644 --- a/code/modules/mob/living/living.dm +++ b/code/modules/mob/living/living.dm @@ -378,7 +378,7 @@ SetStunned(0) SetWeakened(0) radiation = 0 - nutrition = 400 + nutrition = NUTRITION_LEVEL_FED + 50 bodytemperature = 310 sdisabilities = 0 disabilities = 0 @@ -540,6 +540,7 @@ if(C.handcuffed) C.handcuffed = null C.update_inv_handcuffed(0) + return else C.legcuffed = null C.update_inv_legcuffed(0) @@ -571,18 +572,19 @@ C.visible_message("[C] attempts to remove [I]!") C << "You attempt to remove [I]. (This will take around [displaytime] minutes and you need to stand still.)" spawn(0) - if(do_after(C, breakouttime)) + if(do_after(C, breakouttime, 10)) if(!I || C.buckled) return C.visible_message("[C] manages to remove [I]!") C << "You successfully remove [I]." if(C.handcuffed) - C.handcuffed.loc = usr.loc + C.handcuffed.loc = C.loc C.handcuffed = null C.update_inv_handcuffed(0) + return if(C.legcuffed) - C.legcuffed.loc = usr.loc + C.legcuffed.loc = C.loc C.legcuffed = null C.update_inv_legcuffed(0) else @@ -760,6 +762,13 @@ /mob/living/singularity_pull(S) step_towards(src,S) +/mob/living/narsie_act() + if(client) + makeNewConstruct(/mob/living/simple_animal/construct/harvester, src, null, 1) + spawn_dust() + gib() + return + /mob/living/proc/do_attack_animation(atom/A) var/pixel_x_diff = 0 var/pixel_y_diff = 0 diff --git a/code/modules/mob/living/living_defines.dm b/code/modules/mob/living/living_defines.dm index dc7b9cd2f44..c0db992236d 100644 --- a/code/modules/mob/living/living_defines.dm +++ b/code/modules/mob/living/living_defines.dm @@ -41,3 +41,4 @@ var/floating = 0 var/nightvision = 0 var/mob_size = 1 //size of the mob. 0 is small, 1 is human sized, and 2 is large. + var/metabolism_efficiency = 1 //more or less efficiency to metabolize helpful/harmful reagents and regulate body temperature.. \ No newline at end of file diff --git a/code/modules/mob/living/say.dm b/code/modules/mob/living/say.dm index fda757d8aed..31b691a9071 100644 --- a/code/modules/mob/living/say.dm +++ b/code/modules/mob/living/say.dm @@ -261,6 +261,8 @@ var/list/department_radio_keys = list( if(stuttering) message = stutter(message) + message = capitalize(message) + return message /mob/living/proc/radio(message, message_mode, steps) diff --git a/code/modules/mob/living/silicon/ai/ai.dm b/code/modules/mob/living/silicon/ai/ai.dm index 30c30cc6e0d..4b12eb1cf13 100644 --- a/code/modules/mob/living/silicon/ai/ai.dm +++ b/code/modules/mob/living/silicon/ai/ai.dm @@ -548,7 +548,7 @@ var/list/ai_list = list() cleared = 1 L -= I if (cleared) - queueAlarm(text("--- [] alarm in [] has been cleared.", class, A.name), class, 0) + queueAlarm("--- [class] alarm in [A.name] has been cleared.", class, 0) if (viewalerts) ai_alerts() return !cleared diff --git a/code/modules/mob/living/silicon/ai/say.dm b/code/modules/mob/living/silicon/ai/say.dm index 4d7ffb41382..6bb20acc14f 100644 --- a/code/modules/mob/living/silicon/ai/say.dm +++ b/code/modules/mob/living/silicon/ai/say.dm @@ -33,7 +33,7 @@ return !config.silent_ai /mob/living/silicon/ai/radio(message, message_mode) - if(!radio_enabled || aiRestorePowerRoutine || stat) //AI cannot speak if radio is disabled (via intelicard) or depowered. + if(!radio_enabled || aiRestorePowerRoutine || stat) //AI cannot speak if radio is disabled (via intellicard) or depowered. src << "Your radio transmitter is offline!" return 0 ..(message,message_mode) diff --git a/code/modules/mob/living/silicon/robot/robot.dm b/code/modules/mob/living/silicon/robot/robot.dm index 7a7b4ddc838..b3707f263cb 100644 --- a/code/modules/mob/living/silicon/robot/robot.dm +++ b/code/modules/mob/living/silicon/robot/robot.dm @@ -385,7 +385,7 @@ cleared = 1 L -= I if (cleared) - queueAlarm(text("--- [class] alarm in [A.name] has been cleared."), class, 0) + queueAlarm("--- [class] alarm in [A.name] has been cleared.", class, 0) // if (viewalerts) robot_alerts() return !cleared diff --git a/code/modules/mob/living/silicon/robot/robot_modules.dm b/code/modules/mob/living/silicon/robot/robot_modules.dm index f698a6ae801..6e488bc3ec9 100644 --- a/code/modules/mob/living/silicon/robot/robot_modules.dm +++ b/code/modules/mob/living/silicon/robot/robot_modules.dm @@ -161,7 +161,7 @@ modules += new /obj/item/device/flashlight/seclite(src) modules += new /obj/item/weapon/restraints/handcuffs/cable/zipties/cyborg(src) modules += new /obj/item/weapon/melee/baton/loaded(src) - modules += new /obj/item/weapon/gun/energy/taser/cyborg(src) + modules += new /obj/item/weapon/gun/energy/gun/advtaser/cyborg(src) modules += new /obj/item/clothing/mask/gas/sechailer/cyborg(src) emag = new /obj/item/weapon/gun/energy/laser/cyborg(src) fix_modules() @@ -223,9 +223,9 @@ emag = new /obj/item/borg/stun(src) modules += new /obj/item/weapon/storage/bag/ore(src) if(R.emagged) - modules += new /obj/item/weapon/pickaxe/diamonddrill(src) + modules += new /obj/item/weapon/pickaxe/drill/diamonddrill(src) else - modules += new /obj/item/weapon/pickaxe/borgdrill(src) + modules += new /obj/item/weapon/pickaxe/jackhammer/borgdrill(src) modules += new /obj/item/device/flashlight/lantern(src) modules += new /obj/item/weapon/storage/bag/sheetsnatcher/borg(src) modules += new /obj/item/device/t_scanner/adv_mining_scanner(src) @@ -234,9 +234,9 @@ /obj/item/weapon/robot_module/miner/on_emag() ..() - for(var/obj/item/weapon/pickaxe/borgdrill/D in modules) + for(var/obj/item/weapon/pickaxe/jackhammer/borgdrill/D in modules) qdel(D) - modules += new /obj/item/weapon/pickaxe/diamonddrill(src) + modules += new /obj/item/weapon/pickaxe/drill/diamonddrill(src) rebuild() diff --git a/code/modules/mob/living/simple_animal/constructs.dm b/code/modules/mob/living/simple_animal/constructs.dm index f52831f11af..2f515596d37 100644 --- a/code/modules/mob/living/simple_animal/constructs.dm +++ b/code/modules/mob/living/simple_animal/constructs.dm @@ -70,7 +70,8 @@ Proj.on_hit(src, 0) return 0 - +/mob/living/simple_animal/construct/narsie_act() + return /////////////////Juggernaut/////////////// diff --git a/code/modules/mob/living/simple_animal/friendly/corgi.dm b/code/modules/mob/living/simple_animal/friendly/corgi.dm index 7726038a19a..debdf749a93 100644 --- a/code/modules/mob/living/simple_animal/friendly/corgi.dm +++ b/code/modules/mob/living/simple_animal/friendly/corgi.dm @@ -25,7 +25,15 @@ var/obj/item/inventory_back var/facehugger -/mob/living/simple_animal/corgi/Life() +/mob/living/simple_animal/corgi/New() + ..() + regenerate_icons() + +/mob/living/simple_animal/corgi/Die() + ..() + regenerate_icons() + +/mob/living/simple_animal/corgi/revive() ..() regenerate_icons() @@ -141,7 +149,7 @@ //The objects that corgis can wear on their backs. var/list/allowed_types = list( - /obj/item/clothing/suit/armor/vest, + /obj/item/clothing/suit/armor/vest/alt, /obj/item/device/radio, /obj/item/device/radio/off, /obj/item/clothing/suit/cardborg, @@ -192,134 +200,138 @@ var/valid = 0 //Various hats and items (worn on his head) change Ian's behaviour. His attributes are reset when a hat is removed. - switch(item_to_add.type) - if( /obj/item/clothing/glasses/sunglasses, /obj/item/clothing/head/that, /obj/item/clothing/head/collectable/paper, - /obj/item/clothing/head/hardhat, /obj/item/clothing/head/collectable/hardhat,/obj/item/clothing/head/hardhat/white, /obj/item/weapon/paper ) - valid = 1 + if(istype(item_to_add, /obj/item/clothing/tie/scarf)) + valid = 1 + else + switch(item_to_add.type) + if( /obj/item/clothing/glasses/sunglasses, /obj/item/clothing/head/that, /obj/item/clothing/head/collectable/paper, + /obj/item/clothing/head/hardhat, /obj/item/clothing/head/collectable/hardhat, /obj/item/clothing/head/hardhat/white, + /obj/item/weapon/paper) + valid = 1 - if(/obj/item/clothing/head/helmet) - name = "Sergeant [real_name]" - desc = "The ever-loyal, the ever-vigilant." - valid = 1 + if(/obj/item/clothing/head/helmet) + name = "Sergeant [real_name]" + desc = "The ever-loyal, the ever-vigilant." + valid = 1 - if(/obj/item/clothing/head/chefhat, /obj/item/clothing/head/collectable/chef) - name = "Sous chef [real_name]" - desc = "Your food will be taste-tested. All of it." - valid = 1 + if(/obj/item/clothing/head/chefhat, /obj/item/clothing/head/collectable/chef) + name = "Sous chef [real_name]" + desc = "Your food will be taste-tested. All of it." + valid = 1 - if(/obj/item/clothing/head/caphat, /obj/item/clothing/head/collectable/captain) - name = "Captain [real_name]" - desc = "Probably better than the last captain." - valid = 1 + if(/obj/item/clothing/head/caphat, /obj/item/clothing/head/collectable/captain) + name = "Captain [real_name]" + desc = "Probably better than the last captain." + valid = 1 - if(/obj/item/clothing/head/kitty, /obj/item/clothing/head/collectable/kitty) - name = "Runtime" - emote_see = list("coughs up a furball", "stretches") - emote_hear = list("purrs") - speak = list("Purrr", "Meow!", "MAOOOOOW!", "HISSSSS", "MEEEEEEW") - desc = "It's a cute little kitty-cat! ... wait ... what the hell?" - valid = 1 + if(/obj/item/clothing/head/kitty, /obj/item/clothing/head/collectable/kitty) + name = "Runtime" + emote_see = list("coughs up a furball", "stretches") + emote_hear = list("purrs") + speak = list("Purrr", "Meow!", "MAOOOOOW!", "HISSSSS", "MEEEEEEW") + desc = "It's a cute little kitty-cat! ... wait ... what the hell?" + valid = 1 - if(/obj/item/clothing/head/rabbitears, /obj/item/clothing/head/collectable/rabbitears) - name = "Hoppy" - emote_see = list("twitches its nose", "hops around a bit") - desc = "This is Hoppy. It's a corgi-...urmm... bunny rabbit" - valid = 1 + if(/obj/item/clothing/head/rabbitears, /obj/item/clothing/head/collectable/rabbitears) + name = "Hoppy" + emote_see = list("twitches its nose", "hops around a bit") + desc = "This is Hoppy. It's a corgi-...urmm... bunny rabbit" + valid = 1 - if(/obj/item/clothing/head/beret, /obj/item/clothing/head/collectable/beret) - name = "Yann" - desc = "Mon dieu! C'est un chien!" - speak = list("le woof!", "le bark!", "JAPPE!!") - emote_see = list("cowers in fear.", "surrenders.", "plays dead.","looks as though there is a wall in front of him.") - valid = 1 + if(/obj/item/clothing/head/beret, /obj/item/clothing/head/collectable/beret) + name = "Yann" + desc = "Mon dieu! C'est un chien!" + speak = list("le woof!", "le bark!", "JAPPE!!") + emote_see = list("cowers in fear.", "surrenders.", "plays dead.","looks as though there is a wall in front of him.") + valid = 1 - if(/obj/item/clothing/head/det_hat) - name = "Detective [real_name]" - desc = "[name] sees through your lies..." - emote_see = list("investigates the area.","sniffs around for clues.","searches for scooby snacks.") - valid = 1 + if(/obj/item/clothing/head/det_hat) + name = "Detective [real_name]" + desc = "[name] sees through your lies..." + emote_see = list("investigates the area.","sniffs around for clues.","searches for scooby snacks.") + valid = 1 - if(/obj/item/clothing/head/nursehat) - name = "Nurse [real_name]" - desc = "[name] needs 100cc of beef jerky...STAT!" - valid = 1 + if(/obj/item/clothing/head/nursehat) + name = "Nurse [real_name]" + desc = "[name] needs 100cc of beef jerky...STAT!" + valid = 1 - if(/obj/item/clothing/head/pirate, /obj/item/clothing/head/collectable/pirate) - name = "[pick("Ol'","Scurvy","Black","Rum","Gammy","Bloody","Gangrene","Death","Long-John")] [pick("kibble","leg","beard","tooth","poop-deck","Threepwood","Le Chuck","corsair","Silver","Crusoe")]" - desc = "Yaarghh!! Thar' be a scurvy dog!" - emote_see = list("hunts for treasure.","stares coldly...","gnashes his tiny corgi teeth!") - emote_hear = list("growls ferociously!", "snarls.") - speak = list("Arrrrgh!!","Grrrrrr!") - valid = 1 + if(/obj/item/clothing/head/pirate, /obj/item/clothing/head/collectable/pirate) + name = "[pick("Ol'","Scurvy","Black","Rum","Gammy","Bloody","Gangrene","Death","Long-John")] [pick("kibble","leg","beard","tooth","poop-deck","Threepwood","Le Chuck","corsair","Silver","Crusoe")]" + desc = "Yaarghh!! Thar' be a scurvy dog!" + emote_see = list("hunts for treasure.","stares coldly...","gnashes his tiny corgi teeth!") + emote_hear = list("growls ferociously!", "snarls.") + speak = list("Arrrrgh!!","Grrrrrr!") + valid = 1 - if(/obj/item/clothing/head/ushanka) - name = "[pick("Comrade","Commissar","Glorious Leader")] [real_name]" - desc = "A follower of Karl Barx." - emote_see = list("contemplates the failings of the capitalist economic model.", "ponders the pros and cons of vangaurdism.") - valid = 1 + if(/obj/item/clothing/head/ushanka) + name = "[pick("Comrade","Commissar","Glorious Leader")] [real_name]" + desc = "A follower of Karl Barx." + emote_see = list("contemplates the failings of the capitalist economic model.", "ponders the pros and cons of vangaurdism.") + valid = 1 - if(/obj/item/clothing/head/collectable/police) - name = "Officer [real_name]" - emote_see = list("drools.","looks for donuts.") - desc = "Stop right there criminal scum!" - valid = 1 + if(/obj/item/clothing/head/collectable/police) + name = "Officer [real_name]" + emote_see = list("drools.","looks for donuts.") + desc = "Stop right there criminal scum!" + valid = 1 - if(/obj/item/clothing/head/wizard/fake, /obj/item/clothing/head/wizard, /obj/item/clothing/head/collectable/wizard) - name = "Grandwizard [real_name]" - speak = list("YAP", "Woof!", "Bark!", "AUUUUUU", "EI NATH!") - valid = 1 + if(/obj/item/clothing/head/wizard/fake, /obj/item/clothing/head/wizard, /obj/item/clothing/head/collectable/wizard) + name = "Grandwizard [real_name]" + speak = list("YAP", "Woof!", "Bark!", "AUUUUUU", "EI NATH!") + valid = 1 - if(/obj/item/clothing/head/cardborg) - name = "Borgi" - speak = list("Ping!","Beep!","Woof!") - emote_see = list("goes rogue.", "sniffs out non-humans.") - desc = "Result of robotics budget cuts." - valid = 1 + if(/obj/item/clothing/head/cardborg) + name = "Borgi" + speak = list("Ping!","Beep!","Woof!") + emote_see = list("goes rogue.", "sniffs out non-humans.") + desc = "Result of robotics budget cuts." + valid = 1 - if(/obj/item/weapon/bedsheet) - name = "\improper Ghost" - speak = list("WoooOOOooo~","AUUUUUUUUUUUUUUUUUU") - emote_see = list("stumbles around.", "shivers.") - emote_hear = list("howls!","groans.") - desc = "Spooky!" - valid = 1 + if(/obj/item/weapon/bedsheet) + name = "\improper Ghost" + speak = list("WoooOOOooo~","AUUUUUUUUUUUUUUUUUU") + emote_see = list("stumbles around.", "shivers.") + emote_hear = list("howls!","groans.") + desc = "Spooky!" + valid = 1 - if(/obj/item/clothing/head/helmet/space/santahat) - name = "Santa's Corgi Helper" - emote_hear = list("barks christmas songs.", "yaps merrily!") - emote_see = list("looks for presents.", "checks his list.") - desc = "He's very fond of milk and cookies." - valid = 1 + if(/obj/item/clothing/head/helmet/space/santahat) + name = "Santa's Corgi Helper" + emote_hear = list("barks christmas songs.", "yaps merrily!") + emote_see = list("looks for presents.", "checks his list.") + desc = "He's very fond of milk and cookies." + valid = 1 - if(/obj/item/clothing/head/soft) - name = "Corgi Tech [real_name]" - desc = "The reason your yellow gloves have chew-marks." - valid = 1 + if(/obj/item/clothing/head/soft) + name = "Corgi Tech [real_name]" + desc = "The reason your yellow gloves have chew-marks." + valid = 1 - if(/obj/item/clothing/head/hardhat/reindeer) - name = "[real_name] the red-nosed Corgi" - emote_hear = list("lights the way!", "illuminates.", "yaps!") - desc = "He has a very shiny nose." - SetLuminosity(1) - valid = 1 + if(/obj/item/clothing/head/hardhat/reindeer) + name = "[real_name] the red-nosed Corgi" + emote_hear = list("lights the way!", "illuminates.", "yaps!") + desc = "He has a very shiny nose." + SetLuminosity(1) + valid = 1 - if(/obj/item/clothing/head/sombrero) - name = "Segnor [real_name]" - desc = "You must respect elder [real_name]" - valid = 1 + if(/obj/item/clothing/head/sombrero) + name = "Segnor [real_name]" + desc = "You must respect elder [real_name]" + valid = 1 - if(/obj/item/clothing/head/hopcap) - name = "Lieutenant [real_name]" - desc = "Can actually be trusted to not run off on his own." - valid = 1 + if(/obj/item/clothing/head/hopcap) + name = "Lieutenant [real_name]" + desc = "Can actually be trusted to not run off on his own." + valid = 1 if(valid) + if(!usr.drop_item()) + usr << "\The [item_to_add] is stuck to your hand, you cannot put it on [src]'s head!" + return 0 if(health <= 0) usr << "There is merely a dull, lifeless look in [real_name]'s eyes as you put the [item_to_add] on \him." else if(usr) - if(!usr.drop_item()) - usr << "\The [item_to_add] is stuck to your hand, you cannot put it on [src]'s head!" - return 0 usr.visible_message("[usr] puts [item_to_add] on [real_name]'s head. [src] looks at [usr] and barks once.", "You put [item_to_add] on [real_name]'s head. [src] gives you a peculiar look, then wags \his tail once and barks.", "You hear a friendly-sounding bark.") @@ -411,25 +423,27 @@ /mob/living/simple_animal/corgi/regenerate_icons() - overlays = list() + overlays.Cut() if(inventory_head) - var/head_icon_state = inventory_head.icon_state + var/image/head_icon if(health <= 0) - head_icon_state += "2" - - var/icon/head_icon = image('icons/mob/corgi_head.dmi',head_icon_state) - if(head_icon) - overlays += head_icon + head_icon = image('icons/mob/corgi_head.dmi', icon_state = inventory_head.icon_state, dir = EAST) + head_icon.pixel_y = -8 + head_icon.transform = turn(head_icon.transform, 180) + else + head_icon = image('icons/mob/corgi_head.dmi', icon_state = inventory_head.icon_state) + overlays += head_icon if(inventory_back) - var/back_icon_state = inventory_back.icon_state + var/image/back_icon if(health <= 0) - back_icon_state += "2" - - var/icon/back_icon = image('icons/mob/corgi_back.dmi',back_icon_state) - if(back_icon) - overlays += back_icon + back_icon = image('icons/mob/corgi_back.dmi', icon_state = inventory_back.icon_state, dir = EAST) + back_icon.pixel_y = -11 + back_icon.transform = turn(back_icon.transform, 180) + else + back_icon = image('icons/mob/corgi_back.dmi', icon_state = inventory_back.icon_state) + overlays += back_icon if(facehugger) if(istype(src, /mob/living/simple_animal/corgi/puppy)) diff --git a/code/modules/mob/mob.dm b/code/modules/mob/mob.dm index e26a681c46a..e80a4a863c3 100644 --- a/code/modules/mob/mob.dm +++ b/code/modules/mob/mob.dm @@ -518,7 +518,7 @@ var/list/slot_equipment_priority = list( \ namecounts[name] = 1 creatures[name] = O - if(istype(O, /obj/machinery/singularity)) + if(istype(O, /obj/singularity)) var/name = "Singularity" if (names.Find(name)) namecounts[name]++ diff --git a/code/modules/mob/mob_defines.dm b/code/modules/mob/mob_defines.dm index 20a575fea58..ecdf9f9daf8 100644 --- a/code/modules/mob/mob_defines.dm +++ b/code/modules/mob/mob_defines.dm @@ -78,7 +78,8 @@ var/drowsyness = 0//Carbon var/dizziness = 0//Carbon var/jitteriness = 0//Carbon - var/nutrition = 400//Carbon + var/nutrition = NUTRITION_LEVEL_FED + 50//Carbon + var/satiety = 0//Carbon var/overeatduration = 0 // How long this guy is overeating //Carbon var/paralysis = 0 diff --git a/code/modules/mob/new_player/new_player.dm b/code/modules/mob/new_player/new_player.dm index fd087516a33..72c56c7f554 100644 --- a/code/modules/mob/new_player/new_player.dm +++ b/code/modules/mob/new_player/new_player.dm @@ -25,10 +25,13 @@ var/output = "You are ready Cancel
" + if(ready) + output += "\[ Ready | Not Ready \]
" + else + output += "\[ Ready | Not Ready \]
" else + output += "View the Crew Manifest" output += "" output += "" @@ -98,7 +101,10 @@ return 1 if(href_list["ready"]) - ready = text2num(href_list["ready"]) + if(!ticker || ticker.current_state <= GAME_STATE_PREGAME) // Make sure we don't ready up after the round has started + ready = !ready + else + ready = 0 if(href_list["refresh"]) src << browse(null, "window=playersetup") //closes the player setup window @@ -136,6 +142,9 @@ return LateChoices() + if(href_list["manifest"]) + ViewManifest() + if(href_list["SelectedJob"]) if(!enter_allowed) @@ -364,6 +373,12 @@ return new_character +/mob/new_player/proc/ViewManifest() + var/dat = "" + dat += "
Crew Manifest
" + dat += data_core.get_manifest(OOC = 1) + + src << browse(dat, "window=manifest;size=370x420;can_close=1") /mob/new_player/Move() return 0 diff --git a/code/modules/mob/new_player/preferences_setup.dm b/code/modules/mob/new_player/preferences_setup.dm index 901fa258ca8..6742c29bf6d 100644 --- a/code/modules/mob/new_player/preferences_setup.dm +++ b/code/modules/mob/new_player/preferences_setup.dm @@ -81,7 +81,7 @@ if(BARTENDER) clothes_s = new /icon('icons/mob/uniform.dmi', "ba_suit_s") clothes_s.Blend(new /icon('icons/mob/feet.dmi', "black"), ICON_UNDERLAY) - clothes_s.Blend(new /icon('icons/mob/suit.dmi', "armor"), ICON_OVERLAY) + clothes_s.Blend(new /icon('icons/mob/suit.dmi', "armoralt"), ICON_OVERLAY) if(backbag == 2) clothes_s.Blend(new /icon('icons/mob/back.dmi', "backpack"), ICON_OVERLAY) else if(backbag == 3) @@ -260,12 +260,12 @@ if(backbag == 3) clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel-cap"), ICON_OVERLAY) if(HOS) - clothes_s = new /icon('icons/mob/uniform.dmi', "hosred_s") + clothes_s = new /icon('icons/mob/uniform.dmi', "hos_s") clothes_s.Blend(new /icon('icons/mob/feet.dmi', "jackboots"), ICON_UNDERLAY) clothes_s.Blend(new /icon('icons/mob/hands.dmi', "bgloves"), ICON_UNDERLAY) - clothes_s.Blend(new /icon('icons/mob/head.dmi', "hoscap"), ICON_OVERLAY) + clothes_s.Blend(new /icon('icons/mob/head.dmi', "hosberetblack"), ICON_OVERLAY) clothes_s.Blend(new /icon('icons/mob/eyes.dmi', "sunhud"), ICON_OVERLAY) - clothes_s.Blend(new /icon('icons/mob/suit.dmi', "hos"), ICON_OVERLAY) + clothes_s.Blend(new /icon('icons/mob/suit.dmi', "hostrench"), ICON_OVERLAY) if(backbag == 2) clothes_s.Blend(new /icon('icons/mob/back.dmi', "securitypack"), ICON_OVERLAY) if(backbag == 3) @@ -293,9 +293,10 @@ if(backbag == 3) clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel-norm"), ICON_OVERLAY) if(OFFICER) - clothes_s = new /icon('icons/mob/uniform.dmi', "secred_s") + clothes_s = new /icon('icons/mob/uniform.dmi', "security_s") clothes_s.Blend(new /icon('icons/mob/feet.dmi', "jackboots"), ICON_UNDERLAY) - clothes_s.Blend(new /icon('icons/mob/head.dmi', "helmet"), ICON_OVERLAY) + clothes_s.Blend(new /icon('icons/mob/hands.dmi', "bgloves"), ICON_UNDERLAY) + clothes_s.Blend(new /icon('icons/mob/head.dmi', "beret_badge"), ICON_OVERLAY) clothes_s.Blend(new /icon('icons/mob/suit.dmi', "armor"), ICON_OVERLAY) if(backbag == 2) clothes_s.Blend(new /icon('icons/mob/back.dmi', "securitypack"), ICON_OVERLAY) diff --git a/code/modules/mob/new_player/sprite_accessories.dm b/code/modules/mob/new_player/sprite_accessories.dm index 0c60767621b..c47444be1da 100644 --- a/code/modules/mob/new_player/sprite_accessories.dm +++ b/code/modules/mob/new_player/sprite_accessories.dm @@ -720,12 +720,12 @@ gender = NEUTER /datum/sprite_accessory/undershirt/tank_white - name = "White Tank-Top" + name = "White Tank Top" icon_state = "tank_white" gender = NEUTER /datum/sprite_accessory/undershirt/tank_black - name = "Black Tank-Top" + name = "Black Tank Top" icon_state = "tank_black" gender = NEUTER @@ -738,3 +738,208 @@ name = "Midriff Tank Top" icon_state = "tank_midriff" gender = FEMALE + +/datum/sprite_accessory/undershirt/lover + name = "Lover shirt" + icon_state = "lover" + gender = NEUTER + +/datum/sprite_accessory/undershirt/ian + name = "Blue Ian Shirt" + icon_state = "ian" + gender = NEUTER + +/datum/sprite_accessory/undershirt/uk + name = "UK Shirt" + icon_state = "uk" + gender = NEUTER + +/datum/sprite_accessory/undershirt/ilovent + name = "I Love NT Shirt" + icon_state = "ilovent" + gender = NEUTER + +/datum/sprite_accessory/undershirt/peace + name = "Peace Shirt" + icon_state = "peace" + gender = NEUTER + +/datum/sprite_accessory/undershirt/mondmondjaja + name = "Band Shirt" + icon_state = "band" + gender = NEUTER + +/datum/sprite_accessory/undershirt/pacman + name = "Pogoman Shirt" + icon_state = "pogoman" + gender = NEUTER + +/datum/sprite_accessory/undershirt/matroska + name = "Matroska Shirt" + icon_state = "matroska" + gender = NEUTER + +/datum/sprite_accessory/undershirt/whiteshortsleeve + name = "White Short-sleeved Shirt" + icon_state = "whiteshortsleeve" + gender = NEUTER + +/datum/sprite_accessory/undershirt/purpleshortsleeve + name = "Purple Short-sleeved Shirt" + icon_state = "purpleshortsleeve" + gender = NEUTER + +/datum/sprite_accessory/undershirt/blueshortsleeve + name = "Blue Short-sleeved Shirt" + icon_state = "blueshortsleeve" + gender = NEUTER + +/datum/sprite_accessory/undershirt/greenshortsleeve + name = "Green Short-sleeved Shirt" + icon_state = "greenshortsleeve" + gender = NEUTER + +/datum/sprite_accessory/undershirt/blackshortsleeve + name = "Black Short-sleeved Shirt" + icon_state = "blackshortsleeve" + gender = NEUTER + +/datum/sprite_accessory/undershirt/blueshirt + name = "Blue T-Shirt" + icon_state = "blueshirt" + gender = NEUTER + +/datum/sprite_accessory/undershirt/redshirt + name = "Red T-Shirt" + icon_state = "redshirt" + gender = NEUTER + +/datum/sprite_accessory/undershirt/yellowshirt + name = "Yellow T-Shirt" + icon_state = "yellowshirt" + gender = NEUTER + +/datum/sprite_accessory/undershirt/greenshirt + name = "Green T-Shirt" + icon_state = "greenshirt" + gender = NEUTER + +/datum/sprite_accessory/undershirt/bluepolo + name = "Blue Polo Shirt" + icon_state = "bluepolo" + gender = NEUTER + +/datum/sprite_accessory/undershirt/redpolo + name = "Red Polo Shirt" + icon_state = "redpolo" + gender = NEUTER + +/datum/sprite_accessory/undershirt/whitepolo + name = "White Polo Shirt" + icon_state = "whitepolo" + gender = NEUTER + +/datum/sprite_accessory/undershirt/grayyellowpolo + name = "Gray-Yellow Polo Shirt" + icon_state = "grayyellowpolo" + gender = NEUTER + +/datum/sprite_accessory/undershirt/redtop + name = "Red Top" + icon_state = "redtop" + gender = FEMALE + +/datum/sprite_accessory/undershirt/whitetop + name = "White Top" + icon_state = "whitetop" + gender = FEMALE + +/datum/sprite_accessory/undershirt/greenshirtsport + name = "Green Sports Shirt" + icon_state = "greenshirtsport" + gender = NEUTER + +/datum/sprite_accessory/undershirt/redshirtsport + name = "Red Sports Shirt" + icon_state = "redshirtsport" + gender = NEUTER + +/datum/sprite_accessory/undershirt/blueshirtsport + name = "Blue Sports Shirt" + icon_state = "blueshirtsport" + gender = NEUTER + +/datum/sprite_accessory/undershirt/ss13 + name = "SS13 Shirt" + icon_state = "shirt_ss13" + gender = NEUTER + +/datum/sprite_accessory/undershirt/tankfire + name = "Fire Tank Top" + icon_state = "tank_fire" + gender = NEUTER + +/datum/sprite_accessory/undershirt/question + name = "Question Shirt" + icon_state = "shirt_question" + gender = NEUTER + +/datum/sprite_accessory/undershirt/skull + name = "Skull Shirt" + icon_state = "shirt_skull" + gender = NEUTER + +/datum/sprite_accessory/undershirt/commie + name = "Commie Shirt" + icon_state = "shirt_commie" + gender = NEUTER + +/datum/sprite_accessory/undershirt/nano + name = "Nanotransen Shirt" + icon_state = "shirt_nano" + gender = NEUTER + +/datum/sprite_accessory/undershirt/stripe + name = "Striped Shirt" + icon_state = "shirt_stripes" + gender = NEUTER + +/datum/sprite_accessory/undershirt/blueshirt + name = "Blue Shirt" + icon_state = "shirt_blue" + gender = NEUTER + +/datum/sprite_accessory/undershirt/redshirt + name = "Red Shirt" + icon_state = "shirt_red" + gender = NEUTER + +/datum/sprite_accessory/undershirt/greenshirt + name = "Green Shirt" + icon_state = "shirt_green" + gender = NEUTER + +/datum/sprite_accessory/undershirt/meat + name = "Meat Shirt" + icon_state = "shirt_meat" + gender = NEUTER + +/datum/sprite_accessory/undershirt/tiedye + name = "Tie-dye Shirt" + icon_state = "shirt_tiedye" + gender = NEUTER + +/datum/sprite_accessory/undershirt/redjersey + name = "Red Jersey" + icon_state = "shirt_redjersey" + gender = NEUTER + +/datum/sprite_accessory/undershirt/bluejersey + name = "Blue Jersey" + icon_state = "shirt_bluejersey" + gender = NEUTER + +/datum/sprite_accessory/undershirt/tankstripe + name = "Striped Tank Top" + icon_state = "tank_stripes" + gender = FEMALE diff --git a/code/modules/paperwork/paperbin.dm b/code/modules/paperwork/paperbin.dm index 53831b9f235..a85940d0f81 100644 --- a/code/modules/paperwork/paperbin.dm +++ b/code/modules/paperwork/paperbin.dm @@ -55,7 +55,7 @@ P.loc = user.loc user.put_in_hands(P) - user << "You take [P] out of the [src]." + user << "You take [P] out of \the [src]." else user << "[src] is empty!" diff --git a/code/modules/power/lighting.dm b/code/modules/power/lighting.dm index dd9af7e4a73..232791722cc 100644 --- a/code/modules/power/lighting.dm +++ b/code/modules/power/lighting.dm @@ -679,7 +679,7 @@ if(istype(I, /obj/item/weapon/reagent_containers/syringe)) var/obj/item/weapon/reagent_containers/syringe/S = I - user << "You inject the solution into the [src]." + user << "You inject the solution into \the [src]." if(S.reagents.has_reagent("plasma", 5)) diff --git a/code/modules/power/singularity/collector.dm b/code/modules/power/singularity/collector.dm index 2d4ede128b5..8e07804317d 100644 --- a/code/modules/power/singularity/collector.dm +++ b/code/modules/power/singularity/collector.dm @@ -97,7 +97,7 @@ var/global/list/rad_collectors = list() user << "The controls are now [src.locked ? "locked." : "unlocked."]" else src.locked = 0 //just in case it somehow gets locked - user << "The controls can only be locked when the [src] is active." + user << "The controls can only be locked when \the [src] is active." else user << "Access denied!" return 1 diff --git a/code/modules/power/singularity/containment_field.dm b/code/modules/power/singularity/containment_field.dm index 377670faa43..14062e210f5 100644 --- a/code/modules/power/singularity/containment_field.dm +++ b/code/modules/power/singularity/containment_field.dm @@ -74,7 +74,7 @@ return ..() /obj/machinery/field/CanPass(obj/mover as obj, turf/target, height=0) - if((istype(mover, /obj/machinery) && !istype(mover, /obj/machinery/singularity)) || \ + if((istype(mover, /obj/machinery) && !istype(mover, /obj/singularity)) || \ istype(mover, /obj/structure) || \ istype(mover, /obj/mecha)) bump(mover) diff --git a/code/modules/power/singularity/emitter.dm b/code/modules/power/singularity/emitter.dm index 6da19164d8e..8e358e5a43c 100644 --- a/code/modules/power/singularity/emitter.dm +++ b/code/modules/power/singularity/emitter.dm @@ -63,13 +63,13 @@ if(!src.locked) if(src.active==1) src.active = 0 - user << "You turn off the [src]." + user << "You turn off \the [src]." message_admins("Emitter turned off by [key_name(user, user.client)](?) in ([x],[y],[z] - JMP)",0,1) log_game("Emitter turned off by [user.ckey]([user]) in ([x],[y],[z])") investigate_log("turned off by [user.key]","singulo") else src.active = 1 - user << "You turn on the [src]." + user << "You turn on \the [src]." src.shot_number = 0 src.fire_delay = 100 investigate_log("turned on by [user.key]","singulo") @@ -152,7 +152,7 @@ if(istype(W, /obj/item/weapon/wrench)) if(active) - user << "Turn off the [src] first." + user << "Turn off \the [src] first." return switch(state) if(0 && !isinspace()) @@ -176,7 +176,7 @@ if(istype(W, /obj/item/weapon/weldingtool)) var/obj/item/weapon/weldingtool/WT = W if(active) - user << "Turn off the [src] first." + user << "Turn off \the [src] first." return switch(state) if(0) @@ -185,23 +185,23 @@ if (WT.remove_fuel(0,user)) playsound(src.loc, 'sound/items/Welder2.ogg', 50, 1) user.visible_message("[user.name] starts to weld the [src.name] to the floor.", \ - "You start to weld the [src] to the floor.", \ + "You start to weld \the [src] to the floor.", \ "You hear welding") if (do_after(user,20)) if(!src || !WT.isOn()) return state = 2 - user << "You weld the [src] to the floor." + user << "You weld \the [src] to the floor." connect_to_network() if(2) if (WT.remove_fuel(0,user)) playsound(src.loc, 'sound/items/Welder2.ogg', 50, 1) user.visible_message("[user.name] starts to cut the [src.name] free from the floor.", \ - "You start to cut the [src] free from the floor.", \ + "You start to cut \the [src] free from the floor.", \ "You hear welding") if (do_after(user,20)) if(!src || !WT.isOn()) return state = 1 - user << "You cut the [src] free from the floor." + user << "You cut \the [src] free from the floor." disconnect_from_network() return @@ -215,7 +215,7 @@ user << "The controls are now [src.locked ? "locked." : "unlocked."]" else src.locked = 0 //just in case it somehow gets locked - user << "The controls can only be locked when the [src] is online." + user << "The controls can only be locked when \the [src] is online." else user << "Access denied." return @@ -227,4 +227,4 @@ if(!emagged) locked = 0 emagged = 1 - user.visible_message("[user.name] emags the [src.name].","You short out the lock.") + user.visible_message("[user.name] emags the [src.name].","You short out the lock.") diff --git a/code/modules/power/singularity/field_generator.dm b/code/modules/power/singularity/field_generator.dm index 34f49fa328b..d0fdaf04d41 100644 --- a/code/modules/power/singularity/field_generator.dm +++ b/code/modules/power/singularity/field_generator.dm @@ -127,7 +127,7 @@ field_generator power level display if (WT.remove_fuel(0,user)) playsound(src.loc, 'sound/items/Welder2.ogg', 50, 1) user.visible_message("[user.name] starts to weld the [src.name] to the floor.", \ - "You start to weld the [src] to the floor.", \ + "You start to weld \the [src] to the floor.", \ "You hear welding") if (do_after(user,20)) if(!src || !WT.isOn()) return @@ -139,12 +139,12 @@ field_generator power level display if (WT.remove_fuel(0,user)) playsound(src.loc, 'sound/items/Welder2.ogg', 50, 1) user.visible_message("[user.name] starts to cut the [src.name] free from the floor.", \ - "You start to cut the [src] free from the floor.", \ + "You start to cut \the [src] free from the floor.", \ "You hear welding") if (do_after(user,20)) if(!src || !WT.isOn()) return state = 1 - user << "You cut the [src] free from the floor." + user << "You cut \the [src] free from the floor." else return else @@ -344,7 +344,7 @@ field_generator power level display //I want to avoid using global variables. spawn(1) var/temp = 1 //stops spam - for(var/obj/machinery/singularity/O in world) + for(var/obj/singularity/O in world) if(O.last_warning && temp) if((world.time - O.last_warning) > 50) //to stop message-spam temp = 0 diff --git a/code/modules/power/singularity/generator.dm b/code/modules/power/singularity/generator.dm index d618cd54eef..0f27d92cd47 100644 --- a/code/modules/power/singularity/generator.dm +++ b/code/modules/power/singularity/generator.dm @@ -12,7 +12,7 @@ /obj/machinery/the_singularitygen/process() var/turf/T = get_turf(src) if(src.energy >= 200) - new /obj/machinery/singularity/(T, 50) + new /obj/singularity/(T, 50) if(src) qdel(src) /obj/machinery/the_singularitygen/attackby(obj/item/W, mob/user) diff --git a/code/modules/power/singularity/narsie.dm b/code/modules/power/singularity/narsie.dm index 9253dfde465..1ed275131b6 100644 --- a/code/modules/power/singularity/narsie.dm +++ b/code/modules/power/singularity/narsie.dm @@ -1,4 +1,4 @@ -/obj/machinery/singularity/narsie //Moving narsie to a child object of the singularity so it can be made to function differently. --NEO +/obj/singularity/narsie //Moving narsie to a child object of the singularity so it can be made to function differently. --NEO name = "Nar-sie's Avatar" desc = "Your mind begins to bubble and ooze as it tries to comprehend what it sees." icon = 'icons/obj/magic_terror.dmi' @@ -10,9 +10,8 @@ move_self = 1 //Do we move on our own? grav_pull = 5 //How many tiles out do we pull? consume_range = 6 //How many tiles out do we eat - var/uneatable = list(/turf/space, /obj/effect/overlay, /mob/living/simple_animal/construct) -/obj/machinery/singularity/narsie/large +/obj/singularity/narsie/large name = "Nar-Sie" icon = 'icons/obj/narsie.dmi' // Pixel stuff centers Narsie. @@ -23,7 +22,7 @@ grav_pull = 10 consume_range = 12 //How many tiles out do we eat -/obj/machinery/singularity/narsie/large/New() +/obj/singularity/narsie/large/New() ..() world << "NAR-SIE HAS RISEN" world << pick(sound('sound/hallucinations/im_here1.ogg'), sound('sound/hallucinations/im_here2.ogg')) @@ -39,7 +38,7 @@ emergency_shuttle.incall(0.3) // Cannot recall -/obj/machinery/singularity/narsie/large/attack_ghost(mob/dead/observer/user as mob) +/obj/singularity/narsie/large/attack_ghost(mob/dead/observer/user as mob) if(!(src in view())) user << "Your soul is too far away." return @@ -47,7 +46,7 @@ new /obj/effect/effect/sleep_smoke(user.loc) -/obj/machinery/singularity/narsie/process() +/obj/singularity/narsie/process() eat() if(!target || prob(5)) pickcultist() @@ -56,15 +55,15 @@ mezzer() -/obj/machinery/singularity/narsie/Bump(atom/A)//you dare stand before a god?! +/obj/singularity/narsie/Bump(atom/A)//you dare stand before a god?! godsmack(A) return -/obj/machinery/singularity/narsie/Bumped(atom/A) +/obj/singularity/narsie/Bumped(atom/A) godsmack(A) return -/obj/machinery/singularity/narsie/proc/godsmack(var/atom/A) +/obj/singularity/narsie/proc/godsmack(var/atom/A) if(istype(A,/obj/)) var/obj/O = A O.ex_act(1.0) @@ -75,7 +74,7 @@ T.ChangeTurf(/turf/simulated/floor/engine/cult) -/obj/machinery/singularity/narsie/mezzer() +/obj/singularity/narsie/mezzer() for(var/mob/living/carbon/M in oviewers(8, src)) if(M.stat == CONSCIOUS) if(!iscultist(M)) @@ -83,33 +82,15 @@ M.apply_effect(3, STUN) -/obj/machinery/singularity/narsie/consume(var/atom/A) - if(is_type_in_list(A, uneatable)) - return 0 +/obj/singularity/narsie/consume(var/atom/A) + A.narsie_act() - if(istype(A,/mob/living/)) - var/mob/living/C = A - if(C.client) - makeNewConstruct(/mob/living/simple_animal/construct/harvester, C, null, 1) - C.spawn_dust() - C.gib() - return - if(isturf(A)) - var/turf/T = A - if(istype(T, /turf/simulated/floor) && !istype(T, /turf/simulated/floor/engine/cult)) - if(prob(20)) T.ChangeTurf(/turf/simulated/floor/engine/cult) - - else if(istype(T,/turf/simulated/wall) && !istype(T, /turf/simulated/wall/cult)) - if(prob(20)) T.ChangeTurf(/turf/simulated/wall/cult) +/obj/singularity/narsie/ex_act() //No throwing bombs at it either. --NEO return -/obj/machinery/singularity/narsie/ex_act() //No throwing bombs at it either. --NEO - return - - -/obj/machinery/singularity/narsie/proc/pickcultist() //Narsie rewards his cultists with being devoured first, then picks a ghost to follow. --NEO +/obj/singularity/narsie/proc/pickcultist() //Narsie rewards his cultists with being devoured first, then picks a ghost to follow. --NEO var/list/cultists = list() var/list/noncultists = list() for(var/mob/living/carbon/food in living_mob_list) //we don't care about constructs or cult-Ians or whatever. cult-monkeys are fair game i guess @@ -143,7 +124,7 @@ return -/obj/machinery/singularity/narsie/proc/acquire(var/mob/food) +/obj/singularity/narsie/proc/acquire(var/mob/food) target << "NAR-SIE HAS LOST INTEREST IN YOU" target = food if(ishuman(target)) @@ -152,10 +133,10 @@ target << "NAR-SIE HAS CHOSEN YOU TO LEAD HIM TO HIS NEXT MEAL" //Wizard narsie -/obj/machinery/singularity/narsie/wizard +/obj/singularity/narsie/wizard grav_pull = 0 -/obj/machinery/singularity/narsie/wizard/eat() +/obj/singularity/narsie/wizard/eat() set background = BACKGROUND_ENABLED // if(defer_powernet_rebuild != 2) // defer_powernet_rebuild = 1 @@ -167,7 +148,7 @@ return -/obj/machinery/singularity/narsie/proc/narsie_spawn_animation() +/obj/singularity/narsie/proc/narsie_spawn_animation() icon = 'icons/obj/narsie_spawn_anim.dmi' dir = SOUTH move_self = 0 diff --git a/code/modules/power/singularity/particle_accelerator/particle.dm b/code/modules/power/singularity/particle_accelerator/particle.dm index 7d41c552c37..ed5d1f760d2 100644 --- a/code/modules/power/singularity/particle_accelerator/particle.dm +++ b/code/modules/power/singularity/particle_accelerator/particle.dm @@ -38,7 +38,7 @@ if (A) if(ismob(A)) toxmob(A) - if((istype(A,/obj/machinery/the_singularitygen))||(istype(A,/obj/machinery/singularity/))) + if((istype(A,/obj/machinery/the_singularitygen))||(istype(A,/obj/singularity/))) A:energy += energy return diff --git a/code/modules/power/singularity/singularity.dm b/code/modules/power/singularity/singularity.dm index 60a9f5f1cd9..8f1443cb6c3 100644 --- a/code/modules/power/singularity/singularity.dm +++ b/code/modules/power/singularity/singularity.dm @@ -1,6 +1,6 @@ //This file was auto-corrected by findeclaration.exe on 25.5.2012 20:42:33 -/obj/machinery/singularity +/obj/singularity name = "gravitational singularity" desc = "A gravitational singularity." icon = 'icons/obj/singularity.dmi' @@ -10,7 +10,6 @@ layer = 6 luminosity = 6 unacidable = 1 //Don't comment this out. - use_power = 0 var/current_size = 1 var/allowed_size = 1 var/contained = 1 //Are we going to move around? @@ -27,20 +26,24 @@ var/last_failed_movement = 0//Will not move in the same dir if it couldnt before, will help with the getting stuck on fields thing var/last_warning -/obj/machinery/singularity/New(loc, var/starting_energy = 50, var/temp = 0) +/obj/singularity/New(loc, var/starting_energy = 50, var/temp = 0) //CARN: admin-alert for chuckle-fuckery. admin_investigate_setup() src.energy = starting_energy ..() + processing_objects.Add(src) for(var/obj/machinery/power/singularity_beacon/singubeacon in world) if(singubeacon.active) target = singubeacon break return +/obj/singularity/Destroy() + processing_objects.Remove(src) + ..() -/obj/machinery/singularity/Move(atom/newloc, direct) +/obj/singularity/Move(atom/newloc, direct) if(current_size >= STAGE_FIVE || check_turfs_in(direct)) last_failed_movement = 0//Reset this because we moved return ..() @@ -49,17 +52,17 @@ return 0 -/obj/machinery/singularity/attack_hand(mob/user as mob) +/obj/singularity/attack_hand(mob/user as mob) consume(user) return 1 -/obj/machinery/singularity/Process_Spacemove() //The singularity stops drifting for no man! +/obj/singularity/Process_Spacemove() //The singularity stops drifting for no man! return 0 -/obj/machinery/singularity/blob_act(severity) +/obj/singularity/blob_act(severity) return -/obj/machinery/singularity/ex_act(severity, target) +/obj/singularity/ex_act(severity, target) switch(severity) if(1.0) if(current_size <= STAGE_TWO) @@ -75,21 +78,21 @@ return -/obj/machinery/singularity/bullet_act(obj/item/projectile/P) +/obj/singularity/bullet_act(obj/item/projectile/P) return 0 //Will there be an impact? Who knows. Will we see it? No. -/obj/machinery/singularity/Bump(atom/A) +/obj/singularity/Bump(atom/A) consume(A) return -/obj/machinery/singularity/Bumped(atom/A) +/obj/singularity/Bumped(atom/A) consume(A) return -/obj/machinery/singularity/process() +/obj/singularity/process() if(current_size >= STAGE_TWO) move() pulse() @@ -102,17 +105,17 @@ return -/obj/machinery/singularity/attack_ai() //to prevent ais from gibbing themselves when they click on one. +/obj/singularity/attack_ai() //to prevent ais from gibbing themselves when they click on one. return -/obj/machinery/singularity/proc/admin_investigate_setup() +/obj/singularity/proc/admin_investigate_setup() last_warning = world.time var/count = locate(/obj/machinery/field/containment) in orange(30, src) if(!count) message_admins("A singulo has been created without containment fields active ([x],[y],[z])",1) investigate_log("was created. [count?"":"No containment fields were active"]","singulo") -/obj/machinery/singularity/proc/dissipate() +/obj/singularity/proc/dissipate() if(!dissipate) return if(dissipate_track >= dissipate_delay) @@ -122,7 +125,7 @@ dissipate_track++ -/obj/machinery/singularity/proc/expand(var/force_size = 0) +/obj/singularity/proc/expand(var/force_size = 0) var/temp_allowed_size = src.allowed_size if(force_size) temp_allowed_size = force_size @@ -191,7 +194,7 @@ return 0 -/obj/machinery/singularity/proc/check_energy() +/obj/singularity/proc/check_energy() if(energy <= 0) investigate_log("collapsed.","singulo") qdel(src) @@ -212,11 +215,11 @@ return 1 -/obj/machinery/singularity/proc/eat() +/obj/singularity/proc/eat() set background = BACKGROUND_ENABLED for(var/atom/X in orange(grav_pull,src)) var/dist = get_dist(X, src) - var/obj/machinery/singularity/S = src + var/obj/singularity/S = src if(dist > consume_range) X.singularity_pull(S, current_size) else if(dist <= consume_range) @@ -224,13 +227,13 @@ return -/obj/machinery/singularity/proc/consume(var/atom/A) +/obj/singularity/proc/consume(var/atom/A) var/gain = A.singularity_act(current_size) src.energy += gain return -/obj/machinery/singularity/proc/move(var/force_move = 0) +/obj/singularity/proc/move(var/force_move = 0) if(!move_self) return 0 @@ -245,7 +248,7 @@ step(src, movement_dir) -/obj/machinery/singularity/proc/check_turfs_in(var/direction = 0, var/step = 0) +/obj/singularity/proc/check_turfs_in(var/direction = 0, var/step = 0) if(!direction) return 0 var/steps = 0 @@ -298,7 +301,7 @@ return 1 -/obj/machinery/singularity/proc/can_move(var/turf/T) +/obj/singularity/proc/can_move(var/turf/T) if(!T) return 0 if((locate(/obj/machinery/field/containment) in T)||(locate(/obj/machinery/shieldwall) in T)) @@ -314,7 +317,7 @@ return 1 -/obj/machinery/singularity/proc/event() +/obj/singularity/proc/event() var/numb = pick(1,2,3,4,5,6) switch(numb) if(1)//EMP @@ -328,7 +331,7 @@ return 1 -/obj/machinery/singularity/proc/toxmob() +/obj/singularity/proc/toxmob() var/toxrange = 10 var/toxdamage = 4 var/radiation = 15 @@ -344,7 +347,7 @@ return -/obj/machinery/singularity/proc/mezzer() +/obj/singularity/proc/mezzer() for(var/mob/living/carbon/M in oviewers(8, src)) if(istype(M, /mob/living/carbon/brain)) //Ignore brains continue @@ -361,19 +364,19 @@ return -/obj/machinery/singularity/proc/emp_area() +/obj/singularity/proc/emp_area() empulse(src, 8, 10) return -/obj/machinery/singularity/proc/pulse() +/obj/singularity/proc/pulse() for(var/obj/machinery/power/rad_collector/R in rad_collectors) if(get_dist(R, src) <= 15) // Better than using orange() every process R.receive_pulse(energy) return -/obj/machinery/singularity/singularity_act() +/obj/singularity/singularity_act() var/gain = (energy/2) var/dist = max((current_size - 2),1) explosion(src.loc,(dist),(dist*2),(dist*4)) diff --git a/code/modules/power/solar.dm b/code/modules/power/solar.dm index 062f28cb028..7c70cb2c484 100644 --- a/code/modules/power/solar.dm +++ b/code/modules/power/solar.dm @@ -33,9 +33,10 @@ var/list/solars_list = list() //set the control of the panel to a given computer if closer than SOLAR_MAX_DIST /obj/machinery/power/solar/proc/set_control(var/obj/machinery/power/solar_control/SC) - if(SC && (get_dist(src, SC) > SOLAR_MAX_DIST)) + if(!SC || (get_dist(src, SC) > SOLAR_MAX_DIST)) return 0 control = SC + SC.connected_panels |= src return 1 //set the control of the panel to null and removes it from the control list of the previous control computer if needed @@ -323,12 +324,10 @@ var/list/solars_list = list() var/obj/machinery/power/solar/S = M if(!S.control) //i.e unconnected S.set_control(src) - connected_panels |= S else if(istype(M, /obj/machinery/power/tracker)) if(!connected_tracker) //if there's already a tracker connected to the computer don't add another var/obj/machinery/power/tracker/T = M if(!T.control) //i.e unconnected - connected_tracker = T T.set_control(src) //called by the sun controller, update the facing angle (either manually or via tracking) and rotates the panels accordingly @@ -484,10 +483,10 @@ var/list/solars_list = list() set_panels(targetdir) if(href_list["search_connected"]) - src.search_for_connected() + search_for_connected() if(connected_tracker && track == 2) connected_tracker.set_angle(sun.angle) - src.set_panels(cdir) + set_panels(cdir) src.updateUsrDialog() return diff --git a/code/modules/power/supermatter/supermatter.dm b/code/modules/power/supermatter/supermatter.dm new file mode 100644 index 00000000000..b08ad2edf4d --- /dev/null +++ b/code/modules/power/supermatter/supermatter.dm @@ -0,0 +1,286 @@ +//Ported from /vg/station13, which was in turn forked from baystation12; +//Please do not bother them with bugs from this port, however, as it has been modified quite a bit. +//Modifications include removing the world-ending full supermatter variation, and leaving only the shard. + +#define NITROGEN_RETARDATION_FACTOR 2 //Higher == N2 slows reaction more +#define THERMAL_RELEASE_MODIFIER 5 //Higher == less heat released during reaction +#define PLASMA_RELEASE_MODIFIER 750 //Higher == less plasma released by reaction +#define OXYGEN_RELEASE_MODIFIER 325 //Higher == less oxygen released at high temperature/power +#define REACTION_POWER_MODIFIER 0.55 //Higher == more overall power + + +//These would be what you would get at point blank, decreases with distance +#define DETONATION_RADS 200 +#define DETONATION_HALLUCINATION 600 + + +#define WARNING_DELAY 30 //seconds between warnings. + +/obj/machinery/power/supermatter_shard + name = "supermatter shard" + desc = "A strangely translucent and iridescent crystal that looks like it used to be part of a larger structure. You get headaches just from looking at it." + icon = 'icons/obj/supermatter.dmi' + icon_state = "darkmatter_shard" + density = 1 + anchored = 0 + luminosity = 4 + + + var/gasefficency = 0.125 + + var/base_icon_state = "darkmatter_shard" + + var/damage = 0 + var/damage_archived = 0 + var/safe_alert = "Crystalline hyperstructure returning to safe operating levels." + var/warning_point = 50 + var/warning_alert = "Danger! Crystal hyperstructure instability!" + var/emergency_point = 500 + var/emergency_alert = "CRYSTAL DELAMINATION IMMINENT." + var/explosion_point = 900 + + var/emergency_issued = 0 + + var/explosion_power = 8 + + var/lastwarning = 0 // Time in 1/10th of seconds since the last sent warning + var/power = 0 + + var/oxygen = 0 // Moving this up here for easier debugging. + + //Temporary values so that we can optimize this + //How much the bullets damage should be multiplied by when it is added to the internal variables + var/config_bullet_energy = 2 + //How much of the power is left after processing is finished? +// var/config_power_reduction_per_tick = 0.5 + //How much hallucination should it produce per unit of power? + var/config_hallucination_power = 0.1 + + var/obj/item/device/radio/radio + + //for logging + var/has_been_powered = 0 + var/has_reached_emergency = 0 + +/obj/machinery/power/supermatter_shard/New() + . = ..() + radio = new(src) + radio.listening = 0 + investigate_log("has been created.", "supermatter") + + +/obj/machinery/power/supermatter_shard/Destroy() + investigate_log("has been destroyed.", "supermatter") + qdel(radio) + . = ..() + +/obj/machinery/power/supermatter_shard/proc/explode() + investigate_log("has exploded.", "supermatter") + explosion(get_turf(src), explosion_power, explosion_power * 2, explosion_power * 3, explosion_power * 4, 1, 1) + qdel(src) + return + +/obj/machinery/power/supermatter_shard/process() + var/turf/L = loc + + if(isnull(L)) // We have a null turf...something is wrong, stop processing this entity. + return PROCESS_KILL + + if(!istype(L)) //We are in a crate or somewhere that isn't turf, if we return to turf resume processing but for now. + return //Yeah just stop. + + if(istype(L, /turf/space)) // Stop processing this stuff if we've been ejected. + return + + if(damage > warning_point) // while the core is still damaged and it's still worth noting its status + if((world.timeofday - lastwarning) / 10 >= WARNING_DELAY) + var/stability = num2text(round((damage / explosion_point) * 100)) + + if(damage > emergency_point) + radio.talk_into(src, "[emergency_alert] Instability: [stability]%") + lastwarning = world.timeofday + if(!has_reached_emergency) + investigate_log("has reached the emergency point for the first time.", "supermatter") + message_admins("[src] has reached the emergency point (JMP).") + has_reached_emergency = 1 + + else if(damage >= damage_archived) // The damage is still going up + radio.talk_into(src, "[warning_alert] Instability: [stability]%") + lastwarning = world.timeofday - 150 + + else // Phew, we're safe + radio.talk_into(src, "[safe_alert]") + lastwarning = world.timeofday + + if(damage > explosion_point) + for(var/mob/living/mob in living_mob_list) + if(istype(mob, /mob/living/carbon/human)) + //Hilariously enough, running into a closet should make you get hit the hardest. + var/mob/living/carbon/human/H = mob + H.hallucination += max(50, min(300, DETONATION_HALLUCINATION * sqrt(1 / (get_dist(mob, src) + 1)) ) ) + var/rads = DETONATION_RADS * sqrt( 1 / (get_dist(mob, src) + 1) ) + mob.apply_effect(rads, IRRADIATE) + + explode() + + //Ok, get the air from the turf + var/datum/gas_mixture/env = L.return_air() + + //Remove gas from surrounding area + var/datum/gas_mixture/removed = env.remove(gasefficency * env.total_moles()) + + if(!removed || !removed.total_moles()) + damage += max((power-1600)/10, 0) + power = min(power, 1600) + return 1 + + damage_archived = damage + damage = max( damage + ( (removed.temperature - 800) / 150 ) , 0 ) + //Ok, 100% oxygen atmosphere = best reaction + //Maxes out at 100% oxygen pressure + oxygen = max(min((removed.oxygen - (removed.nitrogen * NITROGEN_RETARDATION_FACTOR)) / MOLES_CELLSTANDARD, 1), 0) + + var/temp_factor = 50 + + if(oxygen > 0.8) + // with a perfect gas mix, make the power less based on heat + icon_state = "[base_icon_state]_glow" + else + // in normal mode, base the produced energy around the heat + temp_factor = 30 + icon_state = base_icon_state + + power = max( (removed.temperature * temp_factor / T0C) * oxygen + power, 0) //Total laser power plus an overload + + //We've generated power, now let's transfer it to the collectors for storing/usage + transfer_energy() + + var/device_energy = power * REACTION_POWER_MODIFIER + + //To figure out how much temperature to add each tick, consider that at one atmosphere's worth + //of pure oxygen, with all four lasers firing at standard energy and no N2 present, at room temperature + //that the device energy is around 2140. At that stage, we don't want too much heat to be put out + //Since the core is effectively "cold" + + //Also keep in mind we are only adding this temperature to (efficiency)% of the one tile the rock + //is on. An increase of 4*C @ 25% efficiency here results in an increase of 1*C / (#tilesincore) overall. + removed.temperature += (device_energy / THERMAL_RELEASE_MODIFIER) + + removed.temperature = max(0, min(removed.temperature, 2500)) + + //Calculate how much gas to release + removed.toxins += max(device_energy / PLASMA_RELEASE_MODIFIER, 0) + + removed.oxygen += max((device_energy + removed.temperature - T0C) / OXYGEN_RELEASE_MODIFIER, 0) + + env.merge(removed) + + for(var/mob/living/carbon/human/l in view(src, min(7, round(power ** 0.25)))) // If they can see it without mesons on. Bad on them. + if(!istype(l.glasses, /obj/item/clothing/glasses/meson)) + l.hallucination = max(0, min(200, l.hallucination + power * config_hallucination_power * sqrt( 1 / min(1, get_dist(l, src)) ) ) ) + + for(var/mob/living/l in range(src, round((power / 100) ** 0.25))) + var/rads = (power / 10) * sqrt( 1 / min(get_dist(l, src),1) ) + l.apply_effect(rads, IRRADIATE) + + power -= (power/500)**3 + + return 1 + + +/obj/machinery/power/supermatter_shard/bullet_act(var/obj/item/projectile/Proj) + var/turf/L = loc + if(!istype(L)) // We don't run process() when we are in space + return 0 // This stops people from being able to really power up the supermatter + // Then bring it inside to explode instantly upon landing on a valid turf. + + + if(Proj.flag != "bullet") + power += Proj.damage * config_bullet_energy + if(!has_been_powered) + investigate_log("has been powered for the first time.", "supermatter") + message_admins("[src] has been powered for the first time (JMP).") + has_been_powered = 1 + else + damage += Proj.damage * config_bullet_energy + return 0 + + +/obj/machinery/power/supermatter_shard/attack_paw(mob/user as mob) + return attack_hand(user) + + +/obj/machinery/power/supermatter_shard/attack_robot(mob/user as mob) + if(Adjacent(user)) + return attack_hand(user) + else + user << "You attempt to interface with the control circuits but find they are not connected to your network. Maybe in a future firmware update." + return + +/obj/machinery/power/supermatter_shard/attack_ai(mob/user as mob) + user << "You attempt to interface with the control circuits but find they are not connected to your network. Maybe in a future firmware update." + +/obj/machinery/power/supermatter_shard/attack_hand(mob/user as mob) + user.visible_message("\The [user] reaches out and touches \the [src], inducing a resonance... \his body starts to glow and bursts into flames before flashing into ash.",\ + "You reach out and touch \the [src]. Everything starts burning and all you can hear is ringing. Your last thought is \"That was not a wise decision.\"",\ + "You hear an unearthly noise as a wave of heat washes over you.") + + playsound(get_turf(src), 'sound/effects/supermatter.ogg', 50, 1) + + Consume(user) + +/obj/machinery/power/supermatter_shard/proc/transfer_energy() + for(var/obj/machinery/power/rad_collector/R in rad_collectors) + if(get_dist(R, src) <= 15) // Better than using orange() every process + R.receive_pulse(power/10) + return + +/obj/machinery/power/supermatter_shard/attackby(obj/item/weapon/W as obj, mob/living/user as mob) + if(user.drop_item(W)) + Consume(W) + user.visible_message("As [user] touches \the [src] with \a [W], silence fills the room...",\ + "You touch \the [src] with \the [W], and everything suddenly goes silent.\"\n\The [W] flashes into dust as you flinch away from \the [src].",\ + "Everything suddenly goes silent.") + + playsound(get_turf(src), 'sound/effects/supermatter.ogg', 50, 1) + + user.apply_effect(150, IRRADIATE) + + +/obj/machinery/power/supermatter_shard/Bumped(atom/AM as mob|obj) + if(istype(AM, /mob/living)) + AM.visible_message("\The [AM] slams into \the [src] inducing a resonance... \his body starts to glow and catch flame before flashing into ash.",\ + "You slam into \the [src] as your ears are filled with unearthly ringing. Your last thought is \"Oh, fuck.\"",\ + "You hear an unearthly noise as a wave of heat washes over you.") + else + AM.visible_message("\The [AM] smacks into \the [src] and rapidly flashes to ash.",\ + "You hear a loud crack as you are washed with a wave of heat.") + + playsound(get_turf(src), 'sound/effects/supermatter.ogg', 50, 1) + + Consume(AM) + + +/obj/machinery/power/supermatter_shard/proc/Consume(atom/movable/AM) + if(istype(AM, /mob/living)) + var/mob/living/user = AM + user.dust() + power += 200 + message_admins("[src] has consumed [key_name(user)]? (JMP).") + else + qdel(AM) + + investigate_log("has consumed [AM].", "supermatter") + + power += 200 + + //Some poor sod got eaten, go ahead and irradiate people nearby. + for(var/mob/living/L in range(10)) + var/rads = 500 * sqrt( 1 / (get_dist(L, src) + 1) ) + L.apply_effect(rads, IRRADIATE) + investigate_log("has irradiated [L] after consuming [AM].", "supermatter") + if(L in view()) + L.show_message("As \the [src] slowly stops resonating, you find your skin covered in new radiation burns.", 1,\ + "The unearthly ringing subsides and you notice you have new radiation burns.", 2) + else + L.show_message("You hear an uneartly ringing and notice your skin is covered in fresh radiation burns.", 2) diff --git a/code/modules/power/supermatter/supermatter_crate.dm b/code/modules/power/supermatter/supermatter_crate.dm new file mode 100644 index 00000000000..dd65e75cfc5 --- /dev/null +++ b/code/modules/power/supermatter/supermatter_crate.dm @@ -0,0 +1,7 @@ +/datum/supply_packs/engineering/engine/supermatter_shard + name = "Supermatter Shard Crate" + contains = list(/obj/machinery/power/supermatter_shard) + cost = 100 //So cargo thinks twice before killing themselves with it + containertype = /obj/structure/closet/crate/secure + containername = "supermatter shard crate" + access = access_ce diff --git a/code/modules/power/tracker.dm b/code/modules/power/tracker.dm index 20e8ab528c4..5cf341f9fbb 100644 --- a/code/modules/power/tracker.dm +++ b/code/modules/power/tracker.dm @@ -27,9 +27,10 @@ //set the control of the tracker to a given computer if closer than SOLAR_MAX_DIST /obj/machinery/power/tracker/proc/set_control(var/obj/machinery/power/solar_control/SC) - if(SC && (get_dist(src, SC) > SOLAR_MAX_DIST)) + if(!SC || (get_dist(src, SC) > SOLAR_MAX_DIST)) return 0 control = SC + SC.connected_tracker = src return 1 //set the control of the tracker to null and removes it from the previous control computer if needed diff --git a/code/modules/projectiles/ammunition.dm b/code/modules/projectiles/ammunition.dm index 801d9b6e2e8..0f85597e0ec 100644 --- a/code/modules/projectiles/ammunition.dm +++ b/code/modules/projectiles/ammunition.dm @@ -73,21 +73,34 @@ stored_ammo.Insert(1,b) return b -/obj/item/ammo_box/proc/give_round(var/obj/item/ammo_casing/r) - var/obj/item/ammo_casing/rb = r - if (rb) - if (stored_ammo.len < max_ammo && rb.caliber == caliber) - stored_ammo += rb - rb.loc = src - return 1 +/obj/item/ammo_box/proc/give_round(var/obj/item/ammo_casing/R, var/replace_spent = 0) + if(!R || (R.caliber != caliber)) + return 0 + + if (stored_ammo.len < max_ammo) + stored_ammo += R + R.loc = src + return 1 + + //for accessibles magazines (e.g internal ones) when full, start replacing spent ammo + else if(replace_spent) + for(var/obj/item/ammo_casing/AC in stored_ammo) + if(!AC.BB)//found a spent ammo + stored_ammo -= AC + AC.loc = get_turf(src.loc) + + stored_ammo += R + R.loc = src + return 1 + return 0 -/obj/item/ammo_box/attackby(var/obj/item/A as obj, mob/user as mob, var/silent = 0) +/obj/item/ammo_box/attackby(var/obj/item/A as obj, mob/user as mob, var/silent = 0, var/replace_spent = 0) var/num_loaded = 0 if(istype(A, /obj/item/ammo_box)) var/obj/item/ammo_box/AM = A for(var/obj/item/ammo_casing/AC in AM.stored_ammo) - var/did_load = give_round(AC) + var/did_load = give_round(AC, replace_spent) if(did_load) AM.stored_ammo -= AC num_loaded++ @@ -95,17 +108,18 @@ break if(istype(A, /obj/item/ammo_casing)) var/obj/item/ammo_casing/AC = A - if(give_round(AC)) + if(give_round(AC, replace_spent)) user.drop_item() AC.loc = src num_loaded++ + if(num_loaded) if(!silent) user << "You load [num_loaded] shell\s into \the [src]!" A.update_icon() update_icon() - return num_loaded - return 0 + + return num_loaded /obj/item/ammo_box/attack_self(mob/user as mob) var/obj/item/ammo_casing/A = get_round() diff --git a/code/modules/projectiles/ammunition/ammo_casings.dm b/code/modules/projectiles/ammunition/ammo_casings.dm index a53b80ca1ed..4cf1351fbf1 100644 --- a/code/modules/projectiles/ammunition/ammo_casings.dm +++ b/code/modules/projectiles/ammunition/ammo_casings.dm @@ -96,6 +96,12 @@ icon_state = "ishell" projectile_type = /obj/item/projectile/bullet/incendiary/shell +/obj/item/ammo_casing/shotgun/frag12 + name = "FRAG-12 slug" + desc = "A high explosive breaching round for a 12 gauge shotgun." + icon_state = "heshell" + projectile_type = /obj/item/projectile/bullet/frag12 + /obj/item/ammo_casing/shotgun/incendiary/dragonsbreath name = "dragonsbreath shell" desc = "A shotgun shell which fires a spread of incendiary pellets." @@ -157,4 +163,4 @@ desc = "A cased high explosive grenade that can only be activated once fired out of a grenade launcher." caliber = "40mm" icon_state = "40mmHE" - projectile_type = /obj/item/projectile/bullet/a40mm \ No newline at end of file + projectile_type = /obj/item/projectile/bullet/a40mm diff --git a/code/modules/projectiles/ammunition/energy.dm b/code/modules/projectiles/ammunition/energy.dm index 5004ad7e4b6..a20e00aae51 100644 --- a/code/modules/projectiles/ammunition/energy.dm +++ b/code/modules/projectiles/ammunition/energy.dm @@ -71,7 +71,7 @@ /obj/item/ammo_casing/energy/ion projectile_type = /obj/item/projectile/ion select_name = "ion" - fire_sound = 'sound/weapons/Laser.ogg' + fire_sound = 'sound/weapons/IonRifle.ogg' /obj/item/ammo_casing/energy/declone projectile_type = /obj/item/projectile/energy/declone @@ -114,10 +114,10 @@ projectile_type = /obj/item/projectile/kinetic select_name = "kinetic" e_cost = 500 - fire_sound = 'sound/weapons/Gunshot4.ogg' + fire_sound = 'sound/weapons/Kenetic_accel.ogg' /obj/item/ammo_casing/energy/disabler - projectile_type = /obj/item/projectile/energy/disabler + projectile_type = /obj/item/projectile/beam/disabler select_name = "disable" e_cost = 50 fire_sound = "sound/weapons/taser.ogg" diff --git a/code/modules/projectiles/ammunition/magazines.dm b/code/modules/projectiles/ammunition/magazines.dm index 742541a7011..f9d3c7410a0 100644 --- a/code/modules/projectiles/ammunition/magazines.dm +++ b/code/modules/projectiles/ammunition/magazines.dm @@ -1,4 +1,9 @@ ////////////////INTERNAL MAGAZINES////////////////////// + +//internals magazines are accessible, so replace spent ammo if full when trying to put a live one in +/obj/item/ammo_box/magazine/internal/give_round(var/obj/item/ammo_casing/R) + return ..(R,1) + /obj/item/ammo_box/magazine/internal/cylinder name = "revolver cylinder" desc = "Oh god, this shouldn't be here" @@ -126,7 +131,7 @@ caliber = ".45" max_ammo = 20 -/obj/item/ammo_box/magazine/smgm/update_icon() +/obj/item/ammo_box/magazine/smgm45/update_icon() ..() icon_state = "[initial(icon_state)]-[round(ammo_count(),2)]" diff --git a/code/modules/projectiles/firing.dm b/code/modules/projectiles/firing.dm index 8abcea10af0..c5f2b3a0e7d 100644 --- a/code/modules/projectiles/firing.dm +++ b/code/modules/projectiles/firing.dm @@ -34,7 +34,7 @@ return 0 if(targloc == curloc) //Fire the projectile user.bullet_act(BB) - qdel(BB) + del(BB) return 1 BB.loc = get_turf(user) BB.starting = get_turf(user) diff --git a/code/modules/projectiles/gun.dm b/code/modules/projectiles/gun.dm index 97e0779a17f..240b2378209 100644 --- a/code/modules/projectiles/gun.dm +++ b/code/modules/projectiles/gun.dm @@ -1,3 +1,7 @@ + #define SAWN_INTACT 0 + #define SAWN_OFF 1 + #define SAWN_SAWING -1 + /obj/item/weapon/gun name = "gun" desc = "It's a gun. It's pretty terrible, though." @@ -23,6 +27,7 @@ var/obj/item/ammo_casing/chambered = null var/trigger_guard = 1 var/sawn_desc = null + var/sawn_state = SAWN_INTACT /obj/item/weapon/gun/proc/process_chamber() return 0 @@ -30,12 +35,17 @@ /obj/item/weapon/gun/proc/special_check(var/mob/M) //Placeholder for any special checks, like detective's revolver. return 1 +//check if there's enough ammo/energy/whatever to shoot one time +//i.e if clicking would make it shoot +/obj/item/weapon/gun/proc/can_shoot() + return 1 + /obj/item/weapon/gun/proc/shoot_with_empty_chamber(mob/living/user as mob|obj) user << "*click*" playsound(user, 'sound/weapons/empty.ogg', 100, 1) return -/obj/item/weapon/gun/proc/shoot_live_shot(mob/living/user as mob|obj, var/pointblank = 0, var/mob/pbtarget = null) +/obj/item/weapon/gun/proc/shoot_live_shot(mob/living/user as mob|obj, var/pointblank = 0, var/mob/pbtarget = null, var/message = 1) if(recoil) spawn() shake_camera(user, recoil + 1, recoil) @@ -44,6 +54,8 @@ playsound(user, fire_sound, 10, 1) else playsound(user, fire_sound, 50, 1) + if(!message) + return if(pointblank) user.visible_message("[user] fires [src] point blank at [pbtarget]!", "You fire [src] point blank at [pbtarget]!", "You hear a [istype(src, /obj/item/weapon/gun/energy) ? "laser blast" : "gunshot"]!") else @@ -62,43 +74,53 @@ return //Exclude lasertag guns from the CLUMSY check. - if(clumsy_check) + if(clumsy_check && can_shoot()) if(istype(user, /mob/living)) var/mob/living/M = user if ((CLUMSY in M.mutations) && prob(40)) - M << "You shoot yourself in the foot with \the [src]!" - afterattack(user, user) + user << "You shoot yourself in the foot with \the [src]!" + process_fire(user,user,0,params) M.drop_item() return + if(isliving(user)) + var/mob/living/L = user + if(!can_trigger_gun(L)) + return + + process_fire(target,user,flag,params) + +/obj/item/weapon/gun/proc/can_trigger_gun(mob/living/user) if (!user.IsAdvancedToolUser()) user << "You don't have the dexterity to do this!" - return + return 0 if(trigger_guard) - if(istype(user, /mob/living)) - var/mob/living/M = user - if (HULK in M.mutations) - M << "Your meaty finger is much too large for the trigger guard!" - return + if (HULK in user.mutations) + user << "Your meaty finger is much too large for the trigger guard!" + return 0 if(ishuman(user)) var/mob/living/carbon/human/H = user if(H.dna && NOGUNS in H.dna.species.specflags) user << "Your fingers don't fit in the trigger guard!" - return + return 0 + return 1 + +/obj/item/weapon/gun/proc/process_fire(atom/target as mob|obj|turf, mob/living/user as mob|obj, var/message = 1, params) add_fingerprint(user) + if(!special_check(user)) + return + if(chambered) if(!chambered.fire(target, user, params, , suppressed)) shoot_with_empty_chamber(user) else - if(!special_check(user)) - return if(get_dist(user, target) <= 1) //Making sure whether the target is in vicinity for the pointblank shot - shoot_live_shot(user, 1, target) + shoot_live_shot(user, 1, target,message) else - shoot_live_shot(user) + shoot_live_shot(user,message) else shoot_with_empty_chamber(user) process_chamber() diff --git a/code/modules/projectiles/guns/energy.dm b/code/modules/projectiles/guns/energy.dm index 08351551243..4c407cd5a20 100644 --- a/code/modules/projectiles/guns/energy.dm +++ b/code/modules/projectiles/guns/energy.dm @@ -35,7 +35,9 @@ /obj/item/weapon/gun/energy/afterattack(atom/target as mob|obj|turf, mob/living/user as mob|obj, params) newshot() //prepare a new shot ..() - +/obj/item/weapon/gun/energy/can_shoot() + var/obj/item/ammo_casing/energy/shot = ammo_type[select] + return power_supply.charge >= shot.e_cost /obj/item/weapon/gun/energy/proc/newshot() if (!ammo_type || !power_supply) diff --git a/code/modules/projectiles/guns/energy/laser.dm b/code/modules/projectiles/guns/energy/laser.dm index ebace57085b..75d5a076186 100644 --- a/code/modules/projectiles/guns/energy/laser.dm +++ b/code/modules/projectiles/guns/energy/laser.dm @@ -125,9 +125,11 @@ obj/item/weapon/gun/energy/laser/retro /obj/item/weapon/gun/energy/laser/bluetag/process() charge_tick++ - if(charge_tick < 4) return 0 + if(charge_tick < 4) + return 0 charge_tick = 0 - if(!power_supply) return 0 + if(!power_supply) + return 0 power_supply.give(100) update_icon() return 1 @@ -162,9 +164,11 @@ obj/item/weapon/gun/energy/laser/retro /obj/item/weapon/gun/energy/laser/redtag/process() charge_tick++ - if(charge_tick < 4) return 0 + if(charge_tick < 4) + return 0 charge_tick = 0 - if(!power_supply) return 0 + if(!power_supply) + return 0 power_supply.give(100) update_icon() return 1 diff --git a/code/modules/projectiles/guns/energy/nuclear.dm b/code/modules/projectiles/guns/energy/nuclear.dm index 7074c8102b1..6ca4a48924e 100644 --- a/code/modules/projectiles/guns/energy/nuclear.dm +++ b/code/modules/projectiles/guns/energy/nuclear.dm @@ -3,7 +3,7 @@ desc = "A basic hybrid energy gun with two settings: Stun and kill." icon_state = "energy" item_state = null //so the human update icon uses the icon_state instead. - ammo_type = list(/obj/item/ammo_casing/energy/electrode, /obj/item/ammo_casing/energy/laser) + ammo_type = list(/obj/item/ammo_casing/energy/disabler, /obj/item/ammo_casing/energy/laser) origin_tech = "combat=3;magnets=2" modifystate = 2 @@ -12,7 +12,6 @@ select_fire(user) update_icon() - /obj/item/weapon/gun/energy/gun/nuclear name = "advanced energy gun" desc = "An energy gun with an experimental miniaturized nuclear reactor that automatically charges the internal power cell." @@ -21,6 +20,7 @@ var/lightfail = 0 var/charge_tick = 0 modifystate = 0 + ammo_type = list(/obj/item/ammo_casing/energy/electrode, /obj/item/ammo_casing/energy/laser) /obj/item/weapon/gun/energy/gun/nuclear/New() ..() diff --git a/code/modules/projectiles/guns/energy/special.dm b/code/modules/projectiles/guns/energy/special.dm index f2392adfea0..4db3e4a9ffb 100644 --- a/code/modules/projectiles/guns/energy/special.dm +++ b/code/modules/projectiles/guns/energy/special.dm @@ -123,7 +123,7 @@ if(overheat || recent_reload) return power_supply.give(500) - playsound(src.loc, 'sound/weapons/shotgunpump.ogg', 60, 1) + playsound(src.loc, 'sound/weapons/kenetic_reload.ogg', 60, 1) recent_reload = 1 update_icon() return diff --git a/code/modules/projectiles/guns/energy/stun.dm b/code/modules/projectiles/guns/energy/stun.dm index 2c79a769a35..432594d9c8a 100644 --- a/code/modules/projectiles/guns/energy/stun.dm +++ b/code/modules/projectiles/guns/energy/stun.dm @@ -7,25 +7,37 @@ ammo_type = list(/obj/item/ammo_casing/energy/electrode) cell_type = "/obj/item/weapon/stock_parts/cell/crap" -/obj/item/weapon/gun/energy/taser/cyborg - name = "taser gun" - desc = "An integrated taser that draws directly from a cyborg's power cell. The weapon contains a limiter to prevent the cyborg's power cell from overheating." - icon_state = "taser" - fire_sound = 'sound/weapons/Taser.ogg' +/obj/item/weapon/gun/energy/stunrevolver + name = "stun revolver" + desc = "A high-tech revolver that fires internal, reusable stun cartidges in a revolving cylinder." + icon_state = "stunrevolver" + origin_tech = "combat=3;materials=3;powerstorage=2" + ammo_type = list(/obj/item/ammo_casing/energy/electrode/gun) + cell_type = "/obj/item/weapon/stock_parts/cell" + +/obj/item/weapon/gun/energy/gun/advtaser + name = "advanced taser" + desc = "A hybrid taser designed to fire both short-range high-power electrodes and long-range disabler beams." + icon_state = "advtaser" + ammo_type = list(/obj/item/ammo_casing/energy/electrode, /obj/item/ammo_casing/energy/disabler) + +/obj/item/weapon/gun/energy/gun/advtaser/cyborg + name = "advanced taser" + desc = "An integrated advanced taser that draws directly from a cyborg's power cell. The weapon contains a limiter to prevent the cyborg's power cell from overheating." cell_type = "/obj/item/weapon/stock_parts/cell/secborg" var/charge_tick = 0 - var/recharge_time = 10 //Time it takes for shots to recharge (in ticks) + var/recharge_time = 10 -/obj/item/weapon/gun/energy/taser/cyborg/New() +/obj/item/weapon/gun/energy/gun/advtaser/cyborg/New() ..() processing_objects.Add(src) -/obj/item/weapon/gun/energy/taser/cyborg/Destroy() +/obj/item/weapon/gun/energy/gun/advtaser/cyborg/Destroy() processing_objects.Remove(src) ..() -/obj/item/weapon/gun/energy/taser/cyborg/process() //Every [recharge_time] ticks, recharge a shot for the cyborg +/obj/item/weapon/gun/energy/gun/advtaser/cyborg/process() //Every [recharge_time] ticks, recharge a shot for the cyborg charge_tick++ if(charge_tick < recharge_time) return 0 charge_tick = 0 @@ -42,16 +54,6 @@ return 1 -/obj/item/weapon/gun/energy/stunrevolver - name = "stun revolver" - desc = "A high-tech revolver that fires internal, reusable stun cartidges in a revolving cylinder." - icon_state = "stunrevolver" - origin_tech = "combat=3;materials=3;powerstorage=2" - ammo_type = list(/obj/item/ammo_casing/energy/electrode/gun) - cell_type = "/obj/item/weapon/stock_parts/cell" - - - /obj/item/weapon/gun/energy/crossbow name = "mini energy crossbow" desc = "A weapon favored by syndicate stealth specialists." diff --git a/code/modules/projectiles/guns/magic.dm b/code/modules/projectiles/guns/magic.dm index f9a0be82b99..c575632c498 100644 --- a/code/modules/projectiles/guns/magic.dm +++ b/code/modules/projectiles/guns/magic.dm @@ -29,6 +29,9 @@ no_den_usage = 0 ..() +/obj/item/weapon/gun/magic/can_shoot() + return charges + /obj/item/weapon/gun/magic/proc/newshot() if (charges && chambered) chambered.newshot() diff --git a/code/modules/projectiles/guns/projectile.dm b/code/modules/projectiles/guns/projectile.dm index d2c6a9a29ba..b1540df35b9 100644 --- a/code/modules/projectiles/guns/projectile.dm +++ b/code/modules/projectiles/guns/projectile.dm @@ -40,6 +40,11 @@ chambered.loc = src return +/obj/item/weapon/gun/projectile/can_shoot() + if(!magazine || !magazine.ammo_count(0)) + return 0 + return 1 + /obj/item/weapon/gun/projectile/attackby(var/obj/item/A as obj, mob/user as mob) ..() if (istype(A, /obj/item/ammo_box/magazine)) diff --git a/code/modules/projectiles/guns/projectile/automatic.dm b/code/modules/projectiles/guns/projectile/automatic.dm index 6cfa117be6a..10763b224d3 100644 --- a/code/modules/projectiles/guns/projectile/automatic.dm +++ b/code/modules/projectiles/guns/projectile/automatic.dm @@ -17,6 +17,9 @@ if(..() && chambered) alarmed = 0 +/obj/item/weapon/gun/projectile/automatic/can_shoot() + return get_ammo() + /obj/item/weapon/gun/projectile/automatic/proc/empty_alarm() if(!chambered && !get_ammo() && !alarmed) playsound(src.loc, 'sound/weapons/smg_empty_alarm.ogg', 40, 1) diff --git a/code/modules/projectiles/guns/projectile/revolver.dm b/code/modules/projectiles/guns/projectile/revolver.dm index 7188ce64cbc..c829cff0c4a 100644 --- a/code/modules/projectiles/guns/projectile/revolver.dm +++ b/code/modules/projectiles/guns/projectile/revolver.dm @@ -5,7 +5,7 @@ mag_type = /obj/item/ammo_box/magazine/internal/cylinder /obj/item/weapon/gun/projectile/revolver/chamber_round() - if (chambered || !magazine) + if ((chambered && chambered.BB)|| !magazine) //if there's a live ammo in the chamber or no magazine return else if (magazine.ammo_count()) chambered = magazine.get_round(1) @@ -37,6 +37,9 @@ else user << "[src] is empty." +/obj/item/weapon/gun/projectile/revolver/can_shoot() + return get_ammo(0,0) + /obj/item/weapon/gun/projectile/revolver/get_ammo(var/countchambered = 0, var/countempties = 1) var/boolets = 0 //mature var names for mature people if (chambered && countchambered) @@ -172,7 +175,7 @@ return /obj/item/weapon/gun/projectile/revolver/russian/attack_self(mob/user as mob) - if(!spun && get_ammo(0,0)) + if(!spun && can_shoot()) user.visible_message("[user] spins the chamber of the revolver.", "You spin the revolver's chamber.") Spin() else @@ -190,34 +193,35 @@ user << "[src] is empty." /obj/item/weapon/gun/projectile/revolver/russian/afterattack(atom/target as mob|obj|turf, mob/living/user as mob|obj, flag, params) - if(!spun && get_ammo(0,0)) - user.visible_message("[user] spins the chamber of the revolver.", "You spin the revolver's chamber.") - Spin() - ..() - spun = 0 - -/obj/item/weapon/gun/projectile/revolver/russian/attack(atom/target as mob|obj|turf|area, mob/living/user as mob|obj) - if(!spun && get_ammo(0,0)) - user.visible_message("[user] spins the chamber of the revolver.", "You spin the revolver's chamber.") - Spin() + if(user.a_intent == "harm") // Flogging action + return + if(isliving(user)) + if(!can_trigger_gun(user)) + return + if(target != user) + user << "A mechanism prevents you from shooting anyone but yourself." return - - if(target == user) - if(!chambered) - user.visible_message("*click*", "*click*") + if(ishuman(user)) + var/mob/living/carbon/human/H = user + if(!spun) + user << "You need to spin the revolver's chamber first." return - if(isliving(target) && isliving(user)) - var/obj/item/organ/limb/affecting = user.zone_sel.selecting - if(affecting == "head") - var/obj/item/ammo_casing/AC = chambered - if(AC.fire(user, user)) + spun = 0 + + if(chambered) + var/obj/item/ammo_casing/AC = chambered + if(AC.fire(user, user)) + playsound(user, fire_sound, 50, 1) + var/obj/item/organ/limb/affecting = H.get_organ(check_zone(user.zone_sel.selecting)) + var/limb_name = affecting.getDisplayName() + if(affecting == "head" || affecting == "eyes" || affecting == "mouth") user.apply_damage(300, BRUTE, affecting) - playsound(user, fire_sound, 50, 1) - user.visible_message("[user.name] fires [src] at \his head!", "You fire [src] at your head!", "You hear a [istype(AC.BB, /obj/item/projectile/beam) ? "laser blast" : "gunshot"]!") - return + user.visible_message("[user.name] fires [src] at \his head!", "You fire [src] at your head!", "You hear a gunshot!") else - user.visible_message("*click*", "*click*") - return - ..() + user.visible_message("[user.name] cowardly fires [src] at \his [limb_name]!", "You cowardly fire [src] at your [limb_name]!", "You hear a gunshot!") + return + + user.visible_message("*click*") + playsound(user, 'sound/weapons/empty.ogg', 100, 1) diff --git a/code/modules/projectiles/guns/projectile/shotgun.dm b/code/modules/projectiles/guns/projectile/shotgun.dm index 1858059454a..9683e458354 100644 --- a/code/modules/projectiles/guns/projectile/shotgun.dm +++ b/code/modules/projectiles/guns/projectile/shotgun.dm @@ -25,6 +25,11 @@ /obj/item/weapon/gun/projectile/shotgun/chamber_round() return +/obj/item/weapon/gun/projectile/shotgun/can_shoot() + if(!chambered) + return 0 + return (chambered.BB ? 1 : 0) + /obj/item/weapon/gun/projectile/shotgun/attack_self(mob/living/user) if(recentpump) return pump(user) @@ -69,8 +74,12 @@ /obj/item/weapon/gun/projectile/shotgun/riot/attackby(var/obj/item/A as obj, mob/user as mob) ..() - if(istype(A, /obj/item/weapon/circular_saw) || istype(A, /obj/item/weapon/melee/energy) || istype(A, /obj/item/weapon/pickaxe/plasmacutter)) + if(istype(A, /obj/item/weapon/circular_saw) || istype(A, /obj/item/weapon/pickaxe/plasmacutter)) sawoff(user) + if(istype(A, /obj/item/weapon/melee/energy)) + var/obj/item/weapon/melee/energy/W = A + if(W.active) + sawoff(user) /obj/item/weapon/gun/projectile/revolver/doublebarrel name = "double-barreled shotgun" @@ -89,27 +98,13 @@ ..() if(istype(A, /obj/item/ammo_box) || istype(A, /obj/item/ammo_casing)) chamber_round() - if(istype(A, /obj/item/weapon/circular_saw) || istype(A, /obj/item/weapon/melee/energy) || istype(A, /obj/item/weapon/pickaxe/plasmacutter)) + if(istype(A, /obj/item/weapon/melee/energy)) + var/obj/item/weapon/melee/energy/W = A + if(W.active) + sawoff(user) + if(istype(A, /obj/item/weapon/circular_saw) || istype(A, /obj/item/weapon/pickaxe/plasmacutter)) sawoff(user) -/obj/item/weapon/gun/projectile/proc/sawoff(mob/user as mob) - user << "You begin to shorten \the [src]." - if(get_ammo()) - afterattack(user, user) - user.visible_message("The [src] goes off!", "The [src] goes off in your face!") - return - if(do_after(user, 30)) - name = "sawn-off [src.name]" - desc = sawn_desc - icon_state = initial(icon_state) + "-sawn" - w_class = 3.0 - item_state = "gun" - slot_flags &= ~SLOT_BACK //you can't sling it on your back - slot_flags |= SLOT_BELT //but you can wear it on your belt (poorly concealed under a trenchcoat, ideally) - user << "You shorten \the [src]!" - update_icon() - return - /obj/item/weapon/gun/projectile/revolver/doublebarrel/attack_self(mob/living/user as mob) var/num_unloaded = 0 while (get_ammo() > 0) @@ -140,7 +135,7 @@ /obj/item/weapon/gun/projectile/revolver/doublebarrel/improvised/attackby(var/obj/item/A as obj, mob/user as mob) ..() - if(istype(A, /obj/item/stack/cable_coil)) + if(istype(A, /obj/item/stack/cable_coil) && !sawn_state) var/obj/item/stack/cable_coil/C = A if(C.use(10)) flags = CONDUCT @@ -150,4 +145,55 @@ update_icon() else user << "You need at least ten lengths of cable if you want to make a sling." - return \ No newline at end of file + return + +//Sawing guns related procs +/obj/item/weapon/gun/projectile/proc/blow_up(mob/user as mob) + . = 0 + for(var/obj/item/ammo_casing/AC in magazine.stored_ammo) + if(AC.BB) + process_fire(user, user) + . = 1 + +/obj/item/weapon/gun/projectile/shotgun/blow_up(mob/user as mob) + . = 0 + if(chambered && chambered.BB) + process_fire(user, user,0) + . = 1 + for(var/obj/item/ammo_casing/AC in magazine.stored_ammo) + if(AC.BB) + chambered = AC + process_fire(user, user,0) + . = 1 + +/obj/item/weapon/gun/projectile/proc/sawoff(mob/user as mob) + if(sawn_state == SAWN_OFF) + user << "\The [src] is already shorten." + return + + if(sawn_state == SAWN_SAWING) + return + + user.visible_message("[user] begin to shorten \the [src].", "You begin to shorten \the [src].") + + //if there's any live ammo inside the gun, makes it go off + if(blow_up(user)) + user.visible_message("\The [src] goes off!", "\The [src] goes off in your face!") + return + + sawn_state = SAWN_SAWING + + if(do_after(user, 30)) + name = "sawn-off [src.name]" + desc = sawn_desc + icon_state = initial(icon_state) + "-sawn" + w_class = 3.0 + item_state = "gun" + slot_flags &= ~SLOT_BACK //you can't sling it on your back + slot_flags |= SLOT_BELT //but you can wear it on your belt (poorly concealed under a trenchcoat, ideally) + sawn_state = SAWN_OFF + user.visible_message("[user] shorten \the [src]!", "You shorten \the [src]!") + update_icon() + return + else + sawn_state = SAWN_INTACT \ No newline at end of file diff --git a/code/modules/projectiles/projectile.dm b/code/modules/projectiles/projectile.dm index d2dc5b61e67..02798ab0189 100644 --- a/code/modules/projectiles/projectile.dm +++ b/code/modules/projectiles/projectile.dm @@ -35,8 +35,24 @@ var/stutter = 0 var/eyeblur = 0 var/drowsy = 0 + var/stamina = 0 var/forcedodge = 0 + var/range = 0 + var/proj_hit = 0 + +/obj/item/projectile/proc/Range() + if(range) + range-- + if(range <= 0) + on_range() + else + return + +/obj/item/projectile/proc/on_range() //if we want there to be effects when they reach the end of their range + proj_hit = 1 + qdel(src) + /obj/item/projectile/proc/on_hit(atom/target, blocked = 0, hit_zone) if(!isliving(target)) return 0 if(isanimal(target)) return 0 @@ -115,6 +131,3 @@ Bump(original) Range() sleep(1) - -/obj/item/projectile/proc/Range() - return \ No newline at end of file diff --git a/code/modules/projectiles/projectile/beams.dm b/code/modules/projectiles/projectile/beams.dm index d6bfe72329a..d9bba99275d 100644 --- a/code/modules/projectiles/projectile/beams.dm +++ b/code/modules/projectiles/projectile/beams.dm @@ -36,6 +36,13 @@ irradiate = 30 forcedodge = 1 +/obj/item/projectile/beam/disabler + name = "disabler beam" + icon_state = "omnilaser" + damage = 33 + damage_type = STAMINA + eyeblur = 0 + /obj/item/projectile/beam/pulse name = "pulse" icon_state = "u_laser" diff --git a/code/modules/projectiles/projectile/bullets.dm b/code/modules/projectiles/projectile/bullets.dm index a3634a488f6..e48c944e162 100644 --- a/code/modules/projectiles/projectile/bullets.dm +++ b/code/modules/projectiles/projectile/bullets.dm @@ -9,14 +9,12 @@ /obj/item/projectile/bullet/weakbullet damage = 5 - stun = 5 - weaken = 5 + stamina = 33 /obj/item/projectile/bullet/weakbullet2 damage = 15 - stun = 5 - weaken = 5 + stamina = 50 /obj/item/projectile/bullet/weakbullet3 damage = 20 @@ -30,8 +28,7 @@ /obj/item/projectile/bullet/midbullet damage = 20 - stun = 5 - weaken = 5 + stamina = 50 /obj/item/projectile/bullet/midbullet2 damage = 25 @@ -46,8 +43,7 @@ /obj/item/projectile/bullet/stunshot name = "stunshot" damage = 5 - stun = 5 - weaken = 5 + stamina = 50 stutter = 5 /obj/item/projectile/bullet/incendiary diff --git a/code/modules/projectiles/projectile/energy.dm b/code/modules/projectiles/projectile/energy.dm index 2f64825d1fd..13c015ab0cd 100644 --- a/code/modules/projectiles/projectile/energy.dm +++ b/code/modules/projectiles/projectile/energy.dm @@ -15,13 +15,24 @@ weaken = 5 stutter = 5 hitsound = "sparks" + range = 7 - on_hit(var/atom/target, var/blocked = 0) +/obj/item/projectile/energy/electrode/on_hit(var/atom/target, var/blocked = 0) + if(!proj_hit) if(!ismob(target) || blocked >= 2) //Fully blocked by mob or collided with dense object - burst into sparks! var/datum/effect/effect/system/spark_spread/sparks = new /datum/effect/effect/system/spark_spread sparks.set_up(1, 1, src) sparks.start() - ..() + proj_hit = 1 + ..() + +/obj/item/projectile/energy/electrode/on_range() //to ensure the bolt sparks when it reaches the end of its range if it didn't hit a target yet + if(!proj_hit) + var/datum/effect/effect/system/spark_spread/sparks = new /datum/effect/effect/system/spark_spread + sparks.set_up(1, 1, src) + sparks.start() + proj_hit = 1 + ..() /obj/item/projectile/energy/declone name = "radiation beam" @@ -31,39 +42,24 @@ irradiate = 40 -/obj/item/projectile/energy/dart +/obj/item/projectile/energy/dart //ninja throwing dart name = "dart" icon_state = "toxin" damage = 5 damage_type = TOX weaken = 5 + range = 7 - -/obj/item/projectile/energy/bolt +/obj/item/projectile/energy/bolt //ebow bolts name = "bolt" icon_state = "cbbolt" - damage = 10 + damage = 15 damage_type = TOX nodamage = 0 weaken = 5 stutter = 5 - + range = 10 /obj/item/projectile/energy/bolt/large name = "largebolt" damage = 20 - -/obj/item/projectile/energy/disabler - name = "disabler beam" - icon_state = "omnilaser" - damage = 34 - damage_type = STAMINA - var/range = 7 - -/obj/item/projectile/energy/disabler/Range() - range-- - if(range <= 0) - qdel(src) - - - diff --git a/code/modules/projectiles/projectile/special.dm b/code/modules/projectiles/projectile/special.dm index a359fb02159..65a0c7c1451 100644 --- a/code/modules/projectiles/projectile/special.dm +++ b/code/modules/projectiles/projectile/special.dm @@ -18,7 +18,6 @@ damage = 50 flag = "bullet" - /obj/item/projectile/bullet/gyro/on_hit(atom/target, blocked = 0) explosion(target, -1, 0, 2) return 1 @@ -29,6 +28,7 @@ icon_state= "bolter" damage = 60 flag = "bullet" + range = 7 /obj/item/projectile/bullet/a40mm/on_hit(atom/target, blocked = 0) explosion(target, -1, 0, 2, 1, 0, flame_range = 3) @@ -105,7 +105,7 @@ damage = 15 damage_type = BRUTE flag = "bomb" - var/range = 3 + range = 3 obj/item/projectile/kinetic/New() var/turf/proj_turf = get_turf(src) @@ -168,3 +168,14 @@ obj/item/projectile/kinetic/New() if(!gun) qdel(src) gun.create_portal(src) + + +/obj/item/projectile/bullet/gyro/on_hit(atom/target, blocked = 0) + explosion(target, -1, 0, 2) + return 1 + + +/obj/item/projectile/bullet/frag12 + name ="explosive slug" + damage = 25 + weaken = 5 diff --git a/code/modules/reagents/Chemistry-Holder.dm b/code/modules/reagents/Chemistry-Holder.dm index 9e4da4d8a40..a6d6d2572e2 100644 --- a/code/modules/reagents/Chemistry-Holder.dm +++ b/code/modules/reagents/Chemistry-Holder.dm @@ -283,7 +283,7 @@ datum/reagents/proc/handle_reactions() if(ME2.Uses <= 0) // give the notification that the slime core is dead for(var/mob/M in seen) M << "\icon[my_atom] The [my_atom]'s power is consumed in the reaction." - ME2.name = "\improper used slime extract" + ME2.name = "used slime extract" ME2.desc = "This extract has been used up." playsound(get_turf(my_atom), 'sound/effects/bubbles.ogg', 80, 1) diff --git a/code/modules/reagents/Chemistry-Reagents.dm b/code/modules/reagents/Chemistry-Reagents.dm deleted file mode 100644 index 4a278afbdbe..00000000000 --- a/code/modules/reagents/Chemistry-Reagents.dm +++ /dev/null @@ -1,3477 +0,0 @@ -#define SOLID 1 -#define LIQUID 2 -#define GAS 3 - -#define REM REAGENTS_EFFECT_MULTIPLIER - -//The reaction procs must ALWAYS set src = null, this detaches the proc from the object (the reagent) -//so that it can continue working when the reagent is deleted while the proc is still active. - - -datum/reagent - var/name = "Reagent" - var/id = "reagent" - var/description = "" - var/datum/reagents/holder = null - var/reagent_state = SOLID - var/list/data - var/volume = 0 - var/nutriment_factor = 0 - //var/list/viruses = list() - var/color = "#000000" // rgb: 0, 0, 0 (does not support alpha channels - yet!) - -datum/reagent/proc/reaction_mob(var/mob/M, var/method=TOUCH, var/volume) //By default we have a chance to transfer some - if(!istype(M, /mob/living)) return 0 - var/datum/reagent/self = src - src = null //of the reagent to the mob on TOUCHING it. - - if(!istype(self.holder.my_atom, /obj/effect/effect/chem_smoke)) - // If the chemicals are in a smoke cloud, do not try to let the chemicals "penetrate" into the mob's system (balance station 13) -- Doohl - - if(method == TOUCH) - - var/chance = 1 - var/block = 0 - - for(var/obj/item/clothing/C in M.get_equipped_items()) - if(C.permeability_coefficient < chance) chance = C.permeability_coefficient - if(istype(C, /obj/item/clothing/suit/bio_suit)) - // bio suits are just about completely fool-proof - Doohl - // kind of a hacky way of making bio suits more resistant to chemicals but w/e - if(prob(75)) - block = 1 - - if(istype(C, /obj/item/clothing/head/bio_hood)) - if(prob(75)) - block = 1 - - chance = chance * 100 - - if(prob(chance) && !block) - if(M.reagents) - M.reagents.add_reagent(self.id,self.volume/2) - return 1 - -datum/reagent/proc/reaction_obj(var/obj/O, var/volume) //By default we transfer a small part of the reagent to the object - src = null //if it can hold reagents. nope! - //if(O.reagents) - // O.reagents.add_reagent(id,volume/3) - return - -datum/reagent/proc/reaction_turf(var/turf/T, var/volume) - src = null - return - -datum/reagent/proc/on_mob_life(var/mob/living/M as mob) - if(!istype(M, /mob/living)) - return //Noticed runtime errors from pacid trying to damage ghosts, this should fix. --NEO - holder.remove_reagent(src.id, REAGENTS_METABOLISM) //By default it slowly disappears. - return - -datum/reagent/proc/on_move(var/mob/M) - return - -// Called after add_reagents creates a new reagent. -datum/reagent/proc/on_new(var/data) - return - -// Called when two reagents of the same are mixing. -datum/reagent/proc/on_merge(var/data) - return - -datum/reagent/proc/on_update(var/atom/A) - return - -datum/reagent/blood - data = list("donor"=null,"viruses"=null,"blood_DNA"=null,"blood_type"=null,"resistances"=null,"trace_chem"=null,"mind"=null,"ckey"=null,"gender"=null,"real_name"=null,"cloneable"=null) - name = "Blood" - id = "blood" - reagent_state = LIQUID - color = "#C80000" // rgb: 200, 0, 0 - -datum/reagent/blood/reaction_mob(var/mob/M, var/method=TOUCH, var/volume) - var/datum/reagent/blood/self = src - src = null - if(self.data && self.data["viruses"]) - for(var/datum/disease/D in self.data["viruses"]) - - if(D.spread_flags & SPECIAL || D.spread_flags & NON_CONTAGIOUS) - continue - - if(method == TOUCH) - M.ContractDisease(D) - else //injected - M.ForceContractDisease(D) - -datum/reagent/blood/on_new(var/list/data) - if(istype(data)) - SetViruses(src, data) - -datum/reagent/blood/on_merge(var/list/data) - if(src.data && data) - src.data["cloneable"] = 0 //On mix, consider the genetic sampling unviable for pod cloning, or else we won't know who's even getting cloned, etc - if(src.data["viruses"] || data["viruses"]) - - var/list/mix1 = src.data["viruses"] - var/list/mix2 = data["viruses"] - - // Stop issues with the list changing during mixing. - var/list/to_mix = list() - - for(var/datum/disease/advance/AD in mix1) - to_mix += AD - for(var/datum/disease/advance/AD in mix2) - to_mix += AD - - var/datum/disease/advance/AD = Advance_Mix(to_mix) - if(AD) - var/list/preserve = list(AD) - for(var/D in src.data["viruses"]) - if(!istype(D, /datum/disease/advance)) - preserve += D - src.data["viruses"] = preserve - return 1 - - -datum/reagent/blood/reaction_turf(var/turf/simulated/T, var/volume)//splash the blood all over the place - if(!istype(T)) return - var/datum/reagent/blood/self = src - src = null - if(!(volume >= 3)) return - //var/datum/disease/D = self.data["virus"] - if(!self.data["donor"] || istype(self.data["donor"], /mob/living/carbon/human)) - var/obj/effect/decal/cleanable/blood/blood_prop = locate() in T //find some blood here - if(!blood_prop) //first blood! - blood_prop = new(T) - blood_prop.blood_DNA[self.data["blood_DNA"]] = self.data["blood_type"] - - for(var/datum/disease/D in self.data["viruses"]) - var/datum/disease/newVirus = D.Copy(1) - blood_prop.viruses += newVirus - newVirus.holder = blood_prop - - - else if(istype(self.data["donor"], /mob/living/carbon/monkey)) - var/obj/effect/decal/cleanable/blood/blood_prop = locate() in T - if(!blood_prop) - blood_prop = new(T) - blood_prop.blood_DNA["Non-Human DNA"] = "A+" - for(var/datum/disease/D in self.data["viruses"]) - var/datum/disease/newVirus = D.Copy(1) - blood_prop.viruses += newVirus - newVirus.holder = blood_prop - - else if(istype(self.data["donor"], /mob/living/carbon/alien)) - var/obj/effect/decal/cleanable/xenoblood/blood_prop = locate() in T - if(!blood_prop) - blood_prop = new(T) - blood_prop.blood_DNA["UNKNOWN DNA STRUCTURE"] = "X*" - for(var/datum/disease/D in self.data["viruses"]) - var/datum/disease/newVirus = D.Copy(1) - blood_prop.viruses += newVirus - newVirus.holder = blood_prop - return - -/* Must check the transfering of reagents and their data first. They all can point to one disease datum. - - Del() - if(src.data["virus"]) - var/datum/disease/D = src.data["virus"] - D.cure(0) - ..() -*/ -datum/reagent/vaccine - //data must contain virus type - name = "Vaccine" - id = "vaccine" - reagent_state = LIQUID - color = "#C81040" // rgb: 200, 16, 64 - -datum/reagent/vaccine/reaction_mob(var/mob/M, var/method=TOUCH, var/volume) - var/datum/reagent/vaccine/self = src - src = null - if(islist(self.data) && method == INGEST) - for(var/datum/disease/D in M.viruses) - if(D.GetDiseaseID() in self.data) - D.cure() - M.resistances |= self.data - return - -datum/reagent/vaccine/on_merge(var/list/data) - if(istype(data)) - src.data |= data.Copy() - - -datum/reagent/water - name = "Water" - id = "water" - description = "A ubiquitous chemical substance that is composed of hydrogen and oxygen." - reagent_state = LIQUID - color = "#AAAAAA77" // rgb: 170, 170, 170, 77 (alpha) - var/cooling_temperature = 2 - -datum/reagent/water/reaction_turf(var/turf/simulated/T, var/volume) - if (!istype(T)) return - var/CT = cooling_temperature - src = null - if(volume >= 10) - T.MakeSlippery() - - for(var/mob/living/carbon/slime/M in T) - M.apply_water() - - var/hotspot = (locate(/obj/effect/hotspot) in T) - if(hotspot && !istype(T, /turf/space)) - if(T.air) - var/datum/gas_mixture/G = T.air - G.temperature = max(min(G.temperature-(CT*1000),G.temperature/CT),0) - G.react() - qdel(hotspot) - return - -datum/reagent/water/reaction_obj(var/obj/O, var/volume) - src = null - if(istype(O,/obj/item/weapon/reagent_containers/food/snacks/monkeycube)) - var/obj/item/weapon/reagent_containers/food/snacks/monkeycube/cube = O - if(!cube.wrapped) - cube.Expand() - return - -datum/reagent/water/reaction_mob(var/mob/living/M, var/method=TOUCH, var/volume)//Splashing people with water can help put them out! - if(!istype(M, /mob/living)) - return - if(method == TOUCH) - M.adjust_fire_stacks(-(volume / 10)) - if(M.fire_stacks <= 0) - M.ExtinguishMob() - return - -datum/reagent/water/holywater - name = "Holy Water" - id = "holywater" - description = "Water blessed by some deity." - color = "#E0E8EF" // rgb: 224, 232, 239 - -datum/reagent/water/holywater/on_mob_life(var/mob/living/M as mob) - if(!data) data = 1 - data++ - M.jitteriness = max(M.jitteriness-5,0) - if(data >= 30) // 12 units, 54 seconds @ metabolism 0.4 units & tick rate 1.8 sec - if (!M.stuttering) M.stuttering = 1 - M.stuttering += 4 - M.Dizzy(5) - if(iscultist(M) && prob(5)) - M.say(pick("Av'te Nar'sie","Pa'lid Mors","INO INO ORA ANA","SAT ANA!","Daim'niodeis Arc'iai Le'eones","Egkau'haom'nai en Chaous","Ho Diak'nos tou Ap'iron","R'ge Na'sie","Diabo us Vo'iscum","Si gn'um Co'nu")) - if(data >= 75 && prob(33)) // 30 units, 135 seconds - if (!M.confused) M.confused = 1 - M.confused += 3 - if(iscultist(M)) - ticker.mode.remove_cultist(M.mind) - holder.remove_reagent(src.id, src.volume) // maybe this is a little too perfect and a max() cap on the statuses would be better?? - M.jitteriness = 0 - M.stuttering = 0 - M.confused = 0 - holder.remove_reagent(src.id, 0.4) //fixed consumption to prevent balancing going out of whack - return - -datum/reagent/water/holywater/reaction_turf(var/turf/simulated/T, var/volume) - ..() - if(!istype(T)) return - if(volume>=10) - for(var/obj/effect/rune/R in T) - qdel(R) - T.Bless() - -datum/reagent/fuel/unholywater //if you somehow managed to extract this from someone, dont splash it on yourself and have a smoke - name = "Unholy Water" - id = "unholywater" - description = "Something that shouldn't exist on this plane of existance." - -datum/reagent/fuel/unholywater/on_mob_life(var/mob/living/M as mob) - M.adjustBrainLoss(3) - if(iscultist(M)) - M.status_flags |= GOTTAGOFAST - M.drowsyness = max(M.drowsyness-5, 0) - M.AdjustParalysis(-2) - M.AdjustStunned(-2) - M.AdjustWeakened(-2) - else - M.adjustToxLoss(2) - M.adjustFireLoss(2) - M.adjustOxyLoss(2) - M.adjustBruteLoss(2) - holder.remove_reagent(src.id, 1) - -datum/reagent/hellwater //if someone has this in their system they've really pissed off an eldrich god - name = "Hell Water" - id = "hell_water" - description = "YOUR FLESH! IT BURNS!" - -datum/reagent/hellwater/on_mob_life(var/mob/living/M as mob) - M.fire_stacks = min(5,M.fire_stacks + 3) - M.IgniteMob() //Only problem with igniting people is currently the commonly availible fire suits make you immune to being on fire - M.adjustToxLoss(1) - M.adjustFireLoss(1) //Hence the other damages... ain't I a bastard? - M.adjustBrainLoss(5) - holder.remove_reagent(src.id, 1) - -datum/reagent/lube - name = "Space Lube" - id = "lube" - description = "Lubricant is a substance introduced between two moving surfaces to reduce the friction and wear between them. giggity." - reagent_state = LIQUID - color = "#009CA8" // rgb: 0, 156, 168 - -datum/reagent/lube/reaction_turf(var/turf/simulated/T, var/volume) - if (!istype(T)) return - src = null - if(volume >= 1) - T.MakeSlippery(2) - -datum/reagent/slimetoxin - name = "Mutation Toxin" - id = "mutationtoxin" - description = "A corruptive toxin produced by slimes." - reagent_state = LIQUID - color = "#13BC5E" // rgb: 19, 188, 94 - -datum/reagent/aslimetoxin - name = "Advanced Mutation Toxin" - id = "amutationtoxin" - description = "An advanced corruptive toxin produced by slimes." - reagent_state = LIQUID - color = "#13BC5E" // rgb: 19, 188, 94 - -datum/reagent/aslimetoxin/reaction_mob(var/mob/M, var/volume) - src = null - M.ForceContractDisease(new /datum/disease/transformation/slime(0)) - -datum/reagent/inaprovaline - name = "Inaprovaline" - id = "inaprovaline" - description = "Inaprovaline is a synaptic stimulant and cardiostimulant. Commonly used to stabilize patients." - reagent_state = LIQUID - color = "#C8A5DC" // rgb: 200, 165, 220 - -datum/reagent/inaprovaline/on_mob_life(var/mob/living/M as mob) - if(!M) M = holder.my_atom - if(M.losebreath >= 10) - M.losebreath = max(10, M.losebreath-5) - holder.remove_reagent(src.id, 0.5 * REAGENTS_METABOLISM) - return - -datum/reagent/space_drugs - name = "Space drugs" - id = "space_drugs" - description = "An illegal chemical compound used as drug." - reagent_state = LIQUID - color = "#60A584" // rgb: 96, 165, 132 - -datum/reagent/space_drugs/on_mob_life(var/mob/living/M as mob) - if(!M) M = holder.my_atom - M.druggy = max(M.druggy, 15) - if(isturf(M.loc) && !istype(M.loc, /turf/space)) - if(M.canmove) - if(prob(10)) step(M, pick(cardinal)) - if(prob(7)) M.emote(pick("twitch","drool","moan","giggle")) - holder.remove_reagent(src.id, 0.5 * REAGENTS_METABOLISM) - return - -datum/reagent/serotrotium - name = "Serotrotium" - id = "serotrotium" - description = "A chemical compound that promotes concentrated production of the serotonin neurotransmitter in humans." - reagent_state = LIQUID - color = "#202040" // rgb: 20, 20, 40 - -datum/reagent/serotrotium/on_mob_life(var/mob/living/M as mob) - if(ishuman(M)) - if(prob(7)) M.emote(pick("twitch","drool","moan","gasp")) - holder.remove_reagent(src.id, 0.25 * REAGENTS_METABOLISM) - return - -/* silicate - name = "Silicate" - id = "silicate" - description = "A compound that can be used to reinforce glass." - reagent_state = LIQUID - color = "#C7FFFF" // rgb: 199, 255, 255 - - reaction_obj(var/obj/O, var/volume) - src = null - if(istype(O,/obj/structure/window)) - if(O:silicate <= 200) - - O:silicate += volume - O:health += volume * 3 - - if(!O:silicateIcon) - var/icon/I = icon(O.icon,O.icon_state,O.dir) - - var/r = (volume / 100) + 1 - var/g = (volume / 70) + 1 - var/b = (volume / 50) + 1 - I.SetIntensity(r,g,b) - O.icon = I - O:silicateIcon = I - else - var/icon/I = O:silicateIcon - - var/r = (volume / 100) + 1 - var/g = (volume / 70) + 1 - var/b = (volume / 50) + 1 - I.SetIntensity(r,g,b) - O.icon = I - O:silicateIcon = I - - return*/ - -datum/reagent/oxygen - name = "Oxygen" - id = "oxygen" - description = "A colorless, odorless gas." - reagent_state = GAS - color = "#808080" // rgb: 128, 128, 128 - -datum/reagent/copper - name = "Copper" - id = "copper" - description = "A highly ductile metal." - color = "#6E3B08" // rgb: 110, 59, 8 - -datum/reagent/nitrogen - name = "Nitrogen" - id = "nitrogen" - description = "A colorless, odorless, tasteless gas." - reagent_state = GAS - color = "#808080" // rgb: 128, 128, 128 - -datum/reagent/hydrogen - name = "Hydrogen" - id = "hydrogen" - description = "A colorless, odorless, nonmetallic, tasteless, highly combustible diatomic gas." - reagent_state = GAS - color = "#808080" // rgb: 128, 128, 128 - -datum/reagent/potassium - name = "Potassium" - id = "potassium" - description = "A soft, low-melting solid that can easily be cut with a knife. Reacts violently with water." - reagent_state = SOLID - color = "#A0A0A0" // rgb: 160, 160, 160 - -datum/reagent/mercury - name = "Mercury" - id = "mercury" - description = "A chemical element." - reagent_state = LIQUID - color = "#484848" // rgb: 72, 72, 72 - -datum/reagent/mercury/on_mob_life(var/mob/living/M as mob) - if(!M) M = holder.my_atom - if(M.canmove && istype(M.loc, /turf/space)) - step(M, pick(cardinal)) - if(prob(5)) M.emote(pick("twitch","drool","moan")) - M.adjustBrainLoss(2) - ..() - return - -datum/reagent/sulfur - name = "Sulfur" - id = "sulfur" - description = "A chemical element." - reagent_state = SOLID - color = "#BF8C00" // rgb: 191, 140, 0 - -datum/reagent/carbon - name = "Carbon" - id = "carbon" - description = "A chemical element." - reagent_state = SOLID - color = "#1C1300" // rgb: 30, 20, 0 - -datum/reagent/carbon/reaction_turf(var/turf/T, var/volume) - src = null - if(!istype(T, /turf/space)) - new /obj/effect/decal/cleanable/dirt(T) - -datum/reagent/chlorine - name = "Chlorine" - id = "chlorine" - description = "A chemical element." - reagent_state = GAS - color = "#808080" // rgb: 128, 128, 128 - -datum/reagent/chlorine/on_mob_life(var/mob/living/M as mob) - if(!M) M = holder.my_atom - M.take_organ_damage(1*REM, 0) - ..() - return - -datum/reagent/fluorine - name = "Fluorine" - id = "fluorine" - description = "A highly-reactive chemical element." - reagent_state = GAS - color = "#808080" // rgb: 128, 128, 128 - -datum/reagent/fluorine/on_mob_life(var/mob/living/M as mob) - if(!M) M = holder.my_atom - M.adjustToxLoss(1*REM) - ..() - return - -datum/reagent/sodium - name = "Sodium" - id = "sodium" - description = "A chemical element." - reagent_state = SOLID - color = "#808080" // rgb: 128, 128, 128 - -datum/reagent/phosphorus - name = "Phosphorus" - id = "phosphorus" - description = "A chemical element." - reagent_state = SOLID - color = "#832828" // rgb: 131, 40, 40 - -datum/reagent/lithium - name = "Lithium" - id = "lithium" - description = "A chemical element." - reagent_state = SOLID - color = "#808080" // rgb: 128, 128, 128 - -datum/reagent/lithium/on_mob_life(var/mob/living/M as mob) - if(!M) M = holder.my_atom - if(M.canmove && istype(M.loc, /turf/space)) - step(M, pick(cardinal)) - if(prob(5)) M.emote(pick("twitch","drool","moan")) - ..() - return - -datum/reagent/sugar - name = "Sugar" - id = "sugar" - description = "The organic compound commonly known as table sugar and sometimes called saccharose. This white, odorless, crystalline powder has a pleasing, sweet taste." - reagent_state = SOLID - color = "#FFFFFF" // rgb: 255, 255, 255 - -datum/reagent/sugar/on_mob_life(var/mob/living/M as mob) - M.nutrition += 1*REM - ..() - return - -datum/reagent/glycerol - name = "Glycerol" - id = "glycerol" - description = "Glycerol is a simple polyol compound. Glycerol is sweet-tasting and of low toxicity." - reagent_state = LIQUID - color = "#808080" // rgb: 128, 128, 128 - -datum/reagent/nitroglycerin - name = "Nitroglycerin" - id = "nitroglycerin" - description = "Nitroglycerin is a heavy, colorless, oily, explosive liquid obtained by nitrating glycerol." - reagent_state = LIQUID - color = "#808080" // rgb: 128, 128, 128 - -datum/reagent/radium - name = "Radium" - id = "radium" - description = "Radium is an alkaline earth metal. It is extremely radioactive." - reagent_state = SOLID - color = "#C7C7C7" // rgb: 199,199,199 - -datum/reagent/radium/on_mob_life(var/mob/living/M as mob) - if(!M) M = holder.my_atom - M.apply_effect(2*REM,IRRADIATE,0) - ..() - return - -datum/reagent/radium/reaction_turf(var/turf/T, var/volume) - src = null - if(volume >= 3) - if(!istype(T, /turf/space)) - new /obj/effect/decal/cleanable/greenglow(T) - return - - -datum/reagent/ryetalyn - name = "Ryetalyn" - id = "ryetalyn" - description = "Ryetalyn can cure all genetic abnomalities." - reagent_state = SOLID - color = "#C8A5DC" // rgb: 200, 165, 220 - -datum/reagent/ryetalyn/on_mob_life(var/mob/living/M as mob) - if(!M) M = holder.my_atom - - var/needs_update = M.mutations.len > 0 - - M.mutations = list() - M.disabilities = 0 - M.sdisabilities = 0 - M.jitteriness = 0 - - // Might need to update appearance for hulk etc. - if(needs_update && ishuman(M)) - var/mob/living/carbon/human/H = M - H.update_mutations() - - ..() - return - -datum/reagent/thermite - name = "Thermite" - id = "thermite" - description = "Thermite produces an aluminothermic reaction known as a thermite reaction. Can be used to melt walls." - reagent_state = SOLID - color = "#673910" // rgb: 103, 57, 16 - -datum/reagent/thermite/reaction_turf(var/turf/T, var/volume) - src = null - if(volume >= 1 && istype(T, /turf/simulated/wall)) - var/turf/simulated/wall/Wall = T - if(istype(Wall, /turf/simulated/wall/r_wall)) - Wall.thermite = Wall.thermite+(volume*2.5) - else - Wall.thermite = Wall.thermite+(volume*10) - Wall.overlays = list() - Wall.overlays += image('icons/effects/effects.dmi',"thermite") - return - -datum/reagent/thermite/on_mob_life(var/mob/living/M as mob) - if(!M) M = holder.my_atom - M.adjustFireLoss(1) - ..() - return - -datum/reagent/virus_food - name = "Virus Food" - id = "virusfood" - description = "A mixture of water and milk. Virus cells can use this mixture to reproduce." - reagent_state = LIQUID - nutriment_factor = 2 * REAGENTS_METABOLISM - color = "#899613" // rgb: 137, 150, 19 - -datum/reagent/virus_food/on_mob_life(var/mob/living/M as mob) - if(!M) M = holder.my_atom - M.nutrition += nutriment_factor*REM - ..() - return - -datum/reagent/sterilizine - name = "Sterilizine" - id = "sterilizine" - description = "Sterilizes wounds in preparation for surgery." - reagent_state = LIQUID - color = "#C8A5DC" // rgb: 200, 165, 220 -/*datum/reagent/sterilizine/reaction_mob(var/mob/living/M, var/method=TOUCH, var/volume) - src = null - if (method==TOUCH) - if(istype(M, /mob/living/carbon/human)) - if(M.health >= -100 && M.health <= 0) - M.crit_op_stage = 0.0 - if (method==INGEST) - usr << "Well, that was stupid." - M.adjustToxLoss(3) - return - -datum/reagent/sterilizine/on_mob_life(var/mob/living/M as mob) - if(!M) M = holder.my_atom - M.radiation += 3 - ..() - return - */ -datum/reagent/iron - name = "Iron" - id = "iron" - description = "Pure iron is a metal." - reagent_state = SOLID - color = "#C8A5DC" // rgb: 200, 165, 220 - -datum/reagent/gold - name = "Gold" - id = "gold" - description = "Gold is a dense, soft, shiny metal and the most malleable and ductile metal known." - reagent_state = SOLID - color = "#F7C430" // rgb: 247, 196, 48 - -datum/reagent/silver - name = "Silver" - id = "silver" - description = "A soft, white, lustrous transition metal, it has the highest electrical conductivity of any element and the highest thermal conductivity of any metal." - reagent_state = SOLID - color = "#D0D0D0" // rgb: 208, 208, 208 - -datum/reagent/uranium - name ="Uranium" - id = "uranium" - description = "A silvery-white metallic chemical element in the actinide series, weakly radioactive." - reagent_state = SOLID - color = "#B8B8C0" // rgb: 184, 184, 192 - -datum/reagent/uranium/on_mob_life(var/mob/living/M as mob) - if(!M) M = holder.my_atom - M.apply_effect(1,IRRADIATE,0) - ..() - return - - -datum/reagent/uranium/reaction_turf(var/turf/T, var/volume) - src = null - if(volume >= 3) - if(!istype(T, /turf/space)) - new /obj/effect/decal/cleanable/greenglow(T) - -datum/reagent/aluminium - name = "Aluminium" - id = "aluminium" - description = "A silvery white and ductile member of the boron group of chemical elements." - reagent_state = SOLID - color = "#A8A8A8" // rgb: 168, 168, 168 - -datum/reagent/silicon - name = "Silicon" - id = "silicon" - description = "A tetravalent metalloid, silicon is less reactive than its chemical analog carbon." - reagent_state = SOLID - color = "#A8A8A8" // rgb: 168, 168, 168 - -datum/reagent/fuel - name = "Welding fuel" - id = "fuel" - description = "Required for welders. Flamable." - reagent_state = LIQUID - color = "#660000" // rgb: 102, 0, 0 - -datum/reagent/fuel/reaction_mob(var/mob/living/M, var/method=TOUCH, var/volume)//Splashing people with welding fuel to make them easy to ignite! - if(!istype(M, /mob/living)) - return - if(method == TOUCH) - M.adjust_fire_stacks(volume / 10) - return - -//Commenting this out as it's horribly broken. It's a neat effect though, so it might be worth making a new reagent (that is less common) with similar effects. -Pete -/* -datum/reagent/fuel/reaction_obj(var/obj/O, var/volume) - src = null - var/turf/the_turf = get_turf(O) - if(!the_turf) - return //No sense trying to start a fire if you don't have a turf to set on fire. --NEO - var/datum/gas_mixture/napalm = new - var/datum/gas/volatile_fuel/fuel = new - fuel.moles = 15 - napalm.trace_gases += fuel - the_turf.assume_air(napalm) - -datum/reagent/fuel/reaction_turf(var/turf/T, var/volume) - src = null - var/datum/gas_mixture/napalm = new - var/datum/gas/volatile_fuel/fuel = new - fuel.moles = 15 - napalm.trace_gases += fuel - T.assume_air(napalm) - return*/ - -datum/reagent/fuel/on_mob_life(var/mob/living/M as mob) - if(!M) M = holder.my_atom - M.adjustToxLoss(1) - ..() - return - -datum/reagent/space_cleaner - name = "Space cleaner" - id = "cleaner" - description = "A compound used to clean things. Now with 50% more sodium hypochlorite!" - reagent_state = LIQUID - color = "#A5F0EE" // rgb: 165, 240, 238 - -datum/reagent/space_cleaner/reaction_obj(var/obj/O, var/volume) - if(istype(O,/obj/effect/decal/cleanable)) - qdel(O) - else - if(O) - O.clean_blood() - -datum/reagent/space_cleaner/reaction_turf(var/turf/T, var/volume) - if(volume >= 1) - T.clean_blood() - for(var/obj/effect/decal/cleanable/C in T) - qdel(C) - - for(var/mob/living/carbon/slime/M in T) - M.adjustToxLoss(rand(5,10)) - -datum/reagent/space_cleaner/reaction_mob(var/mob/M, var/method=TOUCH, var/volume) - if(iscarbon(M)) - var/mob/living/carbon/C = M - if(C.r_hand) - C.r_hand.clean_blood() - if(C.l_hand) - C.l_hand.clean_blood() - if(C.wear_mask) - if(C.wear_mask.clean_blood()) - C.update_inv_wear_mask(0) - if(ishuman(M)) - var/mob/living/carbon/human/H = C - if(H.head) - if(H.head.clean_blood()) - H.update_inv_head(0) - if(H.wear_suit) - if(H.wear_suit.clean_blood()) - H.update_inv_wear_suit(0) - else if(H.w_uniform) - if(H.w_uniform.clean_blood()) - H.update_inv_w_uniform(0) - if(H.shoes) - if(H.shoes.clean_blood()) - H.update_inv_shoes(0) - M.clean_blood() - -datum/reagent/leporazine - name = "Leporazine" - id = "leporazine" - description = "Leporazine can be use to stabilize an individuals body temperature." - reagent_state = LIQUID - color = "#C8A5DC" // rgb: 200, 165, 220 - -datum/reagent/leporazine/on_mob_life(var/mob/living/M as mob) - if(!M) M = holder.my_atom - if(M.bodytemperature > 310) - M.bodytemperature = max(310, M.bodytemperature - (40 * TEMPERATURE_DAMAGE_COEFFICIENT)) - else if(M.bodytemperature < 311) - M.bodytemperature = min(310, M.bodytemperature + (40 * TEMPERATURE_DAMAGE_COEFFICIENT)) - ..() - return - -datum/reagent/cryptobiolin - name = "Cryptobiolin" - id = "cryptobiolin" - description = "Cryptobiolin causes confusion and dizzyness." - reagent_state = LIQUID - color = "#C8A5DC" // rgb: 200, 165, 220 - -datum/reagent/cryptobiolin/on_mob_life(var/mob/living/M as mob) - if(!M) M = holder.my_atom - M.Dizzy(1) - if(!M.confused) M.confused = 1 - M.confused = max(M.confused, 20) - holder.remove_reagent(src.id, 0.5 * REAGENTS_METABOLISM) - ..() - return - -datum/reagent/kelotane - name = "Kelotane" - id = "kelotane" - description = "Kelotane is a drug used to treat burns." - reagent_state = LIQUID - color = "#C8A5DC" // rgb: 200, 165, 220 - -datum/reagent/kelotane/on_mob_life(var/mob/living/M as mob) - if(M.stat == 2.0) - return - if(!M) M = holder.my_atom - M.heal_organ_damage(0,2*REM) - ..() - return - -datum/reagent/dermaline - name = "Dermaline" - id = "dermaline" - description = "Dermaline is the next step in burn medication. Works twice as good as kelotane and enables the body to restore even the direst heat-damaged tissue." - reagent_state = LIQUID - color = "#C8A5DC" // rgb: 200, 165, 220 - -datum/reagent/dermaline/on_mob_life(var/mob/living/M as mob) - if(M.stat == 2.0) //THE GUY IS **DEAD**! BEREFT OF ALL LIFE HE RESTS IN PEACE etc etc. He does NOT metabolise shit anymore, god DAMN - return - if(!M) M = holder.my_atom - M.heal_organ_damage(0,3*REM) - ..() - return - -datum/reagent/dexalin - name = "Dexalin" - id = "dexalin" - description = "Dexalin is used in the treatment of oxygen deprivation." - reagent_state = LIQUID - color = "#C8A5DC" // rgb: 200, 165, 220 - -datum/reagent/dexalin/on_mob_life(var/mob/living/M as mob) - if(M.stat == 2.0) - return //See above, down and around. --Agouri - if(!M) M = holder.my_atom - M.adjustOxyLoss(-2*REM) - if(holder.has_reagent("lexorin")) - holder.remove_reagent("lexorin", 2*REM) - ..() - return - -datum/reagent/dexalinp - name = "Dexalin Plus" - id = "dexalinp" - description = "Dexalin Plus is used in the treatment of oxygen deprivation. Its highly effective." - reagent_state = LIQUID - color = "#C8A5DC" // rgb: 200, 165, 220 - -datum/reagent/dexalinp/on_mob_life(var/mob/living/M as mob) - if(M.stat == 2.0) - return - if(!M) M = holder.my_atom - M.adjustOxyLoss(-M.getOxyLoss()) - if(holder.has_reagent("lexorin")) - holder.remove_reagent("lexorin", 2*REM) - ..() - return - -datum/reagent/tricordrazine - name = "Tricordrazine" - id = "tricordrazine" - description = "Tricordrazine is a highly potent stimulant, originally derived from cordrazine. Can be used to treat a wide range of injuries." - reagent_state = LIQUID - color = "#C8A5DC" // rgb: 200, 165, 220 - -datum/reagent/tricordrazine/on_mob_life(var/mob/living/M as mob) - if(M.stat == 2.0) - return - if(!M) M = holder.my_atom - if(M.getOxyLoss() && prob(80)) M.adjustOxyLoss(-1*REM) - if(M.getBruteLoss() && prob(80)) M.heal_organ_damage(1*REM,0) - if(M.getFireLoss() && prob(80)) M.heal_organ_damage(0,1*REM) - if(M.getToxLoss() && prob(80)) M.adjustToxLoss(-1*REM) - ..() - return - -datum/reagent/anti_toxin - name = "Anti-Toxin (Dylovene)" - id = "anti_toxin" - description = "Dylovene is a broad-spectrum antitoxin." - reagent_state = LIQUID - color = "#C8A5DC" // rgb: 200, 165, 220 - -datum/reagent/anti_toxin/on_mob_life(var/mob/living/M as mob) - if(!M) M = holder.my_atom - M.reagents.remove_all_type(/datum/reagent/toxin, 1*REM, 0, 1) - M.drowsyness = max(M.drowsyness-2*REM, 0) - M.hallucination = max(0, M.hallucination - 5*REM) - M.adjustToxLoss(-2*REM) - ..() - return - -datum/reagent/adminordrazine //An OP chemical for admins - name = "Adminordrazine" - id = "adminordrazine" - description = "It's magic. We don't have to explain it." - reagent_state = LIQUID - color = "#C8A5DC" // rgb: 200, 165, 220 - -datum/reagent/adminordrazine/on_mob_life(var/mob/living/carbon/M as mob) - if(!M) M = holder.my_atom ///This can even heal dead people. - M.reagents.remove_all_type(/datum/reagent/toxin, 5*REM, 0, 1) - M.setCloneLoss(0) - M.setOxyLoss(0) - M.radiation = 0 - M.heal_organ_damage(5,5) - M.adjustToxLoss(-5) - M.hallucination = 0 - M.setBrainLoss(0) - M.disabilities = 0 - M.sdisabilities = 0 - M.eye_blurry = 0 - M.eye_blind = 0 - M.SetWeakened(0) - M.SetStunned(0) - M.SetParalysis(0) - M.silent = 0 - M.dizziness = 0 - M.drowsyness = 0 - M.stuttering = 0 - M.confused = 0 - M.sleeping = 0 - M.jitteriness = 0 - for(var/datum/disease/D in M.viruses) - if(D.severity == NONTHREAT) - continue - D.spread_text = "Remissive" - D.stage-- - if(D.stage < 1) - D.cure() - ..() - return - -datum/reagent/synaptizine - name = "Synaptizine" - id = "synaptizine" - description = "Synaptizine is used to treat various diseases." - reagent_state = LIQUID - color = "#C8A5DC" // rgb: 200, 165, 220 - -datum/reagent/synaptizine/on_mob_life(var/mob/living/M as mob) - if(!M) M = holder.my_atom - M.drowsyness = max(M.drowsyness-5, 0) - M.AdjustParalysis(-1) - M.AdjustStunned(-1) - M.AdjustWeakened(-1) - if(holder.has_reagent("mindbreaker")) - holder.remove_reagent("mindbreaker", 5) - M.hallucination = max(0, M.hallucination - 10) - if(prob(60)) M.adjustToxLoss(1) - ..() - return - -datum/reagent/impedrezene - name = "Impedrezene" - id = "impedrezene" - description = "Impedrezene is a narcotic that impedes one's ability by slowing down the higher brain cell functions." - reagent_state = LIQUID - color = "#C8A5DC" // rgb: 200, 165, 220 - -datum/reagent/impedrezene/on_mob_life(var/mob/living/M as mob) - if(!M) M = holder.my_atom - M.jitteriness = max(M.jitteriness-5,0) - if(prob(80)) M.adjustBrainLoss(1*REM) - if(prob(50)) M.drowsyness = max(M.drowsyness, 3) - if(prob(10)) M.emote("drool") - ..() - return - -datum/reagent/hyronalin - name = "Hyronalin" - id = "hyronalin" - description = "Hyronalin is a medicinal drug used to counter the effect of radiation poisoning." - reagent_state = LIQUID - color = "#C8A5DC" // rgb: 200, 165, 220 - -datum/reagent/hyronalin/on_mob_life(var/mob/living/M as mob) - if(!M) M = holder.my_atom - M.radiation = max(M.radiation-3*REM,0) - ..() - return - -datum/reagent/arithrazine - name = "Arithrazine" - id = "arithrazine" - description = "Arithrazine is an unstable medication used for the most extreme cases of radiation poisoning." - reagent_state = LIQUID - color = "#C8A5DC" // rgb: 200, 165, 220 - -datum/reagent/arithrazine/on_mob_life(var/mob/living/M as mob) - if(M.stat == 2.0) - return //See above, down and around. --Agouri - if(!M) M = holder.my_atom - M.radiation = max(M.radiation-7*REM,0) - M.adjustToxLoss(-1*REM) - if(prob(15)) - M.take_organ_damage(1, 0) - ..() - return - -datum/reagent/alkysine - name = "Alkysine" - id = "alkysine" - description = "Alkysine is a drug used to lessen the damage to neurological tissue after a catastrophic injury. Can heal brain tissue." - reagent_state = LIQUID - color = "#C8A5DC" // rgb: 200, 165, 220 - -datum/reagent/alkysine/on_mob_life(var/mob/living/M as mob) - if(!M) M = holder.my_atom - M.adjustBrainLoss(-3*REM) - ..() - return - -datum/reagent/imidazoline - name = "Imidazoline" - id = "imidazoline" - description = "Heals eye damage." - reagent_state = LIQUID - color = "#C8A5DC" // rgb: 200, 165, 220 - -datum/reagent/imidazoline/on_mob_life(var/mob/living/M as mob) - if(!M) M = holder.my_atom - M.eye_blurry = max(M.eye_blurry-5 , 0) - M.eye_blind = max(M.eye_blind-5 , 0) - M.disabilities &= ~NEARSIGHTED - M.eye_stat = max(M.eye_stat-5, 0) -// M.sdisabilities &= ~1 Replaced by eye surgery - ..() - return - -datum/reagent/inacusiate - name = "Inacusiate" - id = "inacusiate" - description = "Heals ear damage." - reagent_state = LIQUID - color = "#6600FF" // rgb: 100, 165, 255 - -datum/reagent/inacusiate/on_mob_life(var/mob/living/M as mob) - if(!M) M = holder.my_atom - M.ear_damage = 0 - M.ear_deaf = 0 - ..() - return - -datum/reagent/bicaridine - name = "Bicaridine" - id = "bicaridine" - description = "Bicaridine is an analgesic medication and can be used to treat blunt trauma." - reagent_state = LIQUID - color = "#C8A5DC" // rgb: 200, 165, 220 - -datum/reagent/bicaridine/on_mob_life(var/mob/living/M as mob) - if(M.stat == 2.0) - return - if(!M) M = holder.my_atom - M.heal_organ_damage(2*REM,0) - ..() - return - -datum/reagent/hyperzine - name = "Hyperzine" - id = "hyperzine" - description = "Hyperzine is a highly effective, long lasting, muscle stimulant." - reagent_state = LIQUID - color = "#C8A5DC" // rgb: 200, 165, 220 - -datum/reagent/hyperzine/on_mob_life(var/mob/living/M as mob) - if(!M) M = holder.my_atom - if(prob(5)) M.emote(pick("twitch","blink_r","shiver")) - M.status_flags |= GOTTAGOFAST - holder.remove_reagent(src.id, 0.5 * REAGENTS_METABOLISM) - //..() //this was causing hyperzine to be consumed twice... - return - -datum/reagent/cryoxadone - name = "Cryoxadone" - id = "cryoxadone" - description = "A chemical mixture with almost magical healing powers. Its main limitation is that the targets body temperature must be under 170K for it to metabolise correctly." - reagent_state = LIQUID - color = "#C8A5DC" // rgb: 200, 165, 220 - -datum/reagent/cryoxadone/on_mob_life(var/mob/living/M as mob) - if(!M) M = holder.my_atom - if(M.bodytemperature < 170) - M.adjustCloneLoss(-1) - M.adjustOxyLoss(-3) - M.heal_organ_damage(3,3) - M.adjustToxLoss(-3) - ..() - return - -datum/reagent/clonexadone - name = "Clonexadone" - id = "clonexadone" - description = "A liquid compound similar to that used in the cloning process. Can be used to 'finish' clones that get ejected early when used in conjunction with a cryo tube." - reagent_state = LIQUID - color = "#C8A5DC" // rgb: 200, 165, 220 - -datum/reagent/clonexadone/on_mob_life(var/mob/living/M as mob) - if(!M) M = holder.my_atom - if(M.bodytemperature < 170) - M.adjustCloneLoss(-3) - M.adjustOxyLoss(-3) - M.heal_organ_damage(3,3) - M.adjustToxLoss(-3) - M.status_flags &= ~DISFIGURED - ..() - return - -datum/reagent/rezadone - name = "Rezadone" - id = "rezadone" - description = "A powder derived from fish toxin, this substance can effectively treat cellular damage in humanoids, though excessive consumption has side effects." - reagent_state = SOLID - color = "#669900" // rgb: 102, 153, 0 - -datum/reagent/rezadone/on_mob_life(var/mob/living/M as mob) - if(!M) M = holder.my_atom - if(!data) data = 1 - data++ - switch(data) - if(1 to 15) - M.adjustCloneLoss(-1) - M.heal_organ_damage(1,1) - if(15 to 35) - M.adjustCloneLoss(-2) - M.heal_organ_damage(2,1) - M.status_flags &= ~DISFIGURED - if(35 to INFINITY) - M.adjustToxLoss(1) - M.Dizzy(5) - M.Jitter(5) - - ..() - return - -datum/reagent/spaceacillin - name = "Spaceacillin" - id = "spaceacillin" - description = "An all-purpose antiviral agent." - reagent_state = LIQUID - color = "#C8A5DC" // rgb: 200, 165, 220 - -datum/reagent/spaceacillin/on_mob_life(var/mob/living/M as mob)//no more mr. panacea - holder.remove_reagent(src.id, 0.2) - ..() - return - -datum/reagent/nanites - name = "Nanomachines" - id = "nanites" - description = "Microscopic construction robots." - reagent_state = LIQUID - color = "#535E66" // rgb: 83, 94, 102 - -datum/reagent/nanites/reaction_mob(var/mob/M, var/method=TOUCH, var/volume) - src = null - if( (prob(10) && method==TOUCH) || method==INGEST) - M.ForceContractDisease(new /datum/disease/transformation/robot(0)) - -datum/reagent/xenomicrobes - name = "Xenomicrobes" - id = "xenomicrobes" - description = "Microbes with an entirely alien cellular structure." - reagent_state = LIQUID - color = "#535E66" // rgb: 83, 94, 102 - -datum/reagent/xenomicrobes/reaction_mob(var/mob/M, var/method=TOUCH, var/volume) - src = null - if( (prob(10) && method==TOUCH) || method==INGEST) - M.ContractDisease(new /datum/disease/transformation/xeno(0)) - -datum/reagent/fluorosurfactant//foam precursor - name = "Fluorosurfactant" - id = "fluorosurfactant" - description = "A perfluoronated sulfonic acid that forms a foam when mixed with water." - reagent_state = LIQUID - color = "#9E6B38" // rgb: 158, 107, 56 - -datum/reagent/foaming_agent// Metal foaming agent. This is lithium hydride. Add other recipes (e.g. LiH + H2O -> LiOH + H2) eventually. - name = "Foaming agent" - id = "foaming_agent" - description = "A agent that yields metallic foam when mixed with light metal and a strong acid." - reagent_state = SOLID - color = "#664B63" // rgb: 102, 75, 99 - -datum/reagent/ammonia - name = "Ammonia" - id = "ammonia" - description = "A caustic substance commonly used in fertilizer or household cleaners." - reagent_state = GAS - color = "#404030" // rgb: 64, 64, 48 - -datum/reagent/diethylamine - name = "Diethylamine" - id = "diethylamine" - description = "A secondary amine, mildly corrosive." - reagent_state = LIQUID - color = "#604030" // rgb: 96, 64, 48 - -datum/reagent/ethylredoxrazine // FUCK YOU, ALCOHOL - name = "Ethylredoxrazine" - id = "ethylredoxrazine" - description = "A powerful oxidizer that reacts with ethanol." - reagent_state = SOLID - color = "#605048" // rgb: 96, 80, 72 - -datum/reagent/ethylredoxrazine/on_mob_life(var/mob/living/M as mob) - if(!M) M = holder.my_atom - M.dizziness = 0 - M.drowsyness = 0 - M.stuttering = 0 - M.confused = 0 - M.reagents.remove_all_type(/datum/reagent/ethanol, 1*REM, 0, 1) - ..() - return - -//////////////////////////Poison stuff/////////////////////// - -datum/reagent/toxin - name = "Toxin" - id = "toxin" - description = "A toxic chemical." - reagent_state = LIQUID - color = "#CF3600" // rgb: 207, 54, 0 - var/toxpwr = 1.5 - -datum/reagent/toxin/on_mob_life(var/mob/living/M as mob) - if(!M) M = holder.my_atom - if(toxpwr) - M.adjustToxLoss(toxpwr*REM) - ..() - return - -datum/reagent/toxin/amatoxin - name = "Amatoxin" - id = "amatoxin" - description = "A powerful poison derived from certain species of mushroom." - reagent_state = LIQUID - color = "#792300" // rgb: 121, 35, 0 - toxpwr = 1 - -datum/reagent/toxin/mutagen - name = "Unstable mutagen" - id = "mutagen" - description = "Might cause unpredictable mutations. Keep away from children." - reagent_state = LIQUID - color = "#13BC5E" // rgb: 19, 188, 94 - toxpwr = 0 - -datum/reagent/toxin/mutagen/reaction_mob(var/mob/living/carbon/M, var/method=TOUCH, var/volume) - if(!..()) return - if(!istype(M) || !M.dna) return //No robots, AIs, aliens, Ians or other mobs should be affected by this. - src = null - if((method==TOUCH && prob(33)) || method==INGEST) - randmuti(M) - if(prob(98)) - randmutb(M) - else - randmutg(M) - domutcheck(M, null) - updateappearance(M) - return - -datum/reagent/toxin/mutagen/on_mob_life(var/mob/living/carbon/M) - if(!istype(M)) return - if(!M) M = holder.my_atom - M.apply_effect(5,IRRADIATE,0) - ..() - return - -datum/reagent/toxin/plasma - name = "Plasma" - id = "plasma" - description = "Plasma in its liquid form." - reagent_state = LIQUID - color = "#DB2D08" // rgb: 219, 45, 8 - toxpwr = 3 - -datum/reagent/toxin/plasma/on_mob_life(var/mob/living/M as mob) - if(!M) M = holder.my_atom - if(holder.has_reagent("inaprovaline")) - holder.remove_reagent("inaprovaline", 2*REM) - ..() - return - -datum/reagent/toxin/plasma/reaction_obj(var/obj/O, var/volume) - src = null - /*if(istype(O,/obj/item/weapon/reagent_containers/food/snacks/egg/slime)) - var/obj/item/weapon/reagent_containers/food/snacks/egg/slime/egg = O - if (egg.grown) - egg.Hatch()*/ - if((!O) || (!volume)) return 0 - O.atmos_spawn_air(SPAWN_TOXINS|SPAWN_20C, volume) - -datum/reagent/toxin/plasma/reaction_turf(var/turf/simulated/T, var/volume) - src = null - if(istype(T)) - T.atmos_spawn_air(SPAWN_TOXINS|SPAWN_20C, volume) - return - -datum/reagent/toxin/plasma/reaction_mob(var/mob/living/M, var/method=TOUCH, var/volume)//Splashing people with plasma is stronger than fuel! - if(!istype(M, /mob/living)) - return - if(method == TOUCH) - M.adjust_fire_stacks(volume / 5) - return - -datum/reagent/toxin/lexorin - name = "Lexorin" - id = "lexorin" - description = "Lexorin temporarily stops respiration. Causes tissue damage." - reagent_state = LIQUID - color = "#C8A5DC" // rgb: 200, 165, 220 - toxpwr = 0 - -datum/reagent/toxin/lexorin/on_mob_life(var/mob/living/M as mob) - if(M.stat == 2.0) - return - if(!M) M = holder.my_atom - if(prob(33)) - M.take_organ_damage(1*REM, 0) - M.adjustOxyLoss(3) - if(prob(20)) M.emote("gasp") - ..() - return - -datum/reagent/toxin/slimejelly - name = "Slime Jelly" - id = "slimejelly" - description = "A gooey semi-liquid produced from one of the deadliest lifeforms in existence. SO REAL." - reagent_state = LIQUID - color = "#801E28" // rgb: 128, 30, 40 - toxpwr = 0 - -datum/reagent/toxin/slimejelly/on_mob_life(var/mob/living/M as mob) - if(prob(10)) - M << "Your insides are burning!" - M.adjustToxLoss(rand(20,60)*REM) - else if(prob(40)) - M.heal_organ_damage(5*REM,0) - ..() - return - -datum/reagent/toxin/cyanide - name = "Cyanide" - id = "cyanide" - description = "A highly toxic chemical." - reagent_state = LIQUID - color = "#CF3600" // rgb: 207, 54, 0 - toxpwr = 3 - -datum/reagent/toxin/cyanide/on_mob_life(var/mob/living/M as mob) - if(!M) M = holder.my_atom - M.adjustOxyLoss(3*REM) - M.sleeping += 1 - ..() - return - -datum/reagent/toxin/minttoxin - name = "Mint Toxin" - id = "minttoxin" - description = "Useful for dealing with undesirable customers." - reagent_state = LIQUID - color = "#CF3600" // rgb: 207, 54, 0 - toxpwr = 0 - -datum/reagent/toxin/minttoxin/on_mob_life(var/mob/living/M as mob) - if(!M) M = holder.my_atom - if (FAT in M.mutations) - M.gib() - ..() - return - -datum/reagent/toxin/carpotoxin - name = "Carpotoxin" - id = "carpotoxin" - description = "A deadly neurotoxin produced by the dreaded spess carp." - reagent_state = LIQUID - color = "#003333" // rgb: 0, 51, 51 - toxpwr = 2 - -datum/reagent/toxin/zombiepowder - name = "Zombie Powder" - id = "zombiepowder" - description = "A strong neurotoxin that puts the subject into a death-like state." - reagent_state = SOLID - color = "#669900" // rgb: 102, 153, 0 - toxpwr = 0.5 - -datum/reagent/toxin/zombiepowder/on_mob_life(var/mob/living/carbon/M as mob) - if(!M) M = holder.my_atom - M.status_flags |= FAKEDEATH - M.adjustOxyLoss(0.5*REM) - M.Weaken(5) - M.silent = max(M.silent, 5) - M.tod = worldtime2text() - ..() - return - -datum/reagent/toxin/zombiepowder/Del() - if(holder && ismob(holder.my_atom)) - var/mob/M = holder.my_atom - M.status_flags &= ~FAKEDEATH - ..() - -datum/reagent/toxin/mindbreaker - name = "Mindbreaker Toxin" - id = "mindbreaker" - description = "A powerful hallucinogen. Not a thing to be messed with." - reagent_state = LIQUID - color = "#B31008" // rgb: 139, 166, 233 - toxpwr = 0 - -datum/reagent/toxin/mindbreaker/on_mob_life(var/mob/living/M) - if(!M) M = holder.my_atom - M.hallucination += 10 - ..() - return - -datum/reagent/toxin/plantbgone - name = "Plant-B-Gone" - id = "plantbgone" - description = "A harmful toxic mixture to kill plantlife. Do not ingest!" - reagent_state = LIQUID - color = "#49002E" // rgb: 73, 0, 46 - toxpwr = 1 - -datum/reagent/toxin/plantbgone/reaction_obj(var/obj/O, var/volume) - if(istype(O,/obj/structure/alien/weeds/)) - var/obj/structure/alien/weeds/alien_weeds = O - alien_weeds.health -= rand(15,35) // Kills alien weeds pretty fast - alien_weeds.healthcheck() - else if(istype(O,/obj/effect/glowshroom)) //even a small amount is enough to kill it - qdel(O) - else if(istype(O,/obj/effect/spacevine)) - var/obj/effect/spacevine/SV = O - SV.on_chem_effect(src) - -datum/reagent/toxin/plantbgone/reaction_mob(var/mob/living/M, var/method=TOUCH, var/volume) - src = null - if(iscarbon(M)) - var/mob/living/carbon/C = M - if(!C.wear_mask) // If not wearing a mask - C.adjustToxLoss(2) // 4 toxic damage per application, doubled for some reason - -datum/reagent/toxin/plantbgone/weedkiller - name = "Weed Killer" - id = "weedkiller" - description = "A harmful toxic mixture to kill weeds. Do not ingest!" - reagent_state = LIQUID - color = "#4B004B" // rgb: 75, 0, 75 - - -datum/reagent/toxin/pestkiller - name = "Pest Killer" - id = "pestkiller" - description = "A harmful toxic mixture to kill pests. Do not ingest!" - color = "#4B004B" // rgb: 75, 0, 75 - toxpwr = 1 - -datum/reagent/toxin/pestkiller/reaction_mob(var/mob/living/M, var/method=TOUCH, var/volume) - src = null - if(iscarbon(M)) - var/mob/living/carbon/C = M - if(!C.wear_mask) // If not wearing a mask - C.adjustToxLoss(2) // 4 toxic damage per application, doubled for some reason - -datum/reagent/toxin/stoxin - name = "Sleep Toxin" - id = "stoxin" - description = "An effective hypnotic used to treat insomnia." - reagent_state = LIQUID - color = "#E895CC" // rgb: 232, 149, 204 - toxpwr = 0 - -datum/reagent/toxin/stoxin/on_mob_life(var/mob/living/M as mob) - if(!M) M = holder.my_atom - if(!data) data = 1 - switch(data) - if(1 to 12) - if(prob(5)) M.emote("yawn") - if(12 to 15) - M.eye_blurry = max(M.eye_blurry, 10) - if(15 to 25) - M.drowsyness = max(M.drowsyness, 20) - if(25 to INFINITY) - M.Paralyse(20) - M.drowsyness = max(M.drowsyness, 30) - data++ - ..() - return - - -datum/reagent/toxin/spore - name = "Spore Toxin" - id = "spore" - description = "A toxic spore cloud which blocks vision when ingested." - reagent_state = LIQUID - color = "#9ACD32" - toxpwr = 0.5 - -datum/reagent/toxin/spore/on_mob_life(var/mob/living/M as mob) - ..() - M.damageoverlaytemp = 60 - M.eye_blurry = max(M.eye_blurry, 3) - return - - -datum/reagent/toxin/spore_burning - name = "Burning Spore Toxin" - id = "spore_burning" - description = "A burning spore cloud." - reagent_state = LIQUID - color = "#9ACD32" - toxpwr = 0.5 - -datum/reagent/toxin/spore_burning/on_mob_life(var/mob/living/M as mob) - ..() - M.adjust_fire_stacks(2) - M.IgniteMob() - -datum/reagent/toxin/chloralhydrate - name = "Chloral Hydrate" - id = "chloralhydrate" - description = "A powerful sedative." - reagent_state = SOLID - color = "#000067" // rgb: 0, 0, 103 - toxpwr = 0 - -datum/reagent/toxin/chloralhydrate/on_mob_life(var/mob/living/M as mob) - if(!M) M = holder.my_atom - if(!data) data = 1 - data++ - switch(data) - if(1 to 10) - M.confused += 2 - M.drowsyness += 2 - if(10 to 50) - M.sleeping += 1 - if(51 to INFINITY) - M.sleeping += 1 - M.adjustToxLoss((data - 50)*REM) - holder.remove_reagent(src.id, 0.5 * REAGENTS_METABOLISM) - ..() - return - -datum/reagent/toxin/beer2 //disguised as normal beer for use by emagged brobots - name = "Beer" - id = "beer2" - description = "An alcoholic beverage made from malted grains, hops, yeast, and water." - reagent_state = LIQUID - color = "#664300" // rgb: 102, 67, 0 - -datum/reagent/toxin/beer2/on_mob_life(var/mob/living/M as mob) - if(!M) M = holder.my_atom - if(!data) data = 1 - switch(data) - if(1 to 50) - M.sleeping += 1 - if(51 to INFINITY) - M.sleeping += 1 - M.adjustToxLoss((data - 50)*REM) - data++ - holder.remove_reagent(src.id, 0.5 * REAGENTS_METABOLISM) - ..() - return - -datum/reagent/toxin/acid - name = "Sulphuric acid" - id = "sacid" - description = "A strong mineral acid with the molecular formula H2SO4." - reagent_state = LIQUID - color = "#DB5008" // rgb: 219, 80, 8 - toxpwr = 1 - var/acidpwr = 10 //the amount of protection removed from the armour - -datum/reagent/toxin/acid/reaction_mob(var/mob/living/carbon/C, var/method=TOUCH, var/volume) - if(!istype(C)) - return - if(method != TOUCH) - if(!C.unacidable) - C.take_organ_damage(min(6*toxpwr, volume * toxpwr)) - return - - C.acid_act(acidpwr, toxpwr, volume) - -datum/reagent/toxin/acid/reaction_obj(var/obj/O, var/volume) - if(istype(O.loc, /mob)) //handled in human acid_act() - return - O.acid_act(acidpwr, toxpwr, volume) - -datum/reagent/toxin/acid/polyacid - name = "Polytrinic acid" - id = "pacid" - description = "Polytrinic acid is a an extremely corrosive chemical substance." - reagent_state = LIQUID - color = "#8E18A9" // rgb: 142, 24, 169 - toxpwr = 2 - acidpwr = 20 - -datum/reagent/toxin/coffeepowder - name = "Coffee Grounds" - id = "coffeepowder" - description = "Finely ground coffee beans, used to make coffee." - reagent_state = SOLID - color = "#5B2E0D" // rgb: 91, 46, 13 - toxpwr = 0.5 - -datum/reagent/toxin/teapowder - name = "Ground Tea Leaves" - id = "teapowder" - description = "Finely shredded tea leaves, used for making tea." - reagent_state = SOLID - color = "#7F8400" // rgb: 127, 132, 0 - toxpwr = 0.5 - -datum/reagent/toxin/mutetoxin //the new zombie powder. - name = "Mute Toxin" - id = "mutetoxin" - description = "A toxin that temporarily paralyzes the vocal cords." - reagent_state = LIQUID - color = "#F0F8FF" // rgb: 240, 248, 255 - toxpwr = 0 - -datum/reagent/toxin/mutetoxin/on_mob_life(mob/living/carbon/M) - M.silent += REM + 1 //If this var is increased by one or less, it will have no effect since silent is decreased right after reagents are handled in Life(). Hence the + 1. - ..() - -datum/reagent/toxin/staminatoxin - name = "Tirizene" - id = "tirizene" - description = "A toxin that affects the stamina of a person when injected into the bloodstream." - reagent_state = LIQUID - color = "#6E2828" - data = 13 - toxpwr = 0 - -datum/reagent/toxin/staminatoxin/on_mob_life(mob/living/carbon/M) - M.adjustStaminaLoss(REM * data) - data = max(data - 1, 3) - ..() - -/////////////////////////Coloured Crayon Powder//////////////////////////// -//For colouring in /proc/mix_color_from_reagents - - -datum/reagent/crayonpowder - name = "Crayon Powder" - id = "crayon powder" - var/colorname = "none" - description = "A powder made by grinding down crayons, good for colouring chemical reagents." - reagent_state = SOLID - color = "#FFFFFF" // rgb: 207, 54, 0 - -datum/reagent/crayonpowder/New() - description = "\an [colorname] powder made by grinding down crayons, good for colouring chemical reagents." - - -datum/reagent/crayonpowder/red - name = "Red Crayon Powder" - id = "redcrayonpowder" - colorname = "red" - -datum/reagent/crayonpowder/orange - name = "Orange Crayon Powder" - id = "orangecrayonpowder" - colorname = "orange" - color = "#FF9300" // orange - -datum/reagent/crayonpowder/yellow - name = "Yellow Crayon Powder" - id = "yellowcrayonpowder" - colorname = "yellow" - color = "#FFF200" // yellow - -datum/reagent/crayonpowder/green - name = "Green Crayon Powder" - id = "greencrayonpowder" - colorname = "green" - color = "#A8E61D" // green - -datum/reagent/crayonpowder/blue - name = "Blue Crayon Powder" - id = "bluecrayonpowder" - colorname = "blue" - color = "#00B7EF" // blue - -datum/reagent/crayonpowder/purple - name = "Purple Crayon Powder" - id = "purplecrayonpowder" - colorname = "purple" - color = "#DA00FF" // purple - -datum/reagent/crayonpowder/invisible - name = "Invisible Crayon Powder" - id = "invisiblecrayonpowder" - colorname = "invisible" - color = "#FFFFFF00" // white + no alpha - - -/////////////////////////Food Reagents//////////////////////////// -// Part of the food code. Nutriment is used instead of the old "heal_amt" code. Also is where all the food -// condiments, additives, and such go. -datum/reagent/nutriment - name = "Nutriment" - id = "nutriment" - description = "All the vitamins, minerals, and carbohydrates the body needs in pure form." - reagent_state = SOLID - nutriment_factor = 15 * REAGENTS_METABOLISM - color = "#664330" // rgb: 102, 67, 48 - -datum/reagent/nutriment/on_mob_life(var/mob/living/M as mob) - if(!M) M = holder.my_atom - if(prob(50)) M.heal_organ_damage(1,0) - M.nutrition += nutriment_factor // For hunger and fatness -/* - // If overeaten - vomit and fall down - // Makes you feel bad but removes reagents and some effect - // from your body - if (M.nutrition > 650) - M.nutrition = rand (250, 400) - M.weakened += rand(2, 10) - M.jitteriness += rand(0, 5) - M.dizziness = max (0, (M.dizziness - rand(0, 15))) - M.druggy = max (0, (M.druggy - rand(0, 15))) - M.adjustToxLoss(rand(-15, -5))) - M.updatehealth() -*/ - ..() - return - -datum/reagent/lipozine - name = "Lipozine" // The anti-nutriment. - id = "lipozine" - description = "A chemical compound that causes a powerful fat-burning reaction." - reagent_state = LIQUID - nutriment_factor = 10 * REAGENTS_METABOLISM - color = "#BBEDA4" // rgb: 187, 237, 164 - -datum/reagent/lipozine/on_mob_life(var/mob/living/M as mob) - if(!M) M = holder.my_atom - M.nutrition -= nutriment_factor - M.overeatduration = 0 - if(M.nutrition < 0)//Prevent from going into negatives. - M.nutrition = 0 - ..() - return - -datum/reagent/soysauce - name = "Soysauce" - id = "soysauce" - description = "A salty sauce made from the soy plant." - reagent_state = LIQUID - nutriment_factor = 2 * REAGENTS_METABOLISM - color = "#792300" // rgb: 121, 35, 0 - -datum/reagent/ketchup - name = "Ketchup" - id = "ketchup" - description = "Ketchup, catsup, whatever. It's tomato paste." - reagent_state = LIQUID - nutriment_factor = 5 * REAGENTS_METABOLISM - color = "#731008" // rgb: 115, 16, 8 - - -datum/reagent/capsaicin - name = "Capsaicin Oil" - id = "capsaicin" - description = "This is what makes chilis hot." - reagent_state = LIQUID - color = "#B31008" // rgb: 179, 16, 8 - -datum/reagent/capsaicin/on_mob_life(var/mob/living/M as mob) - if(!M) M = holder.my_atom - if(!data) data = 1 - switch(data) - if(1 to 15) - M.bodytemperature += 5 * TEMPERATURE_DAMAGE_COEFFICIENT - if(holder.has_reagent("frostoil")) - holder.remove_reagent("frostoil", 5) - if(istype(M, /mob/living/carbon/slime)) - M.bodytemperature += rand(5,20) - if(15 to 25) - M.bodytemperature += 10 * TEMPERATURE_DAMAGE_COEFFICIENT - if(istype(M, /mob/living/carbon/slime)) - M.bodytemperature += rand(10,20) - if(25 to INFINITY) - M.bodytemperature += 15 * TEMPERATURE_DAMAGE_COEFFICIENT - if(istype(M, /mob/living/carbon/slime)) - M.bodytemperature += rand(15,20) - data++ - ..() - return - -datum/reagent/condensedcapsaicin - name = "Condensed Capsaicin" - id = "condensedcapsaicin" - description = "A chemical agent used for self-defense and in police work." - reagent_state = LIQUID - color = "#B31008" // rgb: 179, 16, 8 - -datum/reagent/condensedcapsaicin/reaction_mob(var/mob/living/M, var/method=TOUCH, var/volume) - if(!istype(M, /mob/living/carbon/human) && !istype(M, /mob/living/carbon/monkey)) - return - - var/mob/living/carbon/victim = M - if(method == TOUCH) - //check for protection - var/mouth_covered = 0 - var/eyes_covered = 0 - var/obj/item/safe_thing = null - - //monkeys and humans can have masks - if( victim.wear_mask ) - if ( victim.wear_mask.flags & MASKCOVERSEYES ) - eyes_covered = 1 - safe_thing = victim.wear_mask - if ( victim.wear_mask.flags & MASKCOVERSMOUTH ) - mouth_covered = 1 - safe_thing = victim.wear_mask - - //only humans can have helmets and glasses - if(istype(victim, /mob/living/carbon/human)) - var/mob/living/carbon/human/H = victim - if( H.head ) - if ( H.head.flags & MASKCOVERSEYES ) - eyes_covered = 1 - safe_thing = H.head - if ( H.head.flags & MASKCOVERSMOUTH ) - mouth_covered = 1 - safe_thing = H.head - if(H.glasses) - eyes_covered = 1 - if ( !safe_thing ) - safe_thing = H.glasses - - //actually handle the pepperspray effects - if ( eyes_covered && mouth_covered ) - return - else if ( mouth_covered ) // Reduced effects if partially protected - if(prob(5)) - victim.emote("scream") - victim.eye_blurry = max(M.eye_blurry, 3) - victim.eye_blind = max(M.eye_blind, 1) - victim.confused = max(M.confused, 3) - victim.damageoverlaytemp = 60 - victim.Weaken(3) - victim.drop_item() - return - else if ( eyes_covered ) // Eye cover is better than mouth cover - victim.eye_blurry = max(M.eye_blurry, 3) - victim.damageoverlaytemp = 30 - return - else // Oh dear :D - if(prob(5)) - victim.emote("scream") - victim.eye_blurry = max(M.eye_blurry, 5) - victim.eye_blind = max(M.eye_blind, 2) - victim.confused = max(M.confused, 6) - victim.damageoverlaytemp = 75 - victim.Weaken(5) - victim.drop_item() - -datum/reagent/condensedcapsaicin/on_mob_life(var/mob/living/M as mob) - if(!M) M = holder.my_atom - if(prob(5)) - M.visible_message("[M] [pick("dry heaves!","coughs!","splutters!")]") - ..() - return - -datum/reagent/frostoil - name = "Frost Oil" - id = "frostoil" - description = "A special oil that noticably chills the body. Extraced from Icepeppers." - reagent_state = LIQUID - color = "#B31008" // rgb: 139, 166, 233 - -datum/reagent/frostoil/on_mob_life(var/mob/living/M as mob) - if(!M) M = holder.my_atom - if(!data) data = 1 - switch(data) - if(1 to 15) - M.bodytemperature -= 5 * TEMPERATURE_DAMAGE_COEFFICIENT - if(holder.has_reagent("capsaicin")) - holder.remove_reagent("capsaicin", 5) - if(istype(M, /mob/living/carbon/slime)) - M.bodytemperature -= rand(5,20) - if(15 to 25) - M.bodytemperature -= 10 * TEMPERATURE_DAMAGE_COEFFICIENT - if(istype(M, /mob/living/carbon/slime)) - M.bodytemperature -= rand(10,20) - if(25 to INFINITY) - M.bodytemperature -= 15 * TEMPERATURE_DAMAGE_COEFFICIENT - if(prob(1)) M.emote("shiver") - if(istype(M, /mob/living/carbon/slime)) - M.bodytemperature -= rand(15,20) - data++ - ..() - return - -datum/reagent/frostoil/reaction_turf(var/turf/simulated/T, var/volume) - if(volume >= 5) - for(var/mob/living/carbon/slime/M in T) - M.adjustToxLoss(rand(15,30)) - //if(istype(T)) - // T.atmos_spawn_air(SPAWN_COLD) - -datum/reagent/sodiumchloride - name = "Table Salt" - id = "sodiumchloride" - description = "A salt made of sodium chloride. Commonly used to season food." - reagent_state = SOLID - color = "#FFFFFF" // rgb: 255,255,255 - -datum/reagent/blackpepper - name = "Black Pepper" - id = "blackpepper" - description = "A powder ground from peppercorns. *AAAACHOOO*" - reagent_state = SOLID - // no color (ie, black) - -datum/reagent/coco - name = "Coco Powder" - id = "coco" - description = "A fatty, bitter paste made from coco beans." - reagent_state = SOLID - nutriment_factor = 5 * REAGENTS_METABOLISM - color = "#302000" // rgb: 48, 32, 0 - -datum/reagent/coco/on_mob_life(var/mob/living/M as mob) - M.nutrition += nutriment_factor - ..() - return - -datum/reagent/hot_coco - name = "Hot Chocolate" - id = "hot_coco" - description = "Made with love! And coco beans." - reagent_state = LIQUID - nutriment_factor = 2 * REAGENTS_METABOLISM - color = "#403010" // rgb: 64, 48, 16 - -datum/reagent/hot_coco/on_mob_life(var/mob/living/M as mob) - if (M.bodytemperature < 310)//310 is the normal bodytemp. 310.055 - M.bodytemperature = min(310, M.bodytemperature + (5 * TEMPERATURE_DAMAGE_COEFFICIENT)) - M.nutrition += nutriment_factor - ..() - return - -datum/reagent/mushroomhallucinogen - name = "Mushroom Hallucinogen" - id = "mushroomhallucinogen" - description = "A strong hallucinogenic drug derived from certain species of mushroom." - color = "#E700E7" // rgb: 231, 0, 231 - -datum/reagent/mushroomhallucinogen/on_mob_life(var/mob/living/M as mob) - if(!M) M = holder.my_atom - M.druggy = max(M.druggy, 30) - if(!data) data = 1 - switch(data) - if(1 to 5) - if (!M.stuttering) M.stuttering = 1 - M.Dizzy(5) - if(prob(10)) M.emote(pick("twitch","giggle")) - if(5 to 10) - if (!M.stuttering) M.stuttering = 1 - M.Jitter(10) - M.Dizzy(10) - M.druggy = max(M.druggy, 35) - if(prob(20)) M.emote(pick("twitch","giggle")) - if (10 to INFINITY) - if (!M.stuttering) M.stuttering = 1 - M.Jitter(20) - M.Dizzy(20) - M.druggy = max(M.druggy, 40) - if(prob(30)) M.emote(pick("twitch","giggle")) - holder.remove_reagent(src.id, 0.2) - data++ - ..() - return - -datum/reagent/sprinkles - name = "Sprinkles" - id = "sprinkles" - description = "Multi-colored little bits of sugar, commonly found on donuts. Loved by cops." - nutriment_factor = 1 * REAGENTS_METABOLISM - color = "#FF00FF" // rgb: 255, 0, 255 - -datum/reagent/sprinkles/on_mob_life(var/mob/living/M as mob) - M.nutrition += nutriment_factor - if(istype(M, /mob/living/carbon/human) && M.job in list("Security Officer", "Head of Security", "Detective", "Warden")) - if(!M) M = holder.my_atom - M.heal_organ_damage(1,1) - M.nutrition += nutriment_factor - ..() - return - ..() - -/* //removed because of meta bullshit. this is why we can't have nice things. -datum/reagent/syndicream - name = "Cream filling" - id = "syndicream" - description = "Delicious cream filling of a mysterious origin. Tastes criminally good." - nutriment_factor = 1 * REAGENTS_METABOLISM - color = "#AB7878" // rgb: 171, 120, 120 - -datum/reagent/syndicream/on_mob_life(var/mob/living/M as mob) - M.nutrition += nutriment_factor - if(istype(M, /mob/living/carbon/human) && M.mind) - if(M.mind.special_role) - if(!M) M = holder.my_atom - M.heal_organ_damage(1,1) - M.nutrition += nutriment_factor - ..() - return - ..() -*/ -datum/reagent/cornoil - name = "Corn Oil" - id = "cornoil" - description = "An oil derived from various types of corn." - reagent_state = LIQUID - nutriment_factor = 20 * REAGENTS_METABOLISM - color = "#302000" // rgb: 48, 32, 0 - -datum/reagent/cornoil/on_mob_life(var/mob/living/M as mob) - M.nutrition += nutriment_factor - ..() - return - -datum/reagent/cornoil/reaction_turf(var/turf/simulated/T, var/volume) - if (!istype(T)) return - src = null - if(volume >= 3) - T.MakeSlippery() - var/hotspot = (locate(/obj/effect/hotspot) in T) - if(hotspot) - var/datum/gas_mixture/lowertemp = T.remove_air( T:air:total_moles() ) - lowertemp.temperature = max( min(lowertemp.temperature-2000,lowertemp.temperature / 2) ,0) - lowertemp.react() - T.assume_air(lowertemp) - qdel(hotspot) - -datum/reagent/enzyme - name = "Universal Enzyme" - id = "enzyme" - description = "A universal enzyme used in the preperation of certain chemicals and foods." - reagent_state = LIQUID - color = "#365E30" // rgb: 54, 94, 48 - -datum/reagent/dry_ramen - name = "Dry Ramen" - id = "dry_ramen" - description = "Space age food, since August 25, 1958. Contains dried noodles, vegetables, and chemicals that boil in contact with water." - reagent_state = SOLID - nutriment_factor = 1 * REAGENTS_METABOLISM - color = "#302000" // rgb: 48, 32, 0 - -datum/reagent/dry_ramen/on_mob_life(var/mob/living/M as mob) - M.nutrition += nutriment_factor - ..() - return - -datum/reagent/hot_ramen - name = "Hot Ramen" - id = "hot_ramen" - description = "The noodles are boiled, the flavors are artificial, just like being back in school." - reagent_state = LIQUID - nutriment_factor = 5 * REAGENTS_METABOLISM - color = "#302000" // rgb: 48, 32, 0 - -datum/reagent/hot_ramen/on_mob_life(var/mob/living/M as mob) - M.nutrition += nutriment_factor - if (M.bodytemperature < 310)//310 is the normal bodytemp. 310.055 - M.bodytemperature = min(310, M.bodytemperature + (10 * TEMPERATURE_DAMAGE_COEFFICIENT)) - ..() - return - -datum/reagent/hell_ramen - name = "Hell Ramen" - id = "hell_ramen" - description = "The noodles are boiled, the flavors are artificial, just like being back in school." - reagent_state = LIQUID - nutriment_factor = 5 * REAGENTS_METABOLISM - color = "#302000" // rgb: 48, 32, 0 - -datum/reagent/hell_ramen/on_mob_life(var/mob/living/M as mob) - M.nutrition += nutriment_factor - M.bodytemperature += 10 * TEMPERATURE_DAMAGE_COEFFICIENT - ..() - return - -datum/reagent/flour - name = "flour" - id = "flour" - description = "This is what you rub all over yourself to pretend to be a ghost." - reagent_state = SOLID - nutriment_factor = 1 * REAGENTS_METABOLISM - color = "#FFFFFF" // rgb: 0, 0, 0 - -datum/reagent/flour/on_mob_life(var/mob/living/M as mob) - M.nutrition += nutriment_factor - ..() - return - -datum/reagent/flour/reaction_turf(var/turf/T, var/volume) - src = null - if(!istype(T, /turf/space)) - new /obj/effect/decal/cleanable/flour(T) - -datum/reagent/cherryjelly - name = "Cherry Jelly" - id = "cherryjelly" - description = "Totally the best. Only to be spread on foods with excellent lateral symmetry." - reagent_state = LIQUID - nutriment_factor = 1 * REAGENTS_METABOLISM - color = "#801E28" // rgb: 128, 30, 40 - -datum/reagent/cherryjelly/on_mob_life(var/mob/living/M as mob) - M.nutrition += nutriment_factor - ..() - return - -///////////////////////////////////////////////////////////////////////////////////////////////////////// -/////////////////////// DRINKS BELOW, Beer is up there though, along with cola. Cap'n Pete's Cuban Spiced Rum//////////////////////////////// -///////////////////////////////////////////////////////////////////////////////////////////////////////// - -datum/reagent/orangejuice - name = "Orange juice" - id = "orangejuice" - description = "Both delicious AND rich in Vitamin C, what more do you need?" - reagent_state = LIQUID - nutriment_factor = 1 * REAGENTS_METABOLISM - color = "#E78108" // rgb: 231, 129, 8 - -datum/reagent/orangejuice/on_mob_life(var/mob/living/M as mob) - M.nutrition += nutriment_factor - if(!M) M = holder.my_atom - if(M.getOxyLoss() && prob(30)) M.adjustOxyLoss(-1) - M.nutrition++ - ..() - return - -datum/reagent/tomatojuice - name = "Tomato Juice" - id = "tomatojuice" - description = "Tomatoes made into juice. What a waste of big, juicy tomatoes, huh?" - reagent_state = LIQUID - nutriment_factor = 1 * REAGENTS_METABOLISM - color = "#731008" // rgb: 115, 16, 8 - -datum/reagent/tomatojuice/on_mob_life(var/mob/living/M as mob) - M.nutrition += nutriment_factor - if(!M) M = holder.my_atom - if(M.getFireLoss() && prob(20)) M.heal_organ_damage(0,1) - M.nutrition++ - ..() - return - -datum/reagent/limejuice - name = "Lime Juice" - id = "limejuice" - description = "The sweet-sour juice of limes." - reagent_state = LIQUID - nutriment_factor = 1 * REAGENTS_METABOLISM - color = "#365E30" // rgb: 54, 94, 48 - -datum/reagent/limejuice/on_mob_life(var/mob/living/M as mob) - M.nutrition += nutriment_factor - if(!M) M = holder.my_atom - if(M.getToxLoss() && prob(20)) M.adjustToxLoss(-1*REM) - M.nutrition++ - ..() - return - -datum/reagent/carrotjuice - name = "Carrot juice" - id = "carrotjuice" - description = "It is just like a carrot but without crunching." - reagent_state = LIQUID - nutriment_factor = 1 * REAGENTS_METABOLISM - color = "#973800" // rgb: 151, 56, 0 - -datum/reagent/carrotjuice/on_mob_life(var/mob/living/M as mob) - if(!M) M = holder.my_atom - M.nutrition += nutriment_factor - M.eye_blurry = max(M.eye_blurry-1 , 0) - M.eye_blind = max(M.eye_blind-1 , 0) - if(!data) data = 1 - switch(data) - if(1 to 20) - //nothing - if(21 to INFINITY) - if (prob(data-10)) - M.disabilities &= ~NEARSIGHTED - data++ - ..() - return - -datum/reagent/berryjuice - name = "Berry Juice" - id = "berryjuice" - description = "A delicious blend of several different kinds of berries." - reagent_state = LIQUID - nutriment_factor = 1 * REAGENTS_METABOLISM - color = "#863333" // rgb: 134, 51, 51 - -datum/reagent/berryjuice/on_mob_life(var/mob/living/M as mob) - if(!M) M = holder.my_atom - M.nutrition += nutriment_factor - ..() - return - -datum/reagent/poisonberryjuice - name = "Poison Berry Juice" - id = "poisonberryjuice" - description = "A tasty juice blended from various kinds of very deadly and toxic berries." - reagent_state = LIQUID - nutriment_factor = 1 * REAGENTS_METABOLISM - color = "#863353" // rgb: 134, 51, 83 - -datum/reagent/poisonberryjuice/on_mob_life(var/mob/living/M as mob) - if(!M) M = holder.my_atom - M.nutrition += nutriment_factor - M.adjustToxLoss(1) - ..() - return - -datum/reagent/watermelonjuice - name = "Watermelon Juice" - id = "watermelonjuice" - description = "Delicious juice made from watermelon." - reagent_state = LIQUID - nutriment_factor = 1 * REAGENTS_METABOLISM - color = "#863333" // rgb: 134, 51, 51 - -datum/reagent/watermelonjuice/on_mob_life(var/mob/living/M as mob) - if(!M) M = holder.my_atom - M.nutrition += nutriment_factor - ..() - return - -datum/reagent/lemonjuice - name = "Lemon Juice" - id = "lemonjuice" - description = "This juice is VERY sour." - reagent_state = LIQUID - nutriment_factor = 1 * REAGENTS_METABOLISM - color = "#863333" // rgb: 175, 175, 0 - -datum/reagent/lemonjuice/on_mob_life(var/mob/living/M as mob) - if(!M) M = holder.my_atom - M.nutrition += nutriment_factor - ..() - return - -datum/reagent/banana - name = "Banana Juice" - id = "banana" - description = "The raw essence of a banana. HONK" - nutriment_factor = 1 * REAGENTS_METABOLISM - color = "#863333" // rgb: 175, 175, 0 - -datum/reagent/banana/on_mob_life(var/mob/living/M as mob) - M.nutrition += nutriment_factor - if(istype(M, /mob/living/carbon/human) && M.job in list("Clown")) - if(!M) M = holder.my_atom - M.heal_organ_damage(1,1) - ..() - return - if(istype(M, /mob/living/carbon/monkey)) - if(!M) M = holder.my_atom - M.heal_organ_damage(1,1) - ..() - return - ..() - -datum/reagent/nothing - name = "Nothing" - id = "nothing" - description = "Absolutely nothing." - nutriment_factor = 1 * REAGENTS_METABOLISM - -datum/reagent/nothing/on_mob_life(var/mob/living/M as mob) - M.nutrition += nutriment_factor - if(istype(M, /mob/living/carbon/human) && M.job in list("Mime")) - if(!M) M = holder.my_atom - M.heal_organ_damage(1,1) - ..() - return - ..() - -datum/reagent/potato_juice - name = "Potato Juice" - id = "potato" - description = "Juice of the potato. Bleh." - reagent_state = LIQUID - nutriment_factor = 2 * REAGENTS_METABOLISM - color = "#302000" // rgb: 48, 32, 0 - -datum/reagent/potato_juice/on_mob_life(var/mob/living/M as mob) - M.nutrition += nutriment_factor - ..() - return - -datum/reagent/milk - name = "Milk" - id = "milk" - description = "An opaque white liquid produced by the mammary glands of mammals." - reagent_state = LIQUID - color = "#DFDFDF" // rgb: 223, 223, 223 - -datum/reagent/milk/on_mob_life(var/mob/living/M as mob) - if(!M) M = holder.my_atom - if(M.getBruteLoss() && prob(20)) M.heal_organ_damage(1,0) - if(holder.has_reagent("capsaicin")) - holder.remove_reagent("capsaicin", 2) - M.nutrition++ - ..() - return - -datum/reagent/soymilk - name = "Soy Milk" - id = "soymilk" - description = "An opaque white liquid made from soybeans." - reagent_state = LIQUID - color = "#DFDFC7" // rgb: 223, 223, 199 - -datum/reagent/soymilk/on_mob_life(var/mob/living/M as mob) - if(!M) M = holder.my_atom - if(M.getBruteLoss() && prob(20)) M.heal_organ_damage(1,0) - M.nutrition++ - ..() - return - -datum/reagent/cream - name = "Cream" - id = "cream" - description = "The fatty, still liquid part of milk. Why don't you mix this with sum scotch, eh?" - reagent_state = LIQUID - nutriment_factor = 1 * REAGENTS_METABOLISM - color = "#DFD7AF" // rgb: 223, 215, 175 - -datum/reagent/cream/on_mob_life(var/mob/living/M as mob) - M.nutrition += nutriment_factor - if(M.getBruteLoss() && prob(20)) M.heal_organ_damage(1,0) - ..() - return - -datum/reagent/coffee - name = "Coffee" - id = "coffee" - description = "Coffee is a brewed drink prepared from roasted seeds, commonly called coffee beans, of the coffee plant." - reagent_state = LIQUID - color = "#482000" // rgb: 72, 32, 0 - -datum/reagent/coffee/on_mob_life(var/mob/living/M as mob) - ..() - M.dizziness = max(0,M.dizziness-5) - M.drowsyness = max(0,M.drowsyness-3) - M.sleeping = max(0,M.sleeping - 2) - if (M.bodytemperature < 310)//310 is the normal bodytemp. 310.055 - M.bodytemperature = min(310, M.bodytemperature + (25 * TEMPERATURE_DAMAGE_COEFFICIENT)) - M.Jitter(5) - if(holder.has_reagent("frostoil")) - holder.remove_reagent("frostoil", 5) - ..() - return - -datum/reagent/tea - name = "Tea" - id = "tea" - description = "Tasty black tea, it has antioxidants, it's good for you!" - reagent_state = LIQUID - color = "#101000" // rgb: 16, 16, 0 - -datum/reagent/tea/on_mob_life(var/mob/living/M as mob) - ..() - M.dizziness = max(0,M.dizziness-2) - M.drowsyness = max(0,M.drowsyness-1) - M.jitteriness = max(0,M.jitteriness-3) - M.sleeping = max(0,M.sleeping-1) - if(M.getToxLoss() && prob(20)) - M.adjustToxLoss(-1) - if (M.bodytemperature < 310) //310 is the normal bodytemp. 310.055 - M.bodytemperature = min(310, M.bodytemperature + (20 * TEMPERATURE_DAMAGE_COEFFICIENT)) - ..() - return - -datum/reagent/icecoffee - name = "Iced Coffee" - id = "icecoffee" - description = "Coffee and ice, refreshing and cool." - reagent_state = LIQUID - color = "#102838" // rgb: 16, 40, 56 - -datum/reagent/icecoffee/on_mob_life(var/mob/living/M as mob) - ..() - M.dizziness = max(0,M.dizziness-5) - M.drowsyness = max(0,M.drowsyness-3) - M.sleeping = max(0,M.sleeping-2) - if (M.bodytemperature > 310)//310 is the normal bodytemp. 310.055 - M.bodytemperature = max(310, M.bodytemperature - (5 * TEMPERATURE_DAMAGE_COEFFICIENT)) - M.Jitter(5) - ..() - return - -datum/reagent/icetea - name = "Iced Tea" - id = "icetea" - description = "No relation to a certain rap artist/ actor." - reagent_state = LIQUID - color = "#104038" // rgb: 16, 64, 56 - -datum/reagent/icetea/on_mob_life(var/mob/living/M as mob) - ..() - M.dizziness = max(0,M.dizziness-2) - M.drowsyness = max(0,M.drowsyness-1) - M.sleeping = max(0,M.sleeping-2) - if(M.getToxLoss() && prob(20)) - M.adjustToxLoss(-1) - if (M.bodytemperature > 310)//310 is the normal bodytemp. 310.055 - M.bodytemperature = max(310, M.bodytemperature - (5 * TEMPERATURE_DAMAGE_COEFFICIENT)) - return - -datum/reagent/space_cola - name = "Cola" - id = "cola" - description = "A refreshing beverage." - reagent_state = LIQUID - color = "#100800" // rgb: 16, 8, 0 - -datum/reagent/space_cola/on_mob_life(var/mob/living/M as mob) - M.drowsyness = max(0,M.drowsyness-5) - if (M.bodytemperature > 310)//310 is the normal bodytemp. 310.055 - M.bodytemperature = max(310, M.bodytemperature - (5 * TEMPERATURE_DAMAGE_COEFFICIENT)) - M.nutrition += 1 - ..() - return - -datum/reagent/nuka_cola - name = "Nuka Cola" - id = "nuka_cola" - description = "Cola, cola never changes." - reagent_state = LIQUID - color = "#100800" // rgb: 16, 8, 0 - -datum/reagent/nuka_cola/on_mob_life(var/mob/living/M as mob) - M.Jitter(20) - M.druggy = max(M.druggy, 30) - M.dizziness +=5 - M.drowsyness = 0 - M.sleeping = max(0,M.sleeping-2) - M.status_flags |= GOTTAGOFAST - if (M.bodytemperature > 310)//310 is the normal bodytemp. 310.055 - M.bodytemperature = max(310, M.bodytemperature - (5 * TEMPERATURE_DAMAGE_COEFFICIENT)) - M.nutrition += 1 - ..() - return - -datum/reagent/spacemountainwind - name = "Space Mountain Wind" - id = "spacemountainwind" - description = "Blows right through you like a space wind." - reagent_state = LIQUID - color = "#102000" // rgb: 16, 32, 0 - -datum/reagent/spacemountainwind/on_mob_life(var/mob/living/M as mob) - M.drowsyness = max(0,M.drowsyness-7) - M.sleeping = max(0,M.sleeping-1) - if (M.bodytemperature > 310) - M.bodytemperature = max(310, M.bodytemperature - (5 * TEMPERATURE_DAMAGE_COEFFICIENT)) - M.Jitter(5) - M.nutrition += 1 - ..() - return - -datum/reagent/dr_gibb - name = "Dr. Gibb" - id = "dr_gibb" - description = "A delicious blend of 42 different flavours" - reagent_state = LIQUID - color = "#102000" // rgb: 16, 32, 0 - -datum/reagent/dr_gibb/on_mob_life(var/mob/living/M as mob) - M.drowsyness = max(0,M.drowsyness-6) - if (M.bodytemperature > 310) - M.bodytemperature = max(310, M.bodytemperature - (5 * TEMPERATURE_DAMAGE_COEFFICIENT)) //310 is the normal bodytemp. 310.055 - M.nutrition += 1 - ..() - return - -datum/reagent/space_up - name = "Space-Up" - id = "space_up" - description = "Tastes like a hull breach in your mouth." - reagent_state = LIQUID - color = "#00FF00" // rgb: 0, 255, 0 - -datum/reagent/space_up/on_mob_life(var/mob/living/M as mob) - if (M.bodytemperature > 310) - M.bodytemperature = max(310, M.bodytemperature - (8 * TEMPERATURE_DAMAGE_COEFFICIENT)) //310 is the normal bodytemp. 310.055 - M.nutrition += 1 - ..() - return - -datum/reagent/lemon_lime - name = "Lemon Lime" - description = "A tangy substance made of 0.5% natural citrus!" - id = "lemon_lime" - reagent_state = LIQUID - color = "#8CFF00" // rgb: 135, 255, 0 - -datum/reagent/lemon_lime/on_mob_life(var/mob/living/M as mob) - if (M.bodytemperature > 310) - M.bodytemperature = max(310, M.bodytemperature - (8 * TEMPERATURE_DAMAGE_COEFFICIENT)) //310 is the normal bodytemp. 310.055 - M.nutrition += 1 - ..() - return - -datum/reagent/sodawater - name = "Soda Water" - id = "sodawater" - description = "A can of club soda. Why not make a scotch and soda?" - reagent_state = LIQUID - color = "#619494" // rgb: 97, 148, 148 - -datum/reagent/sodawater/on_mob_life(var/mob/living/M as mob) - M.dizziness = max(0,M.dizziness-5) - M.drowsyness = max(0,M.drowsyness-3) - if (M.bodytemperature > 310) - M.bodytemperature = max(310, M.bodytemperature - (5 * TEMPERATURE_DAMAGE_COEFFICIENT)) - ..() - return - -datum/reagent/tonic - name = "Tonic Water" - id = "tonic" - description = "It tastes strange but at least the quinine keeps the Space Malaria at bay." - reagent_state = LIQUID - color = "#0064C8" // rgb: 0, 100, 200 - -datum/reagent/tonic/on_mob_life(var/mob/living/M as mob) - M.dizziness = max(0,M.dizziness-5) - M.drowsyness = max(0,M.drowsyness-3) - M.sleeping = max(0,M.sleeping-2) - if (M.bodytemperature > 310) - M.bodytemperature = max(310, M.bodytemperature - (5 * TEMPERATURE_DAMAGE_COEFFICIENT)) - ..() - return - -datum/reagent/ice - name = "Ice" - id = "ice" - description = "Frozen water, your dentist wouldn't like you chewing this." - reagent_state = SOLID - color = "#619494" // rgb: 97, 148, 148 - -datum/reagent/ice/on_mob_life(var/mob/living/M as mob) - if(!M) M = holder.my_atom - M.bodytemperature -= 5 * TEMPERATURE_DAMAGE_COEFFICIENT - ..() - return - -datum/reagent/soy_latte - name = "Soy Latte" - id = "soy_latte" - description = "A nice and tasty beverage while you are reading your hippie books." - reagent_state = LIQUID - color = "#664300" // rgb: 102, 67, 0 - -datum/reagent/soy_latte/on_mob_life(var/mob/living/M as mob) - ..() - M.dizziness = max(0,M.dizziness-5) - M.drowsyness = max(0,M.drowsyness-3) - M.sleeping = 0 - if (M.bodytemperature < 310)//310 is the normal bodytemp. 310.055 - M.bodytemperature = min(310, M.bodytemperature + (5 * TEMPERATURE_DAMAGE_COEFFICIENT)) - M.Jitter(5) - if(M.getBruteLoss() && prob(20)) M.heal_organ_damage(1,0) - M.nutrition++ - ..() - return - -datum/reagent/cafe_latte - name = "Cafe Latte" - id = "cafe_latte" - description = "A nice, strong and tasty beverage while you are reading." - reagent_state = LIQUID - color = "#664300" // rgb: 102, 67, 0 - -datum/reagent/cafe_latte/on_mob_life(var/mob/living/M as mob) - ..() - M.dizziness = max(0,M.dizziness-5) - M.drowsyness = max(0,M.drowsyness-3) - M.sleeping = 0 - if (M.bodytemperature < 310)//310 is the normal bodytemp. 310.055 - M.bodytemperature = min(310, M.bodytemperature + (5 * TEMPERATURE_DAMAGE_COEFFICIENT)) - M.Jitter(5) - if(M.getBruteLoss() && prob(20)) M.heal_organ_damage(1,0) - M.nutrition++ - ..() - return - -datum/reagent/doctor_delight - name = "The Doctor's Delight" - id = "doctorsdelight" - description = "A gulp a day keeps the MediBot away. That's probably for the best." - reagent_state = LIQUID - color = "#FF8CFF" // rgb: 255, 140, 255 - -datum/reagent/doctor_delight/on_mob_life(var/mob/living/M as mob) - if(!M) M = holder.my_atom - if(M.getOxyLoss() && prob(80)) M.adjustOxyLoss(-2) - if(M.getBruteLoss() && prob(80)) M.heal_organ_damage(2,0) - if(M.getFireLoss() && prob(80)) M.heal_organ_damage(0,2) - if(M.getToxLoss() && prob(80)) M.adjustToxLoss(-2) - if(M.dizziness !=0) M.dizziness = max(0,M.dizziness-15) - if(M.confused !=0) M.confused = max(0,M.confused - 5) - ..() - return - -//////////////////////////////////Hydroponics stuff/////////////////////////////// - -datum/reagent/plantnutriment - name = "Generic nutriment" - id = "plantnutriment" - description = "Some kind of nutriment. You can't really tell what it is. You should probably report it, along with how you obtained it." - reagent_state = LIQUID - color = "#000000" // RBG: 0, 0, 0 - var/tox_prob = 0 - -datum/reagent/plantnutriment/on_mob_life(var/mob/living/M as mob) - if(prob(tox_prob)) M.adjustToxLoss(1*REM) - ..() - return - -datum/reagent/plantnutriment/eznutriment - name = "E-Z-Nutrient" - id = "eznutriment" - description = "Cheap and extremely common type of plant nutriment." - reagent_state = LIQUID - color = "#376400" // RBG: 50, 100, 0 - tox_prob = 10 - -datum/reagent/plantnutriment/left4zednutriment - name = "Left 4 Zed" - id = "left4zednutriment" - description = "Unstable nutriment that makes plants mutate more often than usual." - reagent_state = LIQUID - color = "#1A1E4D" // RBG: 26, 30, 77 - tox_prob = 25 - -datum/reagent/plantnutriment/robustharvestnutriment - name = "Robust Harvest" - id = "robustharvestnutriment" - description = "Very potent nutriment that prevents plants from mutating." - reagent_state = LIQUID - color = "#9D9D00" // RBG: 157, 157, 0 - tox_prob = 15 - -//////////////////////////////////////////////The ten friggen million reagents that get you drunk////////////////////////////////////////////// - -datum/reagent/atomicbomb - name = "Atomic Bomb" - id = "atomicbomb" - description = "Nuclear proliferation never tasted so good." - reagent_state = LIQUID - color = "#666300" // rgb: 102, 99, 0 - -datum/reagent/atomicbomb/on_mob_life(var/mob/living/M as mob) - M.druggy = max(M.druggy, 50) - M.confused = max(M.confused+2,0) - M.Dizzy(10) - if (!M.stuttering) M.stuttering = 1 - M.stuttering += 3 - if(!data) data = 1 - data++ - switch(data) - if(51 to 200) - M.sleeping += 1 - if(201 to INFINITY) - M.sleeping += 1 - M.adjustToxLoss(2) - ..() - return - -datum/reagent/gargle_blaster - name = "Pan-Galactic Gargle Blaster" - id = "gargleblaster" - description = "Whoah, this stuff looks volatile!" - reagent_state = LIQUID - color = "#664300" // rgb: 102, 67, 0 - -datum/reagent/gargle_blaster/on_mob_life(var/mob/living/M as mob) - if(!data) data = 1 - data++ - M.dizziness +=6 - if(data >= 15 && data <45) - if (!M.stuttering) M.stuttering = 1 - M.stuttering += 3 - else if(data >= 45 && prob(50) && data <55) - M.confused = max(M.confused+3,0) - else if(data >=55) - M.druggy = max(M.druggy, 55) - else if(data >=200) - M.adjustToxLoss(2) - ..() - return - -datum/reagent/neurotoxin - name = "Neurotoxin" - id = "neurotoxin" - description = "A strong neurotoxin that puts the subject into a death-like state." - reagent_state = LIQUID - color = "#2E2E61" // rgb: 46, 46, 97 - -datum/reagent/neurotoxin/on_mob_life(var/mob/living/carbon/M as mob) - if(!M) M = holder.my_atom - M.weakened = max(M.weakened, 3) - if(!data) data = 1 - data++ - M.dizziness +=6 - if(data >= 15 && data <45) - if (!M.stuttering) M.stuttering = 1 - M.stuttering += 3 - else if(data >= 45 && prob(50) && data <55) - M.confused = max(M.confused+3,0) - else if(data >=55) - M.druggy = max(M.druggy, 55) - else if(data >=200) - M.adjustToxLoss(2) - ..() - return - -datum/reagent/hippies_delight - name = "Hippie's Delight" - id = "hippiesdelight" - description = "You just don't get it maaaan." - reagent_state = LIQUID - color = "#664300" // rgb: 102, 67, 0 - -datum/reagent/hippies_delight/on_mob_life(var/mob/living/M as mob) - if(!M) M = holder.my_atom - M.druggy = max(M.druggy, 50) - if(!data) data = 1 - data++ - switch(data) - if(1 to 5) - if (!M.stuttering) M.stuttering = 1 - M.Dizzy(10) - if(prob(10)) M.emote(pick("twitch","giggle")) - if(5 to 10) - if (!M.stuttering) M.stuttering = 1 - M.Jitter(20) - M.Dizzy(20) - M.druggy = max(M.druggy, 45) - if(prob(20)) M.emote(pick("twitch","giggle")) - if (10 to 200) - if (!M.stuttering) M.stuttering = 1 - M.Jitter(40) - M.Dizzy(40) - M.druggy = max(M.druggy, 60) - if(prob(30)) M.emote(pick("twitch","giggle")) - if(200 to INFINITY) - if (!M.stuttering) M.stuttering = 1 - M.Jitter(60) - M.Dizzy(60) - M.druggy = max(M.druggy, 75) - if(prob(40)) M.emote(pick("twitch","giggle")) - if(prob(30)) M.adjustToxLoss(2) - holder.remove_reagent(src.id, 0.2) - ..() - return - -/*boozepwr chart -55 = non-toxic alchohol -45 = medium-toxic -35 = the hard stuff -25 = potent mixes -<15 = deadly toxic -*/ - -datum/reagent/ethanol - name = "Ethanol" - id = "ethanol" - description = "A well-known alcohol with a variety of applications." - reagent_state = LIQUID - color = "#404030" // rgb: 64, 64, 48 - var/boozepwr = 10 //lower numbers mean the booze will have an effect faster. - -datum/reagent/ethanol/on_mob_life(var/mob/living/M as mob) - if(!data) data = 1 - data++ - M.jitteriness = max(M.jitteriness-5,0) - if(data >= boozepwr) - if (!M.stuttering) M.stuttering = 1 - M.stuttering += 4 - M.Dizzy(5) - if(data >= boozepwr*2.5 && prob(33)) - if (!M.confused) M.confused = 1 - M.confused += 3 - if(data >= boozepwr*10 && prob(33)) - M.adjustToxLoss(2) - ..() - return -datum/reagent/ethanol/reaction_obj(var/obj/O, var/volume) - if(istype(O,/obj/item/weapon/paper)) - var/obj/item/weapon/paper/paperaffected = O - paperaffected.clearpaper() - usr << "The solution melts away the ink on the paper." - if(istype(O,/obj/item/weapon/book)) - if(volume >= 5) - var/obj/item/weapon/book/affectedbook = O - affectedbook.dat = null - usr << "The solution melts away the ink on the book." - else - usr << "It wasn't enough..." - return - -datum/reagent/ethanol/reaction_mob(var/mob/living/M, var/method=TOUCH, var/volume)//Splashing people with ethanol isn't quite as good as fuel. - if(!istype(M, /mob/living)) - return - if(method == TOUCH) - M.adjust_fire_stacks(volume / 15) - return - -datum/reagent/ethanol/beer - name = "Beer" - id = "beer" - description = "An alcoholic beverage made from malted grains, hops, yeast, and water." - color = "#664300" // rgb: 102, 67, 0 - boozepwr = 55 - -datum/reagent/ethanol/beer/on_mob_life(var/mob/living/M as mob) - M.nutrition += 1 - ..() - return - -datum/reagent/ethanol/beer/greenbeer - name = "Green Beer" - id = "greenbeer" - description = "An alcoholic beverage made from malted grains, hops, yeast, and water. Dyed a festive green." - color = "#A8E61D" - -datum/reagent/ethanol/kahlua - name = "Kahlua" - id = "kahlua" - description = "A widely known, Mexican coffee-flavoured liqueur. In production since 1936!" - color = "#664300" // rgb: 102, 67, 0 - boozepwr = 45 - -datum/reagent/ethanol/kahlua/on_mob_life(var/mob/living/M as mob) - M.dizziness = max(0,M.dizziness-5) - M.drowsyness = max(0,M.drowsyness-3) - M.sleeping = max(0,M.sleeping-2) - M.Jitter(5) - ..() - return - -datum/reagent/ethanol/whiskey - name = "Whiskey" - id = "whiskey" - description = "A superb and well-aged single-malt whiskey. Damn." - color = "#664300" // rgb: 102, 67, 0 - boozepwr = 35 - -datum/reagent/ethanol/thirteenloko - name = "Thirteen Loko" - id = "thirteenloko" - description = "A potent mixture of caffeine and alcohol." - color = "#102000" // rgb: 16, 32, 0 - boozepwr = 35 - -datum/reagent/ethanol/thirteenloko/on_mob_life(var/mob/living/M as mob) - M.drowsyness = max(0,M.drowsyness-7) - M.sleeping = max(0,M.sleeping-2) - if (M.bodytemperature > 310) - M.bodytemperature = max(310, M.bodytemperature - (5 * TEMPERATURE_DAMAGE_COEFFICIENT)) - M.Jitter(5) - M.nutrition += 1 - ..() - return - -datum/reagent/ethanol/vodka - name = "Vodka" - id = "vodka" - description = "Number one drink AND fueling choice for Russians worldwide." - color = "#0064C8" // rgb: 0, 100, 200 - boozepwr = 35 - -datum/reagent/ethanol/vodka/on_mob_life(var/mob/living/M as mob) - M.radiation = max(M.radiation-2,0) - ..() - return - -datum/reagent/ethanol/bilk - name = "Bilk" - id = "bilk" - description = "This appears to be beer mixed with milk. Disgusting." - color = "#895C4C" // rgb: 137, 92, 76 - boozepwr = 55 - -datum/reagent/ethanol/bilk/on_mob_life(var/mob/living/M as mob) - if(M.getBruteLoss() && prob(10)) M.heal_organ_damage(1,0) - M.nutrition += 2 - ..() - return - -datum/reagent/ethanol/threemileisland - name = "Three Mile Island Iced Tea" - id = "threemileisland" - description = "Made for a woman, strong enough for a man." - color = "#666340" // rgb: 102, 99, 64 - boozepwr = 15 - -datum/reagent/ethanol/threemileisland/on_mob_life(var/mob/living/M as mob) - M.druggy = max(M.druggy, 50) - ..() - return - -datum/reagent/ethanol/gin - name = "Gin" - id = "gin" - description = "It's gin. In space. I say, good sir." - color = "#664300" // rgb: 102, 67, 0 - boozepwr = 55 - -datum/reagent/ethanol/rum - name = "Rum" - id = "rum" - description = "Yohoho and all that." - color = "#664300" // rgb: 102, 67, 0 - boozepwr = 45 - -datum/reagent/ethanol/tequilla - name = "Tequila" - id = "tequilla" - description = "A strong and mildly flavoured, mexican produced spirit. Feeling thirsty hombre?" - color = "#FFFF91" // rgb: 255, 255, 145 - boozepwr = 35 - -datum/reagent/ethanol/vermouth - name = "Vermouth" - id = "vermouth" - description = "You suddenly feel a craving for a martini..." - color = "#91FF91" // rgb: 145, 255, 145 - boozepwr = 45 - -datum/reagent/ethanol/wine - name = "Wine" - id = "wine" - description = "An premium alchoholic beverage made from distilled grape juice." - color = "#7E4043" // rgb: 126, 64, 67 - boozepwr = 45 - -datum/reagent/ethanol/cognac - name = "Cognac" - id = "cognac" - description = "A sweet and strongly alchoholic drink, made after numerous distillations and years of maturing. Classy as fornication." - color = "#AB3C05" // rgb: 171, 60, 5 - boozepwr = 45 - -datum/reagent/ethanol/hooch - name = "Hooch" - id = "hooch" - description = "Either someone's failure at cocktail making or attempt in alchohol production. In any case, do you really want to drink that?" - color = "#664300" // rgb: 102, 67, 0 - boozepwr = 35 - -datum/reagent/ethanol/ale - name = "Ale" - id = "ale" - description = "A dark alchoholic beverage made by malted barley and yeast." - color = "#664300" // rgb: 102, 67, 0 - boozepwr = 55 - -datum/reagent/ethanol/goldschlager - name = "Goldschlager" - id = "goldschlager" - description = "100 proof cinnamon schnapps, made for alcoholic teen girls on spring break." - color = "#FFFF91" // rgb: 255, 255, 145 - boozepwr = 25 - -datum/reagent/ethanol/patron - name = "Patron" - id = "patron" - description = "Tequila with silver in it, a favorite of alcoholic women in the club scene." - color = "#585840" // rgb: 88, 88, 64 - boozepwr = 45 - -datum/reagent/ethanol/gintonic - name = "Gin and Tonic" - id = "gintonic" - description = "An all time classic, mild cocktail." - color = "#664300" // rgb: 102, 67, 0 - boozepwr = 55 - -datum/reagent/ethanol/cuba_libre - name = "Cuba Libre" - id = "cubalibre" - description = "Rum, mixed with cola. Viva la revolution." - color = "#3E1B00" // rgb: 62, 27, 0 - boozepwr = 45 - -datum/reagent/ethanol/whiskey_cola - name = "Whiskey Cola" - id = "whiskeycola" - description = "Whiskey, mixed with cola. Surprisingly refreshing." - color = "#3E1B00" // rgb: 62, 27, 0 - boozepwr = 35 - -datum/reagent/ethanol/martini - name = "Classic Martini" - id = "martini" - description = "Vermouth with Gin. Not quite how 007 enjoyed it, but still delicious." - color = "#664300" // rgb: 102, 67, 0 - boozepwr = 35 - -datum/reagent/ethanol/vodkamartini - name = "Vodka Martini" - id = "vodkamartini" - description = "Vodka with Gin. Not quite how 007 enjoyed it, but still delicious." - color = "#664300" // rgb: 102, 67, 0 - boozepwr = 25 - -datum/reagent/ethanol/white_russian - name = "White Russian" - id = "whiterussian" - description = "That's just, like, your opinion, man..." - color = "#A68340" // rgb: 166, 131, 64 - boozepwr = 35 - -datum/reagent/ethanol/screwdrivercocktail - name = "Screwdriver" - id = "screwdrivercocktail" - description = "Vodka, mixed with plain ol' orange juice. The result is surprisingly delicious." - color = "#A68310" // rgb: 166, 131, 16 - boozepwr = 35 - -datum/reagent/ethanol/booger - name = "Booger" - id = "booger" - description = "Ewww..." - color = "#8CFF8C" // rgb: 140, 255, 140 - boozepwr = 45 - -datum/reagent/ethanol/bloody_mary - name = "Bloody Mary" - id = "bloodymary" - description = "A strange yet pleasurable mixture made of vodka, tomato and lime juice. Or at least you THINK the red stuff is tomato juice." - color = "#664300" // rgb: 102, 67, 0 - boozepwr = 35 - -datum/reagent/ethanol/brave_bull - name = "Brave Bull" - id = "bravebull" - description = "It's just as effective as Dutch-Courage!." - color = "#664300" // rgb: 102, 67, 0 - boozepwr = 35 - -datum/reagent/ethanol/tequilla_sunrise - name = "Tequila Sunrise" - id = "tequillasunrise" - description = "Tequila and orange juice. Much like a Screwdriver, only Mexican~" - color = "#FFE48C" // rgb: 255, 228, 140 - boozepwr = 35 - -datum/reagent/ethanol/toxins_special - name = "Toxins Special" - id = "toxinsspecial" - description = "This thing is ON FIRE! CALL THE DAMN SHUTTLE!" - reagent_state = LIQUID - color = "#664300" // rgb: 102, 67, 0 - boozepwr = 15 - -datum/reagent/ethanol/toxins_special/on_mob_life(var/mob/living/M as mob) - if (M.bodytemperature < 330) - M.bodytemperature = min(330, M.bodytemperature + (15 * TEMPERATURE_DAMAGE_COEFFICIENT)) //310 is the normal bodytemp. 310.055 - ..() - return - -datum/reagent/ethanol/beepsky_smash - name = "Beepsky Smash" - id = "beepskysmash" - description = "Deny drinking this and prepare for THE LAW." - reagent_state = LIQUID - color = "#664300" // rgb: 102, 67, 0 - boozepwr = 25 - -datum/reagent/ethanol/beepsky_smash/on_mob_life(var/mob/living/M as mob) - M.Stun(2) - ..() - return - -datum/reagent/ethanol/irish_cream - name = "Irish Cream" - id = "irishcream" - description = "Whiskey-imbued cream, what else would you expect from the Irish." - color = "#664300" // rgb: 102, 67, 0 - boozepwr = 35 - -datum/reagent/ethanol/manly_dorf - name = "The Manly Dorf" - id = "manlydorf" - description = "Beer and Ale, brought together in a delicious mix. Intended for true men only." - color = "#664300" // rgb: 102, 67, 0 - boozepwr = 45 //was 10, but really its only beer and ale, both weak alchoholic beverages - -datum/reagent/ethanol/longislandicedtea - name = "Long Island Iced Tea" - id = "longislandicedtea" - description = "The liquor cabinet, brought together in a delicious mix. Intended for middle-aged alcoholic women only." - color = "#664300" // rgb: 102, 67, 0 - boozepwr = 25 - -datum/reagent/ethanol/moonshine - name = "Moonshine" - id = "moonshine" - description = "You've really hit rock bottom now... your liver packed its bags and left last night." - color = "#664300" // rgb: 102, 67, 0 - boozepwr = 25 - -datum/reagent/ethanol/b52 - name = "B-52" - id = "b52" - description = "Coffee, Irish Cream, and cognac. You will get bombed." - color = "#664300" // rgb: 102, 67, 0 - boozepwr = 25 - -datum/reagent/ethanol/irishcoffee - name = "Irish Coffee" - id = "irishcoffee" - description = "Coffee, and alcohol. More fun than a Mimosa to drink in the morning." - color = "#664300" // rgb: 102, 67, 0 - boozepwr = 35 - -datum/reagent/ethanol/margarita - name = "Margarita" - id = "margarita" - description = "On the rocks with salt on the rim. Arriba~!" - color = "#8CFF8C" // rgb: 140, 255, 140 - boozepwr = 35 - -datum/reagent/ethanol/black_russian - name = "Black Russian" - id = "blackrussian" - description = "For the lactose-intolerant. Still as classy as a White Russian." - color = "#360000" // rgb: 54, 0, 0 - boozepwr = 35 - -datum/reagent/ethanol/manhattan - name = "Manhattan" - id = "manhattan" - description = "The Detective's undercover drink of choice. He never could stomach gin..." - color = "#664300" // rgb: 102, 67, 0 - boozepwr = 45 - -datum/reagent/ethanol/manhattan_proj - name = "Manhattan Project" - id = "manhattan_proj" - description = "A scientist's drink of choice, for pondering ways to blow up the station." - color = "#664300" // rgb: 102, 67, 0 - boozepwr = 15 - -datum/reagent/ethanol/manhattan_proj/on_mob_life(var/mob/living/M as mob) - M.druggy = max(M.druggy, 30) - ..() - return - -datum/reagent/ethanol/whiskeysoda - name = "Whiskey Soda" - id = "whiskeysoda" - description = "For the more refined griffon." - color = "#664300" // rgb: 102, 67, 0 - boozepwr = 35 - -datum/reagent/ethanol/antifreeze - name = "Anti-freeze" - id = "antifreeze" - description = "Ultimate refreshment." - color = "#664300" // rgb: 102, 67, 0 - boozepwr = 25 - -datum/reagent/ethanol/antifreeze/on_mob_life(var/mob/living/M as mob) - if (M.bodytemperature < 330) - M.bodytemperature = min(330, M.bodytemperature + (20 * TEMPERATURE_DAMAGE_COEFFICIENT)) //310 is the normal bodytemp. 310.055 - ..() - return - -datum/reagent/ethanol/barefoot - name = "Barefoot" - id = "barefoot" - description = "Barefoot and pregnant" - color = "#664300" // rgb: 102, 67, 0 - boozepwr = 45 - -datum/reagent/ethanol/snowwhite - name = "Snow White" - id = "snowwhite" - description = "A cold refreshment" - color = "#FFFFFF" // rgb: 255, 255, 255 - boozepwr = 45 - -datum/reagent/ethanol/demonsblood - name = "Demons Blood" - id = "demonsblood" - description = "AHHHH!!!!" - color = "#820000" // rgb: 130, 0, 0 - boozepwr = 35 - -datum/reagent/ethanol/vodkatonic - name = "Vodka and Tonic" - id = "vodkatonic" - description = "For when a gin and tonic isn't russian enough." - color = "#0064C8" // rgb: 0, 100, 200 - boozepwr = 35 - -datum/reagent/ethanol/ginfizz - name = "Gin Fizz" - id = "ginfizz" - description = "Refreshingly lemony, deliciously dry." - color = "#664300" // rgb: 102, 67, 0 - boozepwr = 45 - -datum/reagent/ethanol/bahama_mama - name = "Bahama mama" - id = "bahama_mama" - description = "Tropical cocktail." - color = "#FF7F3B" // rgb: 255, 127, 59 - boozepwr = 35 - -datum/reagent/ethanol/singulo - name = "Singulo" - id = "singulo" - description = "A blue-space beverage!" - color = "#2E6671" // rgb: 46, 102, 113 - boozepwr = 15 - -datum/reagent/ethanol/sbiten - name = "Sbiten" - id = "sbiten" - description = "A spicy Vodka! Might be a little hot for the little guys!" - color = "#664300" // rgb: 102, 67, 0 - boozepwr = 35 - -datum/reagent/ethanol/sbiten/on_mob_life(var/mob/living/M as mob) - if (M.bodytemperature < 360) - M.bodytemperature = min(360, M.bodytemperature + (50 * TEMPERATURE_DAMAGE_COEFFICIENT)) //310 is the normal bodytemp. 310.055 - ..() - return - -datum/reagent/ethanol/devilskiss - name = "Devils Kiss" - id = "devilskiss" - description = "Creepy time!" - color = "#A68310" // rgb: 166, 131, 16 - boozepwr = 35 - -datum/reagent/ethanol/red_mead - name = "Red Mead" - id = "red_mead" - description = "The true Viking drink! Even though it has a strange red color." - color = "#C73C00" // rgb: 199, 60, 0 - boozepwr = 45 - -datum/reagent/ethanol/mead - name = "Mead" - id = "mead" - description = "A Vikings drink, though a cheap one." - reagent_state = LIQUID - color = "#664300" // rgb: 102, 67, 0 - boozepwr = 45 - -datum/reagent/ethanol/mead/on_mob_life(var/mob/living/M as mob) - M.nutrition += 1 - ..() - return - -datum/reagent/ethanol/iced_beer - name = "Iced Beer" - id = "iced_beer" - description = "A beer which is so cold the air around it freezes." - color = "#664300" // rgb: 102, 67, 0 - boozepwr = 55 - -datum/reagent/ethanol/iced_beer/on_mob_life(var/mob/living/M as mob) - if(M.bodytemperature > 270) - M.bodytemperature = max(270, M.bodytemperature - (20 * TEMPERATURE_DAMAGE_COEFFICIENT)) //310 is the normal bodytemp. 310.055 - ..() - return - -datum/reagent/ethanol/grog - name = "Grog" - id = "grog" - description = "Watered down rum, Nanotrasen approves!" - color = "#664300" // rgb: 102, 67, 0 - boozepwr = 90 - -datum/reagent/ethanol/aloe - name = "Aloe" - id = "aloe" - description = "So very, very, very good." - color = "#664300" // rgb: 102, 67, 0 - boozepwr = 35 - -datum/reagent/ethanol/andalusia - name = "Andalusia" - id = "andalusia" - description = "A nice, strange named drink." - color = "#664300" // rgb: 102, 67, 0 - boozepwr = 35 - -datum/reagent/ethanol/alliescocktail - name = "Allies Cocktail" - id = "alliescocktail" - description = "A drink made from your allies, not as sweet as when made from your enemies." - color = "#664300" // rgb: 102, 67, 0 - boozepwr = 35 - -datum/reagent/ethanol/acid_spit - name = "Acid Spit" - id = "acidspit" - description = "A drink for the daring, can be deadly if incorrectly prepared!" - reagent_state = LIQUID - color = "#365000" // rgb: 54, 80, 0 - boozepwr = 45 - -datum/reagent/ethanol/amasec - name = "Amasec" - id = "amasec" - description = "Official drink of the Nanotrasen Gun-Club!" - reagent_state = LIQUID - color = "#664300" // rgb: 102, 67, 0 - boozepwr = 35 - -datum/reagent/ethanol/changelingsting - name = "Changeling Sting" - id = "changelingsting" - description = "You take a tiny sip and feel a burning sensation..." - color = "#2E6671" // rgb: 46, 102, 113 - boozepwr = 15 - -datum/reagent/ethanol/irishcarbomb - name = "Irish Car Bomb" - id = "irishcarbomb" - description = "Mmm, tastes like chocolate cake..." - color = "#2E6671" // rgb: 46, 102, 113 - boozepwr = 25 - -datum/reagent/ethanol/syndicatebomb - name = "Syndicate Bomb" - id = "syndicatebomb" - description = "Tastes like terrorism!" - color = "#2E6671" // rgb: 46, 102, 113 - boozepwr = 15 - -datum/reagent/ethanol/erikasurprise - name = "Erika Surprise" - id = "erikasurprise" - description = "The surprise is, it's green!" - color = "#2E6671" // rgb: 46, 102, 113 - boozepwr = 35 - -datum/reagent/ethanol/driestmartini - name = "Driest Martini" - id = "driestmartini" - description = "Only for the experienced. You think you see sand floating in the glass." - nutriment_factor = 1 * REAGENTS_METABOLISM - color = "#2E6671" // rgb: 46, 102, 113 - boozepwr = 25 - -datum/reagent/ethanol/bananahonk - name = "Banana Mama" - id = "bananahonk" - description = "A drink from Clown Heaven." - nutriment_factor = 1 * REAGENTS_METABOLISM - color = "#FFFF91" // rgb: 255, 255, 140 - boozepwr = 25 - -datum/reagent/ethanol/bananahonk/on_mob_life(var/mob/living/M as mob) - M.nutrition += nutriment_factor - if(istype(M, /mob/living/carbon/human) && M.job in list("Clown") || istype(M, /mob/living/carbon/monkey)) - if(!M) M = holder.my_atom - M.heal_organ_damage(1,1) - ..() - return - -datum/reagent/ethanol/silencer - name = "Silencer" - id = "silencer" - description = "A drink from Mime Heaven." - nutriment_factor = 1 * REAGENTS_METABOLISM - color = "#664300" // rgb: 102, 67, 0 - boozepwr = 15 - -datum/reagent/ethanol/silencer/on_mob_life(var/mob/living/M as mob) - M.nutrition += nutriment_factor - if(istype(M, /mob/living/carbon/human) && M.job in list("Mime")) - if(!M) M = holder.my_atom - M.heal_organ_damage(1,1) - ..() - return - -// Undefine the alias for REAGENTS_EFFECT_MULTIPLER -#undef REM diff --git a/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents.dm b/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents.dm new file mode 100644 index 00000000000..641c0916c0f --- /dev/null +++ b/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents.dm @@ -0,0 +1,858 @@ +#define SOLID 1 +#define LIQUID 2 +#define GAS 3 + +#define REM REAGENTS_EFFECT_MULTIPLIER + +//The reaction procs must ALWAYS set src = null, this detaches the proc from the object (the reagent) +//so that it can continue working when the reagent is deleted while the proc is still active. + + +//Various reagents +//Toxin & acid reagents +//Hydroponics stuff + +datum/reagent + var/name = "Reagent" + var/id = "reagent" + var/description = "" + var/datum/reagents/holder = null + var/reagent_state = LIQUID + var/list/data + var/volume = 0 + //var/list/viruses = list() + var/color = "#000000" // rgb: 0, 0, 0 (does not support alpha channels - yet!) + var/metabolization_rate = REAGENTS_METABOLISM + +datum/reagent/proc/reaction_mob(var/mob/M, var/method=TOUCH, var/volume) //By default we have a chance to transfer some + if(!istype(M, /mob/living)) + return 0 + var/datum/reagent/self = src + src = null //of the reagent to the mob on TOUCHING it. + + if(!istype(self.holder.my_atom, /obj/effect/effect/chem_smoke)) + // If the chemicals are in a smoke cloud, do not try to let the chemicals "penetrate" into the mob's system (balance station 13) -- Doohl + + if(method == TOUCH) + + var/chance = 1 + var/block = 0 + + for(var/obj/item/clothing/C in M.get_equipped_items()) + if(C.permeability_coefficient < chance) chance = C.permeability_coefficient + if(istype(C, /obj/item/clothing/suit/bio_suit)) + // bio suits are just about completely fool-proof - Doohl + // kind of a hacky way of making bio suits more resistant to chemicals but w/e + if(prob(75)) + block = 1 + + if(istype(C, /obj/item/clothing/head/bio_hood)) + if(prob(75)) + block = 1 + + chance = chance * 100 + + if(prob(chance) && !block) + if(M.reagents) + M.reagents.add_reagent(self.id,self.volume/2) + return 1 + +datum/reagent/proc/reaction_obj(var/obj/O, var/volume) //By default we transfer a small part of the reagent to the object + src = null //if it can hold reagents. nope! + //if(O.reagents) + // O.reagents.add_reagent(id,volume/3) + return + +datum/reagent/proc/reaction_turf(var/turf/T, var/volume) + src = null + return + +datum/reagent/proc/on_mob_life(var/mob/living/M as mob) + if(!istype(M, /mob/living)) + return //Noticed runtime errors from pacid trying to damage ghosts, this should fix. --NEO + holder.remove_reagent(src.id, metabolization_rate * M.metabolism_efficiency) //By default it slowly disappears. + return + +datum/reagent/proc/on_move(var/mob/M) + return + +// Called after add_reagents creates a new reagent. +datum/reagent/proc/on_new(var/data) + return + +// Called when two reagents of the same are mixing. +datum/reagent/proc/on_merge(var/data) + return + +datum/reagent/proc/on_update(var/atom/A) + return + +datum/reagent/blood + data = list("donor"=null,"viruses"=null,"blood_DNA"=null,"blood_type"=null,"resistances"=null,"trace_chem"=null,"mind"=null,"ckey"=null,"gender"=null,"real_name"=null,"cloneable"=null) + name = "Blood" + id = "blood" + color = "#C80000" // rgb: 200, 0, 0 + +datum/reagent/blood/reaction_mob(var/mob/M, var/method=TOUCH, var/volume) + var/datum/reagent/blood/self = src + src = null + if(self.data && self.data["viruses"]) + for(var/datum/disease/D in self.data["viruses"]) + + if(D.spread_flags & SPECIAL || D.spread_flags & NON_CONTAGIOUS) + continue + + if(method == TOUCH) + M.ContractDisease(D) + else //injected + M.ForceContractDisease(D) + +datum/reagent/blood/on_new(var/list/data) + if(istype(data)) + SetViruses(src, data) + +datum/reagent/blood/on_merge(var/list/data) + if(src.data && data) + src.data["cloneable"] = 0 //On mix, consider the genetic sampling unviable for pod cloning, or else we won't know who's even getting cloned, etc + if(src.data["viruses"] || data["viruses"]) + + var/list/mix1 = src.data["viruses"] + var/list/mix2 = data["viruses"] + + // Stop issues with the list changing during mixing. + var/list/to_mix = list() + + for(var/datum/disease/advance/AD in mix1) + to_mix += AD + for(var/datum/disease/advance/AD in mix2) + to_mix += AD + + var/datum/disease/advance/AD = Advance_Mix(to_mix) + if(AD) + var/list/preserve = list(AD) + for(var/D in src.data["viruses"]) + if(!istype(D, /datum/disease/advance)) + preserve += D + src.data["viruses"] = preserve + return 1 + + +datum/reagent/blood/reaction_turf(var/turf/simulated/T, var/volume)//splash the blood all over the place + if(!istype(T)) return + var/datum/reagent/blood/self = src + src = null + if(!(volume >= 3)) return + //var/datum/disease/D = self.data["virus"] + if(!self.data["donor"] || istype(self.data["donor"], /mob/living/carbon/human)) + var/obj/effect/decal/cleanable/blood/blood_prop = locate() in T //find some blood here + if(!blood_prop) //first blood! + blood_prop = new(T) + blood_prop.blood_DNA[self.data["blood_DNA"]] = self.data["blood_type"] + + for(var/datum/disease/D in self.data["viruses"]) + var/datum/disease/newVirus = D.Copy(1) + blood_prop.viruses += newVirus + newVirus.holder = blood_prop + + + else if(istype(self.data["donor"], /mob/living/carbon/monkey)) + var/obj/effect/decal/cleanable/blood/blood_prop = locate() in T + if(!blood_prop) + blood_prop = new(T) + blood_prop.blood_DNA["Non-Human DNA"] = "A+" + for(var/datum/disease/D in self.data["viruses"]) + var/datum/disease/newVirus = D.Copy(1) + blood_prop.viruses += newVirus + newVirus.holder = blood_prop + + else if(istype(self.data["donor"], /mob/living/carbon/alien)) + var/obj/effect/decal/cleanable/xenoblood/blood_prop = locate() in T + if(!blood_prop) + blood_prop = new(T) + blood_prop.blood_DNA["UNKNOWN DNA STRUCTURE"] = "X*" + for(var/datum/disease/D in self.data["viruses"]) + var/datum/disease/newVirus = D.Copy(1) + blood_prop.viruses += newVirus + newVirus.holder = blood_prop + return + +/* Must check the transfering of reagents and their data first. They all can point to one disease datum. + + Del() + if(src.data["virus"]) + var/datum/disease/D = src.data["virus"] + D.cure(0) + ..() +*/ +datum/reagent/vaccine + //data must contain virus type + name = "Vaccine" + id = "vaccine" + color = "#C81040" // rgb: 200, 16, 64 + +datum/reagent/vaccine/reaction_mob(var/mob/M, var/method=TOUCH, var/volume) + var/datum/reagent/vaccine/self = src + src = null + if(islist(self.data) && method == INGEST) + for(var/datum/disease/D in M.viruses) + if(D.GetDiseaseID() in self.data) + D.cure() + M.resistances |= self.data + return + +datum/reagent/vaccine/on_merge(var/list/data) + if(istype(data)) + src.data |= data.Copy() + + +datum/reagent/water + name = "Water" + id = "water" + description = "A ubiquitous chemical substance that is composed of hydrogen and oxygen." + color = "#AAAAAA77" // rgb: 170, 170, 170, 77 (alpha) + var/cooling_temperature = 2 + +datum/reagent/water/reaction_turf(var/turf/simulated/T, var/volume) + if (!istype(T)) return + var/CT = cooling_temperature + src = null + if(volume >= 10) + T.MakeSlippery() + + for(var/mob/living/carbon/slime/M in T) + M.apply_water() + + var/hotspot = (locate(/obj/effect/hotspot) in T) + if(hotspot && !istype(T, /turf/space)) + if(T.air) + var/datum/gas_mixture/G = T.air + G.temperature = max(min(G.temperature-(CT*1000),G.temperature/CT),0) + G.react() + qdel(hotspot) + return + +datum/reagent/water/reaction_obj(var/obj/O, var/volume) + src = null + if(istype(O,/obj/item/weapon/reagent_containers/food/snacks/monkeycube)) + var/obj/item/weapon/reagent_containers/food/snacks/monkeycube/cube = O + if(!cube.wrapped) + cube.Expand() + return + +datum/reagent/water/reaction_mob(var/mob/living/M, var/method=TOUCH, var/volume)//Splashing people with water can help put them out! + if(!istype(M, /mob/living)) + return + if(method == TOUCH) + M.adjust_fire_stacks(-(volume / 10)) + if(M.fire_stacks <= 0) + M.ExtinguishMob() + return + +datum/reagent/water/holywater + name = "Holy Water" + id = "holywater" + description = "Water blessed by some deity." + color = "#E0E8EF" // rgb: 224, 232, 239 + +datum/reagent/water/holywater/on_mob_life(var/mob/living/M as mob) + if(!data) data = 1 + data++ + M.jitteriness = max(M.jitteriness-5,0) + if(data >= 30) // 12 units, 54 seconds @ metabolism 0.4 units & tick rate 1.8 sec + if (!M.stuttering) M.stuttering = 1 + M.stuttering += 4 + M.Dizzy(5) + if(iscultist(M) && prob(5)) + M.say(pick("Av'te Nar'sie","Pa'lid Mors","INO INO ORA ANA","SAT ANA!","Daim'niodeis Arc'iai Le'eones","Egkau'haom'nai en Chaous","Ho Diak'nos tou Ap'iron","R'ge Na'sie","Diabo us Vo'iscum","Si gn'um Co'nu")) + if(data >= 75 && prob(33)) // 30 units, 135 seconds + if (!M.confused) M.confused = 1 + M.confused += 3 + if(iscultist(M)) + ticker.mode.remove_cultist(M.mind) + holder.remove_reagent(src.id, src.volume) // maybe this is a little too perfect and a max() cap on the statuses would be better?? + M.jitteriness = 0 + M.stuttering = 0 + M.confused = 0 + holder.remove_reagent(src.id, 0.4) //fixed consumption to prevent balancing going out of whack + return + +datum/reagent/water/holywater/reaction_turf(var/turf/simulated/T, var/volume) + ..() + if(!istype(T)) return + if(volume>=10) + for(var/obj/effect/rune/R in T) + qdel(R) + T.Bless() + +datum/reagent/fuel/unholywater //if you somehow managed to extract this from someone, dont splash it on yourself and have a smoke + name = "Unholy Water" + id = "unholywater" + description = "Something that shouldn't exist on this plane of existance." + +datum/reagent/fuel/unholywater/on_mob_life(var/mob/living/M as mob) + M.adjustBrainLoss(3) + if(iscultist(M)) + M.status_flags |= GOTTAGOFAST + M.drowsyness = max(M.drowsyness-5, 0) + M.AdjustParalysis(-2) + M.AdjustStunned(-2) + M.AdjustWeakened(-2) + else + M.adjustToxLoss(2) + M.adjustFireLoss(2) + M.adjustOxyLoss(2) + M.adjustBruteLoss(2) + holder.remove_reagent(src.id, 1) + +datum/reagent/hellwater //if someone has this in their system they've really pissed off an eldrich god + name = "Hell Water" + id = "hell_water" + description = "YOUR FLESH! IT BURNS!" + +datum/reagent/hellwater/on_mob_life(var/mob/living/M as mob) + M.fire_stacks = min(5,M.fire_stacks + 3) + M.IgniteMob() //Only problem with igniting people is currently the commonly availible fire suits make you immune to being on fire + M.adjustToxLoss(1) + M.adjustFireLoss(1) //Hence the other damages... ain't I a bastard? + M.adjustBrainLoss(5) + holder.remove_reagent(src.id, 1) + +datum/reagent/lube + name = "Space Lube" + id = "lube" + description = "Lubricant is a substance introduced between two moving surfaces to reduce the friction and wear between them. giggity." + color = "#009CA8" // rgb: 0, 156, 168 + +datum/reagent/lube/reaction_turf(var/turf/simulated/T, var/volume) + if (!istype(T)) return + src = null + if(volume >= 1) + T.MakeSlippery(2) + +datum/reagent/slimetoxin + name = "Mutation Toxin" + id = "mutationtoxin" + description = "A corruptive toxin produced by slimes." + color = "#13BC5E" // rgb: 19, 188, 94 + +datum/reagent/aslimetoxin + name = "Advanced Mutation Toxin" + id = "amutationtoxin" + description = "An advanced corruptive toxin produced by slimes." + color = "#13BC5E" // rgb: 19, 188, 94 + +datum/reagent/aslimetoxin/reaction_mob(var/mob/M, var/volume) + src = null + M.ForceContractDisease(new /datum/disease/transformation/slime(0)) + +datum/reagent/space_drugs + name = "Space drugs" + id = "space_drugs" + description = "An illegal chemical compound used as drug." + color = "#60A584" // rgb: 96, 165, 132 + metabolization_rate = 0.5 * REAGENTS_METABOLISM + +datum/reagent/space_drugs/on_mob_life(var/mob/living/M as mob) + M.druggy = max(M.druggy, 15) + if(isturf(M.loc) && !istype(M.loc, /turf/space)) + if(M.canmove) + if(prob(10)) step(M, pick(cardinal)) + if(prob(7)) M.emote(pick("twitch","drool","moan","giggle")) + ..() + return + +datum/reagent/serotrotium + name = "Serotrotium" + id = "serotrotium" + description = "A chemical compound that promotes concentrated production of the serotonin neurotransmitter in humans." + color = "#202040" // rgb: 20, 20, 40 + metabolization_rate = 0.25 * REAGENTS_METABOLISM + +datum/reagent/serotrotium/on_mob_life(var/mob/living/M as mob) + if(ishuman(M)) + if(prob(7)) M.emote(pick("twitch","drool","moan","gasp")) + ..() + return + +datum/reagent/oxygen + name = "Oxygen" + id = "oxygen" + description = "A colorless, odorless gas." + reagent_state = GAS + color = "#808080" // rgb: 128, 128, 128 + +datum/reagent/copper + name = "Copper" + id = "copper" + description = "A highly ductile metal." + reagent_state = SOLID + color = "#6E3B08" // rgb: 110, 59, 8 + +datum/reagent/nitrogen + name = "Nitrogen" + id = "nitrogen" + description = "A colorless, odorless, tasteless gas." + reagent_state = GAS + color = "#808080" // rgb: 128, 128, 128 + +datum/reagent/hydrogen + name = "Hydrogen" + id = "hydrogen" + description = "A colorless, odorless, nonmetallic, tasteless, highly combustible diatomic gas." + reagent_state = GAS + color = "#808080" // rgb: 128, 128, 128 + +datum/reagent/potassium + name = "Potassium" + id = "potassium" + description = "A soft, low-melting solid that can easily be cut with a knife. Reacts violently with water." + reagent_state = SOLID + color = "#A0A0A0" // rgb: 160, 160, 160 + +datum/reagent/mercury + name = "Mercury" + id = "mercury" + description = "A chemical element." + color = "#484848" // rgb: 72, 72, 72 + +datum/reagent/mercury/on_mob_life(var/mob/living/M as mob) + if(M.canmove && istype(M.loc, /turf/space)) + step(M, pick(cardinal)) + if(prob(5)) + M.emote(pick("twitch","drool","moan")) + M.adjustBrainLoss(2) + ..() + return + +datum/reagent/sulfur + name = "Sulfur" + id = "sulfur" + description = "A chemical element." + reagent_state = SOLID + color = "#BF8C00" // rgb: 191, 140, 0 + +datum/reagent/carbon + name = "Carbon" + id = "carbon" + description = "A chemical element." + reagent_state = SOLID + color = "#1C1300" // rgb: 30, 20, 0 + +datum/reagent/carbon/reaction_turf(var/turf/T, var/volume) + src = null + if(!istype(T, /turf/space)) + new /obj/effect/decal/cleanable/dirt(T) + +datum/reagent/chlorine + name = "Chlorine" + id = "chlorine" + description = "A chemical element." + reagent_state = GAS + color = "#808080" // rgb: 128, 128, 128 + +datum/reagent/chlorine/on_mob_life(var/mob/living/M as mob) + M.take_organ_damage(1*REM, 0) + ..() + return + +datum/reagent/fluorine + name = "Fluorine" + id = "fluorine" + description = "A highly-reactive chemical element." + reagent_state = GAS + color = "#808080" // rgb: 128, 128, 128 + +datum/reagent/fluorine/on_mob_life(var/mob/living/M as mob) + M.adjustToxLoss(1*REM) + ..() + return + +datum/reagent/sodium + name = "Sodium" + id = "sodium" + description = "A chemical element." + reagent_state = SOLID + color = "#808080" // rgb: 128, 128, 128 + +datum/reagent/phosphorus + name = "Phosphorus" + id = "phosphorus" + description = "A chemical element." + reagent_state = SOLID + color = "#832828" // rgb: 131, 40, 40 + +datum/reagent/lithium + name = "Lithium" + id = "lithium" + description = "A chemical element." + reagent_state = SOLID + color = "#808080" // rgb: 128, 128, 128 + +datum/reagent/lithium/on_mob_life(var/mob/living/M as mob) + if(M.canmove && istype(M.loc, /turf/space)) + step(M, pick(cardinal)) + if(prob(5)) + M.emote(pick("twitch","drool","moan")) + ..() + return + +datum/reagent/glycerol + name = "Glycerol" + id = "glycerol" + description = "Glycerol is a simple polyol compound. Glycerol is sweet-tasting and of low toxicity." + color = "#808080" // rgb: 128, 128, 128 + +datum/reagent/nitroglycerin + name = "Nitroglycerin" + id = "nitroglycerin" + description = "Nitroglycerin is a heavy, colorless, oily, explosive liquid obtained by nitrating glycerol." + color = "#808080" // rgb: 128, 128, 128 + +datum/reagent/radium + name = "Radium" + id = "radium" + description = "Radium is an alkaline earth metal. It is extremely radioactive." + reagent_state = SOLID + color = "#C7C7C7" // rgb: 199,199,199 + +datum/reagent/radium/on_mob_life(var/mob/living/M as mob) + M.apply_effect(2*REM/M.metabolism_efficiency,IRRADIATE,0) + ..() + return + +datum/reagent/radium/reaction_turf(var/turf/T, var/volume) + src = null + if(volume >= 3) + if(!istype(T, /turf/space)) + new /obj/effect/decal/cleanable/greenglow(T) + return + +datum/reagent/thermite + name = "Thermite" + id = "thermite" + description = "Thermite produces an aluminothermic reaction known as a thermite reaction. Can be used to melt walls." + reagent_state = SOLID + color = "#673910" // rgb: 103, 57, 16 + +datum/reagent/thermite/reaction_turf(var/turf/T, var/volume) + src = null + if(volume >= 1 && istype(T, /turf/simulated/wall)) + var/turf/simulated/wall/Wall = T + if(istype(Wall, /turf/simulated/wall/r_wall)) + Wall.thermite = Wall.thermite+(volume*2.5) + else + Wall.thermite = Wall.thermite+(volume*10) + Wall.overlays = list() + Wall.overlays += image('icons/effects/effects.dmi',"thermite") + return + +datum/reagent/thermite/on_mob_life(var/mob/living/M as mob) + M.adjustFireLoss(1) + ..() + return + +datum/reagent/sterilizine + name = "Sterilizine" + id = "sterilizine" + description = "Sterilizes wounds in preparation for surgery." + color = "#C8A5DC" // rgb: 200, 165, 220 + +datum/reagent/iron + name = "Iron" + id = "iron" + description = "Pure iron is a metal." + reagent_state = SOLID + color = "#C8A5DC" // rgb: 200, 165, 220 + +datum/reagent/gold + name = "Gold" + id = "gold" + description = "Gold is a dense, soft, shiny metal and the most malleable and ductile metal known." + reagent_state = SOLID + color = "#F7C430" // rgb: 247, 196, 48 + +datum/reagent/silver + name = "Silver" + id = "silver" + description = "A soft, white, lustrous transition metal, it has the highest electrical conductivity of any element and the highest thermal conductivity of any metal." + reagent_state = SOLID + color = "#D0D0D0" // rgb: 208, 208, 208 + +datum/reagent/uranium + name ="Uranium" + id = "uranium" + description = "A silvery-white metallic chemical element in the actinide series, weakly radioactive." + reagent_state = SOLID + color = "#B8B8C0" // rgb: 184, 184, 192 + +datum/reagent/uranium/on_mob_life(var/mob/living/M as mob) + M.apply_effect(1/M.metabolism_efficiency,IRRADIATE,0) + ..() + return + + +datum/reagent/uranium/reaction_turf(var/turf/T, var/volume) + src = null + if(volume >= 3) + if(!istype(T, /turf/space)) + new /obj/effect/decal/cleanable/greenglow(T) + +datum/reagent/aluminium + name = "Aluminium" + id = "aluminium" + description = "A silvery white and ductile member of the boron group of chemical elements." + reagent_state = SOLID + color = "#A8A8A8" // rgb: 168, 168, 168 + +datum/reagent/silicon + name = "Silicon" + id = "silicon" + description = "A tetravalent metalloid, silicon is less reactive than its chemical analog carbon." + reagent_state = SOLID + color = "#A8A8A8" // rgb: 168, 168, 168 + +datum/reagent/fuel + name = "Welding fuel" + id = "fuel" + description = "Required for welders. Flamable." + color = "#660000" // rgb: 102, 0, 0 + +datum/reagent/fuel/reaction_mob(var/mob/living/M, var/method=TOUCH, var/volume)//Splashing people with welding fuel to make them easy to ignite! + if(!istype(M, /mob/living)) + return + if(method == TOUCH) + M.adjust_fire_stacks(volume / 10) + return + +datum/reagent/fuel/on_mob_life(var/mob/living/M as mob) + M.adjustToxLoss(1) + ..() + return + +datum/reagent/space_cleaner + name = "Space cleaner" + id = "cleaner" + description = "A compound used to clean things. Now with 50% more sodium hypochlorite!" + color = "#A5F0EE" // rgb: 165, 240, 238 + +datum/reagent/space_cleaner/reaction_obj(var/obj/O, var/volume) + if(istype(O,/obj/effect/decal/cleanable)) + qdel(O) + else + if(O) + O.clean_blood() + +datum/reagent/space_cleaner/reaction_turf(var/turf/T, var/volume) + if(volume >= 1) + T.clean_blood() + for(var/obj/effect/decal/cleanable/C in T) + qdel(C) + + for(var/mob/living/carbon/slime/M in T) + M.adjustToxLoss(rand(5,10)) + +datum/reagent/space_cleaner/reaction_mob(var/mob/M, var/method=TOUCH, var/volume) + if(iscarbon(M)) + var/mob/living/carbon/C = M + if(C.r_hand) + C.r_hand.clean_blood() + if(C.l_hand) + C.l_hand.clean_blood() + if(C.wear_mask) + if(C.wear_mask.clean_blood()) + C.update_inv_wear_mask(0) + if(ishuman(M)) + var/mob/living/carbon/human/H = C + if(H.head) + if(H.head.clean_blood()) + H.update_inv_head(0) + if(H.wear_suit) + if(H.wear_suit.clean_blood()) + H.update_inv_wear_suit(0) + else if(H.w_uniform) + if(H.w_uniform.clean_blood()) + H.update_inv_w_uniform(0) + if(H.shoes) + if(H.shoes.clean_blood()) + H.update_inv_shoes(0) + M.clean_blood() + +datum/reagent/cryptobiolin + name = "Cryptobiolin" + id = "cryptobiolin" + description = "Cryptobiolin causes confusion and dizzyness." + color = "#C8A5DC" // rgb: 200, 165, 220 + metabolization_rate = 0.5 * REAGENTS_METABOLISM + +datum/reagent/cryptobiolin/on_mob_life(var/mob/living/M as mob) + M.Dizzy(1) + if(!M.confused) + M.confused = 1 + M.confused = max(M.confused, 20) + return + +datum/reagent/impedrezene + name = "Impedrezene" + id = "impedrezene" + description = "Impedrezene is a narcotic that impedes one's ability by slowing down the higher brain cell functions." + color = "#C8A5DC" // rgb: 200, 165, 220 + +datum/reagent/impedrezene/on_mob_life(var/mob/living/M as mob) + M.jitteriness = max(M.jitteriness-5,0) + if(prob(80)) M.adjustBrainLoss(1*REM) + if(prob(50)) M.drowsyness = max(M.drowsyness, 3) + if(prob(10)) M.emote("drool") + ..() + return + +datum/reagent/nanites + name = "Nanomachines" + id = "nanites" + description = "Microscopic construction robots." + color = "#535E66" // rgb: 83, 94, 102 + +datum/reagent/nanites/reaction_mob(var/mob/M, var/method=TOUCH, var/volume) + src = null + if( (prob(10) && method==TOUCH) || method==INGEST) + M.ForceContractDisease(new /datum/disease/transformation/robot(0)) + +datum/reagent/xenomicrobes + name = "Xenomicrobes" + id = "xenomicrobes" + description = "Microbes with an entirely alien cellular structure." + color = "#535E66" // rgb: 83, 94, 102 + +datum/reagent/xenomicrobes/reaction_mob(var/mob/M, var/method=TOUCH, var/volume) + src = null + if( (prob(10) && method==TOUCH) || method==INGEST) + M.ContractDisease(new /datum/disease/transformation/xeno(0)) + +datum/reagent/fluorosurfactant//foam precursor + name = "Fluorosurfactant" + id = "fluorosurfactant" + description = "A perfluoronated sulfonic acid that forms a foam when mixed with water." + color = "#9E6B38" // rgb: 158, 107, 56 + +datum/reagent/foaming_agent// Metal foaming agent. This is lithium hydride. Add other recipes (e.g. LiH + H2O -> LiOH + H2) eventually. + name = "Foaming agent" + id = "foaming_agent" + description = "A agent that yields metallic foam when mixed with light metal and a strong acid." + reagent_state = SOLID + color = "#664B63" // rgb: 102, 75, 99 + +datum/reagent/ammonia + name = "Ammonia" + id = "ammonia" + description = "A caustic substance commonly used in fertilizer or household cleaners." + reagent_state = GAS + color = "#404030" // rgb: 64, 64, 48 + +datum/reagent/diethylamine + name = "Diethylamine" + id = "diethylamine" + description = "A secondary amine, mildly corrosive." + color = "#604030" // rgb: 96, 64, 48 + + + +/////////////////////////Coloured Crayon Powder//////////////////////////// +//For colouring in /proc/mix_color_from_reagents + + +datum/reagent/crayonpowder + name = "Crayon Powder" + id = "crayon powder" + var/colorname = "none" + description = "A powder made by grinding down crayons, good for colouring chemical reagents." + reagent_state = SOLID + color = "#FFFFFF" // rgb: 207, 54, 0 + +datum/reagent/crayonpowder/New() + description = "\an [colorname] powder made by grinding down crayons, good for colouring chemical reagents." + + +datum/reagent/crayonpowder/red + name = "Red Crayon Powder" + id = "redcrayonpowder" + colorname = "red" + +datum/reagent/crayonpowder/orange + name = "Orange Crayon Powder" + id = "orangecrayonpowder" + colorname = "orange" + color = "#FF9300" // orange + +datum/reagent/crayonpowder/yellow + name = "Yellow Crayon Powder" + id = "yellowcrayonpowder" + colorname = "yellow" + color = "#FFF200" // yellow + +datum/reagent/crayonpowder/green + name = "Green Crayon Powder" + id = "greencrayonpowder" + colorname = "green" + color = "#A8E61D" // green + +datum/reagent/crayonpowder/blue + name = "Blue Crayon Powder" + id = "bluecrayonpowder" + colorname = "blue" + color = "#00B7EF" // blue + +datum/reagent/crayonpowder/purple + name = "Purple Crayon Powder" + id = "purplecrayonpowder" + colorname = "purple" + color = "#DA00FF" // purple + +datum/reagent/crayonpowder/invisible + name = "Invisible Crayon Powder" + id = "invisiblecrayonpowder" + colorname = "invisible" + color = "#FFFFFF00" // white + no alpha + + + + +//////////////////////////////////Hydroponics stuff/////////////////////////////// + +datum/reagent/plantnutriment + name = "Generic nutriment" + id = "plantnutriment" + description = "Some kind of nutriment. You can't really tell what it is. You should probably report it, along with how you obtained it." + color = "#000000" // RBG: 0, 0, 0 + var/tox_prob = 0 + +datum/reagent/plantnutriment/on_mob_life(var/mob/living/M as mob) + if(prob(tox_prob)) + M.adjustToxLoss(1*REM) + ..() + return + +datum/reagent/plantnutriment/eznutriment + name = "E-Z-Nutrient" + id = "eznutriment" + description = "Cheap and extremely common type of plant nutriment." + color = "#376400" // RBG: 50, 100, 0 + tox_prob = 10 + +datum/reagent/plantnutriment/left4zednutriment + name = "Left 4 Zed" + id = "left4zednutriment" + description = "Unstable nutriment that makes plants mutate more often than usual." + color = "#1A1E4D" // RBG: 26, 30, 77 + tox_prob = 25 + +datum/reagent/plantnutriment/robustharvestnutriment + name = "Robust Harvest" + id = "robustharvestnutriment" + description = "Very potent nutriment that prevents plants from mutating." + color = "#9D9D00" // RBG: 157, 157, 0 + tox_prob = 15 + + + +// Undefine the alias for REAGENTS_EFFECT_MULTIPLER +#undef REM + diff --git a/code/modules/reagents/Chemistry-Reagents/Consumable-Reagents/Drink-Reagents/Alcohols.dm b/code/modules/reagents/Chemistry-Reagents/Consumable-Reagents/Drink-Reagents/Alcohols.dm new file mode 100644 index 00000000000..2c059efc478 --- /dev/null +++ b/code/modules/reagents/Chemistry-Reagents/Consumable-Reagents/Drink-Reagents/Alcohols.dm @@ -0,0 +1,620 @@ + + + +/////////////////////////////////////////////////////////////////////////////////////// + //ALCOHOLS +///////////////////////////////////////////////////////////////////////////////////// + +/*boozepwr chart +55 = non-toxic alchohol +45 = medium-toxic +35 = the hard stuff +25 = potent mixes +<15 = deadly toxic +*/ + +datum/reagent/consumable/ethanol + name = "Ethanol" + id = "ethanol" + description = "A well-known alcohol with a variety of applications." + color = "#404030" // rgb: 64, 64, 48 + nutriment_factor = 0 + var/boozepwr = 10 //lower numbers mean the booze will have an effect faster. + +datum/reagent/consumable/ethanol/on_mob_life(var/mob/living/M as mob) + if(!data) + data = 1 + data++ + M.jitteriness = max(M.jitteriness-5,0) + if(data >= boozepwr) + if (!M.stuttering) M.stuttering = 1 + M.stuttering += 4 + M.Dizzy(5) + if(data >= boozepwr*2.5 && prob(33)) + if (!M.confused) M.confused = 1 + M.confused += 3 + if(data >= boozepwr*10 && prob(33)) + M.adjustToxLoss(2) + ..() + return +datum/reagent/consumable/ethanol/reaction_obj(var/obj/O, var/volume) + if(istype(O,/obj/item/weapon/paper)) + var/obj/item/weapon/paper/paperaffected = O + paperaffected.clearpaper() + usr << "The solution melts away the ink on the paper." + if(istype(O,/obj/item/weapon/book)) + if(volume >= 5) + var/obj/item/weapon/book/affectedbook = O + affectedbook.dat = null + usr << "The solution melts away the ink on the book." + else + usr << "It wasn't enough..." + return + +datum/reagent/consumable/ethanol/reaction_mob(var/mob/living/M, var/method=TOUCH, var/volume)//Splashing people with ethanol isn't quite as good as fuel. + if(!istype(M, /mob/living)) + return + if(method == TOUCH) + M.adjust_fire_stacks(volume / 15) + return + +datum/reagent/consumable/ethanol/beer + name = "Beer" + id = "beer" + description = "An alcoholic beverage made from malted grains, hops, yeast, and water." + color = "#664300" // rgb: 102, 67, 0 + nutriment_factor = 1 * REAGENTS_METABOLISM + boozepwr = 55 + +datum/reagent/consumable/ethanol/beer/greenbeer + name = "Green Beer" + id = "greenbeer" + description = "An alcoholic beverage made from malted grains, hops, yeast, and water. Dyed a festive green." + color = "#A8E61D" + +datum/reagent/consumable/ethanol/kahlua + name = "Kahlua" + id = "kahlua" + description = "A widely known, Mexican coffee-flavoured liqueur. In production since 1936!" + color = "#664300" // rgb: 102, 67, 0 + boozepwr = 45 + +datum/reagent/consumable/ethanol/kahlua/on_mob_life(var/mob/living/M as mob) + M.dizziness = max(0,M.dizziness-5) + M.drowsyness = max(0,M.drowsyness-3) + M.sleeping = max(0,M.sleeping-2) + M.Jitter(5) + ..() + return + +datum/reagent/consumable/ethanol/whiskey + name = "Whiskey" + id = "whiskey" + description = "A superb and well-aged single-malt whiskey. Damn." + color = "#664300" // rgb: 102, 67, 0 + boozepwr = 35 + +datum/reagent/consumable/ethanol/thirteenloko + name = "Thirteen Loko" + id = "thirteenloko" + description = "A potent mixture of caffeine and alcohol." + color = "#102000" // rgb: 16, 32, 0 + nutriment_factor = 1 * REAGENTS_METABOLISM + boozepwr = 35 + +datum/reagent/consumable/ethanol/thirteenloko/on_mob_life(var/mob/living/M as mob) + M.drowsyness = max(0,M.drowsyness-7) + M.sleeping = max(0,M.sleeping-2) + if (M.bodytemperature > 310) + M.bodytemperature = max(310, M.bodytemperature - (5 * TEMPERATURE_DAMAGE_COEFFICIENT)) + M.Jitter(5) + ..() + return + +datum/reagent/consumable/ethanol/vodka + name = "Vodka" + id = "vodka" + description = "Number one drink AND fueling choice for Russians worldwide." + color = "#0064C8" // rgb: 0, 100, 200 + boozepwr = 35 + +datum/reagent/consumable/ethanol/vodka/on_mob_life(var/mob/living/M as mob) + M.radiation = max(M.radiation-2,0) + ..() + return + +datum/reagent/consumable/ethanol/bilk + name = "Bilk" + id = "bilk" + description = "This appears to be beer mixed with milk. Disgusting." + color = "#895C4C" // rgb: 137, 92, 76 + nutriment_factor = 2 * REAGENTS_METABOLISM + boozepwr = 55 + +datum/reagent/consumable/ethanol/bilk/on_mob_life(var/mob/living/M as mob) + if(M.getBruteLoss() && prob(10)) + M.heal_organ_damage(1,0) + ..() + return + +datum/reagent/consumable/ethanol/threemileisland + name = "Three Mile Island Iced Tea" + id = "threemileisland" + description = "Made for a woman, strong enough for a man." + color = "#666340" // rgb: 102, 99, 64 + boozepwr = 15 + +datum/reagent/consumable/ethanol/threemileisland/on_mob_life(var/mob/living/M as mob) + M.druggy = max(M.druggy, 50) + ..() + return + +datum/reagent/consumable/ethanol/gin + name = "Gin" + id = "gin" + description = "It's gin. In space. I say, good sir." + color = "#664300" // rgb: 102, 67, 0 + boozepwr = 55 + +datum/reagent/consumable/ethanol/rum + name = "Rum" + id = "rum" + description = "Yohoho and all that." + color = "#664300" // rgb: 102, 67, 0 + boozepwr = 45 + +datum/reagent/consumable/ethanol/tequilla + name = "Tequila" + id = "tequilla" + description = "A strong and mildly flavoured, mexican produced spirit. Feeling thirsty hombre?" + color = "#FFFF91" // rgb: 255, 255, 145 + boozepwr = 35 + +datum/reagent/consumable/ethanol/vermouth + name = "Vermouth" + id = "vermouth" + description = "You suddenly feel a craving for a martini..." + color = "#91FF91" // rgb: 145, 255, 145 + boozepwr = 45 + +datum/reagent/consumable/ethanol/wine + name = "Wine" + id = "wine" + description = "An premium alchoholic beverage made from distilled grape juice." + color = "#7E4043" // rgb: 126, 64, 67 + boozepwr = 45 + +datum/reagent/consumable/ethanol/cognac + name = "Cognac" + id = "cognac" + description = "A sweet and strongly alchoholic drink, made after numerous distillations and years of maturing. Classy as fornication." + color = "#AB3C05" // rgb: 171, 60, 5 + boozepwr = 45 + +datum/reagent/consumable/ethanol/hooch + name = "Hooch" + id = "hooch" + description = "Either someone's failure at cocktail making or attempt in alchohol production. In any case, do you really want to drink that?" + color = "#664300" // rgb: 102, 67, 0 + boozepwr = 35 + +datum/reagent/consumable/ethanol/ale + name = "Ale" + id = "ale" + description = "A dark alchoholic beverage made by malted barley and yeast." + color = "#664300" // rgb: 102, 67, 0 + boozepwr = 55 + +datum/reagent/consumable/ethanol/goldschlager + name = "Goldschlager" + id = "goldschlager" + description = "100 proof cinnamon schnapps, made for alcoholic teen girls on spring break." + color = "#FFFF91" // rgb: 255, 255, 145 + boozepwr = 25 + +datum/reagent/consumable/ethanol/patron + name = "Patron" + id = "patron" + description = "Tequila with silver in it, a favorite of alcoholic women in the club scene." + color = "#585840" // rgb: 88, 88, 64 + boozepwr = 45 + +datum/reagent/consumable/ethanol/gintonic + name = "Gin and Tonic" + id = "gintonic" + description = "An all time classic, mild cocktail." + color = "#664300" // rgb: 102, 67, 0 + boozepwr = 55 + +datum/reagent/consumable/ethanol/cuba_libre + name = "Cuba Libre" + id = "cubalibre" + description = "Rum, mixed with cola. Viva la revolution." + color = "#3E1B00" // rgb: 62, 27, 0 + boozepwr = 45 + +datum/reagent/consumable/ethanol/whiskey_cola + name = "Whiskey Cola" + id = "whiskeycola" + description = "Whiskey, mixed with cola. Surprisingly refreshing." + color = "#3E1B00" // rgb: 62, 27, 0 + boozepwr = 35 + +datum/reagent/consumable/ethanol/martini + name = "Classic Martini" + id = "martini" + description = "Vermouth with Gin. Not quite how 007 enjoyed it, but still delicious." + color = "#664300" // rgb: 102, 67, 0 + boozepwr = 35 + +datum/reagent/consumable/ethanol/vodkamartini + name = "Vodka Martini" + id = "vodkamartini" + description = "Vodka with Gin. Not quite how 007 enjoyed it, but still delicious." + color = "#664300" // rgb: 102, 67, 0 + boozepwr = 25 + +datum/reagent/consumable/ethanol/white_russian + name = "White Russian" + id = "whiterussian" + description = "That's just, like, your opinion, man..." + color = "#A68340" // rgb: 166, 131, 64 + boozepwr = 35 + +datum/reagent/consumable/ethanol/screwdrivercocktail + name = "Screwdriver" + id = "screwdrivercocktail" + description = "Vodka, mixed with plain ol' orange juice. The result is surprisingly delicious." + color = "#A68310" // rgb: 166, 131, 16 + boozepwr = 35 + +datum/reagent/consumable/ethanol/booger + name = "Booger" + id = "booger" + description = "Ewww..." + color = "#8CFF8C" // rgb: 140, 255, 140 + boozepwr = 45 + +datum/reagent/consumable/ethanol/bloody_mary + name = "Bloody Mary" + id = "bloodymary" + description = "A strange yet pleasurable mixture made of vodka, tomato and lime juice. Or at least you THINK the red stuff is tomato juice." + color = "#664300" // rgb: 102, 67, 0 + boozepwr = 35 + +datum/reagent/consumable/ethanol/brave_bull + name = "Brave Bull" + id = "bravebull" + description = "It's just as effective as Dutch-Courage!." + color = "#664300" // rgb: 102, 67, 0 + boozepwr = 35 + +datum/reagent/consumable/ethanol/tequilla_sunrise + name = "Tequila Sunrise" + id = "tequillasunrise" + description = "Tequila and orange juice. Much like a Screwdriver, only Mexican~" + color = "#FFE48C" // rgb: 255, 228, 140 + boozepwr = 35 + +datum/reagent/consumable/ethanol/toxins_special + name = "Toxins Special" + id = "toxinsspecial" + description = "This thing is ON FIRE! CALL THE DAMN SHUTTLE!" + color = "#664300" // rgb: 102, 67, 0 + boozepwr = 15 + +datum/reagent/consumable/ethanol/toxins_special/on_mob_life(var/mob/living/M as mob) + if (M.bodytemperature < 330) + M.bodytemperature = min(330, M.bodytemperature + (15 * TEMPERATURE_DAMAGE_COEFFICIENT)) //310 is the normal bodytemp. 310.055 + ..() + return + +datum/reagent/consumable/ethanol/beepsky_smash + name = "Beepsky Smash" + id = "beepskysmash" + description = "Deny drinking this and prepare for THE LAW." + color = "#664300" // rgb: 102, 67, 0 + boozepwr = 25 + +datum/reagent/consumable/ethanol/beepsky_smash/on_mob_life(var/mob/living/M as mob) + M.Stun(2) + ..() + return + +datum/reagent/consumable/ethanol/irish_cream + name = "Irish Cream" + id = "irishcream" + description = "Whiskey-imbued cream, what else would you expect from the Irish." + color = "#664300" // rgb: 102, 67, 0 + boozepwr = 35 + +datum/reagent/consumable/ethanol/manly_dorf + name = "The Manly Dorf" + id = "manlydorf" + description = "Beer and Ale, brought together in a delicious mix. Intended for true men only." + color = "#664300" // rgb: 102, 67, 0 + boozepwr = 45 //was 10, but really its only beer and ale, both weak alchoholic beverages + +datum/reagent/consumable/ethanol/longislandicedtea + name = "Long Island Iced Tea" + id = "longislandicedtea" + description = "The liquor cabinet, brought together in a delicious mix. Intended for middle-aged alcoholic women only." + color = "#664300" // rgb: 102, 67, 0 + boozepwr = 25 + +datum/reagent/consumable/ethanol/moonshine + name = "Moonshine" + id = "moonshine" + description = "You've really hit rock bottom now... your liver packed its bags and left last night." + color = "#664300" // rgb: 102, 67, 0 + boozepwr = 25 + +datum/reagent/consumable/ethanol/b52 + name = "B-52" + id = "b52" + description = "Coffee, Irish Cream, and cognac. You will get bombed." + color = "#664300" // rgb: 102, 67, 0 + boozepwr = 25 + +datum/reagent/consumable/ethanol/irishcoffee + name = "Irish Coffee" + id = "irishcoffee" + description = "Coffee, and alcohol. More fun than a Mimosa to drink in the morning." + color = "#664300" // rgb: 102, 67, 0 + boozepwr = 35 + +datum/reagent/consumable/ethanol/margarita + name = "Margarita" + id = "margarita" + description = "On the rocks with salt on the rim. Arriba~!" + color = "#8CFF8C" // rgb: 140, 255, 140 + boozepwr = 35 + +datum/reagent/consumable/ethanol/black_russian + name = "Black Russian" + id = "blackrussian" + description = "For the lactose-intolerant. Still as classy as a White Russian." + color = "#360000" // rgb: 54, 0, 0 + boozepwr = 35 + +datum/reagent/consumable/ethanol/manhattan + name = "Manhattan" + id = "manhattan" + description = "The Detective's undercover drink of choice. He never could stomach gin..." + color = "#664300" // rgb: 102, 67, 0 + boozepwr = 45 + +datum/reagent/consumable/ethanol/manhattan_proj + name = "Manhattan Project" + id = "manhattan_proj" + description = "A scientist's drink of choice, for pondering ways to blow up the station." + color = "#664300" // rgb: 102, 67, 0 + boozepwr = 15 + +datum/reagent/consumable/ethanol/manhattan_proj/on_mob_life(var/mob/living/M as mob) + M.druggy = max(M.druggy, 30) + ..() + return + +datum/reagent/consumable/ethanol/whiskeysoda + name = "Whiskey Soda" + id = "whiskeysoda" + description = "For the more refined griffon." + color = "#664300" // rgb: 102, 67, 0 + boozepwr = 35 + +datum/reagent/consumable/ethanol/antifreeze + name = "Anti-freeze" + id = "antifreeze" + description = "Ultimate refreshment." + color = "#664300" // rgb: 102, 67, 0 + boozepwr = 25 + +datum/reagent/consumable/ethanol/antifreeze/on_mob_life(var/mob/living/M as mob) + if (M.bodytemperature < 330) + M.bodytemperature = min(330, M.bodytemperature + (20 * TEMPERATURE_DAMAGE_COEFFICIENT)) //310 is the normal bodytemp. 310.055 + ..() + return + +datum/reagent/consumable/ethanol/barefoot + name = "Barefoot" + id = "barefoot" + description = "Barefoot and pregnant" + color = "#664300" // rgb: 102, 67, 0 + boozepwr = 45 + +datum/reagent/consumable/ethanol/snowwhite + name = "Snow White" + id = "snowwhite" + description = "A cold refreshment" + color = "#FFFFFF" // rgb: 255, 255, 255 + boozepwr = 45 + +datum/reagent/consumable/ethanol/demonsblood + name = "Demons Blood" + id = "demonsblood" + description = "AHHHH!!!!" + color = "#820000" // rgb: 130, 0, 0 + boozepwr = 35 + +datum/reagent/consumable/ethanol/vodkatonic + name = "Vodka and Tonic" + id = "vodkatonic" + description = "For when a gin and tonic isn't russian enough." + color = "#0064C8" // rgb: 0, 100, 200 + boozepwr = 35 + +datum/reagent/consumable/ethanol/ginfizz + name = "Gin Fizz" + id = "ginfizz" + description = "Refreshingly lemony, deliciously dry." + color = "#664300" // rgb: 102, 67, 0 + boozepwr = 45 + +datum/reagent/consumable/ethanol/bahama_mama + name = "Bahama mama" + id = "bahama_mama" + description = "Tropical cocktail." + color = "#FF7F3B" // rgb: 255, 127, 59 + boozepwr = 35 + +datum/reagent/consumable/ethanol/singulo + name = "Singulo" + id = "singulo" + description = "A blue-space beverage!" + color = "#2E6671" // rgb: 46, 102, 113 + boozepwr = 15 + +datum/reagent/consumable/ethanol/sbiten + name = "Sbiten" + id = "sbiten" + description = "A spicy Vodka! Might be a little hot for the little guys!" + color = "#664300" // rgb: 102, 67, 0 + boozepwr = 35 + +datum/reagent/consumable/ethanol/sbiten/on_mob_life(var/mob/living/M as mob) + if (M.bodytemperature < 360) + M.bodytemperature = min(360, M.bodytemperature + (50 * TEMPERATURE_DAMAGE_COEFFICIENT)) //310 is the normal bodytemp. 310.055 + ..() + return + +datum/reagent/consumable/ethanol/devilskiss + name = "Devils Kiss" + id = "devilskiss" + description = "Creepy time!" + color = "#A68310" // rgb: 166, 131, 16 + boozepwr = 35 + +datum/reagent/consumable/ethanol/red_mead + name = "Red Mead" + id = "red_mead" + description = "The true Viking drink! Even though it has a strange red color." + color = "#C73C00" // rgb: 199, 60, 0 + boozepwr = 45 + +datum/reagent/consumable/ethanol/mead + name = "Mead" + id = "mead" + description = "A Vikings drink, though a cheap one." + color = "#664300" // rgb: 102, 67, 0 + nutriment_factor = 1 * REAGENTS_METABOLISM + boozepwr = 45 + +datum/reagent/consumable/ethanol/iced_beer + name = "Iced Beer" + id = "iced_beer" + description = "A beer which is so cold the air around it freezes." + color = "#664300" // rgb: 102, 67, 0 + boozepwr = 55 + +datum/reagent/consumable/ethanol/iced_beer/on_mob_life(var/mob/living/M as mob) + if(M.bodytemperature > 270) + M.bodytemperature = max(270, M.bodytemperature - (20 * TEMPERATURE_DAMAGE_COEFFICIENT)) //310 is the normal bodytemp. 310.055 + ..() + return + +datum/reagent/consumable/ethanol/grog + name = "Grog" + id = "grog" + description = "Watered down rum, Nanotrasen approves!" + color = "#664300" // rgb: 102, 67, 0 + boozepwr = 90 + +datum/reagent/consumable/ethanol/aloe + name = "Aloe" + id = "aloe" + description = "So very, very, very good." + color = "#664300" // rgb: 102, 67, 0 + boozepwr = 35 + +datum/reagent/consumable/ethanol/andalusia + name = "Andalusia" + id = "andalusia" + description = "A nice, strange named drink." + color = "#664300" // rgb: 102, 67, 0 + boozepwr = 35 + +datum/reagent/consumable/ethanol/alliescocktail + name = "Allies Cocktail" + id = "alliescocktail" + description = "A drink made from your allies, not as sweet as when made from your enemies." + color = "#664300" // rgb: 102, 67, 0 + boozepwr = 35 + +datum/reagent/consumable/ethanol/acid_spit + name = "Acid Spit" + id = "acidspit" + description = "A drink for the daring, can be deadly if incorrectly prepared!" + color = "#365000" // rgb: 54, 80, 0 + boozepwr = 45 + +datum/reagent/consumable/ethanol/amasec + name = "Amasec" + id = "amasec" + description = "Official drink of the Nanotrasen Gun-Club!" + color = "#664300" // rgb: 102, 67, 0 + boozepwr = 35 + +datum/reagent/consumable/ethanol/changelingsting + name = "Changeling Sting" + id = "changelingsting" + description = "You take a tiny sip and feel a burning sensation..." + color = "#2E6671" // rgb: 46, 102, 113 + boozepwr = 15 + +datum/reagent/consumable/ethanol/irishcarbomb + name = "Irish Car Bomb" + id = "irishcarbomb" + description = "Mmm, tastes like chocolate cake..." + color = "#2E6671" // rgb: 46, 102, 113 + boozepwr = 25 + +datum/reagent/consumable/ethanol/syndicatebomb + name = "Syndicate Bomb" + id = "syndicatebomb" + description = "Tastes like terrorism!" + color = "#2E6671" // rgb: 46, 102, 113 + boozepwr = 15 + +datum/reagent/consumable/ethanol/erikasurprise + name = "Erika Surprise" + id = "erikasurprise" + description = "The surprise is, it's green!" + color = "#2E6671" // rgb: 46, 102, 113 + boozepwr = 35 + +datum/reagent/consumable/ethanol/driestmartini + name = "Driest Martini" + id = "driestmartini" + description = "Only for the experienced. You think you see sand floating in the glass." + nutriment_factor = 1 * REAGENTS_METABOLISM + color = "#2E6671" // rgb: 46, 102, 113 + boozepwr = 25 + +datum/reagent/consumable/ethanol/bananahonk + name = "Banana Mama" + id = "bananahonk" + description = "A drink from Clown Heaven." + nutriment_factor = 1 * REAGENTS_METABOLISM + color = "#FFFF91" // rgb: 255, 255, 140 + boozepwr = 25 + +datum/reagent/consumable/ethanol/bananahonk/on_mob_life(var/mob/living/M as mob) + if( ( istype(M, /mob/living/carbon/human) && M.job in list("Clown") ) || istype(M, /mob/living/carbon/monkey) ) + M.heal_organ_damage(1,1) + ..() + return + +datum/reagent/consumable/ethanol/silencer + name = "Silencer" + id = "silencer" + description = "A drink from Mime Heaven." + nutriment_factor = 1 * REAGENTS_METABOLISM + color = "#664300" // rgb: 102, 67, 0 + boozepwr = 15 + +datum/reagent/consumable/ethanol/silencer/on_mob_life(var/mob/living/M as mob) + if(istype(M, /mob/living/carbon/human) && M.job in list("Mime")) + M.heal_organ_damage(1,1) + ..() + return diff --git a/code/modules/reagents/Chemistry-Reagents/Consumable-Reagents/Drink-Reagents/Drinks.dm b/code/modules/reagents/Chemistry-Reagents/Consumable-Reagents/Drink-Reagents/Drinks.dm new file mode 100644 index 00000000000..656570dce93 --- /dev/null +++ b/code/modules/reagents/Chemistry-Reagents/Consumable-Reagents/Drink-Reagents/Drinks.dm @@ -0,0 +1,537 @@ + +#define REM REAGENTS_EFFECT_MULTIPLIER + + + + +///////////////////////////////////////////////////////////////////////////////////////////////////////// +/////////////////////// DRINKS BELOW, Beer is up there though, along with cola. Cap'n Pete's Cuban Spiced Rum//////////////////////////////// +///////////////////////////////////////////////////////////////////////////////////////////////////////// + +datum/reagent/consumable/orangejuice + name = "Orange juice" + id = "orangejuice" + description = "Both delicious AND rich in Vitamin C, what more do you need?" + color = "#E78108" // rgb: 231, 129, 8 + +datum/reagent/consumable/orangejuice/on_mob_life(var/mob/living/M as mob) + if(M.getOxyLoss() && prob(30)) + M.adjustOxyLoss(-1) + ..() + return + +datum/reagent/consumable/tomatojuice + name = "Tomato Juice" + id = "tomatojuice" + description = "Tomatoes made into juice. What a waste of big, juicy tomatoes, huh?" + color = "#731008" // rgb: 115, 16, 8 + +datum/reagent/consumable/tomatojuice/on_mob_life(var/mob/living/M as mob) + if(M.getFireLoss() && prob(20)) + M.heal_organ_damage(0,1) + ..() + return + +datum/reagent/consumable/limejuice + name = "Lime Juice" + id = "limejuice" + description = "The sweet-sour juice of limes." + color = "#365E30" // rgb: 54, 94, 48 + +datum/reagent/consumable/limejuice/on_mob_life(var/mob/living/M as mob) + if(M.getToxLoss() && prob(20)) + M.adjustToxLoss(-1*REM) + ..() + return + +datum/reagent/consumable/carrotjuice + name = "Carrot juice" + id = "carrotjuice" + description = "It is just like a carrot but without crunching." + color = "#973800" // rgb: 151, 56, 0 + +datum/reagent/consumable/carrotjuice/on_mob_life(var/mob/living/M as mob) + M.eye_blurry = max(M.eye_blurry-1 , 0) + M.eye_blind = max(M.eye_blind-1 , 0) + if(!data) + data = 1 + switch(data) + if(1 to 20) + //nothing + if(21 to INFINITY) + if (prob(data-10)) + M.disabilities &= ~NEARSIGHTED + data++ + ..() + return + +datum/reagent/consumable/berryjuice + name = "Berry Juice" + id = "berryjuice" + description = "A delicious blend of several different kinds of berries." + color = "#863333" // rgb: 134, 51, 51 + +datum/reagent/consumable/poisonberryjuice + name = "Poison Berry Juice" + id = "poisonberryjuice" + description = "A tasty juice blended from various kinds of very deadly and toxic berries." + color = "#863353" // rgb: 134, 51, 83 + +datum/reagent/consumable/poisonberryjuice/on_mob_life(var/mob/living/M as mob) + M.adjustToxLoss(1) + ..() + return + +datum/reagent/consumable/watermelonjuice + name = "Watermelon Juice" + id = "watermelonjuice" + description = "Delicious juice made from watermelon." + color = "#863333" // rgb: 134, 51, 51 + +datum/reagent/consumable/lemonjuice + name = "Lemon Juice" + id = "lemonjuice" + description = "This juice is VERY sour." + color = "#863333" // rgb: 175, 175, 0 + +datum/reagent/consumable/banana + name = "Banana Juice" + id = "banana" + description = "The raw essence of a banana. HONK" + color = "#863333" // rgb: 175, 175, 0 + +datum/reagent/consumable/banana/on_mob_life(var/mob/living/M as mob) + if( ( istype(M, /mob/living/carbon/human) && M.job in list("Clown") ) || istype(M, /mob/living/carbon/monkey) ) + M.heal_organ_damage(1,1) + ..() + +datum/reagent/consumable/nothing + name = "Nothing" + id = "nothing" + description = "Absolutely nothing." + +datum/reagent/consumable/nothing/on_mob_life(var/mob/living/M as mob) + if(istype(M, /mob/living/carbon/human) && M.job in list("Mime")) + M.heal_organ_damage(1,1) + ..() + +datum/reagent/consumable/potato_juice + name = "Potato Juice" + id = "potato" + description = "Juice of the potato. Bleh." + nutriment_factor = 2 * REAGENTS_METABOLISM + color = "#302000" // rgb: 48, 32, 0 + +datum/reagent/consumable/milk + name = "Milk" + id = "milk" + description = "An opaque white liquid produced by the mammary glands of mammals." + color = "#DFDFDF" // rgb: 223, 223, 223 + +datum/reagent/consumable/milk/on_mob_life(var/mob/living/M as mob) + if(M.getBruteLoss() && prob(20)) + M.heal_organ_damage(1,0) + if(holder.has_reagent("capsaicin")) + holder.remove_reagent("capsaicin", 2) + ..() + return + +datum/reagent/consumable/soymilk + name = "Soy Milk" + id = "soymilk" + description = "An opaque white liquid made from soybeans." + color = "#DFDFC7" // rgb: 223, 223, 199 + +datum/reagent/consumable/soymilk/on_mob_life(var/mob/living/M as mob) + if(M.getBruteLoss() && prob(20)) + M.heal_organ_damage(1,0) + ..() + return + +datum/reagent/consumable/cream + name = "Cream" + id = "cream" + description = "The fatty, still liquid part of milk. Why don't you mix this with sum scotch, eh?" + color = "#DFD7AF" // rgb: 223, 215, 175 + +datum/reagent/consumable/cream/on_mob_life(var/mob/living/M as mob) + if(M.getBruteLoss() && prob(20)) + M.heal_organ_damage(1,0) + ..() + return + +datum/reagent/consumable/coffee + name = "Coffee" + id = "coffee" + description = "Coffee is a brewed drink prepared from roasted seeds, commonly called coffee beans, of the coffee plant." + color = "#482000" // rgb: 72, 32, 0 + nutriment_factor = 0 + +datum/reagent/consumable/coffee/on_mob_life(var/mob/living/M as mob) + M.dizziness = max(0,M.dizziness-5) + M.drowsyness = max(0,M.drowsyness-3) + M.sleeping = max(0,M.sleeping - 2) + if (M.bodytemperature < 310)//310 is the normal bodytemp. 310.055 + M.bodytemperature = min(310, M.bodytemperature + (25 * TEMPERATURE_DAMAGE_COEFFICIENT)) + M.Jitter(5) + if(holder.has_reagent("frostoil")) + holder.remove_reagent("frostoil", 5) + ..() + return + +datum/reagent/consumable/tea + name = "Tea" + id = "tea" + description = "Tasty black tea, it has antioxidants, it's good for you!" + color = "#101000" // rgb: 16, 16, 0 + nutriment_factor = 0 + +datum/reagent/consumable/tea/on_mob_life(var/mob/living/M as mob) + M.dizziness = max(0,M.dizziness-2) + M.drowsyness = max(0,M.drowsyness-1) + M.jitteriness = max(0,M.jitteriness-3) + M.sleeping = max(0,M.sleeping-1) + if(M.getToxLoss() && prob(20)) + M.adjustToxLoss(-1) + if (M.bodytemperature < 310) //310 is the normal bodytemp. 310.055 + M.bodytemperature = min(310, M.bodytemperature + (20 * TEMPERATURE_DAMAGE_COEFFICIENT)) + ..() + return + +datum/reagent/consumable/icecoffee + name = "Iced Coffee" + id = "icecoffee" + description = "Coffee and ice, refreshing and cool." + color = "#102838" // rgb: 16, 40, 56 + nutriment_factor = 0 + +datum/reagent/consumable/icecoffee/on_mob_life(var/mob/living/M as mob) + M.dizziness = max(0,M.dizziness-5) + M.drowsyness = max(0,M.drowsyness-3) + M.sleeping = max(0,M.sleeping-2) + if (M.bodytemperature > 310)//310 is the normal bodytemp. 310.055 + M.bodytemperature = max(310, M.bodytemperature - (5 * TEMPERATURE_DAMAGE_COEFFICIENT)) + M.Jitter(5) + ..() + return + +datum/reagent/consumable/icetea + name = "Iced Tea" + id = "icetea" + description = "No relation to a certain rap artist/ actor." + color = "#104038" // rgb: 16, 64, 56 + nutriment_factor = 0 + +datum/reagent/consumable/icetea/on_mob_life(var/mob/living/M as mob) + M.dizziness = max(0,M.dizziness-2) + M.drowsyness = max(0,M.drowsyness-1) + M.sleeping = max(0,M.sleeping-2) + if(M.getToxLoss() && prob(20)) + M.adjustToxLoss(-1) + if (M.bodytemperature > 310)//310 is the normal bodytemp. 310.055 + M.bodytemperature = max(310, M.bodytemperature - (5 * TEMPERATURE_DAMAGE_COEFFICIENT)) + ..() + return + +datum/reagent/consumable/space_cola + name = "Cola" + id = "cola" + description = "A refreshing beverage." + color = "#100800" // rgb: 16, 8, 0 + +datum/reagent/consumable/space_cola/on_mob_life(var/mob/living/M as mob) + M.drowsyness = max(0,M.drowsyness-5) + if (M.bodytemperature > 310)//310 is the normal bodytemp. 310.055 + M.bodytemperature = max(310, M.bodytemperature - (5 * TEMPERATURE_DAMAGE_COEFFICIENT)) + ..() + return + +datum/reagent/consumable/nuka_cola + name = "Nuka Cola" + id = "nuka_cola" + description = "Cola, cola never changes." + color = "#100800" // rgb: 16, 8, 0 + +datum/reagent/consumable/nuka_cola/on_mob_life(var/mob/living/M as mob) + M.Jitter(20) + M.druggy = max(M.druggy, 30) + M.dizziness +=5 + M.drowsyness = 0 + M.sleeping = max(0,M.sleeping-2) + M.status_flags |= GOTTAGOFAST + if (M.bodytemperature > 310)//310 is the normal bodytemp. 310.055 + M.bodytemperature = max(310, M.bodytemperature - (5 * TEMPERATURE_DAMAGE_COEFFICIENT)) + ..() + return + +datum/reagent/consumable/spacemountainwind + name = "Space Mountain Wind" + id = "spacemountainwind" + description = "Blows right through you like a space wind." + color = "#102000" // rgb: 16, 32, 0 + +datum/reagent/consumable/spacemountainwind/on_mob_life(var/mob/living/M as mob) + M.drowsyness = max(0,M.drowsyness-7) + M.sleeping = max(0,M.sleeping-1) + if (M.bodytemperature > 310) + M.bodytemperature = max(310, M.bodytemperature - (5 * TEMPERATURE_DAMAGE_COEFFICIENT)) + M.Jitter(5) + ..() + return + +datum/reagent/consumable/dr_gibb + name = "Dr. Gibb" + id = "dr_gibb" + description = "A delicious blend of 42 different flavours" + color = "#102000" // rgb: 16, 32, 0 + +datum/reagent/consumable/dr_gibb/on_mob_life(var/mob/living/M as mob) + M.drowsyness = max(0,M.drowsyness-6) + if (M.bodytemperature > 310) + M.bodytemperature = max(310, M.bodytemperature - (5 * TEMPERATURE_DAMAGE_COEFFICIENT)) //310 is the normal bodytemp. 310.055 + ..() + return + +datum/reagent/consumable/space_up + name = "Space-Up" + id = "space_up" + description = "Tastes like a hull breach in your mouth." + color = "#00FF00" // rgb: 0, 255, 0 + +datum/reagent/consumable/space_up/on_mob_life(var/mob/living/M as mob) + if (M.bodytemperature > 310) + M.bodytemperature = max(310, M.bodytemperature - (8 * TEMPERATURE_DAMAGE_COEFFICIENT)) //310 is the normal bodytemp. 310.055 + ..() + return + +datum/reagent/consumable/lemon_lime + name = "Lemon Lime" + description = "A tangy substance made of 0.5% natural citrus!" + id = "lemon_lime" + color = "#8CFF00" // rgb: 135, 255, 0 + +datum/reagent/consumable/lemon_lime/on_mob_life(var/mob/living/M as mob) + if (M.bodytemperature > 310) + M.bodytemperature = max(310, M.bodytemperature - (8 * TEMPERATURE_DAMAGE_COEFFICIENT)) //310 is the normal bodytemp. 310.055 + ..() + return + +datum/reagent/consumable/sodawater + name = "Soda Water" + id = "sodawater" + description = "A can of club soda. Why not make a scotch and soda?" + color = "#619494" // rgb: 97, 148, 148 + +datum/reagent/consumable/sodawater/on_mob_life(var/mob/living/M as mob) + M.dizziness = max(0,M.dizziness-5) + M.drowsyness = max(0,M.drowsyness-3) + if (M.bodytemperature > 310) + M.bodytemperature = max(310, M.bodytemperature - (5 * TEMPERATURE_DAMAGE_COEFFICIENT)) + ..() + return + +datum/reagent/consumable/tonic + name = "Tonic Water" + id = "tonic" + description = "It tastes strange but at least the quinine keeps the Space Malaria at bay." + color = "#0064C8" // rgb: 0, 100, 200 + +datum/reagent/consumable/tonic/on_mob_life(var/mob/living/M as mob) + M.dizziness = max(0,M.dizziness-5) + M.drowsyness = max(0,M.drowsyness-3) + M.sleeping = max(0,M.sleeping-2) + if (M.bodytemperature > 310) + M.bodytemperature = max(310, M.bodytemperature - (5 * TEMPERATURE_DAMAGE_COEFFICIENT)) + ..() + return + +datum/reagent/consumable/ice + name = "Ice" + id = "ice" + description = "Frozen water, your dentist wouldn't like you chewing this." + reagent_state = SOLID + color = "#619494" // rgb: 97, 148, 148 + +datum/reagent/consumable/ice/on_mob_life(var/mob/living/M as mob) + M.bodytemperature -= 5 * TEMPERATURE_DAMAGE_COEFFICIENT + ..() + return + +datum/reagent/consumable/soy_latte + name = "Soy Latte" + id = "soy_latte" + description = "A nice and tasty beverage while you are reading your hippie books." + color = "#664300" // rgb: 102, 67, 0 + +datum/reagent/consumable/soy_latte/on_mob_life(var/mob/living/M as mob) + M.dizziness = max(0,M.dizziness-5) + M.drowsyness = max(0,M.drowsyness-3) + M.sleeping = 0 + if (M.bodytemperature < 310)//310 is the normal bodytemp. 310.055 + M.bodytemperature = min(310, M.bodytemperature + (5 * TEMPERATURE_DAMAGE_COEFFICIENT)) + M.Jitter(5) + if(M.getBruteLoss() && prob(20)) + M.heal_organ_damage(1,0) + ..() + return + +datum/reagent/consumable/cafe_latte + name = "Cafe Latte" + id = "cafe_latte" + description = "A nice, strong and tasty beverage while you are reading." + color = "#664300" // rgb: 102, 67, 0 + +datum/reagent/consumable/cafe_latte/on_mob_life(var/mob/living/M as mob) + M.dizziness = max(0,M.dizziness-5) + M.drowsyness = max(0,M.drowsyness-3) + M.sleeping = 0 + if (M.bodytemperature < 310)//310 is the normal bodytemp. 310.055 + M.bodytemperature = min(310, M.bodytemperature + (5 * TEMPERATURE_DAMAGE_COEFFICIENT)) + M.Jitter(5) + if(M.getBruteLoss() && prob(20)) + M.heal_organ_damage(1,0) + ..() + return + +datum/reagent/consumable/doctor_delight + name = "The Doctor's Delight" + id = "doctorsdelight" + description = "A gulp a day keeps the MediBot away. That's probably for the best." + color = "#FF8CFF" // rgb: 255, 140, 255 + +datum/reagent/consumable/doctor_delight/on_mob_life(var/mob/living/M as mob) + if(M.getOxyLoss() && prob(80)) + M.adjustOxyLoss(-2) + if(M.getBruteLoss() && prob(80)) + M.heal_organ_damage(2,0) + if(M.getFireLoss() && prob(80)) + M.heal_organ_damage(0,2) + if(M.getToxLoss() && prob(80)) + M.adjustToxLoss(-2) + if(M.dizziness !=0) + M.dizziness = max(0,M.dizziness-15) + if(M.confused !=0) + M.confused = max(0,M.confused - 5) + holder.remove_reagent(id, metabolization_rate/M.metabolism_efficiency) + return + + +//////////////////////////////////////////////The ten friggen million reagents that get you drunk////////////////////////////////////////////// + +datum/reagent/consumable/atomicbomb + name = "Atomic Bomb" + id = "atomicbomb" + description = "Nuclear proliferation never tasted so good." + color = "#666300" // rgb: 102, 99, 0 + +datum/reagent/consumable/atomicbomb/on_mob_life(var/mob/living/M as mob) + M.druggy = max(M.druggy, 50) + M.confused = max(M.confused+2,0) + M.Dizzy(10) + if (!M.stuttering) + M.stuttering = 1 + M.stuttering += 3 + if(!data) + data = 1 + data++ + switch(data) + if(51 to 200) + M.sleeping += 1 + if(201 to INFINITY) + M.sleeping += 1 + M.adjustToxLoss(2) + ..() + return + +datum/reagent/consumable/gargle_blaster + name = "Pan-Galactic Gargle Blaster" + id = "gargleblaster" + description = "Whoah, this stuff looks volatile!" + color = "#664300" // rgb: 102, 67, 0 + +datum/reagent/consumable/gargle_blaster/on_mob_life(var/mob/living/M as mob) + if(!data) + data = 1 + data++ + M.dizziness +=6 + if(data >= 15 && data <45) + if (!M.stuttering) + M.stuttering = 1 + M.stuttering += 3 + else if(data >= 45 && prob(50) && data <55) + M.confused = max(M.confused+3,0) + else if(data >=55) + M.druggy = max(M.druggy, 55) + else if(data >=200) + M.adjustToxLoss(2) + ..() + return + +datum/reagent/consumable/neurotoxin + name = "Neurotoxin" + id = "neurotoxin" + description = "A strong neurotoxin that puts the subject into a death-like state." + color = "#2E2E61" // rgb: 46, 46, 97 + +datum/reagent/consumable/neurotoxin/on_mob_life(var/mob/living/carbon/M as mob) + M.weakened = max(M.weakened, 3) + if(!data) + data = 1 + data++ + M.dizziness +=6 + if(data >= 15 && data <45) + if (!M.stuttering) + M.stuttering = 1 + M.stuttering += 3 + else if(data >= 45 && prob(50) && data <55) + M.confused = max(M.confused+3,0) + else if(data >=55) + M.druggy = max(M.druggy, 55) + else if(data >=200) + M.adjustToxLoss(2) + ..() + return + +datum/reagent/consumable/hippies_delight + name = "Hippie's Delight" + id = "hippiesdelight" + description = "You just don't get it maaaan." + color = "#664300" // rgb: 102, 67, 0 + nutriment_factor = 0 + metabolization_rate = 0.2 * REAGENTS_METABOLISM + +datum/reagent/consumable/hippies_delight/on_mob_life(var/mob/living/M as mob) + M.druggy = max(M.druggy, 50) + if(!data) + data = 1 + data++ + switch(data) + if(1 to 5) + if (!M.stuttering) M.stuttering = 1 + M.Dizzy(10) + if(prob(10)) M.emote(pick("twitch","giggle")) + if(5 to 10) + if (!M.stuttering) M.stuttering = 1 + M.Jitter(20) + M.Dizzy(20) + M.druggy = max(M.druggy, 45) + if(prob(20)) M.emote(pick("twitch","giggle")) + if (10 to 200) + if (!M.stuttering) M.stuttering = 1 + M.Jitter(40) + M.Dizzy(40) + M.druggy = max(M.druggy, 60) + if(prob(30)) M.emote(pick("twitch","giggle")) + if(200 to INFINITY) + if (!M.stuttering) M.stuttering = 1 + M.Jitter(60) + M.Dizzy(60) + M.druggy = max(M.druggy, 75) + if(prob(40)) M.emote(pick("twitch","giggle")) + if(prob(30)) M.adjustToxLoss(2) + ..() + return + + +// Undefine the alias for REAGENTS_EFFECT_MULTIPLER +#undef REM \ No newline at end of file diff --git a/code/modules/reagents/Chemistry-Reagents/Consumable-Reagents/Food-Reagents.dm b/code/modules/reagents/Chemistry-Reagents/Consumable-Reagents/Food-Reagents.dm new file mode 100644 index 00000000000..c5132e52363 --- /dev/null +++ b/code/modules/reagents/Chemistry-Reagents/Consumable-Reagents/Food-Reagents.dm @@ -0,0 +1,388 @@ + + +/////////////////////////////////////////////////////////////////// + //Food Reagents +////////////////////////////////////////////////////////////////// + + +// Part of the food code. Also is where all the food +// condiments, additives, and such go. + + +datum/reagent/consumable + name = "Consumable" + id = "consumable" + var/nutriment_factor = 1 * REAGENTS_METABOLISM + +datum/reagent/consumable/on_mob_life(var/mob/living/M as mob) + M.nutrition += nutriment_factor + holder.remove_reagent(src.id, metabolization_rate) + +datum/reagent/consumable/nutriment + name = "Nutriment" + id = "nutriment" + description = "All the vitamins, minerals, and carbohydrates the body needs in pure form." + reagent_state = SOLID + nutriment_factor = 15 * REAGENTS_METABOLISM + color = "#664330" // rgb: 102, 67, 48 + +datum/reagent/consumable/nutriment/on_mob_life(var/mob/living/M as mob) + if(prob(50)) + M.heal_organ_damage(1,0) + ..() + return + +datum/reagent/consumable/vitamin + name = "Vitamin" + id = "vitamin" + description = "All the best vitamins, minerals, and carbohydrates the body needs in pure form." + reagent_state = SOLID + color = "#664330" // rgb: 102, 67, 48 + +datum/reagent/consumable/vitamin/on_mob_life(var/mob/living/M as mob) + if(prob(50)) + M.heal_organ_damage(1,1) + if(M.satiety < 600) + M.satiety += 20 + ..() + return + +datum/reagent/consumable/sugar + name = "Sugar" + id = "sugar" + description = "The organic compound commonly known as table sugar and sometimes called saccharose. This white, odorless, crystalline powder has a pleasing, sweet taste." + reagent_state = SOLID + color = "#FFFFFF" // rgb: 255, 255, 255 + nutriment_factor = 10 * REAGENTS_METABOLISM + metabolization_rate = 2 * REAGENTS_METABOLISM + +datum/reagent/consumable/sugar/on_mob_life(var/mob/living/M as mob) + if(M.satiety > -200) + M.satiety -= 20 //eating sugar makes you more hungry over time by making your hunger drop faster. + M.nutrition += max(((NUTRITION_LEVEL_FED + 50) - M.nutrition )/100, 0) * nutriment_factor // sugar doesn't help your hunger if your stomach is nearly full + holder.remove_reagent(src.id, metabolization_rate) + +datum/reagent/consumable/virus_food + name = "Virus Food" + id = "virusfood" + description = "A mixture of water and milk. Virus cells can use this mixture to reproduce." + nutriment_factor = 2 * REAGENTS_METABOLISM + color = "#899613" // rgb: 137, 150, 19 + +datum/reagent/consumable/soysauce + name = "Soysauce" + id = "soysauce" + description = "A salty sauce made from the soy plant." + nutriment_factor = 2 * REAGENTS_METABOLISM + color = "#792300" // rgb: 121, 35, 0 + +datum/reagent/consumable/ketchup + name = "Ketchup" + id = "ketchup" + description = "Ketchup, catsup, whatever. It's tomato paste." + nutriment_factor = 5 * REAGENTS_METABOLISM + color = "#731008" // rgb: 115, 16, 8 + + +datum/reagent/consumable/capsaicin + name = "Capsaicin Oil" + id = "capsaicin" + description = "This is what makes chilis hot." + color = "#B31008" // rgb: 179, 16, 8 + +datum/reagent/consumable/capsaicin/on_mob_life(var/mob/living/M as mob) + if(!data) + data = 1 + switch(data) + if(1 to 15) + M.bodytemperature += 5 * TEMPERATURE_DAMAGE_COEFFICIENT + if(holder.has_reagent("frostoil")) + holder.remove_reagent("frostoil", 5) + if(istype(M, /mob/living/carbon/slime)) + M.bodytemperature += rand(5,20) + if(15 to 25) + M.bodytemperature += 10 * TEMPERATURE_DAMAGE_COEFFICIENT + if(istype(M, /mob/living/carbon/slime)) + M.bodytemperature += rand(10,20) + if(25 to INFINITY) + M.bodytemperature += 15 * TEMPERATURE_DAMAGE_COEFFICIENT + if(istype(M, /mob/living/carbon/slime)) + M.bodytemperature += rand(15,20) + data++ + ..() + return + +datum/reagent/consumable/condensedcapsaicin + name = "Condensed Capsaicin" + id = "condensedcapsaicin" + description = "A chemical agent used for self-defense and in police work." + color = "#B31008" // rgb: 179, 16, 8 + +datum/reagent/consumable/condensedcapsaicin/reaction_mob(var/mob/living/M, var/method=TOUCH, var/volume) + if(!istype(M, /mob/living/carbon/human) && !istype(M, /mob/living/carbon/monkey)) + return + + var/mob/living/carbon/victim = M + if(method == TOUCH) + //check for protection + var/mouth_covered = 0 + var/eyes_covered = 0 + var/obj/item/safe_thing = null + + //monkeys and humans can have masks + if( victim.wear_mask ) + if ( victim.wear_mask.flags & MASKCOVERSEYES ) + eyes_covered = 1 + safe_thing = victim.wear_mask + if ( victim.wear_mask.flags & MASKCOVERSMOUTH ) + mouth_covered = 1 + safe_thing = victim.wear_mask + + //only humans can have helmets and glasses + if(istype(victim, /mob/living/carbon/human)) + var/mob/living/carbon/human/H = victim + if( H.head ) + if ( H.head.flags & MASKCOVERSEYES ) + eyes_covered = 1 + safe_thing = H.head + if ( H.head.flags & MASKCOVERSMOUTH ) + mouth_covered = 1 + safe_thing = H.head + if(H.glasses) + eyes_covered = 1 + if ( !safe_thing ) + safe_thing = H.glasses + + //actually handle the pepperspray effects + if ( eyes_covered && mouth_covered ) + return + else if ( mouth_covered ) // Reduced effects if partially protected + if(prob(5)) + victim.emote("scream") + victim.eye_blurry = max(M.eye_blurry, 3) + victim.eye_blind = max(M.eye_blind, 1) + victim.confused = max(M.confused, 3) + victim.damageoverlaytemp = 60 + victim.Weaken(3) + victim.drop_item() + return + else if ( eyes_covered ) // Eye cover is better than mouth cover + victim.eye_blurry = max(M.eye_blurry, 3) + victim.damageoverlaytemp = 30 + return + else // Oh dear :D + if(prob(5)) + victim.emote("scream") + victim.eye_blurry = max(M.eye_blurry, 5) + victim.eye_blind = max(M.eye_blind, 2) + victim.confused = max(M.confused, 6) + victim.damageoverlaytemp = 75 + victim.Weaken(5) + victim.drop_item() + +datum/reagent/consumable/condensedcapsaicin/on_mob_life(var/mob/living/M as mob) + if(prob(5)) + M.visible_message("[M] [pick("dry heaves!","coughs!","splutters!")]") + ..() + return + +datum/reagent/consumable/frostoil + name = "Frost Oil" + id = "frostoil" + description = "A special oil that noticably chills the body. Extraced from Icepeppers." + color = "#B31008" // rgb: 139, 166, 233 + +datum/reagent/consumable/frostoil/on_mob_life(var/mob/living/M as mob) + if(!data) data = 1 + switch(data) + if(1 to 15) + M.bodytemperature -= 5 * TEMPERATURE_DAMAGE_COEFFICIENT + if(holder.has_reagent("capsaicin")) + holder.remove_reagent("capsaicin", 5) + if(istype(M, /mob/living/carbon/slime)) + M.bodytemperature -= rand(5,20) + if(15 to 25) + M.bodytemperature -= 10 * TEMPERATURE_DAMAGE_COEFFICIENT + if(istype(M, /mob/living/carbon/slime)) + M.bodytemperature -= rand(10,20) + if(25 to INFINITY) + M.bodytemperature -= 15 * TEMPERATURE_DAMAGE_COEFFICIENT + if(prob(1)) + M.emote("shiver") + if(istype(M, /mob/living/carbon/slime)) + M.bodytemperature -= rand(15,20) + data++ + ..() + return + +datum/reagent/consumable/frostoil/reaction_turf(var/turf/simulated/T, var/volume) + if(volume >= 5) + for(var/mob/living/carbon/slime/M in T) + M.adjustToxLoss(rand(15,30)) + //if(istype(T)) + // T.atmos_spawn_air(SPAWN_COLD) + +datum/reagent/consumable/sodiumchloride + name = "Table Salt" + id = "sodiumchloride" + description = "A salt made of sodium chloride. Commonly used to season food." + reagent_state = SOLID + color = "#FFFFFF" // rgb: 255,255,255 + +datum/reagent/consumable/blackpepper + name = "Black Pepper" + id = "blackpepper" + description = "A powder ground from peppercorns. *AAAACHOOO*" + reagent_state = SOLID + // no color (ie, black) + +datum/reagent/consumable/coco + name = "Coco Powder" + id = "coco" + description = "A fatty, bitter paste made from coco beans." + reagent_state = SOLID + nutriment_factor = 5 * REAGENTS_METABOLISM + color = "#302000" // rgb: 48, 32, 0 + +datum/reagent/consumable/hot_coco + name = "Hot Chocolate" + id = "hot_coco" + description = "Made with love! And coco beans." + nutriment_factor = 3 * REAGENTS_METABOLISM + color = "#403010" // rgb: 64, 48, 16 + +datum/reagent/consumable/hot_coco/on_mob_life(var/mob/living/M as mob) + if (M.bodytemperature < 310)//310 is the normal bodytemp. 310.055 + M.bodytemperature = min(310, M.bodytemperature + (5 * TEMPERATURE_DAMAGE_COEFFICIENT)) + ..() + return + +datum/reagent/mushroomhallucinogen + name = "Mushroom Hallucinogen" + id = "mushroomhallucinogen" + description = "A strong hallucinogenic drug derived from certain species of mushroom." + color = "#E700E7" // rgb: 231, 0, 231 + metabolization_rate = 0.2 * REAGENTS_METABOLISM + +datum/reagent/mushroomhallucinogen/on_mob_life(var/mob/living/M as mob) + M.druggy = max(M.druggy, 30) + if(!data) + data = 1 + switch(data) + if(1 to 5) + if (!M.stuttering) + M.stuttering = 1 + M.Dizzy(5) + if(prob(10)) + M.emote(pick("twitch","giggle")) + if(5 to 10) + if (!M.stuttering) + M.stuttering = 1 + M.Jitter(10) + M.Dizzy(10) + M.druggy = max(M.druggy, 35) + if(prob(20)) + M.emote(pick("twitch","giggle")) + if (10 to INFINITY) + if (!M.stuttering) + M.stuttering = 1 + M.Jitter(20) + M.Dizzy(20) + M.druggy = max(M.druggy, 40) + if(prob(30)) + M.emote(pick("twitch","giggle")) + data++ + ..() + return + +datum/reagent/consumable/sprinkles + name = "Sprinkles" + id = "sprinkles" + description = "Multi-colored little bits of sugar, commonly found on donuts. Loved by cops." + color = "#FF00FF" // rgb: 255, 0, 255 + +datum/reagent/consumable/sprinkles/on_mob_life(var/mob/living/M as mob) + if(istype(M, /mob/living/carbon/human) && M.job in list("Security Officer", "Head of Security", "Detective", "Warden")) + M.heal_organ_damage(1,1) + ..() + return + ..() + +datum/reagent/consumable/cornoil + name = "Corn Oil" + id = "cornoil" + description = "An oil derived from various types of corn." + nutriment_factor = 20 * REAGENTS_METABOLISM + color = "#302000" // rgb: 48, 32, 0 + +datum/reagent/consumable/cornoil/reaction_turf(var/turf/simulated/T, var/volume) + if (!istype(T)) + return + src = null + if(volume >= 3) + T.MakeSlippery() + var/hotspot = (locate(/obj/effect/hotspot) in T) + if(hotspot) + var/datum/gas_mixture/lowertemp = T.remove_air( T:air:total_moles() ) + lowertemp.temperature = max( min(lowertemp.temperature-2000,lowertemp.temperature / 2) ,0) + lowertemp.react() + T.assume_air(lowertemp) + qdel(hotspot) + +datum/reagent/consumable/enzyme + name = "Universal Enzyme" + id = "enzyme" + description = "A universal enzyme used in the preperation of certain chemicals and foods." + color = "#365E30" // rgb: 54, 94, 48 + +datum/reagent/consumable/dry_ramen + name = "Dry Ramen" + id = "dry_ramen" + description = "Space age food, since August 25, 1958. Contains dried noodles, vegetables, and chemicals that boil in contact with water." + reagent_state = SOLID + color = "#302000" // rgb: 48, 32, 0 + +datum/reagent/consumable/hot_ramen + name = "Hot Ramen" + id = "hot_ramen" + description = "The noodles are boiled, the flavors are artificial, just like being back in school." + nutriment_factor = 5 * REAGENTS_METABOLISM + color = "#302000" // rgb: 48, 32, 0 + +datum/reagent/consumable/hot_ramen/on_mob_life(var/mob/living/M as mob) + if (M.bodytemperature < 310)//310 is the normal bodytemp. 310.055 + M.bodytemperature = min(310, M.bodytemperature + (10 * TEMPERATURE_DAMAGE_COEFFICIENT)) + ..() + return + +datum/reagent/consumable/hell_ramen + name = "Hell Ramen" + id = "hell_ramen" + description = "The noodles are boiled, the flavors are artificial, just like being back in school." + nutriment_factor = 5 * REAGENTS_METABOLISM + color = "#302000" // rgb: 48, 32, 0 + +datum/reagent/consumable/hell_ramen/on_mob_life(var/mob/living/M as mob) + M.bodytemperature += 10 * TEMPERATURE_DAMAGE_COEFFICIENT + ..() + return + +datum/reagent/consumable/flour + name = "flour" + id = "flour" + description = "This is what you rub all over yourself to pretend to be a ghost." + reagent_state = SOLID + color = "#FFFFFF" // rgb: 0, 0, 0 + +datum/reagent/consumable/flour/reaction_turf(var/turf/T, var/volume) + src = null + if(!istype(T, /turf/space)) + new /obj/effect/decal/cleanable/flour(T) + +datum/reagent/consumable/cherryjelly + name = "Cherry Jelly" + id = "cherryjelly" + description = "Totally the best. Only to be spread on foods with excellent lateral symmetry." + color = "#801E28" // rgb: 128, 30, 40 + + diff --git a/code/modules/reagents/Chemistry-Reagents/Medicine-Reagents.dm b/code/modules/reagents/Chemistry-Reagents/Medicine-Reagents.dm new file mode 100644 index 00000000000..20b105f9040 --- /dev/null +++ b/code/modules/reagents/Chemistry-Reagents/Medicine-Reagents.dm @@ -0,0 +1,399 @@ + +#define REM REAGENTS_EFFECT_MULTIPLIER + +////////////////////////////////////////////////////////////////////////////////////////// + // MEDICINE REAGENTS +////////////////////////////////////////////////////////////////////////////////////// + +// where all the reagents related to medicine go. + +datum/reagent/medicine + name = "Medicine" + id = "medicine" + +datum/reagent/medicine/on_mob_life(var/mob/living/M as mob) + holder.remove_reagent(src.id, metabolization_rate / M.metabolism_efficiency) //medicine reagents stay longer if you have a better metabolism + +datum/reagent/medicine/ethylredoxrazine // FUCK YOU, ALCOHOL + name = "Ethylredoxrazine" + id = "ethylredoxrazine" + description = "A powerful oxidizer that reacts with ethanol." + reagent_state = SOLID + color = "#605048" // rgb: 96, 80, 72 + +datum/reagent/medicine/ethylredoxrazine/on_mob_life(var/mob/living/M as mob) + M.dizziness = 0 + M.drowsyness = 0 + M.stuttering = 0 + M.confused = 0 + M.reagents.remove_all_type(/datum/reagent/consumable/ethanol, 1*REM, 0, 1) + ..() + return + +datum/reagent/medicine/lipozine + name = "Lipozine" // The anti-nutriment. + id = "lipozine" + description = "A chemical compound that causes a powerful fat-burning reaction." + color = "#BBEDA4" // rgb: 187, 237, 164 + +datum/reagent/medicine/lipozine/on_mob_life(var/mob/living/M as mob) + M.nutrition -= 10 * REAGENTS_METABOLISM + M.overeatduration = 0 + if(M.nutrition < 0)//Prevent from going into negatives. + M.nutrition = 0 + ..() + return + +datum/reagent/medicine/hyperzine + name = "Hyperzine" + id = "hyperzine" + description = "Hyperzine is a highly effective, long lasting, muscle stimulant." + color = "#C8A5DC" // rgb: 200, 165, 220 + metabolization_rate = 0.5 * REAGENTS_METABOLISM + +datum/reagent/medicine/hyperzine/on_mob_life(var/mob/living/M as mob) + if(M.stat != DEAD) + if(prob(5)) + M.emote(pick("twitch","blink_r","shiver")) + M.status_flags |= GOTTAGOFAST + ..() + return + +datum/reagent/medicine/leporazine + name = "Leporazine" + id = "leporazine" + description = "Leporazine can be use to stabilize an individuals body temperature." + color = "#C8A5DC" // rgb: 200, 165, 220 + +datum/reagent/medicine/leporazine/on_mob_life(var/mob/living/M as mob) + if(M.bodytemperature > 310) + M.bodytemperature = max(310, M.bodytemperature - (40 * TEMPERATURE_DAMAGE_COEFFICIENT)) + else if(M.bodytemperature < 311) + M.bodytemperature = min(310, M.bodytemperature + (40 * TEMPERATURE_DAMAGE_COEFFICIENT)) + ..() + +datum/reagent/medicine/inaprovaline + name = "Inaprovaline" + id = "inaprovaline" + description = "Inaprovaline is a synaptic stimulant and cardiostimulant. Commonly used to stabilize patients." + color = "#C8A5DC" // rgb: 200, 165, 220 + metabolization_rate = 0.5 * REAGENTS_METABOLISM + +datum/reagent/medicine/inaprovaline/on_mob_life(var/mob/living/M as mob) + if(M.losebreath >= 10) + M.losebreath = max(10, M.losebreath-5) + ..() + return + +datum/reagent/medicine/ryetalyn + name = "Ryetalyn" + id = "ryetalyn" + description = "Ryetalyn can cure all genetic abnomalities." + reagent_state = SOLID + color = "#C8A5DC" // rgb: 200, 165, 220 + +datum/reagent/medicine/ryetalyn/on_mob_life(var/mob/living/M as mob) + + var/needs_update = M.mutations.len > 0 + M.mutations = list() + M.disabilities = 0 + M.sdisabilities = 0 + M.jitteriness = 0 + + // Might need to update appearance for hulk etc. + if(needs_update && ishuman(M)) + var/mob/living/carbon/human/H = M + H.update_mutations() + ..() + return + +datum/reagent/medicine/kelotane + name = "Kelotane" + id = "kelotane" + description = "Kelotane is a drug used to treat burns." + color = "#C8A5DC" // rgb: 200, 165, 220 + +datum/reagent/medicine/kelotane/on_mob_life(var/mob/living/M as mob) + if(M.stat != DEAD) + M.heal_organ_damage(0,2*REM) + ..() + return + +datum/reagent/medicine/dermaline + name = "Dermaline" + id = "dermaline" + description = "Dermaline is the next step in burn medication. Works twice as good as kelotane and enables the body to restore even the direst heat-damaged tissue." + color = "#C8A5DC" // rgb: 200, 165, 220 + +datum/reagent/medicine/dermaline/on_mob_life(var/mob/living/M as mob) + if(M.stat != DEAD) //THE GUY IS **DEAD**! BEREFT OF ALL LIFE HE RESTS IN PEACE etc etc. He does NOT metabolise shit anymore, god DAMN + M.heal_organ_damage(0,3*REM) + ..() + return + +datum/reagent/medicine/dexalin + name = "Dexalin" + id = "dexalin" + description = "Dexalin is used in the treatment of oxygen deprivation." + color = "#C8A5DC" // rgb: 200, 165, 220 + +datum/reagent/medicine/dexalin/on_mob_life(var/mob/living/M as mob) + if(M.stat != DEAD) + M.adjustOxyLoss(-2*REM) + if(holder.has_reagent("lexorin")) + holder.remove_reagent("lexorin", 2*REM) + ..() + return + +datum/reagent/medicine/dexalinp + name = "Dexalin Plus" + id = "dexalinp" + description = "Dexalin Plus is used in the treatment of oxygen deprivation. Its highly effective." + color = "#C8A5DC" // rgb: 200, 165, 220 + +datum/reagent/medicine/dexalinp/on_mob_life(var/mob/living/M as mob) + if(M.stat != DEAD) + M.adjustOxyLoss(-M.getOxyLoss()) + if(holder.has_reagent("lexorin")) + holder.remove_reagent("lexorin", 2*REM) + ..() + return + +datum/reagent/medicine/tricordrazine + name = "Tricordrazine" + id = "tricordrazine" + description = "Tricordrazine is a highly potent stimulant, originally derived from cordrazine. Can be used to treat a wide range of injuries." + color = "#C8A5DC" // rgb: 200, 165, 220 + +datum/reagent/medicine/tricordrazine/on_mob_life(var/mob/living/M as mob) + if(M.stat != DEAD) + if(M.getOxyLoss() && prob(80)) + M.adjustOxyLoss(-1*REM) + if(M.getBruteLoss() && prob(80)) + M.heal_organ_damage(1*REM,0) + if(M.getFireLoss() && prob(80)) + M.heal_organ_damage(0,1*REM) + if(M.getToxLoss() && prob(80)) + M.adjustToxLoss(-1*REM) + ..() + return + +datum/reagent/medicine/anti_toxin + name = "Anti-Toxin (Dylovene)" + id = "anti_toxin" + description = "Dylovene is a broad-spectrum antitoxin." + color = "#C8A5DC" // rgb: 200, 165, 220 + +datum/reagent/medicine/anti_toxin/on_mob_life(var/mob/living/M as mob) + if(M.stat != DEAD) + M.reagents.remove_all_type(/datum/reagent/toxin, 1*REM, 0, 1) + M.drowsyness = max(M.drowsyness-2*REM, 0) + M.hallucination = max(0, M.hallucination - 5*REM) + M.adjustToxLoss(-2*REM) + ..() + return + +datum/reagent/medicine/adminordrazine //An OP chemical for admins + name = "Adminordrazine" + id = "adminordrazine" + description = "It's magic. We don't have to explain it." + color = "#C8A5DC" // rgb: 200, 165, 220 + +datum/reagent/medicine/adminordrazine/on_mob_life(var/mob/living/carbon/M as mob) + if(!M) M = holder.my_atom ///This can even heal dead people. + M.reagents.remove_all_type(/datum/reagent/toxin, 5*REM, 0, 1) + M.setCloneLoss(0) + M.setOxyLoss(0) + M.radiation = 0 + M.heal_organ_damage(5,5) + M.adjustToxLoss(-5) + M.hallucination = 0 + M.setBrainLoss(0) + M.disabilities = 0 + M.sdisabilities = 0 + M.eye_blurry = 0 + M.eye_blind = 0 + M.SetWeakened(0) + M.SetStunned(0) + M.SetParalysis(0) + M.silent = 0 + M.dizziness = 0 + M.drowsyness = 0 + M.stuttering = 0 + M.confused = 0 + M.sleeping = 0 + M.jitteriness = 0 + for(var/datum/disease/D in M.viruses) + if(D.severity == NONTHREAT) + continue + D.spread_text = "Remissive" + D.stage-- + if(D.stage < 1) + D.cure() + ..() + return + +datum/reagent/medicine/synaptizine + name = "Synaptizine" + id = "synaptizine" + description = "Synaptizine is used to treat various diseases." + color = "#C8A5DC" // rgb: 200, 165, 220 + +datum/reagent/medicine/synaptizine/on_mob_life(var/mob/living/M as mob) + M.drowsyness = max(M.drowsyness-5, 0) + M.AdjustParalysis(-1) + M.AdjustStunned(-1) + M.AdjustWeakened(-1) + if(holder.has_reagent("mindbreaker")) + holder.remove_reagent("mindbreaker", 5) + M.hallucination = max(0, M.hallucination - 10) + if(prob(60)) + M.adjustToxLoss(1) + ..() + return + +datum/reagent/medicine/hyronalin + name = "Hyronalin" + id = "hyronalin" + description = "Hyronalin is a medicinal drug used to counter the effect of radiation poisoning." + color = "#C8A5DC" // rgb: 200, 165, 220 + +datum/reagent/medicine/hyronalin/on_mob_life(var/mob/living/M as mob) + M.radiation = max(M.radiation-3*REM,0) + ..() + return + +datum/reagent/medicine/arithrazine + name = "Arithrazine" + id = "arithrazine" + description = "Arithrazine is an unstable medication used for the most extreme cases of radiation poisoning." + color = "#C8A5DC" // rgb: 200, 165, 220 + +datum/reagent/medicine/arithrazine/on_mob_life(var/mob/living/M as mob) + if(M.stat != DEAD) + M.radiation = max(M.radiation-7*REM,0) + M.adjustToxLoss(-1*REM) + if(prob(15)) + M.take_organ_damage(1, 0) + ..() + return + +datum/reagent/medicine/alkysine + name = "Alkysine" + id = "alkysine" + description = "Alkysine is a drug used to lessen the damage to neurological tissue after a catastrophic injury. Can heal brain tissue." + color = "#C8A5DC" // rgb: 200, 165, 220 + +datum/reagent/medicine/alkysine/on_mob_life(var/mob/living/M as mob) + if(M != DEAD) + M.adjustBrainLoss(-3*REM) + ..() + return + +datum/reagent/medicine/imidazoline + name = "Imidazoline" + id = "imidazoline" + description = "Heals eye damage." + color = "#C8A5DC" // rgb: 200, 165, 220 + +datum/reagent/medicine/imidazoline/on_mob_life(var/mob/living/M as mob) + M.eye_blurry = max(M.eye_blurry-5 , 0) + M.eye_blind = max(M.eye_blind-5 , 0) + M.disabilities &= ~NEARSIGHTED + M.eye_stat = max(M.eye_stat-5, 0) +// M.sdisabilities &= ~1 Replaced by eye surgery + ..() + return + +datum/reagent/medicine/inacusiate + name = "Inacusiate" + id = "inacusiate" + description = "Heals ear damage." + color = "#6600FF" // rgb: 100, 165, 255 + +datum/reagent/medicine/inacusiate/on_mob_life(var/mob/living/M as mob) + M.ear_damage = 0 + M.ear_deaf = 0 + ..() + return + +datum/reagent/medicine/bicaridine + name = "Bicaridine" + id = "bicaridine" + description = "Bicaridine is an analgesic medication and can be used to treat blunt trauma." + color = "#C8A5DC" // rgb: 200, 165, 220 + +datum/reagent/medicine/bicaridine/on_mob_life(var/mob/living/M as mob) + if(M.stat != DEAD) + M.heal_organ_damage(2*REM,0) + ..() + return + +datum/reagent/medicine/cryoxadone + name = "Cryoxadone" + id = "cryoxadone" + description = "A chemical mixture with almost magical healing powers. Its main limitation is that the targets body temperature must be under 170K for it to metabolise correctly." + color = "#C8A5DC" // rgb: 200, 165, 220 + +datum/reagent/medicine/cryoxadone/on_mob_life(var/mob/living/M as mob) + if(M.stat != DEAD && M.bodytemperature < 170) + M.adjustCloneLoss(-1) + M.adjustOxyLoss(-3) + M.heal_organ_damage(3,3) + M.adjustToxLoss(-3) + ..() + return + +datum/reagent/medicine/clonexadone + name = "Clonexadone" + id = "clonexadone" + description = "A liquid compound similar to that used in the cloning process. Can be used to 'finish' clones that get ejected early when used in conjunction with a cryo tube." + color = "#C8A5DC" // rgb: 200, 165, 220 + +datum/reagent/medicine/clonexadone/on_mob_life(var/mob/living/M as mob) + if(M.stat != DEAD && M.bodytemperature < 170) + M.adjustCloneLoss(-3) + M.adjustOxyLoss(-3) + M.heal_organ_damage(3,3) + M.adjustToxLoss(-3) + M.status_flags &= ~DISFIGURED + ..() + return + +datum/reagent/medicine/rezadone + name = "Rezadone" + id = "rezadone" + description = "A powder derived from fish toxin, this substance can effectively treat cellular damage in humanoids, though excessive consumption has side effects." + reagent_state = SOLID + color = "#669900" // rgb: 102, 153, 0 + +datum/reagent/medicine/rezadone/on_mob_life(var/mob/living/M as mob) + if(!data) + data = 1 + data++ + switch(data) + if(1 to 15) + M.adjustCloneLoss(-1) + M.heal_organ_damage(1,1) + if(15 to 35) + M.adjustCloneLoss(-2) + M.heal_organ_damage(2,1) + M.status_flags &= ~DISFIGURED + if(35 to INFINITY) + M.adjustToxLoss(1) + M.Dizzy(5) + M.Jitter(5) + + ..() + return + +datum/reagent/medicine/spaceacillin + name = "Spaceacillin" + id = "spaceacillin" + description = "An all-purpose antiviral agent." + color = "#C8A5DC" // rgb: 200, 165, 220 + metabolization_rate = 0.5 * REAGENTS_METABOLISM + + +// Undefine the alias for REAGENTS_EFFECT_MULTIPLER +#undef REM \ No newline at end of file diff --git a/code/modules/reagents/Chemistry-Reagents/Toxin-Reagents.dm b/code/modules/reagents/Chemistry-Reagents/Toxin-Reagents.dm new file mode 100644 index 00000000000..d58815700bf --- /dev/null +++ b/code/modules/reagents/Chemistry-Reagents/Toxin-Reagents.dm @@ -0,0 +1,411 @@ + +#define REM REAGENTS_EFFECT_MULTIPLIER + + +//////////////////////////Poison stuff (Toxins & Acids)/////////////////////// + +datum/reagent/toxin + name = "Toxin" + id = "toxin" + description = "A toxic chemical." + color = "#CF3600" // rgb: 207, 54, 0 + var/toxpwr = 1.5 + +datum/reagent/toxin/on_mob_life(var/mob/living/M as mob) + if(toxpwr) + M.adjustToxLoss(toxpwr*REM) + ..() + return + +datum/reagent/toxin/amatoxin + name = "Amatoxin" + id = "amatoxin" + description = "A powerful poison derived from certain species of mushroom." + color = "#792300" // rgb: 121, 35, 0 + toxpwr = 1 + +datum/reagent/toxin/mutagen + name = "Unstable mutagen" + id = "mutagen" + description = "Might cause unpredictable mutations. Keep away from children." + color = "#13BC5E" // rgb: 19, 188, 94 + toxpwr = 0 + +datum/reagent/toxin/mutagen/reaction_mob(var/mob/living/carbon/M, var/method=TOUCH, var/volume) + if(!..()) + return + if(!istype(M) || !M.dna) + return //No robots, AIs, aliens, Ians or other mobs should be affected by this. + src = null + if((method==TOUCH && prob(33)) || method==INGEST) + randmuti(M) + if(prob(98)) + randmutb(M) + else + randmutg(M) + domutcheck(M, null) + updateappearance(M) + return + +datum/reagent/toxin/mutagen/on_mob_life(var/mob/living/carbon/M) + if(istype(M)) + M.apply_effect(5,IRRADIATE,0) + ..() + return + +datum/reagent/toxin/plasma + name = "Plasma" + id = "plasma" + description = "Plasma in its liquid form." + color = "#DB2D08" // rgb: 219, 45, 8 + toxpwr = 3 + +datum/reagent/toxin/plasma/on_mob_life(var/mob/living/M as mob) + if(holder.has_reagent("inaprovaline")) + holder.remove_reagent("inaprovaline", 2*REM) + ..() + return + +datum/reagent/toxin/plasma/reaction_obj(var/obj/O, var/volume) + src = null + /*if(istype(O,/obj/item/weapon/reagent_containers/food/snacks/egg/slime)) + var/obj/item/weapon/reagent_containers/food/snacks/egg/slime/egg = O + if (egg.grown) + egg.Hatch()*/ + if((!O) || (!volume)) return 0 + O.atmos_spawn_air(SPAWN_TOXINS|SPAWN_20C, volume) + +datum/reagent/toxin/plasma/reaction_turf(var/turf/simulated/T, var/volume) + src = null + if(istype(T)) + T.atmos_spawn_air(SPAWN_TOXINS|SPAWN_20C, volume) + return + +datum/reagent/toxin/plasma/reaction_mob(var/mob/living/M, var/method=TOUCH, var/volume)//Splashing people with plasma is stronger than fuel! + if(!istype(M, /mob/living)) + return + if(method == TOUCH) + M.adjust_fire_stacks(volume / 5) + return + +datum/reagent/toxin/lexorin + name = "Lexorin" + id = "lexorin" + description = "Lexorin temporarily stops respiration. Causes tissue damage." + color = "#C8A5DC" // rgb: 200, 165, 220 + toxpwr = 0 + +datum/reagent/toxin/lexorin/on_mob_life(var/mob/living/M as mob) + if(M.stat != DEAD) + if(prob(33)) + M.take_organ_damage(1*REM, 0) + M.adjustOxyLoss(3) + if(prob(20)) + M.emote("gasp") + ..() + return + +datum/reagent/toxin/slimejelly + name = "Slime Jelly" + id = "slimejelly" + description = "A gooey semi-liquid produced from one of the deadliest lifeforms in existence. SO REAL." + color = "#801E28" // rgb: 128, 30, 40 + toxpwr = 0 + +datum/reagent/toxin/slimejelly/on_mob_life(var/mob/living/M as mob) + if(prob(10)) + M << "Your insides are burning!" + M.adjustToxLoss(rand(20,60)*REM) + else if(prob(40)) + M.heal_organ_damage(5*REM,0) + ..() + return + +datum/reagent/toxin/cyanide + name = "Cyanide" + id = "cyanide" + description = "A highly toxic chemical." + color = "#CF3600" // rgb: 207, 54, 0 + toxpwr = 3 + +datum/reagent/toxin/cyanide/on_mob_life(var/mob/living/M as mob) + M.adjustOxyLoss(3*REM) + M.sleeping += 1 + ..() + return + +datum/reagent/toxin/minttoxin + name = "Mint Toxin" + id = "minttoxin" + description = "Useful for dealing with undesirable customers." + color = "#CF3600" // rgb: 207, 54, 0 + toxpwr = 0 + +datum/reagent/toxin/minttoxin/on_mob_life(var/mob/living/M as mob) + if (FAT in M.mutations) + M.gib() + ..() + return + +datum/reagent/toxin/carpotoxin + name = "Carpotoxin" + id = "carpotoxin" + description = "A deadly neurotoxin produced by the dreaded spess carp." + color = "#003333" // rgb: 0, 51, 51 + toxpwr = 2 + +datum/reagent/toxin/zombiepowder + name = "Zombie Powder" + id = "zombiepowder" + description = "A strong neurotoxin that puts the subject into a death-like state." + reagent_state = SOLID + color = "#669900" // rgb: 102, 153, 0 + toxpwr = 0.5 + +datum/reagent/toxin/zombiepowder/on_mob_life(var/mob/living/carbon/M as mob) + M.status_flags |= FAKEDEATH + M.adjustOxyLoss(0.5*REM) + M.Weaken(5) + M.silent = max(M.silent, 5) + M.tod = worldtime2text() + ..() + return + +datum/reagent/toxin/zombiepowder/Del() + if(holder && ismob(holder.my_atom)) + var/mob/M = holder.my_atom + M.status_flags &= ~FAKEDEATH + ..() + +datum/reagent/toxin/mindbreaker + name = "Mindbreaker Toxin" + id = "mindbreaker" + description = "A powerful hallucinogen. Not a thing to be messed with." + color = "#B31008" // rgb: 139, 166, 233 + toxpwr = 0 + +datum/reagent/toxin/mindbreaker/on_mob_life(var/mob/living/M) + M.hallucination += 10 + ..() + return + +datum/reagent/toxin/plantbgone + name = "Plant-B-Gone" + id = "plantbgone" + description = "A harmful toxic mixture to kill plantlife. Do not ingest!" + color = "#49002E" // rgb: 73, 0, 46 + toxpwr = 1 + +datum/reagent/toxin/plantbgone/reaction_obj(var/obj/O, var/volume) + if(istype(O,/obj/structure/alien/weeds/)) + var/obj/structure/alien/weeds/alien_weeds = O + alien_weeds.health -= rand(15,35) // Kills alien weeds pretty fast + alien_weeds.healthcheck() + else if(istype(O,/obj/effect/glowshroom)) //even a small amount is enough to kill it + qdel(O) + else if(istype(O,/obj/effect/spacevine)) + var/obj/effect/spacevine/SV = O + SV.on_chem_effect(src) + +datum/reagent/toxin/plantbgone/reaction_mob(var/mob/living/M, var/method=TOUCH, var/volume) + src = null + if(iscarbon(M)) + var/mob/living/carbon/C = M + if(!C.wear_mask) // If not wearing a mask + C.adjustToxLoss(2) // 4 toxic damage per application, doubled for some reason + +datum/reagent/toxin/plantbgone/weedkiller + name = "Weed Killer" + id = "weedkiller" + description = "A harmful toxic mixture to kill weeds. Do not ingest!" + color = "#4B004B" // rgb: 75, 0, 75 + + +datum/reagent/toxin/pestkiller + name = "Pest Killer" + id = "pestkiller" + description = "A harmful toxic mixture to kill pests. Do not ingest!" + color = "#4B004B" // rgb: 75, 0, 75 + toxpwr = 1 + +datum/reagent/toxin/pestkiller/reaction_mob(var/mob/living/M, var/method=TOUCH, var/volume) + src = null + if(iscarbon(M)) + var/mob/living/carbon/C = M + if(!C.wear_mask) // If not wearing a mask + C.adjustToxLoss(2) // 4 toxic damage per application, doubled for some reason + +datum/reagent/toxin/stoxin + name = "Sleep Toxin" + id = "stoxin" + description = "An effective hypnotic used to treat insomnia." + color = "#E895CC" // rgb: 232, 149, 204 + toxpwr = 0 + +datum/reagent/toxin/stoxin/on_mob_life(var/mob/living/M as mob) + if(!data) data = 1 + switch(data) + if(1 to 12) + if(prob(5)) M.emote("yawn") + if(12 to 15) + M.eye_blurry = max(M.eye_blurry, 10) + if(15 to 25) + M.drowsyness = max(M.drowsyness, 20) + if(25 to INFINITY) + M.Paralyse(20) + M.drowsyness = max(M.drowsyness, 30) + data++ + ..() + return + + +datum/reagent/toxin/spore + name = "Spore Toxin" + id = "spore" + description = "A toxic spore cloud which blocks vision when ingested." + color = "#9ACD32" + toxpwr = 0.5 + +datum/reagent/toxin/spore/on_mob_life(var/mob/living/M as mob) + M.damageoverlaytemp = 60 + M.eye_blurry = max(M.eye_blurry, 3) + ..() + return + + +datum/reagent/toxin/spore_burning + name = "Burning Spore Toxin" + id = "spore_burning" + description = "A burning spore cloud." + color = "#9ACD32" + toxpwr = 0.5 + +datum/reagent/toxin/spore_burning/on_mob_life(var/mob/living/M as mob) + ..() + M.adjust_fire_stacks(2) + M.IgniteMob() + +datum/reagent/toxin/chloralhydrate + name = "Chloral Hydrate" + id = "chloralhydrate" + description = "A powerful sedative." + reagent_state = SOLID + color = "#000067" // rgb: 0, 0, 103 + toxpwr = 0 + metabolization_rate = 0.5 * REAGENTS_METABOLISM + +datum/reagent/toxin/chloralhydrate/on_mob_life(var/mob/living/M as mob) + if(!data) + data = 1 + data++ + switch(data) + if(1 to 10) + M.confused += 2 + M.drowsyness += 2 + if(10 to 50) + M.sleeping += 1 + if(51 to INFINITY) + M.sleeping += 1 + M.adjustToxLoss((data - 50)*REM) + ..() + return + +datum/reagent/toxin/beer2 //disguised as normal beer for use by emagged brobots + name = "Beer" + id = "beer2" + description = "An alcoholic beverage made from malted grains, hops, yeast, and water." + color = "#664300" // rgb: 102, 67, 0 + metabolization_rate = 0.5 * REAGENTS_METABOLISM + +datum/reagent/toxin/beer2/on_mob_life(var/mob/living/M as mob) + if(!data) + data = 1 + switch(data) + if(1 to 50) + M.sleeping += 1 + if(51 to INFINITY) + M.sleeping += 1 + M.adjustToxLoss((data - 50)*REM) + data++ + ..() + return + + + +//ACID + + +datum/reagent/toxin/acid + name = "Sulphuric acid" + id = "sacid" + description = "A strong mineral acid with the molecular formula H2SO4." + color = "#DB5008" // rgb: 219, 80, 8 + toxpwr = 1 + var/acidpwr = 10 //the amount of protection removed from the armour + +datum/reagent/toxin/acid/reaction_mob(var/mob/living/carbon/C, var/method=TOUCH, var/volume) + if(!istype(C)) + return + if(method != TOUCH) + if(!C.unacidable) + C.take_organ_damage(min(6*toxpwr, volume * toxpwr)) + return + + C.acid_act(acidpwr, toxpwr, volume) + +datum/reagent/toxin/acid/reaction_obj(var/obj/O, var/volume) + if(istype(O.loc, /mob)) //handled in human acid_act() + return + O.acid_act(acidpwr, toxpwr, volume) + +datum/reagent/toxin/acid/polyacid + name = "Polytrinic acid" + id = "pacid" + description = "Polytrinic acid is a an extremely corrosive chemical substance." + color = "#8E18A9" // rgb: 142, 24, 169 + toxpwr = 2 + acidpwr = 20 + +datum/reagent/toxin/coffeepowder + name = "Coffee Grounds" + id = "coffeepowder" + description = "Finely ground coffee beans, used to make coffee." + reagent_state = SOLID + color = "#5B2E0D" // rgb: 91, 46, 13 + toxpwr = 0.5 + +datum/reagent/toxin/teapowder + name = "Ground Tea Leaves" + id = "teapowder" + description = "Finely shredded tea leaves, used for making tea." + reagent_state = SOLID + color = "#7F8400" // rgb: 127, 132, 0 + toxpwr = 0.5 + +datum/reagent/toxin/mutetoxin //the new zombie powder. + name = "Mute Toxin" + id = "mutetoxin" + description = "A toxin that temporarily paralyzes the vocal cords." + color = "#F0F8FF" // rgb: 240, 248, 255 + toxpwr = 0 + +datum/reagent/toxin/mutetoxin/on_mob_life(mob/living/carbon/M) + M.silent += REM + 1 //If this var is increased by one or less, it will have no effect since silent is decreased right after reagents are handled in Life(). Hence the + 1. + ..() + +datum/reagent/toxin/staminatoxin + name = "Tirizene" + id = "tirizene" + description = "A toxin that affects the stamina of a person when injected into the bloodstream." + color = "#6E2828" + data = 13 + toxpwr = 0 + +datum/reagent/toxin/staminatoxin/on_mob_life(mob/living/carbon/M) + M.adjustStaminaLoss(REM * data) + data = max(data - 1, 3) + ..() + + +// Undefine the alias for REAGENTS_EFFECT_MULTIPLER +#undef REM \ No newline at end of file diff --git a/code/modules/research/designs.dm b/code/modules/research/designs.dm index 875504431b4..9be7c88ea13 100644 --- a/code/modules/research/designs.dm +++ b/code/modules/research/designs.dm @@ -149,7 +149,7 @@ datum/design/drill_diamond build_type = PROTOLATHE materials = list("$metal" = 3000, "$glass" = 1000, "$diamond" = 3750) //Yes, a whole diamond is needed. reliability = 79 - build_path = /obj/item/weapon/pickaxe/diamonddrill + build_path = /obj/item/weapon/pickaxe/drill/diamonddrill ///////////////////////////////////////// //////////////Blue Space///////////////// diff --git a/code/modules/surgery/lipoplasty.dm b/code/modules/surgery/lipoplasty.dm index 9ccb93d6dd5..8652fc2978e 100644 --- a/code/modules/surgery/lipoplasty.dm +++ b/code/modules/surgery/lipoplasty.dm @@ -31,7 +31,7 @@ user.visible_message("[user] extracts [target]'s fat!") target.overeatduration = 0 //patient is unfatted var/removednutriment = target.nutrition - target.nutrition = 450 + target.nutrition = NUTRITION_LEVEL_WELL_FED removednutriment -= 450 //whatever was removed goes into the meat var/obj/item/weapon/reagent_containers/food/snacks/meat/human/newmeat = new newmeat.name = "fatty meat" diff --git a/code/modules/telesci/telepad.dm b/code/modules/telesci/telepad.dm index ea7bb4ce13a..e0eccaff92b 100644 --- a/code/modules/telesci/telepad.dm +++ b/code/modules/telesci/telepad.dm @@ -60,10 +60,10 @@ playsound(src, 'sound/items/Ratchet.ogg', 50, 1) if(anchored) anchored = 0 - user << " The [src] can now be moved." + user << " \The [src] can now be moved." else if(!anchored) anchored = 1 - user << " The [src] is now secured." + user << " \The [src] is now secured." if(istype(W, /obj/item/weapon/screwdriver)) if(stage == 0) playsound(src, 'sound/items/Screwdriver.ogg', 50, 1) diff --git a/code/world.dm b/code/world.dm index 82f3817b3c2..c31d225da1d 100644 --- a/code/world.dm +++ b/code/world.dm @@ -89,7 +89,7 @@ master_controller = new /datum/controller/game_controller() spawn(-1) master_controller.setup() - lighting_controller.Initialize() + lighting_controller.initializeLighting() src.update_status() diff --git a/config/admins.txt b/config/admins.txt index e888262a285..cec937826ec 100644 --- a/config/admins.txt +++ b/config/admins.txt @@ -69,3 +69,7 @@ steelpoint = Game Master phil235 = Game Master xxnoob = Game Master tkdrg = Game Master +Cuboos = Game Master +thunder12345 = Game Master +wjohnston = Game Master +mandurrh = Game Master diff --git a/html/changelog.html b/html/changelog.html index f1a6231e621..c0dafcb126f 100644 --- a/html/changelog.html +++ b/html/changelog.html @@ -55,6 +55,32 @@ --> +
+
+
16 December 2014
+Paprika updated:
+-
+
- Reverted security armor and helmets to the old (Grey) style of armor/helmets. +
- Updated security jumpsuits to be more consistent across officer/warden/HoS ranks. +
- Added tactical armor and helmets to replace the largely unused bulletproof vest in the armory. This armor has higher bullet and explosive resistance than normal armor, and uses the previous, more military armor/helmet sprites. +
- Added a new injury doll to go along with the overall health meter. This will show you locational overall limb-based burn/brute damage, so you can tell the difference between being hurt with burn/brute or toxins/stamina damage which does not affect limbs. +
- Reverted some UI icons back to their older status and changed some around for readability. Thank you for your feedback. +
Thunder12345 updated:
+-
+
- Added a new FRAG-12 explosive shotgun shell, built from the unloaded technological shell, using tablecrafting. Constructed using an unloaded technological tech shell, 5 units sulphuric acid, 5 units polytrinic acid, 5 units glycerol, and requires a screwdriver. +
phil235 updated:
+-
+
- Change to the hunger system. Eating food with sugar temporarily worsens your nutrition drop rate. Eating too much sugar too quickly can make you temporarily unable to eat any sugary food. The nutritional effect of sugar depends on how hungry you are thus it cannot easily raise your nutrition level past well fed and is best used when hungry. Lots of sugar can make you a bit jittery at times. Eating food with vitamin (new reagent) counteracts the sugar effects and can give you temporary buffs when well fed: it lowers your chance to catch or spread viruses,it makes your body's metabolism more efficient that is it keeps healing reagents longer and evacuate toxins faster and reduces damage from radioactive reagents. Your metabolism gets less efficient if starving. +
- New hunger hud icons: starving, hungry, fed, well fed, full, fat. +
- Snack vending machine get a chef compartment that can be loaded with non-sugary food by hand or with a tray by anyone with kitchen access (unless you hack the machine with multitool or emag). The food can be unloaded by anyone, like regular snacks +
- Cargo can get a nutritious pizza crate order for 60 points. +
- Grown and cooked food gets some vitamin while junk food gets less nutriment and more sugar (only hot donkpocket and ramen don't have sugar) +
- The number of junk food in snack vending machine is lowered from 6 to 5 of each type. +
- Fixing not being able to load an omelette du fromage on a tray. +