Skip to content

Commit

Permalink
Fixing the Shrimp/Removing Tabbed comments
Browse files Browse the repository at this point in the history
  • Loading branch information
EnderMage99 committed Dec 10, 2024
1 parent fef1ca7 commit 55f8afe
Show file tree
Hide file tree
Showing 3 changed files with 22 additions and 5 deletions.
10 changes: 5 additions & 5 deletions ModularTegustation/fishing/code/fishing_items/fishing_net.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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()
Expand Down Expand Up @@ -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)
Expand All @@ -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)
Expand All @@ -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


Expand All @@ -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

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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()
Expand Down
15 changes: 15 additions & 0 deletions code/modules/mob/living/simple_animal/hostile/ordeal/shrimps.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand All @@ -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
Expand All @@ -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)

0 comments on commit 55f8afe

Please sign in to comment.