diff --git a/code/datums/components/traits/radiation_effects.dm b/code/datums/components/traits/radiation_effects.dm index f61019dec16..366dadeaf62 100644 --- a/code/datums/components/traits/radiation_effects.dm +++ b/code/datums/components/traits/radiation_effects.dm @@ -108,6 +108,11 @@ //Radiation calculation, done here since contamination uses it var/rad_removal_mod = 1 var/rads = living_guy.radiation * 0.04 + if(!rads) + return + if(living_guy.radiation < 0) + living_guy.radiation = 0 + return if(ishuman(living_guy)) var/mob/living/carbon/human/human_guy = parent diff --git a/code/game/objects/items/weapons/tools/wirecutters.dm b/code/game/objects/items/weapons/tools/wirecutters.dm index 4c36b0f0ee5..fdfa1785a9d 100644 --- a/code/game/objects/items/weapons/tools/wirecutters.dm +++ b/code/game/objects/items/weapons/tools/wirecutters.dm @@ -85,6 +85,7 @@ name = "strange wirecutters" desc = "This cuts wires. With " + span_purple("Science!") icon_state = "hybcutters" + random_color = FALSE w_class = ITEMSIZE_NORMAL origin_tech = list(TECH_MATERIAL = 3, TECH_ENGINEERING = 3, TECH_PHORON = 2) attack_verb = list("pinched", "nipped", "warped", "blasted") diff --git a/code/modules/holodeck/HolodeckControl.dm b/code/modules/holodeck/HolodeckControl.dm index 2fb3de64ded..14ed3c6dc72 100644 --- a/code/modules/holodeck/HolodeckControl.dm +++ b/code/modules/holodeck/HolodeckControl.dm @@ -319,7 +319,7 @@ for(var/obj/effect/landmark/L in linkedholodeck) qdel(L) - holographic_objs = A.copy_contents_to(linkedholodeck , 1) + holographic_objs = A.copy_contents_to(linkedholodeck, 1) for(var/obj/holo_obj in holographic_objs) holo_obj.alpha *= 0.8 //give holodeck objs a slight transparency @@ -340,24 +340,24 @@ linkedholodeck.requires_power = FALSE linkedholodeck.power_change() - spawn(30) - for(var/obj/effect/landmark/L in linkedholodeck) - L.delete_me = 1 - if(L.name=="Atmospheric Test Start") - spawn(20) - var/turf/T = get_turf(L) - var/datum/effect/effect/system/spark_spread/s = new /datum/effect/effect/system/spark_spread - s.set_up(2, 1, T) - s.start() - if(T) - T.temperature = 5000 - T.hotspot_expose(50000,50000,1) - if(L.name=="Holocarp Spawn") - holographic_mobs += new /mob/living/simple_mob/animal/space/carp/holodeck(L.loc) + for(var/obj/effect/landmark/L in linkedholodeck) + L.delete_me = TRUE + if(L.name=="Atmospheric Test Start") + spawn(20) + var/turf/T = get_turf(L) + var/datum/effect/effect/system/spark_spread/s = new /datum/effect/effect/system/spark_spread + s.set_up(2, 1, T) + s.start() + if(T) + T.temperature = 5000 + T.hotspot_expose(50000,50000,1) + if(L.name=="Holocarp Spawn") + holographic_mobs += new /mob/living/simple_mob/animal/space/carp/holodeck(L.loc) - if(L.name=="Holocarp Spawn Random") - if (prob(4)) //With 4 spawn points, carp should only appear 15% of the time. - holographic_mobs += new /mob/living/simple_mob/animal/space/carp/holodeck(L.loc) + if(L.name=="Holocarp Spawn Random") + if(prob(4)) //With 4 spawn points, carp should only appear 15% of the time. + holographic_mobs += new /mob/living/simple_mob/animal/space/carp/holodeck(L.loc) + qdel(L) update_projections() diff --git a/code/modules/integrated_electronics/core/tools.dm b/code/modules/integrated_electronics/core/tools.dm index ea27987cc96..81200cdbe4a 100644 --- a/code/modules/integrated_electronics/core/tools.dm +++ b/code/modules/integrated_electronics/core/tools.dm @@ -250,14 +250,6 @@ now off.")) accepting_refs = 0 - - - - - - - - /obj/item/storage/bag/circuits name = "circuit kit" desc = "This kit's essential for any circuitry projects." diff --git a/code/modules/mob/living/silicon/robot/robot_simple_items.dm b/code/modules/mob/living/silicon/robot/robot_simple_items.dm index 2f06fbc85e2..c7e9224eeca 100644 --- a/code/modules/mob/living/silicon/robot/robot_simple_items.dm +++ b/code/modules/mob/living/silicon/robot/robot_simple_items.dm @@ -197,6 +197,9 @@ icon_state = "toolkit_engiborg_multitool" toolspeed = 0.5 +/obj/item/multitool/cyborg/update_icon() + icon_state = "toolkit_engiborg_multitool" + /obj/item/multitool/ai_detector/cyborg name = "AI detector multitool" toolspeed = 0.5 diff --git a/icons/obj/tools_robot.dmi b/icons/obj/tools_robot.dmi index 0542d2bdc91..6032098a176 100644 Binary files a/icons/obj/tools_robot.dmi and b/icons/obj/tools_robot.dmi differ