From 55f8afe6b0fe97cfbd0ba8fcaa78758d0d7230e1 Mon Sep 17 00:00:00 2001 From: EnderMage99 Date: Tue, 10 Dec 2024 15:22:51 -0500 Subject: [PATCH] Fixing the Shrimp/Removing Tabbed comments --- .../fishing/code/fishing_items/fishing_net.dm | 10 +++++----- .../simple_animal/abnormality/waw/shrimp.dm | 2 ++ .../simple_animal/hostile/ordeal/shrimps.dm | 15 +++++++++++++++ 3 files changed, 22 insertions(+), 5 deletions(-) diff --git a/ModularTegustation/fishing/code/fishing_items/fishing_net.dm b/ModularTegustation/fishing/code/fishing_items/fishing_net.dm index cc52f2372d76..a288a2101216 100644 --- a/ModularTegustation/fishing/code/fishing_items/fishing_net.dm +++ b/ModularTegustation/fishing/code/fishing_items/fishing_net.dm @@ -23,7 +23,7 @@ var/fishin_cooldown_delay = 1 SECONDS var/fishin_power = 0.8 var/turf/open/water/deep/open_waters - var/enemy_chance = 15 //chance of getting enemies + var/enemy_chance = 15 //chance of getting enemies var/capacity = 5 /obj/structure/destructible/fishing_net/Initialize() @@ -57,7 +57,7 @@ if(CheckPlanetAligned(FISHGOD_VENUS)) enemy_chance/=2 - if(enemy_chance>5) //gotta have more than 5% + if(enemy_chance>5) //gotta have more than 5% if(prob(enemy_chance)) SpawnEnemy(dropoff, user) qdel(src) @@ -77,7 +77,7 @@ if(prob(1) && SSfishing.IsAligned(/datum/planet/mars)) spawning = /mob/living/simple_animal/hostile/distortion/shrimp_rambo/easy - if(prob(5)) //Super rares first + if(prob(5)) //Super rares first spawning = /mob/living/simple_animal/hostile/shrimp_soldier if(prob(20)) spawning = pick(/mob/living/simple_animal/hostile/shrimp_rifleman, /mob/living/simple_animal/hostile/senior_shrimp) @@ -103,7 +103,7 @@ debris = list(/obj/item/fishing_net/nylon = 1) net_type = /obj/item/fishing_net/nylon fishin_cooldown = 15 SECONDS - fishin_power = 0.7 //Slightly worse + fishin_power = 0.7 //Slightly worse enemy_chance = 10 @@ -123,7 +123,7 @@ icon_state_fished = "trawling_net_steel_full" debris = list(/obj/item/fishing_net/steel = 1) net_type = /obj/item/fishing_net/steel - fishin_cooldown = 30 SECONDS //Slower. + fishin_cooldown = 30 SECONDS //Slower. fishin_power = 1.4 enemy_chance = 10 diff --git a/code/modules/mob/living/simple_animal/abnormality/waw/shrimp.dm b/code/modules/mob/living/simple_animal/abnormality/waw/shrimp.dm index 47f3679900cd..48b06b5b3e7a 100644 --- a/code/modules/mob/living/simple_animal/abnormality/waw/shrimp.dm +++ b/code/modules/mob/living/simple_animal/abnormality/waw/shrimp.dm @@ -187,6 +187,8 @@ attack_verb_simple = "punches" attack_sound = 'sound/weapons/bite.ogg' speak_emote = list("burbles") + butcher_results = list(/obj/item/stack/spacecash/c50 = 1) + guaranteed_butcher_results = list(/obj/item/stack/spacecash/c10 = 1) silk_results = list(/obj/item/stack/sheet/silk/shrimple_simple = 4) /mob/living/simple_animal/hostile/shrimp/Initialize() diff --git a/code/modules/mob/living/simple_animal/hostile/ordeal/shrimps.dm b/code/modules/mob/living/simple_animal/hostile/ordeal/shrimps.dm index 5334c9ea9a66..fc279cedd01b 100644 --- a/code/modules/mob/living/simple_animal/hostile/ordeal/shrimps.dm +++ b/code/modules/mob/living/simple_animal/hostile/ordeal/shrimps.dm @@ -4,6 +4,7 @@ icon = 'ModularTegustation/Teguicons/32x32.dmi' icon_state = "wellcheers_bad" icon_living = "wellcheers_bad" + icon_dead = "wellcheers_bad_dead" faction = list("shrimp") health = 500 //They're here to help maxHealth = 500 @@ -23,6 +24,13 @@ minimum_distance = 3 casingtype = /obj/item/ammo_casing/caseless/ego_shrimprifle projectilesound = 'sound/weapons/gun/pistol/shot_alt.ogg' + butcher_results = list(/obj/item/stack/spacecash/c100 = 1) + silk_results = list(/obj/item/stack/sheet/silk/shrimple_simple = 10, /obj/item/stack/sheet/silk/shrimple_advanced = 5) + +/mob/living/simple_animal/hostile/shrimp_rifleman/Initialize() + . = ..() + if(SSmaptype.maptype == "fixers" || SSmaptype.maptype == "city") + del_on_death = FALSE //extra buff shrimp i guess /mob/living/simple_animal/hostile/senior_shrimp @@ -31,6 +39,7 @@ icon = 'ModularTegustation/Teguicons/32x32.dmi' icon_state = "wellcheers_ripped" icon_living = "wellcheers_ripped" + icon_dead = "wellcheers_ripped_dead" faction = list("shrimp") health = 1337 maxHealth = 1337 @@ -46,7 +55,13 @@ attack_verb_simple = "bashes" attack_sound = 'sound/effects/meteorimpact.ogg' speak_emote = list("burbles") + butcher_results = list(/obj/item/stack/spacecash/c100 = 1, /obj/item/stack/spacecash/c50 = 1) + silk_results = list(/obj/item/stack/sheet/silk/shrimple_simple = 12, /obj/item/stack/sheet/silk/shrimple_advanced = 6) +/mob/living/simple_animal/hostile/senior_shrimp/Initialize() + . = ..() + if(SSmaptype.maptype == "fixers" || SSmaptype.maptype == "city") + del_on_death = FALSE /mob/living/simple_animal/hostile/senior_shrimp/ComponentInitialize() . = ..() AddComponent(/datum/component/knockback, 3, FALSE, FALSE)