cyberpresidentvanellope/GS13
1
0
Fork 0
mirror of https://github.com/KabKebab/GS13.git synced 2026-08-30 00:21:24 +01:00
Code Issues Packages Projects Releases Wiki Activity

wew

Browse Source
This commit is contained in:
Metis
2024-06-05 23:22:40 -04:00
parent c8922d15c8
commit 213b1d8104
5 changed files with 22 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
GainStation13/code/machinery/fattening_turret.dm
+2 -2
View File
@@ -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()
GainStation13/code/mobs/chocoslime.dm
+3 -3
View File
@@ -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)
GainStation13/code/obj/weapons/fatoray.dm
+13 -13
View File
@@ -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