diff --git a/ModularTegustation/Teguicons/32x32.dmi b/ModularTegustation/Teguicons/32x32.dmi index bce84b256369..19e53c82bddf 100644 Binary files a/ModularTegustation/Teguicons/32x32.dmi and b/ModularTegustation/Teguicons/32x32.dmi differ diff --git a/ModularTegustation/fishing/code/fish_market.dm b/ModularTegustation/fishing/code/fish_market.dm index 750cfe868054..e7a54d90517f 100644 --- a/ModularTegustation/fishing/code/fish_market.dm +++ b/ModularTegustation/fishing/code/fish_market.dm @@ -176,6 +176,7 @@ //More nets new /datum/data/extraction_cargo("Fishing Net ", /obj/item/fishing_net, 100) = 1, + new /datum/data/extraction_cargo("Big Baited Fishing Net ", /obj/item/fishing_net/big_bait, 200) = 1, new /datum/data/extraction_cargo("Nylon Fishing Net ", /obj/item/fishing_net/nylon, 300) = 1, new /datum/data/extraction_cargo("Steel Fishing Net ", /obj/item/fishing_net/steel, 300) = 1, new /datum/data/extraction_cargo("Baited Fishing Net ", /obj/item/fishing_net/baited, 300) = 1, diff --git a/ModularTegustation/fishing/code/fishing_items/fishing_net.dm b/ModularTegustation/fishing/code/fishing_items/fishing_net.dm index d6325468620d..b1d862d95682 100644 --- a/ModularTegustation/fishing/code/fishing_items/fishing_net.dm +++ b/ModularTegustation/fishing/code/fishing_items/fishing_net.dm @@ -144,7 +144,7 @@ icon_state_fished = "trawling_net_bait_full" debris = list(/obj/item/fishing_net/baited = 1) net_type = /obj/item/fishing_net/baited - fishin_cooldown = 15 SECONDS //Slower. + fishin_cooldown = 15 SECONDS fishin_power = 1.4 enemy_chance = 30 @@ -165,3 +165,24 @@ debris = list(/obj/item/fishing_net/hicap = 1) net_type = /obj/item/fishing_net/hicap capacity = 10 + +//Shrimp Bait net +/obj/item/fishing_net/big_bait + name = "big baited fishing net" + desc = "Big Baited nets are much slower the normal nets, however they have a near guaranteed chance at catching hostile lifeforms" + icon = 'ModularTegustation/fishing/icons/fishing.dmi' + icon_state = "shrimp_net" + w_class = WEIGHT_CLASS_HUGE + deploy_type = /obj/structure/destructible/fishing_net/big_bait + +/obj/structure/destructible/fishing_net/big_bait + name = "big baited fishing net" + desc = "A wall of twine and wires that traps fish. Alt click to harvest." + icon_state = "trawling_shrimp_net" + icon_state_fished = "trawling_shrimp_net_full" + debris = list(/obj/item/fishing_net/big_bait = 1) + net_type = /obj/item/fishing_net/big_bait + fishin_cooldown = 45 SECONDS //Much Slower + fishin_power = 1 + enemy_chance = 95 + capacity = 1 diff --git a/ModularTegustation/fishing/icons/fishing.dmi b/ModularTegustation/fishing/icons/fishing.dmi index d8b1720dde61..98ee1afa0326 100644 Binary files a/ModularTegustation/fishing/icons/fishing.dmi and b/ModularTegustation/fishing/icons/fishing.dmi differ diff --git a/ModularTegustation/tegu_mobs/lc13_humanoids.dm b/ModularTegustation/tegu_mobs/lc13_humanoids.dm index 79f0d786b617..0e6f1ef9ace9 100644 --- a/ModularTegustation/tegu_mobs/lc13_humanoids.dm +++ b/ModularTegustation/tegu_mobs/lc13_humanoids.dm @@ -45,7 +45,7 @@ Skittish, they prefer to move in groups and will run away if the enemies are in attack_verb_simple = "slice" del_on_death = TRUE retreat_distance = 0 - butcher_results = list(/obj/item/food/meat/slab/human = 1) + butcher_results = list(/obj/item/food/meat/slab/human = 1, /obj/item/stack/spacecash/c10 = 1) silk_results = list(/obj/item/stack/sheet/silk/human_simple = 1) var/retreat_distance_default = 0 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 1ded038e90a2..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() @@ -221,6 +223,8 @@ minimum_distance = 3 casingtype = /obj/item/ammo_casing/caseless/ego_shrimpsoldier projectilesound = 'sound/weapons/gun/pistol/shot_alt.ogg' + butcher_results = list(/obj/item/stack/spacecash/c50 = 1) + guaranteed_butcher_results = list(/obj/item/stack/spacecash/c20 = 1, /obj/item/stack/spacecash/c1 = 5) silk_results = list(/obj/item/stack/sheet/silk/shrimple_simple = 8, /obj/item/stack/sheet/silk/shrimple_advanced = 4) /mob/living/simple_animal/hostile/shrimp_soldier/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 3e4529bfbc49..a1ecc6df5839 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,7 +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 @@ -32,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 @@ -47,6 +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() . = ..()