From bb02bfa284bdc18f22d42b0106032af5ef3e1339 Mon Sep 17 00:00:00 2001 From: Fox-McCloud Date: Tue, 7 Jun 2016 02:25:06 -0400 Subject: [PATCH] Experimentor Duplication Limit --- code/game/objects/items/devices/transfer_valve.dm | 3 ++- code/modules/assembly/bomb.dm | 1 + code/modules/research/experimentor.dm | 5 +++-- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/code/game/objects/items/devices/transfer_valve.dm b/code/game/objects/items/devices/transfer_valve.dm index 9e4d83592b0..5b4afe8095c 100644 --- a/code/game/objects/items/devices/transfer_valve.dm +++ b/code/game/objects/items/devices/transfer_valve.dm @@ -9,6 +9,7 @@ var/mob/attacher = null var/valve_open = 0 var/toggle = 1 + origin_tech = "materials=1;engineering=1" /obj/item/device/transfer_valve/proc/process_activation(var/obj/item/device/D) @@ -187,7 +188,7 @@ attacher_name = "[key_name_admin(attacher)]" var/mob/mob = get_mob_by_key(src.fingerprintslast) - + bombers += "Bomb valve opened at [A.name] ([bombturf.x],[bombturf.y],[bombturf.z]) with [attached_device ? attached_device : "no device"], attached by [attacher_name]. Last touched by: [key_name(mob)]" message_admins("Bomb valve opened at [A.name] (JMP) with [attached_device ? attached_device : "no device"], attached by [attacher_name]. Last touched by: [key_name_admin(mob)]") log_game("Bomb valve opened at [A.name] ([bombturf.x],[bombturf.y],[bombturf.z]) with [attached_device ? attached_device : "no device"], attached by [attacher_name]. Last touched by: [key_name(mob)]") diff --git a/code/modules/assembly/bomb.dm b/code/modules/assembly/bomb.dm index 3bf0775473c..3171755b34c 100644 --- a/code/modules/assembly/bomb.dm +++ b/code/modules/assembly/bomb.dm @@ -10,6 +10,7 @@ var/status = 0 //0 - not readied //1 - bomb finished with welder var/obj/item/device/assembly_holder/bombassembly = null //The first part of the bomb is an assembly holder, holding an igniter+some device var/obj/item/weapon/tank/bombtank = null //the second part of the bomb is a plasma tank + origin_tech = "materials=1;engineering=1" /obj/item/device/onetankbomb/examine(mob/user) ..(user) diff --git a/code/modules/research/experimentor.dm b/code/modules/research/experimentor.dm index 38004bd49fa..00434a3a25d 100644 --- a/code/modules/research/experimentor.dm +++ b/code/modules/research/experimentor.dm @@ -219,6 +219,7 @@ --cloneCount if(cloneCount == 0) cloneMode = FALSE + return var/turf/dropturf = get_turf(pick(view(1,src))) if(!dropturf) //Failsafe to prevent the object being lost in the void forever. dropturf = get_turf(src) @@ -492,7 +493,7 @@ ejectItem() //Global reactions - + if(prob(EFFECT_PROB_VERYLOW) && prob(13)) visible_message("[src] improves [exp_on], drawing the life essence of those nearby!") for(var/mob/living/m in view(4,src)) @@ -504,7 +505,7 @@ reqs[T] = reqs[T] + 1 exp_on.origin_tech = list2params(reqs) investigate_log("Experimentor has set the origin tech of [exp_on] to [exp_on.origin_tech]", "experimentor") - + if(prob(EFFECT_PROB_VERYLOW-badThingCoeff) && prob(87)) var/globalMalf = rand(1,87) if(globalMalf < 15)