diff --git a/code/game/gamemodes/changeling/modularchangling.dm b/code/game/gamemodes/changeling/modularchangling.dm index 5fd786729e..bb48441a34 100644 --- a/code/game/gamemodes/changeling/modularchangling.dm +++ b/code/game/gamemodes/changeling/modularchangling.dm @@ -61,7 +61,7 @@ var/list/obj/effect/proc_holder/power/powerinstances = list() /obj/effect/proc_holder/power/deaf_sting name = "Deaf Sting" - desc = "We silently sting a human, completely silencing them for a short time." + desc = "We silently sting a human, completely deafening them for a short time." genomecost = 1 allowduringlesserform = 1 @@ -71,7 +71,7 @@ var/list/obj/effect/proc_holder/power/powerinstances = list() /obj/effect/proc_holder/power/blind_sting name = "Blind Sting" - desc = "We silently sting a human, completely deafening them for a short time." + desc = "We silently sting a human, completely blinding them for a short time." genomecost = 2 allowduringlesserform = 1 diff --git a/code/game/jobs/job_controller.dm b/code/game/jobs/job_controller.dm index e9f25656a1..865baeee72 100644 --- a/code/game/jobs/job_controller.dm +++ b/code/game/jobs/job_controller.dm @@ -258,18 +258,18 @@ var/global/datum/controller/occupations/job_master if(H.backbag == 2) var/obj/item/weapon/storage/backpack/BPK = new/obj/item/weapon/storage/backpack(H) - new /obj/item/weapon/storage/box(BPK) H.equip_if_possible(BPK, H.slot_back,1) + H.equip_if_possible(new /obj/item/weapon/storage/box(H.back), H.slot_in_backpack) if(H.backbag == 3) var/obj/item/weapon/storage/backpack/BPK = new/obj/item/weapon/storage/backpack/satchel(H) - new /obj/item/weapon/storage/box(BPK) H.equip_if_possible(BPK, H.slot_back,1) + H.equip_if_possible(new /obj/item/weapon/storage/box(H.back), H.slot_in_backpack) if(H.backbag == 4) var/obj/item/weapon/storage/backpack/BPK = new/obj/item/weapon/storage/backpack/satchel_norm(H) - new /obj/item/weapon/storage/box(BPK) H.equip_if_possible(BPK, H.slot_back,1) + H.equip_if_possible(new /obj/item/weapon/storage/box(H.back), H.slot_in_backpack) //Give'em glasses if they are nearsighted if(H.disabilities & 1) diff --git a/code/game/machinery/camera.dm b/code/game/machinery/camera.dm index ae061bb9a1..8af06c5504 100644 --- a/code/game/machinery/camera.dm +++ b/code/game/machinery/camera.dm @@ -66,6 +66,8 @@ continue else if (M == usr) continue + if(M.digitalcamo) + continue var/turf/temp_turf = get_turf(M) if(temp_turf.z != 1 && temp_turf.z != 5) //Not on mining or the station. continue @@ -118,6 +120,11 @@ usr << "Follow camera mode terminated." usr:cameraFollow = null return + if(target.digitalcamo) + usr << "Follow camera mode terminated." + usr:cameraFollow = null + return + else if(istype(target.loc,/obj/effect/dummy)) usr << "Follow camera mode ended." usr:cameraFollow = null diff --git a/code/modules/food/food.dm b/code/modules/food/food.dm index f8df8a8c63..50aec47e71 100644 --- a/code/modules/food/food.dm +++ b/code/modules/food/food.dm @@ -2000,6 +2000,8 @@ new /obj/item/weapon/reagent_containers/food/snacks/rawsticks(spawnloc) user << "You cut the potato." del(src) + else + ..() /obj/item/weapon/reagent_containers/food/snacks/rawsticks name = "raw potato sticks" diff --git a/code/modules/mob/living/carbon/human/examine.dm b/code/modules/mob/living/carbon/human/examine.dm index 1b1e2e182b..e804d08fb3 100644 --- a/code/modules/mob/living/carbon/human/examine.dm +++ b/code/modules/mob/living/carbon/human/examine.dm @@ -205,9 +205,9 @@ if (src.cloneloss) if (src.cloneloss < 30) - msg += "[src.name] looks slightly... unfinished?\n" + msg += "[t_He] [t_has] minor genetic deformities.\n" else - msg += "[src.name] looks very... unfinished?\n" + msg += "[t_He] [t_has] severe genetic deformities.\n" /* if (src.getFireLoss()) if (src.getFireLoss() < 30) @@ -230,7 +230,10 @@ msg += "[t_He] [t_has] a stupid expression on [t_his] face.\n" if (!src.client && !admin_observing) - msg += "[t_He] [t_has] a vacant, braindead stare...\n" + msg += "[t_He] [t_has] a vacant stare...\n" + + if (src.digitalcamo) + msg += "[t_He] [t_is] repulsively uncanny!\n" var/list/wound_descriptions = list() var/list/wound_flavor_text = list() diff --git a/code/modules/mob/living/carbon/human/life.dm b/code/modules/mob/living/carbon/human/life.dm index 4279085a46..58f3628941 100644 --- a/code/modules/mob/living/carbon/human/life.dm +++ b/code/modules/mob/living/carbon/human/life.dm @@ -1483,4 +1483,4 @@ snippets plcheck = t_plasma oxcheck = t_oxygen G.turf_add(T, G.total_moles()) -*/ +*/ \ No newline at end of file