diff --git a/code/defines/obj/supplypacks.dm b/code/defines/obj/supplypacks.dm index 2ed6f77a4f..c7f9475f62 100755 --- a/code/defines/obj/supplypacks.dm +++ b/code/defines/obj/supplypacks.dm @@ -558,8 +558,8 @@ /datum/supply_packs/mecha_ripley name = "Circuit Crate (\"Ripley\" APLU)" contains = list("/obj/item/weapon/book/manual/ripley_build_and_repair", - "/obj/item/mecha_parts/circuitboard/ripley/main", //TEMPORARY due to lack of circuitboard printer - "/obj/item/mecha_parts/circuitboard/ripley/peripherals") //TEMPORARY due to lack of circuitboard printer + "/obj/item/weapon/circuitboard/mecha/ripley/main", //TEMPORARY due to lack of circuitboard printer + "/obj/item/weapon/circuitboard/mecha/ripley/peripherals") //TEMPORARY due to lack of circuitboard printer cost = 40 containertype = "/obj/structure/closet/crate/secure" containername = "APLU \"Ripley\" Circuit Crate" diff --git a/code/game/jobs/job/medical.dm b/code/game/jobs/job/medical.dm index dadb5bd0e7..d9f84a8601 100644 --- a/code/game/jobs/job/medical.dm +++ b/code/game/jobs/job/medical.dm @@ -30,7 +30,7 @@ total_positions = 5 spawn_positions = 3 supervisors = "the chief medical officer" - alt_titles = list("Virologist", "Surgeon", "Paramedic") + alt_titles = list("Virologist", "Surgeon", "Emergency Medical Technician") equip(var/mob/living/carbon/human/H) diff --git a/code/game/machinery/Sleeper.dm b/code/game/machinery/Sleeper.dm index c01c48f94b..32ff757a2a 100644 --- a/code/game/machinery/Sleeper.dm +++ b/code/game/machinery/Sleeper.dm @@ -287,8 +287,8 @@ proc/inject_stox(mob/user as mob) if(src.occupant) - if(src.occupant.reagents.get_reagent_amount("stoxin") + 20 <= 40) - src.occupant.reagents.add_reagent("stoxin", 20) + if(src.occupant.reagents.get_reagent_amount("stoxin") + 10 <= 40) + src.occupant.reagents.add_reagent("stoxin", 10) user << text("Occupant now has [] units of soporifics in his/her bloodstream.", src.occupant.reagents.get_reagent_amount("stoxin")) else user << "No occupant!" @@ -297,8 +297,8 @@ proc/inject_dermaline(mob/user as mob) if (src.occupant) - if(src.occupant.reagents.get_reagent_amount("dermaline") + 20 <= 40) - src.occupant.reagents.add_reagent("dermaline", 20) + if(src.occupant.reagents.get_reagent_amount("dermaline") + 10 <= 40) + src.occupant.reagents.add_reagent("dermaline", 10) user << text("Occupant now has [] units of Dermaline in his/her bloodstream.", src.occupant.reagents.get_reagent_amount("dermaline")) else user << "No occupant!" @@ -307,7 +307,7 @@ proc/inject_bicaridine(mob/user as mob) if(src.occupant) - if(src.occupant.reagents.get_reagent_amount("bicaridine") + 10 <= 20) + if(src.occupant.reagents.get_reagent_amount("bicaridine") + 10 <= 40) src.occupant.reagents.add_reagent("bicaridine", 10) user << text("Occupant now has [] units of Bicaridine in his/her bloodstream.", src.occupant.reagents.get_reagent_amount("bicaridine")) else @@ -317,8 +317,8 @@ proc/inject_dexalin(mob/user as mob) if(src.occupant) - if(src.occupant.reagents.get_reagent_amount("dexalin") + 20 <= 40) - src.occupant.reagents.add_reagent("dexalin", 20) + if(src.occupant.reagents.get_reagent_amount("dexalin") + 10 <= 40) + src.occupant.reagents.add_reagent("dexalin", 10) user << text("Occupant now has [] units of Dexalin in his/her bloodstream.", src.occupant.reagents.get_reagent_amount("dexalin")) else user << "No occupant!" diff --git a/code/modules/mob/living/carbon/human/examine.dm b/code/modules/mob/living/carbon/human/examine.dm index 41fee404c8..4d9f30ac3f 100644 --- a/code/modules/mob/living/carbon/human/examine.dm +++ b/code/modules/mob/living/carbon/human/examine.dm @@ -174,8 +174,9 @@ if(!stat) if (src.brainloss >= 60) usr << "\red [src.name] has a stupid expression on [t_his] face." - if (!src.client) - usr << "\red [src.name] doesn't seem as though they want to talk." + + if (!src.client) + usr << "\red [src.name] doesn't seem as though they want to talk." for(var/named in organs) var/datum/organ/external/temp = organs[named] diff --git a/icons/obj/computer.dmi b/icons/obj/computer.dmi index 59d8905699..fc526d2ed4 100644 Binary files a/icons/obj/computer.dmi and b/icons/obj/computer.dmi differ