diff --git a/GainStation13/code/machinery/fattening_turret.dm b/GainStation13/code/machinery/fattening_turret.dm index 899bcf59..c9281503 100644 --- a/GainStation13/code/machinery/fattening_turret.dm +++ b/GainStation13/code/machinery/fattening_turret.dm @@ -8,7 +8,7 @@ scan_range = 9 req_access = list(ACCESS_SYNDICATE) mode = TURRET_LETHAL - lethal_projectile = /obj/item/projectile/energy/fattening + lethal_projectile = /obj/item/projectile/beam/fattening lethal_projectile_sound = 'sound/weapons/laser.ogg' icon_state = "turretCover" base_icon_state = "standard" @@ -17,7 +17,7 @@ /obj/machinery/porta_turret/fattening/heavy name = "Heavy Fatoray Turret" - lethal_projectile = /obj/item/projectile/energy/fattening/cannon + lethal_projectile = /obj/item/projectile/beam/fattening/cannon shot_delay = 30 /obj/machinery/porta_turret/fattening/ComponentInitialize() diff --git a/GainStation13/code/mobs/chocoslime.dm b/GainStation13/code/mobs/chocoslime.dm index 0fac4752..a800ea1b 100644 --- a/GainStation13/code/mobs/chocoslime.dm +++ b/GainStation13/code/mobs/chocoslime.dm @@ -57,7 +57,7 @@ icon_dead = "icecream_monster_dead" icon_gib = "icecream_monster_dead" move_to_delay = 10 - projectiletype = /obj/item/projectile/energy/fattening/icecream + projectiletype = /obj/item/projectile/beam/fattening/icecream projectilesound = 'sound/weapons/pierce.ogg' ranged = 1 ranged_message = "schlorps" @@ -74,7 +74,7 @@ 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 +/obj/item/projectile/beam/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" @@ -88,7 +88,7 @@ var/food_fed = /datum/reagent/consumable/nutriment var/fullness_add = 30 -/obj/item/projectile/energy/fattening/icecream/on_hit(atom/target, blocked) +/obj/item/projectile/beam/fattening/icecream/on_hit(atom/target, blocked) . = ..() var/mob/living/carbon/L = target if(L.client?.prefs?.weight_gain_weapons) diff --git a/GainStation13/code/obj/weapons/fatoray.dm b/GainStation13/code/obj/weapons/fatoray.dm index 8de22d38..77aaf313 100644 --- a/GainStation13/code/obj/weapons/fatoray.dm +++ b/GainStation13/code/obj/weapons/fatoray.dm @@ -16,10 +16,10 @@ /obj/item/ammo_casing/energy/fattening name = "fattening weapon lens" select_name = "fatten" - projectile_type = /obj/item/projectile/energy/fattening + projectile_type = /obj/item/projectile/beam/fattening ///The base projectile used by the fatoray -/obj/item/projectile/energy/fattening +/obj/item/projectile/beam/fattening name = "fat energy" icon = 'GainStation13/icons/obj/fatoray.dmi' icon_state = "ray" @@ -27,12 +27,12 @@ ricochet_chance = 80 hitsound = 'sound/weapons/sear.ogg' hitsound_wall = 'sound/weapons/effects/searwall.ogg' - is_reflectable = TRUE + damage = 0 + eyeblur = 0 + damage_type = BURN + flag = "energy" light_range = 2 light_color = LIGHT_COLOR_ORANGE - ricochets_max = 50 - ricochet_chance = 80 - is_reflectable = TRUE ///How much fat is added to the target mob? var/fat_added = 100 @@ -58,9 +58,9 @@ name = "one-shot fattening weapon lens" select_name = "fatten" e_cost = 100 - projectile_type = /obj/item/projectile/energy/fattening/cannon + projectile_type = /obj/item/projectile/beam/fattening/cannon -/obj/item/projectile/energy/fattening/cannon +/obj/item/projectile/beam/fattening/cannon name = "fat energy" icon = 'GainStation13/icons/obj/fatoray.dmi' icon_state = "cannon_ray" @@ -85,10 +85,10 @@ /obj/item/ammo_casing/energy/fattening/weak name = "budget fattening weapon lens" select_name = "fatten" - projectile_type = /obj/item/projectile/energy/fattening/weak + projectile_type = /obj/item/projectile/beam/fattening/weak ///The base projectile used by the fatoray -/obj/item/projectile/energy/fattening/weak +/obj/item/projectile/beam/fattening/weak name = "fat energy" icon = 'GainStation13/icons/obj/fatoray.dmi' icon_state = "ray" @@ -115,9 +115,9 @@ name = "one-shot fattening weapon lens" select_name = "fatten" e_cost = 300 - projectile_type = /obj/item/projectile/energy/fattening/cannon_weak + projectile_type = /obj/item/projectile/beam/fattening/cannon_weak -/obj/item/projectile/energy/fattening/cannon_weak +/obj/item/projectile/beam/fattening/cannon_weak name = "fat energy" icon = 'GainStation13/icons/obj/fatoray.dmi' icon_state = "cannon_ray" @@ -129,7 +129,7 @@ /////////////////////////////////////// -/obj/item/projectile/energy/fattening/on_hit(atom/target, blocked) +/obj/item/projectile/beam/fattening/on_hit(atom/target, blocked) . = ..() var/mob/living/carbon/gainer = target diff --git a/_maps/map_files/Mining/Lavaland_Lower.dmm b/_maps/map_files/Mining/Lavaland_Lower.dmm index 4f419ae9..7a841e8f 100644 --- a/_maps/map_files/Mining/Lavaland_Lower.dmm +++ b/_maps/map_files/Mining/Lavaland_Lower.dmm @@ -7489,7 +7489,7 @@ dir = 2; id = "fatchamber" }, -/obj/item/projectile/energy/fattening/cannon, +/obj/item/projectile/beam/fattening/cannon, /turf/open/floor/plating, /area/xenoarch/caloriteresearch_powered) "tf" = ( @@ -7785,7 +7785,7 @@ /turf/open/floor/plasteel/dark, /area/xenoarch/gen) "uG" = ( -/obj/item/projectile/energy/fattening/cannon, +/obj/item/projectile/beam/fattening/cannon, /turf/open/floor/mineral/calorite, /area/xenoarch/caloriteresearch_powered) "uH" = ( diff --git a/_maps/map_files/generic/CentCom.dmm b/_maps/map_files/generic/CentCom.dmm index 0c463ca6..ac5f5c81 100644 --- a/_maps/map_files/generic/CentCom.dmm +++ b/_maps/map_files/generic/CentCom.dmm @@ -2504,7 +2504,7 @@ "rRn" = (/obj/machinery/door/airlock/public{dir = 4},/turf/open/floor/plasteel/freezer,/area/fatlab) "rRu" = (/obj/effect/turf_decal/stripes/white,/turf/open/floor/plasteel/dark,/area/fatlab) "rRy" = (/obj/effect/turf_decal/stripes/asteroid/line,/obj/effect/turf_decal/tile/brown{dir = 8},/obj/effect/turf_decal/tile/brown,/obj/effect/decal/cleanable/dirt,/turf/open/floor/plasteel/dark,/area/fatlab) -"rSj" = (/obj/item/projectile/energy/fattening/cannon_weak,/turf/open/floor/plasteel,/area/awaymission/jungleresort) +"rSj" = (/obj/item/projectile/beam/fattening/cannon_weak,/turf/open/floor/plasteel,/area/awaymission/jungleresort) "rSF" = (/obj/machinery/vending/magivend,/turf/open/floor/engine/cult,/area/wizard_station) "rSQ" = (/obj/structure/table/reinforced,/obj/item/kitchen/knife,/obj/item/reagent_containers/food/condiment/saltshaker{pixel_x = -8; pixel_y = 5},/obj/item/reagent_containers/food/condiment/peppermill{pixel_x = -8},/turf/open/floor/plasteel/cafeteria,/area/centcom/ferry) "rSZ" = (/obj/machinery/light/small{dir = 8},/obj/structure/toilet,/turf/open/floor/plasteel/white,/area/centcom/ferry) @@ -2607,7 +2607,7 @@ "sBN" = (/obj/structure/table/reinforced,/obj/machinery/door/firedoor,/obj/item/reagent_containers/food/condiment/saltshaker{pixel_x = -8; pixel_y = 5},/obj/item/reagent_containers/food/condiment/peppermill{pixel_x = -8},/obj/item/reagent_containers/food/drinks/britcup,/obj/effect/turf_decal/bot,/turf/open/floor/plasteel,/area/tdome/tdomeobserve) "sCW" = (/obj/structure/table/wood,/obj/structure/window/reinforced/spawner/north,/obj/structure/window/reinforced/spawner/west,/obj/item/rupee{desc = "A gift, right?"},/obj/item/clothing/accessory/medal/gato_badge/employee,/turf/open/floor/plasteel/grimy,/area/centcom/ferry) "sCX" = (/obj/effect/turf_decal/stripes/corner{dir = 8},/turf/open/floor/plating,/area/syndicate_mothership) -"sDg" = (/obj/item/projectile/energy/fattening/cannon_weak,/turf/open/floor/mineral/calorite/hide,/area/awaymission/jungleresort) +"sDg" = (/obj/item/projectile/beam/fattening/cannon_weak,/turf/open/floor/mineral/calorite/hide,/area/awaymission/jungleresort) "sDi" = (/obj/effect/turf_decal/stripes/line,/obj/effect/turf_decal/tile/blue{dir = 4},/turf/open/floor/plasteel/dark,/area/ctf) "sDj" = (/obj/effect/decal/cleanable/dirt,/obj/effect/decal/cleanable/dirt,/turf/open/floor/plasteel,/area/fatlab) "sDG" = (/obj/structure/rack/shelf,/obj/item/vending_refill/clothing,/obj/item/vending_refill/kink,/turf/open/floor/plasteel/dark,/area/fatlab)