diff --git a/GainStation13/code/mobs/chocoslime.dm b/GainStation13/code/mobs/chocoslime.dm index 80527b38..d6f8d893 100644 --- a/GainStation13/code/mobs/chocoslime.dm +++ b/GainStation13/code/mobs/chocoslime.dm @@ -45,4 +45,65 @@ initial_language_holder = /datum/language_holder/slime +//Creambeast - basically a bit tougher mob that has feeding ranged attacks +/mob/living/simple_animal/hostile/feed/creambeast + name = "Creambeast" + desc = "A strange mass of thick, creamy ice cream given some sense of instinct." + icon = 'GainStation13/icons/mob/candymonster.dmi' + icon_state = "icecream_monster" + icon_living = "icecream_monster" + icon_dead = "icecream_monster_dead" + icon_gib = "icecream_monster_dead" + mob_biotypes = MOB_ORGANIC|MOB_BEAST + move_to_delay = 20 + projectiletype = /obj/item/projectile/energy/fattening/icecream + projectilesound = 'sound/weapons/pierce.ogg' + ranged = 1 + ranged_message = "schlorps" + ranged_cooldown_time = 30 + vision_range = 2 + speed = 3 + maxHealth = 100 + health = 100 + obj_damage = 0 + melee_damage_lower = 0.001 + melee_damage_upper = 0.001 + speak_emote = list("schlorps") + attacktext = "stuffs itself into" + attack_sound = 'sound/items/eatfood.ogg' + vision_range = 2 + aggro_vision_range = 9 + turns_per_move = 5 + blood_volume = 0 + gold_core_spawnable = HOSTILE_SPAWN + butcher_results = list(/obj/item/reagent_containers/food/snacks/icecream = 4) +/obj/item/projectile/energy/fattening/icecream //might as well make use of this thing to not make ton of different variants of the same thing + name = "ice cream blob" + icon = 'GainStation13/icons/mob/candymonster.dmi' + icon_state = "icecream_projectile" + ricochets_max = 0 + ricochet_chance = 0 + hitsound = 'sound/weapons/tap.ogg' + hitsound_wall = 'sound/weapons/tap.ogg' + is_reflectable = FALSE + light_range = 0 + ///How much fat is added to the target mob? + food_per_feeding = 5 + food_fed = /datum/reagent/consumable/nutriment + fullness_add = 10 + +/obj/item/projectile/energy/fattening/icecream/on_hit(atom/target, blocked) + . = ..() + var/mob/living/carbon/L = target + if(L.client?.prefs?.weight_gain_weapons) + if(L.reagents) + if(!L.is_mouth_covered(head_only = 1)) + L.reagents.add_reagent(food_fed, food_per_feeding) + L.fullness += (fullness_add) + + +/mob/living/simple_animal/hostile/feed/creambeast/GiveTarget(new_target) + if(..()) //we have a target + if(isliving(target) && !target.Adjacent(targets_from) && ranged_cooldown <= world.time) + OpenFire(target) diff --git a/GainStation13/icons/mob/candymonster.dmi b/GainStation13/icons/mob/candymonster.dmi index d1f73805..c3e1d964 100644 Binary files a/GainStation13/icons/mob/candymonster.dmi and b/GainStation13/icons/mob/candymonster.dmi differ diff --git a/_maps/map_files/Mining/Lavaland_Demone.dmm b/_maps/map_files/Mining/Lavaland_Demone.dmm index a19e33a0..8053ef22 100644 --- a/_maps/map_files/Mining/Lavaland_Demone.dmm +++ b/_maps/map_files/Mining/Lavaland_Demone.dmm @@ -1,6 +1,7 @@ "ac" = (/obj/machinery/mineral/ore_redemption,/turf/open/floor/plating,/area/lavaland/demone/villagesilo) "ae" = (/obj/structure/table/wood,/obj/structure/table/wood,/obj/item/reagent_containers/food/drinks/drinkingglass{pixel_x = -8; pixel_y = 18},/obj/item/reagent_containers/food/drinks/drinkingglass{pixel_x = 8; pixel_y = 18},/obj/item/reagent_containers/food/drinks/drinkingglass{pixel_x = 8; pixel_y = 2},/obj/item/reagent_containers/food/drinks/drinkingglass{pixel_y = 6},/obj/item/reagent_containers/food/drinks/drinkingglass{pixel_y = 2; pixel_x = -7},/turf/open/floor/plaswood,/area/lavaland/demone/factoryoffice) "af" = (/obj/structure/grille,/obj/structure/window/fulltile,/turf/open/floor/plating,/area/lavaland/demone/living) +"ai" = (/mob/living/simple_animal/hostile/feed/creambeast,/turf/open/indestructible/bubblegum,/area/ruin/powered/candyland) "al" = (/obj/structure/closet/crate,/obj/item/reagent_containers/food/snacks/chocolatebar,/obj/item/reagent_containers/food/snacks/chocolatebar,/obj/item/reagent_containers/food/snacks/chocolatebar,/obj/item/reagent_containers/food/snacks/chocolatebar,/obj/item/reagent_containers/food/snacks/chocolatebar,/obj/item/reagent_containers/food/snacks/chocolatebar,/obj/item/reagent_containers/food/snacks/chocolatebar,/obj/item/reagent_containers/food/drinks/bottle/strawberryjuice,/obj/item/reagent_containers/food/drinks/bottle/strawberryjuice,/obj/item/reagent_containers/food/drinks/bottle/strawberryjuice,/obj/item/reagent_containers/food/drinks/bottle/strawberryjuice,/obj/item/reagent_containers/food/drinks/bottle/strawberryjuice,/obj/item/reagent_containers/food/drinks/bottle/strawberryjuice,/turf/open/floor/plasteel/freezer,/area/lavaland/demone/factory) "ao" = (/obj/machinery/light{dir = 1},/obj/structure/flora/redgrass/redg,/turf/open/floor/plating/asteroid/basalt/lava_land_surface,/area/lavaland/demone/demonevillage) "ap" = (/obj/structure/cable{icon_state = "1-8"},/turf/open/floor/plating/asteroid/basalt/lava_land_surface,/area/lavaland/surface/outdoors) @@ -239,6 +240,7 @@ "ns" = (/obj/structure/chair/comfy/teal,/turf/open/floor/plasteel/grimy,/area/lavaland/demone/reception) "ny" = (/obj/machinery/bluespace_beacon,/turf/open/floor/plasteel,/area/lavaland/demone/living) "nA" = (/obj/machinery/conveyor{dir = 8; id = "donut"},/obj/structure/cable{icon_state = "1-2"},/turf/open/floor/vault,/area/lavaland/demone/factory) +"nB" = (/obj/effect/light_emitter{set_cap = 3; set_luminosity = 6},/mob/living/simple_animal/hostile/feed/creambeast,/turf/open/indestructible/bubblegum,/area/ruin/powered/candyland) "nE" = (/obj/structure/table/reinforced/brass,/obj/item/reagent_containers/food/drinks/soda_cans/shamblers{pixel_x = 9},/obj/item/kitchen/knife,/turf/open/indestructible/chocolate{icon_state = "choclit_3"},/area/ruin/powered/candyland) "nH" = (/obj/machinery/door/airlock/public/glass{name = "Lounge Area"},/obj/structure/fans/tiny,/turf/open/floor/carpet/red,/area/lavaland/demone/lobby) "nJ" = (/turf/open/floor/plasteel/freezer,/area/lavaland/demone/demonevillage) @@ -679,7 +681,7 @@ "Mw" = (/obj/machinery/power/apc/auto_name/north{name = "Lounge Donut Factory"},/obj/structure/cable{icon_state = "0-2"},/turf/open/floor/plasteel/grimy,/area/lavaland/demone/reception) "Mz" = (/obj/structure/chair/wood/normal{dir = 8},/turf/open/floor/carpet/gato,/area/lavaland/demone/living) "MB" = (/obj/item/flashlight/lantern{icon_state = "lantern-on"; on = 1; pixel_x = -8},/obj/effect/light_emitter{set_cap = 3; set_luminosity = 6},/turf/open/candyfloor,/area/ruin/powered/candyland) -"MH" = (/obj/machinery/light{dir = 1},/turf/open/indestructible/bubblegum,/area/ruin/powered/candyland) +"MH" = (/obj/machinery/light{dir = 1},/mob/living/simple_animal/friendly/cakegolem,/turf/open/indestructible/bubblegum,/area/ruin/powered/candyland) "MJ" = (/obj/item/reagent_containers/food/snacks/tinychocolate,/turf/open/indestructible/chocolate,/area/ruin/powered/candyland) "MK" = (/obj/structure/fence{dir = 4},/turf/open/floor/plating/asteroid/basalt/lava_land_surface,/area/lavaland/surface/outdoors) "ML" = (/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer1,/turf/open/floor/plasteel/dark/side{dir = 10},/area/lavaland/demone/tele) @@ -1034,21 +1036,21 @@ krkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkr krkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrDCDCDCDCDCDCDCDCDCDCDCDCDCrzenenenenenenenenenenenDCDCDCDCDCDCenkrkrkrkrkrenenenenDCDCDCDCDCDCDCFdenenenenenenVgQWQWQWQWQWVgenenenenenenenrrenenenBVenenenenenenenFdeneneneneneneneneneneneneneneneneneneneneneneneneneneniqenenenenenenenenenenenenenenenenenenenenenDCenkrkrenenDCDCDCDCDCDCDCDCDCDCDCxBxBggIFMJeDeDeDeDeDeDhnJhiRxBxBxBxBOaKEqZtFRqbzmFxBxBxBpIpIAHXFXFXFpIZxJBoMHXxBxBxBDCDCDCDCDCDCDCDCenenkrkrkrkrkrkrkrkrkrkrkrkr krkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCenenenenenenenenenenenrKDCDCDCDCDCenkrkrkrkrkrenenenenLbFdDCDCDCDCenenenenenenenenMpDPCCJNCCDPMpenenenenenenenenenenenenenenenenenenenenenenenenzEenenrzDCDCDCDCDCFdenenenenenenenenenenenenenenenenenenenenenenenenenenenenenenenenenenenenenkrenenDCDCDCDCDCDCDCDCDCDCDCxBxBxBggJhiReDeDIFIFeDeDeDIFxBxBxBxBxBdZKERXLnUGbzdZxBxBxBoPotjRototpIINpIpIoMoMxBxBxBxBDCDCDCDCDCDCDCDCenkrkrkrkrkrkrkrkrkrkrkrkr krkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCcXenenenenenenenenenenenDCDCDCDCDCDCenkrkrkrkrenBVenenenidDCDCDCDCenenenenenDCenenVgDoDoDoDoDoVgenenenFdenenenenenenenenenenenenzEDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCenenenenZJUQlqenenenenenenenenenenenenenenenenenenenkJkJenenenenenenenenenenenDCDCDCDCDCDCDCDCDCDCDCDCxBxBxBggIFIFeDeDhauWOxeDeDxBxBpIHXxBxBdZdZdZdZdZdZdZxBxBpILjototjRpIpIpIeIZxoMoMxBxBxBxBxBDCDCDCDCDCDCDCenkrkrkrkrkrkrkrkrkrkrkrkr -krkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCenenenenenenenenenenenDCDCDCDCDCDCenkrkrkrkrenenenDCenenDCDCrrDCenenenenDCDCenenenenkrkrkrkrenenenrzDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCkJkJenenenenenenenenenenidDCDCDCenenenenenenenenenDCDCDCDCDCDCDCDCDCDCDCDCDCDCxBxBggIFnWeDeDeDIFIFIFeDotLjpIwmxBxBxBUMdZdZdZfwxBxBxBpIotototLjwmxBxBxBpIpIoMoMwmpIxBxBxBDCDCDCDCDCDCenenkrkrkrkrkrkrkrkrkrkrkr +krkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCenenenenenenenenenenenDCDCDCDCDCDCenkrkrkrkrenenenDCenenDCDCrrDCenenenenDCDCenenenenkrkrkrkrenenenrzDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCkJkJenenenenenenenenenenidDCDCDCenenenenenenenenenDCDCDCDCDCDCDCDCDCDCDCDCDCDCxBxBggIFnWeDeDeDIFIFIFeDotLjpIwmxBxBxBUMdZaidZfwxBxBxBpIotototLjwmxBxBxBpIpIoMoMwmpIxBxBxBDCDCDCDCDCDCenenkrkrkrkrkrkrkrkrkrkrkr krkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrenDCkrDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCeneneneneneneneneneneneneniqDCDCDCDCenkrkrkrenenDCDCDCenenDCenFdenenenDCDCDCDCenenenkrkrkrkrenDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCenenenenenenenenenenenDCDCDCDCDCenenenenenenDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCxBggggJhIFeDeDeDeDeDotototLjpIpIxBxBipdZdZdZfwxBxBeIototototpIxBxBxBxBxBHXpIpIoMzwxBxBxBDCDCDCDCDCDCenenkrkrkrkrkrkrkrkrkrkrkr krkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrenDCkrkrDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCenenenenenenenenenenenenenenenenDCDCDCenkrkrkrenenDCDCDCDCenDCenenenLbDCDCDCDCDCDCenenkrkrkrkrenenDCDCDCiqDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCenenenenenenenDCDCDCDCDCDCDCDCrrenenenenenenenenenenenenenDCDCDCDCDCDCenenenenenDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCxBxBggggIFIFxBxBxBotototototINpIpIxBxBxBdZxBxBxBpIpIotototpIxBxBAUMHepxBxBpIoMoMHXxBxBxBxBDCDCDCDCDCenenkrkrkrkrkrkrkrkrkrkrkr krkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrenenkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrenDCDCkrDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCANenenenenenenenenenenenenenDCiqenDCDCDCenkrkrkrenenDCDCDCDCenFdenlxidDCDCDCDCDCDCDCDCenenkrkrkrkrenenenenenenenDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCenenenenenenenenenenDCDCDCDCDCDCDCenenenenenenenenenenenenDCDCDCDCDCDCenenenenDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCxBxBxBxBxBxBHXpIZxotjRotototYPHXpIeIxBARxBpIpILjotototjRZxxBxBGgdZdZADADpIoMoMoMxBxBxBxBDCDCDCDCDCenenkrkrkrkrkrkrkrkrkrkrkr krkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrenenenenkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrenDCDCkrDCDCDCDCDCDCDCDCDCDCDCDCDCDCenenenenenenenenenenenenenenDCDCDCiqDCDCDCenkrkrkrenenenDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCenenkrkrkrkrkrkrkrkrkrenenenDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCenenenenenenenenenenenenenenDCDCDCDCDCDCenenenenenenenenenenDCDCDCDCDCDCenenDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCxBxBwmpIoMpIpICxZxotototototLjoPpIROjBQppIINototototpIpIxBxBtddZNtxBxBZxwmZxoMxBxBxBxBDCDCDCDCDCenenkrkrkrkrkrkrkrkrkrkrkr krkrkrkrkrkrkrkrkrkrkrkrkrkrkrenenenenenenenenkrkrkrkrkrkrkrkrkrkrkrkrkrkrenenDCkrkrDCDCDCDCDCDCDCDCDCDCDCDCDCrKenenenenenenenenenenenenenDCDCDCDCDCDCDCenkrkrkreneniqDCDCDCDCDCDCDCDCDCDCDCDCDCDCiqDCenenkrkrkrkrkrkrkrkrkrkrkrenenenenenDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCenenenenenenenenenenenenenenenenDCDCDCDCDCDCDCenenenenenenDCDCDCDCDCDCDCDCenDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCFYFYDCDCDCDCxBHXoMoMoMoMoMoMpILjotototototototjYjYLjotototototjppIpIpIxBxBdZxBxBpIpIpIoMoMHXxBxBDCDCDCDCDCDCDCenkrkrkrkrkrkrkrkrkrkrkr krkrenkrkrkrkrkrkrkrkrkrkrkrenenenenenenenenenenenkrkrkrkrkrDCkrkrkrkrkrkrenenenkrkrDCDCDCDCDCDCDCDCDCDCDCDCDCDCenenenenenenenenenenenrrDCDCDCDCDCDCDCDCenkrkrkrenenenrzDCDCDCDCDCDCDCDCDCDCDCDCrrenenenenkrkrkrkrkrkrkrkrkrkrenenenenenkrenDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCenenenenenenenkrkrkrkrkrkrkrenenDCDCDCDCDCDCDCiqenenenenenDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCFYFYDCDCDCDCxBMBoMoMoMoMoMpIpIpIApLjotototototwKXFotototototLjpIoMoMpIpIxBARxBpIINpIoMoMoMoMxBxBDCDCDCDCDCDCDCenkrkrkrkrkrkrkrkrkrkrkr -krkrenkrkrkrkrkrkrkrkrkrkrkrenenenenenenenenenenenkrkrkrkrkrkrkrkrkrkrkrkrenenenDCkrkrkrDCDCDCDCDCDCDCDCDCDCDCDCenenenenenenenenenenenDCDCDCDCDCDCDCDCDCenkrkrkrenenenenDCDCDCDCDCDCDCDCDCDCDCDCrzenBVenenkrkrkrkrenenkrkrkrenkrenenenenkrkrenDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCenenenenenkrkrkrkrkrkrkrkrkrkrenenDCDCDCDCDCDCrzenenenenDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCxBoMoMoMoMoPpIpIxBxBpIZxpIototototXFcsotototTkpIpIZxoMoMoMoPROjBQpwmoMoMoMoMoMwmxBDCDCDCDCDCDCDCDCenkrkrkrkrkrkrkrkrkrkrkr +krkrenkrkrkrkrkrkrkrkrkrkrkrenenenenenenenenenenenkrkrkrkrkrkrkrkrkrkrkrkrenenenDCkrkrkrDCDCDCDCDCDCDCDCDCDCDCDCenenenenenenenenenenenDCDCDCDCDCDCDCDCDCenkrkrkrenenenenDCDCDCDCDCDCDCDCDCDCDCDCrzenBVenenkrkrkrkrenenkrkrkrenkrenenenenkrkrenDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCenenenenenkrkrkrkrkrkrkrkrkrkrenenDCDCDCDCDCDCrzenenenenDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCxBoMoMoMoMoPpIpIxBxBpIZxpIototototXFcsotototTkpIpIZxoMoMoMoPROjBQpwmoMoMnBoMoMwmxBDCDCDCDCDCDCDCDCenkrkrkrkrkrkrkrkrkrkrkr krkrenkrkrkrkrkrkrkrkrkrkrkrenenenenenkrenenenenenenenenkrkrkrkrkrkrkrkrkrenenenDCDCDCkrkrDCDCDCDCDCDCDCDCDCDCDCenenenenenenenenenenenDCDCDCDCDCDCDCDCDCenkrkrkreneneneniqDCDCDCDCDCDCDCDCDCDCDCDCenenenenenkrkrkrkrkrkrenkrkrkrkrenenenkrenenenDCDCDCDCDCDCDCDCDCDCDCDCDCDCenenenenenkrkrkrkrkrkrkrkrkrkrkrkrenenDCDCDCDCDCMKPzMKMKDCDCDCenDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCxBpIpIoMoMoMpIxBxBxBxBpIeIpIrvototcssaotAppIpIpIxBxBpIoMoMoMHXpIpIoMoMoMoMpIoMzwxBDCDCDCDCDCDCDCDCenkrkrkrkrkrkrkrkrkrkrkr krkrenkrkrkrkrkrkrkrkrkrkrkrenenenenkrkrkrenenenenenenenkrkrkrkrkrkrkrkrkrkrkrenDCDCDCDCkrDCDCDCDCDCDCDCDCDCDCDCenenenenenenenenenrKDCDCDCDCDCDCDCDCDCDCenkrkrkrenenenenenenDCDCDCDCDCDCDCDCDCDCDCDCiqenenenenenenkrkrkrkrkrkrkrkrenenkrkrkrkrkrenDCDCDCDCDCDCDCDCDCDCDCDCDCenenenkrkrkrkrkrkrenenenenkrkrkrkrkrkrkrDCDCDCDCenenenenDCDCenenenDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCFYDCDCxBxBxBoMoMoMHXxBxBxBxBpIpIoMpIwmpIzDzDpIpIpICxxBxBxBxBpIoMoMpIpIoMoMHXxBxBxBxBxBxBDCDCDCDCDCDCDCDCDCkrkrkrkrkrkrkrkrkrkrkr krkrenkrkrkrkrkrkrkrkrkrkrkrenenenenkrenenenenenenenenenenkrkrkrkrkrkrkrkrkrkrenenDCDCDCkrkrDCDCDCDCDCDCDCDCDCDCenenenenenenenenenDCDCDCDCDCDCDCDCDCDCDCenkrkrkrkrenenenenenDCDCDCDCDCDCDCDCDCDCDCDCDCenenenenenenenenkrkrkrkrenkrkrenenenenkrkrenDCDCDCDCDCDCDCDCDCDCDCDCDCenenkrkrkrkrkrkrenenenenenenenkrkrkrkrkrkrDCDCDCDCenenrzDCDCenenenenDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCxBxBxBeIoMpIpIxBxBMBpIoMoMoMHXpIoMpIoMoMpIpIxBxBxBxBpIoMbAHDpIoMoMxBxBxBxBFYDCDCDCDCFYFYDCDCDCDCDCkrkrkrkrkrkrkrkrkrkrkr krkrenkrenenkrkrkrkrkrkrkrkrkrenenenkrenenenenenenenenenenkrkrkrkrkrkrkrkrkrkrenenenDCDCDCkrkrDCDCDCDCDCDCDCDCDCrrenenenenenenenDCDCDCDCDCDCDCDCDCDCDCDCenkrkrkrkrenenenenenDCDCDCDCDCDCDCDCDCDCDCDCDCiqenenenenenenenenenenkrkrenenenenkrkrkrkrkrenDCDCDCDCDCDCDCDCDCDCDCDCenenkrkrkrkrenenenenenenenenenenkrkrkrkrkrDCDCDCDCenenrrDCDCenkrkrkrDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCxBxBxBoMoMeIpIpIpIJByhoMoMoMoMoMoMoMoMJBZxeIxBxBpIoPXOlGnMJBpIxBxBxBxBxBDCDCDCDCFYFYFYFYDCDCDCDCDCkrkrkrkrkrkrkrkrkrkr krkrenenenrzkrkrkrkrkrkrkrkrkrkrenenkrkrkrenenkrkrenenenenkrkrkrkrkrkrkrkrkrkrkrkrkrenDCDCDCkrDCDCDCDCDCDCDCDCDCDCrKenenenenenDCDCDCDCDCDCDCDCDCDCDCDCDCenkrkrkrkrkrenenenenrzDCDCDCDCDCDCDCDCDCDCDCDCenenenenenenkrenenenkrkrkrenenenenkrkrkrkrkrenDCDCDCDCDCDCDCDCDCDCDCDCenenkrkrkrenenenDCenenenenenenenenkrkrkrkrDCDCDCDCenenDCDCDCenkrkrkrDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCxBxBxBpIoMJBINpIoMoMjNJBoMoMoMoMoMoMoMoMoMpIpIpIpIZxJBbAFfoMoMxBxBxBxBxBDCDCDCDCFYFYFYFYDCDCDCDCDCkrkrkrkrkrkrkrkrkrkr krkrenenenenkrkrkrkrkrkrkrkrkrkrkrkrkrenkrkrkrkrenenenenenkrkrkrkrkrkrkrkrkrkrkrkrkrenenenenkrkrDCDCDCDCDCDCDCDCDCDCenenenencXDCDCDCDCDCDCDCDCDCDCDCDCDCDCenkrkrkrkrkrkrkrenenenDCDCDCDCDCDCDCDCDCDCeOenenenenkrkrkrkrkrkrkrkrenenenenkrkrkrkrkrenDCDCDCDCDCDCDCDCDCDCDCDCDCenenkrkrkrenenenenDCDCDCenenenenenkrkrkrkrkrDCDCDCenenDCDCDCenkrkrkrDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCxBxBjdoMJBpIoMoMoMJBpIxBxBxBxBYyYyYyxBxBxBxBpIoMoMJBJBoMoMHXxBxBxBxBDCDCFYDCDCDCFYFYDCDCDCDCDCDCkrkrkrkrkrkrkrkrkrkr -krkrenenenenkrkrkrkrkrkrkrkrkrkrkrkrkrenenenenkrenenenkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrDCDCDCDCDCDCDCDCDCDCeneneneneniqDCDCDCDCDCDCDCDCDCDCDCDCDCenkrkrkrkrkrkrkrkrenenenenenencXDCDCDCDCcXenenenkrkrkrkrkrkrkrkrkrkrkrenenkrkrkrkrenenDCDCDCDCDCDCDCDCDCDCDCDCDCDCenenkrkrkrenenenenenDCDCDCenenenenkrkrkrkrkrDCDCDCenenDCDCenenkrkrkrDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCFYFYDCDCDCDCDCxBxBoPoMJBoMoQoMoMJBoPxBCECECECECECECECECExBMBoMJBJBoMoMoMoMxBxBDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCkrkrkrkrkrkrkrkrkrkr +krkrenenenenkrkrkrkrkrkrkrkrkrkrkrkrkrenenenenkrenenenkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrDCDCDCDCDCDCDCDCDCDCeneneneneniqDCDCDCDCDCDCDCDCDCDCDCDCDCenkrkrkrkrkrkrkrkrenenenenenencXDCDCDCDCcXenenenkrkrkrkrkrkrkrkrkrkrkrenenkrkrkrkrenenDCDCDCDCDCDCDCDCDCDCDCDCDCDCenenkrkrkrenenenenenDCDCDCenenenenkrkrkrkrkrDCDCDCenenDCDCenenkrkrkrDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCFYFYDCDCDCDCDCxBxBoPoMJBoMoQoMnBJBoPxBCECECECECECECECECExBMBoMJBJBoMoMoMoMxBxBDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCkrkrkrkrkrkrkrkrkrkr krkrenenenenkrkrkrkrkrkrkrkrkrkrkrkrkrkrenenenkrenenenenenkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrDCDCDCDCDCDCDCDCDCDCDCenenenenenenrrDCDCDCDCDCDCDCDCDCDCDCDCDCenkrkrkrkrkrkrkrkrkrkrkrenenenenenenenenenenenkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrenDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCenkrkrkrkrenenenenDCDCDCenenenenenkrkrkrkrDCDCDCDCenenDCDCenkrkrkrkrDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCFYFYFYFYDCDCDCDCxBxBCxoMoMoMAqqNoMoMzwxBCExBxBCECECExBxBCExBxBHXpIpIoMCxpIoMxBDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCkrkrkrkrkrkrkrkrkrkr krkrenenenenkrkrkrkrkrkrkrkrkrkrkrkrkrkrenenenkrkrenenenenkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrDCDCDCDCDCDCDCDCDCDCDCenenenenenenenenenDCDCDCDCDCDCDCDCDCDCDCDCDCenkrkrkrkrkrkrkrkrkrkrenenenkrkrenenenenkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrenDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCenkrkrkrkrenkrenenenenenenenenenenkrkrkrkrDCDCDCDCenenenDCenkrkrkrkrDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCFYFYFYFYDCDCDCDCDCxBxBpIoMoMoMoMoMoMoMxBCExBxBWACEZyxBxBCExBxBxBxBxBxBxBxBxBxBDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCkrkrkrkrkrkrkrkrkrkr krkrenenenenenenkrkrkrkrkrkrkrkrkrkrkrkrkrkrenenkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrDCDCDCDCDCDCDCDCDCDCDCenenenenenenenenenDCDCDCDCDCDCDCDCDCDCDCDCDCDCenkrkrkrkrkrkrkrkrkrenenkrkrkrkrenenenkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrkrenDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCenenkrkrkrkrkrkrenenenenenenDCenenkrkrkrkrkrDCDCDCDCenenenDCDCkrkrkrDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCFYFYDCDCDCDCDCDCDCxBxBoMHXpIoMoMCxxBxBCECECECECECECECECExBxBxBxBxBxBDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCkrkrkrkrkrkrkrkrkrkr diff --git a/code/modules/mob/living/simple_animal/hostile/mining_mobs/basilisk.dm b/code/modules/mob/living/simple_animal/hostile/mining_mobs/basilisk.dm index 5384152f..73bc6be4 100644 --- a/code/modules/mob/living/simple_animal/hostile/mining_mobs/basilisk.dm +++ b/code/modules/mob/living/simple_animal/hostile/mining_mobs/basilisk.dm @@ -150,66 +150,3 @@ /mob/living/simple_animal/hostile/asteroid/basilisk/watcher/tendril fromtendril = TRUE - - -//GS13 - will move this elsewhere - Sono -/mob/living/simple_animal/hostile/asteroid/basilisk/fudgebeast - name = "Fudgebeast" - desc = "A strange mass of thick, sweet pudge given some sense of instinct." - icon = 'icons/mob/lavaland/lavaland_monsters.dmi' - icon_state = "Basilisk" - icon_living = "Basilisk" - icon_aggro = "Basilisk_alert" - icon_dead = "Basilisk_dead" - icon_gib = "syndicate_gib" - mob_biotypes = MOB_ORGANIC|MOB_BEAST - move_to_delay = 20 - projectiletype = /obj/item/projectile/energy/fattening/fudge - projectilesound = 'sound/weapons/pierce.ogg' - ranged = 1 - ranged_message = "schlorps" - ranged_cooldown_time = 30 - throw_message = "does nothing against the malleable body of" - vision_range = 2 - speed = 3 - maxHealth = 200 - health = 200 - harm_intent_damage = 5 - obj_damage = 60 - melee_damage_lower = 12 - melee_damage_upper = 12 - attacktext = "bites into" - a_intent = INTENT_HARM - speak_emote = list("chitters") - attack_sound = 'sound/weapons/bladeslice.ogg' - vision_range = 2 - aggro_vision_range = 9 - turns_per_move = 5 - gold_core_spawnable = HOSTILE_SPAWN - loot = list(/obj/item/stack/ore/diamond{layer = ABOVE_MOB_LAYER}, - /obj/item/stack/ore/diamond{layer = ABOVE_MOB_LAYER}) - -/obj/item/projectile/energy/fattening/fudge //might as well make use of the energy projectile - name = "fudge blob" - icon = 'GainStation13/icons/obj/fatoray.dmi' - icon_state = "ray" - ricochets_max = 0 - ricochet_chance = 0 - hitsound = 'sound/weapons/sear.ogg' - hitsound_wall = 'sound/weapons/effects/searwall.ogg' - is_reflectable = FALSE - light_range = 0 - ///How much fat is added to the target mob? - var/food_per_feeding = 10 - var/food_fed = /datum/reagent/consumable/nutriment - var/fullness_add = 10 - -/obj/item/projectile/energy/fattening/fudge/on_hit(atom/target, blocked) - - . = ..() - var/mob/living/carbon/L = target - if(L.client?.prefs?.weight_gain_weapons) - if(L.reagents) - if(!L.is_mouth_covered(head_only = 1)) - L.reagents.add_reagent(food_fed, food_per_feeding) - L.fullness += (fullness_add)