diff --git a/code/game/objects/items/weapons/implants/implant.dm b/code/game/objects/items/weapons/implants/implant.dm index 72d9a860..9ad5c1d8 100644 --- a/code/game/objects/items/weapons/implants/implant.dm +++ b/code/game/objects/items/weapons/implants/implant.dm @@ -341,6 +341,30 @@ the implant may become unstable and either pre-maturely inject the subject or si ticker.mode:remove_revolutionary(H.mind) H << "\blue You feel a surge of loyalty towards Nanotrasen." return 1 +/* + implanted(mob/M) + if(!istype(M, /mob/living/carbon/human)) return 0 + var/mob/living/carbon/human/H = M + if(H.mind in ticker.mode:cult) + ticker.mode:remove_cultist(M.mind) + H << "\blue The implant robs you of your faith in Nar-Sie, leaving only obedience to NanoTrasen." + return 1 + +//Alternatively! This is the null-rod deconversion, if the above doesn't work. There's two things down there and I don't know if that's okay. +/* + if (M.stat !=2) + if((M.mind in ticker.mode.cult) && prob(33)) + M << "\red The power of [src] clears your mind of the cult's influence!" + user << "\red You wave [src] over [M]'s head and see their eyes become clear, their mind returning to normal." + ticker.mode.remove_cultist(M.mind) + for(var/mob/O in viewers(M, null)) + O.show_message(text("\red [] waves [] over []'s head.", user, src, M), 1) +*/ + + + +*/ + /obj/item/weapon/implant/adrenalin diff --git a/code/modules/detectivework/footprints_and_rag.dm b/code/modules/detectivework/footprints_and_rag.dm index e8a207ca..3e0018a5 100644 --- a/code/modules/detectivework/footprints_and_rag.dm +++ b/code/modules/detectivework/footprints_and_rag.dm @@ -30,7 +30,7 @@ /obj/item/weapon/reagent_containers/glass/rag/attack(atom/target as obj|turf|area, mob/user as mob , flag) if(ismob(target) && target.reagents && reagents.total_volume) user.visible_message("\red \The [target] has been smothered with \the [src] by \the [user]!", "\red You smother \the [target] with \the [src]!", "You hear some struggling and muffled cries of surprise") - src.reagents.reaction(target, TOUCH) + src.reagents.reaction(target, INGEST) spawn(5) src.reagents.clear_reagents() return else @@ -50,4 +50,4 @@ return usr << "That's \a [src]." usr << desc - return \ No newline at end of file + return diff --git a/code/modules/projectiles/guns/energy/laser.dm b/code/modules/projectiles/guns/energy/laser.dm index f77dc8a6..0db5d303 100644 --- a/code/modules/projectiles/guns/energy/laser.dm +++ b/code/modules/projectiles/guns/energy/laser.dm @@ -71,7 +71,7 @@ obj/item/weapon/gun/energy/laser/retro origin_tech = "combat=4;materials=3;powerstorage=3" projectile_type = "/obj/item/projectile/beam/heavylaser" - fire_delay = 20 + fire_delay = 8 isHandgun() return 0 @@ -169,4 +169,4 @@ obj/item/weapon/gun/energy/laser/retro if(!power_supply) return 0 power_supply.give(100) update_icon() - return 1 \ No newline at end of file + return 1 diff --git a/code/modules/projectiles/guns/energy/special.dm b/code/modules/projectiles/guns/energy/special.dm index 041e942a..d0de5240 100644 --- a/code/modules/projectiles/guns/energy/special.dm +++ b/code/modules/projectiles/guns/energy/special.dm @@ -200,7 +200,9 @@ obj/item/weapon/gun/energy/staff/focus desc = "A specialized firearm designed to fire lethal bolts of toxins." icon_state = "toxgun" fire_sound = 'sound/effects/stealthoff.ogg' - w_class = 3.0 + fire_delay = 0 + w_class = 2.0 + cell_type = "/obj/item/weapon/cell/crap" origin_tech = "combat=5;plasmatech=4" projectile_type = "/obj/item/projectile/energy/plasma" diff --git a/code/modules/projectiles/projectile/beams.dm b/code/modules/projectiles/projectile/beams.dm index d2838f5d..3d6e3527 100644 --- a/code/modules/projectiles/projectile/beams.dm +++ b/code/modules/projectiles/projectile/beams.dm @@ -93,7 +93,7 @@ var/list/beam_master = list() /obj/item/projectile/beam/heavylaser name = "heavy laser" icon_state = "heavylaser" - damage = 40 + damage = 80 /obj/item/projectile/beam/xray name = "xray beam" @@ -168,4 +168,4 @@ var/list/beam_master = list() damage = 60 stun = 5 weaken = 5 - stutter = 5 \ No newline at end of file + stutter = 5 diff --git a/code/modules/projectiles/projectile/energy.dm b/code/modules/projectiles/projectile/energy.dm index 0c528ef5..40df1167 100644 --- a/code/modules/projectiles/projectile/energy.dm +++ b/code/modules/projectiles/projectile/energy.dm @@ -64,7 +64,7 @@ icon_state = "energy" damage = 20 damage_type = TOX - irradiate = 20 + irradiate = 40 /obj/item/projectile/energy/electrode/instant name = "electrode" @@ -84,4 +84,4 @@ stutter = 10 */ agony = 70 - damage_type = HALLOSS \ No newline at end of file + damage_type = HALLOSS diff --git a/code/modules/projectiles/projectile/force.dm b/code/modules/projectiles/projectile/force.dm index 2fab1a4d..c238a616 100644 --- a/code/modules/projectiles/projectile/force.dm +++ b/code/modules/projectiles/projectile/force.dm @@ -2,7 +2,7 @@ name = "force bolt" icon = 'icons/obj/projectiles.dmi' icon_state = "ice_1" - damage = 20 + damage = 40 flag = "energy" embed = 1 @@ -27,4 +27,4 @@ throwdir = get_dir(src,target) M.throw_at(get_edge_target_turf(M, throwdir),15,1) return ..() -*/ \ No newline at end of file +*/ diff --git a/code/modules/reagents/Chemistry-Reagents-Antidepressants.dm b/code/modules/reagents/Chemistry-Reagents-Antidepressants.dm index 0a722a43..53373c33 100644 --- a/code/modules/reagents/Chemistry-Reagents-Antidepressants.dm +++ b/code/modules/reagents/Chemistry-Reagents-Antidepressants.dm @@ -20,6 +20,18 @@ M << "\blue Your mind feels focused and undivided." ..() return + +/* on_mob_life(var/mob/living/M as mob) + if(ishuman(M)) + if((M.mind in ticker.mode.cult)) + M << "\red The drugs burn your thoughts...the visions stop...and the voices are no more. You are now deaf to the commands of Nar-Sie." + ticker.mode.remove_cultist(M.mind) + for(var/mob/O in viewers(M, null)) + O.show_message(text("\blue []'s eyes blink and become clearer.", M), 1) // So observers know it worked. + + return + +*/ /datum/chemical_reaction/methylphenidate name = "Methylphenidate" @@ -49,6 +61,19 @@ ..() return + +/* on_mob_life(var/mob/living/M as mob) + if(ishuman(M)) + if((M.mind in ticker.mode.cult)) + M << "\red The drugs burn your thoughts...the visions stop...and the voices are no more. You are now deaf to the commands of Nar-Sie." + ticker.mode.remove_cultist(M.mind) + for(var/mob/O in viewers(M, null)) + O.show_message(text("\blue []'s eyes blink and become clearer.", M), 1) // So observers know it worked. + + return + +*/ + /datum/chemical_reaction/citalopram name = "Citalopram" id = "citalopram" @@ -82,6 +107,20 @@ ..() return +/* on_mob_life(var/mob/living/M as mob) + if(ishuman(M)) + if((M.mind in ticker.mode.cult)) + M << "\red The drugs burn your thoughts...the visions stop...and the voices are no more. You are now deaf to the commands of Nar-Sie." + ticker.mode.remove_cultist(M.mind) + for(var/mob/O in viewers(M, null)) + O.show_message(text("\blue []'s eyes blink and become clearer.", M), 1) // So observers know it worked. + + return + +*/ + + + /datum/chemical_reaction/paroxetine name = "Paroxetine" id = "paroxetine" diff --git a/code/modules/reagents/Chemistry-Reagents.dm b/code/modules/reagents/Chemistry-Reagents.dm index 31c62ecb..ab24bdfc 100644 --- a/code/modules/reagents/Chemistry-Reagents.dm +++ b/code/modules/reagents/Chemistry-Reagents.dm @@ -1624,6 +1624,31 @@ datum ..() return + chefspecial + // Quiet and lethal, needs atleast 4 units in the person before they'll die + name = "Chef's Special" + id = "chefspecial" + description = "An extremely toxic chemical that will surely end in death." + reagent_state = LIQUID + color = "#CF3600" // rgb: 207, 54, 0 + custom_metabolism = 0.39 + + on_mob_life(var/mob/living/M as mob) + var/random = rand(150,180) + if(!M) M = holder.my_atom + if(!data) data = 1 + switch(data) + if(0 to 5) + ..() + if(data >= random) + if(M.stat != DEAD) + M.death(0) + M.attack_log += "\[[time_stamp()]\]Died a quick and painless death by Chef Excellence's Special Sauce." + data++ + return + + + toxin/minttoxin name = "Mint Toxin" id = "minttoxin"