diff --git a/code/game/asteroid.dm b/code/game/asteroid.dm index 3d8a6667603..bc167bea04d 100644 --- a/code/game/asteroid.dm +++ b/code/game/asteroid.dm @@ -123,7 +123,7 @@ var/global/max_secret_rooms = 6 theme = "plantlab" treasureitems = list(/obj/item/weapon/gun/energy/floragun=1,/obj/item/seeds/novaflowerseed=2,/obj/item/seeds/bluespacetomatoseed=2,/obj/item/seeds/bluetomatoseed=2, /obj/item/seeds/coffee_robusta_seed=2, /obj/item/seeds/cashseed=2) - fluffitems = list(/obj/structure/flora/kirbyplants=1,/obj/structure/table/reinforced=2,/obj/machinery/hydroponics=1, + fluffitems = list(/obj/structure/flora/kirbyplants=1,/obj/structure/table/reinforced=2,/obj/machinery/hydroponics/constructable=1, /obj/effect/glowshroom/single=2,/obj/item/weapon/reagent_containers/syringe/charcoal=2, /obj/item/weapon/reagent_containers/glass/bottle/diethylamine=3,/obj/item/weapon/reagent_containers/glass/bottle/ammonia=3) diff --git a/code/modules/mining/equipment_locker.dm b/code/modules/mining/equipment_locker.dm index eb73ed5c2ba..8fe2818a82f 100644 --- a/code/modules/mining/equipment_locker.dm +++ b/code/modules/mining/equipment_locker.dm @@ -281,17 +281,18 @@ new /datum/data/mining_equipment("Laser Pointer", /obj/item/device/laser_pointer, 300), new /datum/data/mining_equipment("Alien Toy", /obj/item/clothing/mask/facehugger/toy, 300), new /datum/data/mining_equipment("Advanced Scanner", /obj/item/device/t_scanner/adv_mining_scanner, 400), + new /datum/data/mining_equipment("Hivelord Stabilizer", /obj/item/weapon/hivelordstabilizer , 400), new /datum/data/mining_equipment("Mining Drone", /mob/living/simple_animal/hostile/mining_drone, 500), new /datum/data/mining_equipment("GAR mesons", /obj/item/clothing/glasses/meson/gar, 500), new /datum/data/mining_equipment("Brute First-Aid Kit", /obj/item/weapon/storage/firstaid/brute, 600), - new /datum/data/mining_equipment("Jaunter", /obj/item/device/wormhole_jaunter, 700), + new /datum/data/mining_equipment("Jaunter", /obj/item/device/wormhole_jaunter, 600), new /datum/data/mining_equipment("Kinetic Accelerator", /obj/item/weapon/gun/energy/kinetic_accelerator, 750), new /datum/data/mining_equipment("Resonator", /obj/item/weapon/resonator, 800), new /datum/data/mining_equipment("Lazarus Injector", /obj/item/weapon/lazarus_injector, 1000), new /datum/data/mining_equipment("Silver Pickaxe", /obj/item/weapon/pickaxe/silver, 1200), new /datum/data/mining_equipment("Jetpack", /obj/item/weapon/tank/jetpack/carbondioxide/mining, 2000), new /datum/data/mining_equipment("Space Cash", /obj/item/stack/spacecash/c1000, 2000), - new /datum/data/mining_equipment("Resonator v2", /obj/item/weapon/resonator/upgraded, 3000), + new /datum/data/mining_equipment("Resonator v2", /obj/item/weapon/resonator/upgraded, 2500), new /datum/data/mining_equipment("Diamond Pickaxe", /obj/item/weapon/pickaxe/diamond, 3500), new /datum/data/mining_equipment("Accelerator v2", /obj/item/weapon/gun/energy/kinetic_accelerator/upgraded, 4000), new /datum/data/mining_equipment("Point Transfer Card", /obj/item/weapon/card/mining_point_card, 500), @@ -887,4 +888,23 @@ desc = "A tank of compressed carbon dioxide for miners to use as propulsion in local space. The compact size allows for easy storage at the cost of capacity." volume = 40 throw_range = 7 - w_class = 3 //same as syndie harness \ No newline at end of file + w_class = 3 //same as syndie harness + +/*********************Hivelord stabilizer****************/ + +/obj/item/weapon/hivelordstabilizer + name = "hivelord stabilizer" + icon_state = "hivestabilizer" + item_state = "hivestabilizer" + desc = "Inject a hivelord core with this stabilizer to preserve its healing powers indefinitely." + w_class = 1 + origin_tech = "biotech=1" + +/obj/item/weapon/hivelordstabilizer/attack(obj/item/organ/internal/M, mob/user) + var/obj/item/organ/internal/hivelord_core/C = M + if(!istype(C, /obj/item/organ/internal/hivelord_core)) + user << "The stabilizer only works on hivelord cores." + return ..() + C.preserved = 1 + user << "You inject the hivelord core with the stabilizer. It will no longer go inert." + qdel(src) \ No newline at end of file diff --git a/code/modules/mob/living/simple_animal/hostile/mining_mobs.dm b/code/modules/mob/living/simple_animal/hostile/mining_mobs.dm index 0be7a54e261..3c7c7ee306b 100644 --- a/code/modules/mob/living/simple_animal/hostile/mining_mobs.dm +++ b/code/modules/mob/living/simple_animal/hostile/mining_mobs.dm @@ -264,11 +264,12 @@ slot = "hivecore" force = 0 var/inert = 0 + var/preserved = 0 /obj/item/organ/internal/hivelord_core/New() ..() spawn(2400) - if(!owner) + if(!owner && !preserved) inert = 1 desc = "The remains of a hivelord that have become useless, having been left alone too long after being harvested." @@ -633,4 +634,4 @@ A.transform *= 2 A.environment_smash += 2 user << "You increase the size of [A], giving it a surge of strength!" - qdel(src) + qdel(src) \ No newline at end of file