diff --git a/code/datums/uplink_item.dm b/code/datums/uplink_item.dm index bfdfb312732..4eb5f6049d9 100644 --- a/code/datums/uplink_item.dm +++ b/code/datums/uplink_item.dm @@ -237,9 +237,9 @@ var/list/uplink_items = list() category = "Stealthy and Inconspicuous Weapons" /datum/uplink_item/stealthy_weapons/para_pen - name = "Paralysis Pen" - desc = "A syringe disguised as a functional pen, filled with a neuromuscular-blocking drug that renders a target immobile on injection and makes them seem dead to observers. \ - Side effects of the drug include noticeable drooling. The pen holds one dose of paralyzing agent, and cannot be refilled." + name = "Sleepy Pen" + desc = "A syringe disguised as a functional pen, filled with a potent mix of drugs, including a strong anaesthetic and a chemical that is capable of blocking the movement of the vocal chords. \ + The pen holds one dose of the mixture, and cannot be refilled." item = /obj/item/weapon/pen/paralysis cost = 3 excludefrom = list(/datum/game_mode/nuclear) @@ -370,10 +370,10 @@ var/list/uplink_items = list() /datum/uplink_item/device_tools/plastic_explosives name = "Composition C-4" - desc = "C-4 is plastic explosive of the common variety Composition C. You can use it to breach walls, attach it to organisms to destroy them, or connect a signaler to its wiring to make it remotely detonable. \ + desc = "C-4 is plastic explosive of the common variety Composition C. You can use it to breach walls or connect a signaler to its wiring to make it remotely detonable. \ It has a modifiable timer with a minimum setting of 10 seconds." item = /obj/item/weapon/plastique - cost = 2 + cost = 1 /datum/uplink_item/device_tools/powersink name = "Power sink" diff --git a/code/game/objects/items/weapons/explosives.dm b/code/game/objects/items/weapons/explosives.dm index c5c2f83e071..1417d8da2a8 100644 --- a/code/game/objects/items/weapons/explosives.dm +++ b/code/game/objects/items/weapons/explosives.dm @@ -22,7 +22,7 @@ ..() /obj/item/weapon/plastique/suicide_act(var/mob/user) - . = (BRUTELOSS) + . = BRUTELOSS user.visible_message("[user] activates the C4 and holds it above his head! It looks like \he's going out with a bang!") var/message_say = "FOR NO RAISIN!" if(user.mind) @@ -59,13 +59,9 @@ /obj/item/weapon/plastique/afterattack(atom/movable/target, mob/user, flag) if (!flag) return - if (istype(target, /turf/unsimulated) || istype(target, /turf/simulated/shuttle) || istype(target, /obj/item/weapon/storage/)) + if (ismob(target) || istype(target, /turf/unsimulated) || istype(target, /turf/simulated/shuttle) || istype(target, /obj/item/weapon/storage/)) return user << "Planting explosives..." - if(ismob(target)) - add_logs(user, target, "tried to plant explosives on", object="[name]") - user.visible_message("\red [user.name] is trying to plant some kind of explosive on [target.name]!") - if(do_after(user, 50) && in_range(user, target)) user.drop_item() @@ -88,7 +84,6 @@ explode(get_turf(target)) /obj/item/weapon/plastique/proc/explode(var/location) - if(!target) target = get_atom_on_turf(src) if(!target) @@ -98,7 +93,8 @@ if(target) if (istype(target, /turf/simulated/wall)) - target:dismantle_wall(1) + var/turf/simulated/wall/W = target + W.dismantle_wall(1) else target.ex_act(1) if(target) diff --git a/code/modules/mob/living/carbon/carbon_defines.dm b/code/modules/mob/living/carbon/carbon_defines.dm index 52a95dbc45f..edfd3102e9a 100644 --- a/code/modules/mob/living/carbon/carbon_defines.dm +++ b/code/modules/mob/living/carbon/carbon_defines.dm @@ -3,7 +3,7 @@ var/list/stomach_contents = list() var/list/internal_organs = list() //List of /obj/item/organ in the mob. they don't go in the contents. - var/silent = null //Can't talk. Value goes down every life proc. + var/silent = 0 //Can't talk. Value goes down every life proc. //NOTE TO FUTURE CODERS: DO NOT INITIALIZE NUMERICAL VARS AS NULL OR I WILL MURDER YOU. var/obj/item/handcuffed = null //Whether or not the mob is handcuffed var/obj/item/legcuffed = null //Same as handcuffs but for legs. Bear traps use this. diff --git a/code/modules/paperwork/pen.dm b/code/modules/paperwork/pen.dm index ffa2ca5d801..0b707cdac34 100644 --- a/code/modules/paperwork/pen.dm +++ b/code/modules/paperwork/pen.dm @@ -55,7 +55,7 @@ /* * Parapens */ - /obj/item/weapon/pen/paralysis +/obj/item/weapon/pen/paralysis origin_tech = "materials=2;syndicate=5" @@ -69,8 +69,7 @@ /obj/item/weapon/pen/paralysis/New() - create_reagents(50) - reagents.add_reagent("zombiepowder", 10) - reagents.add_reagent("impedrezene", 25) - reagents.add_reagent("cryptobiolin", 15) + create_reagents(60) + reagents.add_reagent("stoxin", 30) + reagents.add_reagent("mutetoxin", 30) ..() \ No newline at end of file diff --git a/code/modules/reagents/Chemistry-Reagents.dm b/code/modules/reagents/Chemistry-Reagents.dm index 152750d600b..fb4776d7d83 100644 --- a/code/modules/reagents/Chemistry-Reagents.dm +++ b/code/modules/reagents/Chemistry-Reagents.dm @@ -1710,6 +1710,17 @@ datum color = "#7F8400" // rgb: 127, 132, 0 toxpwr = 0.5 + toxin/mutetoxin //the new zombie powder. + name = "Mute Toxin" + id = "mutetoxin" + reagent_state = LIQUID + color = "#F0F8FF" // rgb: 240, 248, 255 + toxpwr = 0 + + on_mob_life(mob/living/carbon/M) + M.silent += 2 * 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. + ..() + /////////////////////////Coloured Crayon Powder//////////////////////////// //For colouring in /proc/mix_color_from_reagents diff --git a/code/modules/reagents/Chemistry-Recipes.dm b/code/modules/reagents/Chemistry-Recipes.dm index b292cc855f0..92dc11e2b18 100644 --- a/code/modules/reagents/Chemistry-Recipes.dm +++ b/code/modules/reagents/Chemistry-Recipes.dm @@ -408,6 +408,13 @@ silicate required_reagents = list("ethanol" = 1, "chlorine" = 3, "water" = 1) result_amount = 1 +/datum/chemical_reaction/mutetoxin //i'll just fit this in here snugly between other unfun chemicals :v + name = "Mute toxin" + id = "mutetoxin" + result = "mutetoxin" + required_reagents = list("uranium" = 2, "water" = 1, "carbon" = 1) + result_amount = 2 + /datum/chemical_reaction/zombiepowder name = "Zombie Powder" id = "zombiepowder"