diff --git a/code/datums/supplypacks.dm b/code/datums/supplypacks.dm index 57d9003ade2..6cedd5722fb 100755 --- a/code/datums/supplypacks.dm +++ b/code/datums/supplypacks.dm @@ -597,6 +597,9 @@ var/list/all_supply_groups = list("Operations","Security","Hospitality","Enginee /obj/item/device/assembly/prox_sensor, /obj/item/device/assembly/prox_sensor, /obj/item/device/assembly/prox_sensor, + /obj/item/device/transfer_valve, + /obj/item/device/transfer_valve, + /obj/item/device/transfer_valve, /obj/item/device/assembly/timer, /obj/item/device/assembly/timer, /obj/item/device/assembly/timer) diff --git a/code/game/dna/dna_misc.dm b/code/game/dna/dna_misc.dm index a9dc0c0e487..44973e26a1c 100644 --- a/code/game/dna/dna_misc.dm +++ b/code/game/dna/dna_misc.dm @@ -296,7 +296,7 @@ M.verbs += /mob/living/carbon/human/proc/remoteobserve if(ismuton(REGENERATEBLOCK,M)) if(probinj(45,inj) || (mRegen in old_mutations)) - M << "\blue You feel strange" + M << "\blue Your body pulses with energy" M.mutations.Add(mRegen) if(ismuton(INCREASERUNBLOCK,M)) if(probinj(45,inj) || (mRun in old_mutations)) @@ -327,7 +327,7 @@ if(ismuton(SHOCKIMMUNITYBLOCK,M)) if(probinj(45,inj) || (mShock in old_mutations)) M.mutations.Add(mShock) - M << "\blue You feel strange" + M << "\blue Your skin feels dry" if(ismuton(SMALLSIZEBLOCK,M)) if(probinj(45,inj) || (mSmallsize in old_mutations)) M << "\blue Your skin feels rubbery" diff --git a/code/game/machinery/autolathe.dm b/code/game/machinery/autolathe.dm index 7b04e0615af..abcb642afde 100644 --- a/code/game/machinery/autolathe.dm +++ b/code/game/machinery/autolathe.dm @@ -39,6 +39,7 @@ var/global/list/autolathe_recipes = list( \ new /obj/item/device/radio/headset(), \ new /obj/item/device/radio/off(), \ new /obj/item/device/assembly/infra(), \ + new /obj/item/device/assembly/prox_sensor(), \ new /obj/item/device/assembly/timer(), \ new /obj/item/weapon/light/tube(), \ new /obj/item/weapon/light/bulb(), \ diff --git a/code/game/machinery/suit_storage_unit.dm b/code/game/machinery/suit_storage_unit.dm index 1d8fd6a36b7..b23ea160cb2 100644 --- a/code/game/machinery/suit_storage_unit.dm +++ b/code/game/machinery/suit_storage_unit.dm @@ -331,11 +331,11 @@ sleep(50) if(src.OCCUPANT) if(src.issuperUV) - var/burndamage = rand(28,35) + var/burndamage = rand(35,45) OCCUPANT.take_organ_damage(0,burndamage) OCCUPANT.emote("scream") else - var/burndamage = rand(6,10) + var/burndamage = rand(10,15) OCCUPANT.take_organ_damage(0,burndamage) OCCUPANT.emote("scream") if(i==3) //End of the cycle diff --git a/code/game/machinery/vending.dm b/code/game/machinery/vending.dm index 7d9588e9baa..b03d7821af9 100644 --- a/code/game/machinery/vending.dm +++ b/code/game/machinery/vending.dm @@ -834,7 +834,7 @@ /obj/item/clothing/suit/wcoat = 1,/obj/item/clothing/under/suit_jacket = 1,/obj/item/clothing/head/that =1,/obj/item/clothing/head/cueball = 1, /obj/item/clothing/under/scratch = 1,/obj/item/clothing/under/kilt = 1,/obj/item/clothing/head/beret = 1,/obj/item/clothing/suit/wcoat = 1, /obj/item/clothing/glasses/monocle =1,/obj/item/clothing/head/bowler = 1,/obj/item/weapon/cane = 1,/obj/item/clothing/under/sl_suit = 1, - /obj/item/clothing/mask/fakemoustache = 1,/obj/item/clothing/suit/bio_suit/plaguedoctorsuit = 1,/obj/item/clothing/head/plaguedoctorhat = 1, + /obj/item/clothing/mask/fakemoustache = 1,/obj/item/clothing/suit/bio_suit/plaguedoctorsuit = 1,/obj/item/clothing/head/plaguedoctorhat = 1,/obj/item/clothing/mask/gas/plaguedoctor = 1, /obj/item/clothing/under/owl = 1,/obj/item/clothing/mask/gas/owl_mask = 1,/obj/item/clothing/suit/apron = 1,/obj/item/clothing/under/waiter = 1, /obj/item/clothing/under/pirate = 1,/obj/item/clothing/suit/pirate = 1,/obj/item/clothing/head/pirate = 1,/obj/item/clothing/head/bandana = 1, /obj/item/clothing/head/bandana = 1,/obj/item/clothing/under/soviet = 1,/obj/item/clothing/head/ushanka = 1,/obj/item/clothing/suit/imperium_monk = 1, diff --git a/code/modules/client/preferences.dm b/code/modules/client/preferences.dm index 89c5a809d23..a521d92a256 100644 --- a/code/modules/client/preferences.dm +++ b/code/modules/client/preferences.dm @@ -949,7 +949,7 @@ datum/preferences b_type = new_b_type if("hair") - if(species == "Human" || species == "Unathi") + if(species == "Human" || species == "Unathi" || species == "Tajaran" || species == "Skrell") var/new_hair = input(user, "Choose your character's hair colour:", "Character Preference") as color|null if(new_hair) r_hair = hex2num(copytext(new_hair, 2, 4)) diff --git a/code/modules/food/recipes_microwave.dm b/code/modules/food/recipes_microwave.dm index f9c68a4cd90..2c4bd6b2c3a 100644 --- a/code/modules/food/recipes_microwave.dm +++ b/code/modules/food/recipes_microwave.dm @@ -1010,14 +1010,18 @@ /obj/item/weapon/ore/clown, ) result = /obj/item/weapon/reagent_containers/food/snacks/clownstears -/* + /datum/recipe/boiledslimeextract reagents = list("water" = 5) items = list( - /obj/item/slime_core, + /obj/item/slime_extract, ) result = /obj/item/weapon/reagent_containers/food/snacks/boiledslimecore -*/ + +/datum/recipe/mint + reagents = list("toxin" = 5) + result = /obj/item/weapon/reagent_containers/food/snacks/mint + /datum/recipe/braincake reagents = list("milk" = 5, "flour" = 15) items = list( diff --git a/code/modules/mob/new_player/sprite_accessories.dm b/code/modules/mob/new_player/sprite_accessories.dm index 73a75b9545b..662bf7940dc 100644 --- a/code/modules/mob/new_player/sprite_accessories.dm +++ b/code/modules/mob/new_player/sprite_accessories.dm @@ -385,133 +385,133 @@ name = "Long Unathi Spines" icon_state = "soghun_longspines" species_allowed = list("Unathi") - do_colouration = 0 + do_colouration = 1 una_spines_short name = "Short Unathi Spines" icon_state = "soghun_shortspines" species_allowed = list("Unathi") - do_colouration = 0 + do_colouration = 1 una_frills_long name = "Long Unathi Frills" icon_state = "soghun_longfrills" species_allowed = list("Unathi") - do_colouration = 0 + do_colouration = 1 una_frills_short name = "Short Unathi Frills" icon_state = "soghun_shortfrill" species_allowed = list("Unathi") - do_colouration = 0 + do_colouration = 1 una_horns name = "Unathi Horns" icon_state = "soghun_horns" species_allowed = list("Unathi") - do_colouration = 0 + do_colouration = 1 skr_tentacle_m name = "Skrell Male Tentacles" icon_state = "skrell_hair_m" species_allowed = list("Skrell") gender = MALE - do_colouration = 0 + do_colouration = 1 skr_tentacle_f name = "Skrell Female Tentacles" icon_state = "skrell_hair_f" species_allowed = list("Skrell") gender = FEMALE - do_colouration = 0 + do_colouration = 1 skr_gold_m name = "Gold plated Skrell Male Tentacles" icon_state = "skrell_goldhair_m" species_allowed = list("Skrell") gender = MALE - do_colouration = 0 + do_colouration = 1 skr_gold_f name = "Gold chained Skrell Female Tentacles" icon_state = "skrell_goldhair_f" species_allowed = list("Skrell") gender = FEMALE - do_colouration = 0 + do_colouration = 1 skr_clothtentacle_m name = "Cloth draped Skrell Male Tentacles" icon_state = "skrell_clothhair_m" species_allowed = list("Skrell") gender = MALE - do_colouration = 0 + do_colouration = 1 skr_clothtentacle_f name = "Cloth draped Skrell Female Tentacles" icon_state = "skrell_clothhair_f" species_allowed = list("Skrell") gender = FEMALE - do_colouration = 0 + do_colouration = 1 taj_ears name = "Tajaran Ears" icon_state = "ears_plain" species_allowed = list("Tajaran") - do_colouration = 0 + do_colouration = 1 taj_ears_clean name = "Tajara Clean" icon_state = "hair_clean" species_allowed = list("Tajaran") - do_colouration = 0 + do_colouration = 1 taj_ears_shaggy name = "Tajara Shaggy" icon_state = "hair_shaggy" species_allowed = list("Tajaran") - do_colouration = 0 + do_colouration = 1 taj_ears_mohawk name = "Tajaran Mohawk" icon_state = "hair_mohawk" species_allowed = list("Tajaran") - do_colouration = 0 + do_colouration = 1 taj_ears_plait name = "Tajara Plait" icon_state = "hair_plait" species_allowed = list("Tajaran") - do_colouration = 0 + do_colouration = 1 taj_ears_straight name = "Tajara Straight" icon_state = "hair_straight" species_allowed = list("Tajaran") - do_colouration = 0 + do_colouration = 1 taj_ears_long name = "Tajara Long" icon_state = "hair_long" species_allowed = list("Tajaran") - do_colouration = 0 + do_colouration = 1 taj_ears_rattail name = "Tajara Rat Tail" icon_state = "hair_rattail" species_allowed = list("Tajaran") - do_colouration = 0 + do_colouration = 1 taj_ears_spiky name = "Tajara Spiky" icon_state = "hair_tajspiky" species_allowed = list("Tajaran") - do_colouration = 0 + do_colouration = 1 taj_ears_messy name = "Tajara Messy" icon_state = "hair_messy" species_allowed = list("Tajaran") - do_colouration = 0 + do_colouration = 1 vox_quills_short name = "Short Vox Quills" @@ -524,37 +524,37 @@ name = "Tajara Sideburns" icon_state = "facial_mutton" species_allowed = list("Tajaran") - do_colouration = 0 + do_colouration = 1 taj_mutton name = "Tajara Mutton" icon_state = "facial_mutton" species_allowed = list("Tajaran") - do_colouration = 0 + do_colouration = 1 taj_pencilstache name = "Tajara Pencilstache" icon_state = "facial_pencilstache" species_allowed = list("Tajaran") - do_colouration = 0 + do_colouration = 1 taj_moustache name = "Tajara Moustache" icon_state = "facial_moustache" species_allowed = list("Tajaran") - do_colouration = 0 + do_colouration = 1 taj_goatee name = "Tajara Goatee" icon_state = "facial_goatee" species_allowed = list("Tajaran") - do_colouration = 0 + do_colouration = 1 taj_smallstache name = "Tajara Smallsatche" icon_state = "facial_smallstache" species_allowed = list("Tajaran") - do_colouration = 0 + do_colouration = 1 //skin styles - WIP //going to have to re-integrate this with surgery diff --git a/code/modules/reagents/Chemistry-Machinery.dm b/code/modules/reagents/Chemistry-Machinery.dm index 5a9a2e48e99..0518784ef39 100644 --- a/code/modules/reagents/Chemistry-Machinery.dm +++ b/code/modules/reagents/Chemistry-Machinery.dm @@ -56,13 +56,13 @@ if(broken_on_spawn) var/amount = pick(3,3,4) var/list/options = list() - options[/obj/item/weapon/stock_parts/capacitor/super] = "Add a super capacitor to fix it." + options[/obj/item/weapon/stock_parts/capacitor/adv] = "Add an advanced capacitor to fix it." options[/obj/item/weapon/stock_parts/console_screen] = "Replace the console screen to fix it." options[/obj/item/weapon/stock_parts/manipulator/pico] = "Upgrade to a pico manipulator to fix it." options[/obj/item/weapon/stock_parts/matter_bin/super] = "Give it a super matter bin to fix it." options[/obj/item/weapon/cell/super] = "Replace the reagent synthesizer with a super capacity cell to fix it." options[/obj/item/device/mass_spectrometer/adv] = "Replace the reagent scanner with an advanced mass spectrometer to fix it" - options[/obj/item/weapon/stock_parts/micro_laser/ultra] = "Repair the reagent synthesizer with an ultra-high-power micro-laser to fix it" + options[/obj/item/weapon/stock_parts/micro_laser/high] = "Repair the reagent synthesizer with an high-power micro-laser to fix it" options[/obj/item/device/reagent_scanner/adv] = "Replace the reagent scanner with an advanced reagent scanner to fix it" options[/obj/item/stack/nanopaste] = "Apply some nanopaste to the broken nozzles to fix it." options[/obj/item/stack/sheet/plasteel] = "Surround the outside with a plasteel cover to fix it." diff --git a/code/modules/reagents/reagent_containers/food/snacks.dm b/code/modules/reagents/reagent_containers/food/snacks.dm index 3a033e47899..a3853acf909 100644 --- a/code/modules/reagents/reagent_containers/food/snacks.dm +++ b/code/modules/reagents/reagent_containers/food/snacks.dm @@ -1851,16 +1851,16 @@ New() ..() reagents.add_reagent("cherryjelly", 5) -/* + /obj/item/weapon/reagent_containers/food/snacks/boiledslimecore - name = "Boiled slime Core" + name = "Boiled Slime Core" desc = "A boiled red thing." - icon_state = "boiledslimecore" + icon_state = "boiledrorocore" New() ..() reagents.add_reagent("slimejelly", 5) bitesize = 3 -*/ + /obj/item/weapon/reagent_containers/food/snacks/mint name = "mint" desc = "it is only wafer thin."