diff --git a/code/_globalvars/lists/mobs.dm b/code/_globalvars/lists/mobs.dm index b08d7ad2..c6946516 100644 --- a/code/_globalvars/lists/mobs.dm +++ b/code/_globalvars/lists/mobs.dm @@ -61,7 +61,8 @@ GLOBAL_LIST_EMPTY(latejoiners) //CIT CHANGE - All latejoining people, for traito GLOBAL_LIST_INIT(noodle_taurs, list( "Naga", - "Tentacle" + "Tentacle", + "Fat Naga" )) GLOBAL_LIST_INIT(paw_taurs, list( diff --git a/code/datums/components/footstep.dm b/code/datums/components/footstep.dm index 7bac1106..64b674ba 100644 --- a/code/datums/components/footstep.dm +++ b/code/datums/components/footstep.dm @@ -97,7 +97,7 @@ var/mob/living/carbon/human/H = LM var/feetCover = (H.wear_suit && (H.wear_suit.body_parts_covered & FEET)) || (H.w_uniform && (H.w_uniform.body_parts_covered & FEET)) - if (H.dna.features["taur"] == "Naga" || H.dna.features["taur"] == "Tentacle") //are we a naga or tentacle taur creature + if (H.dna.features["taur"] == "Naga" || H.dna.features["taur"] == "Tentacle" || H.dna.features["taur"] == "Fat Naga") //are we a naga or tentacle taur creature playsound(T, 'sound/effects/footstep/crawl1.ogg', 15 * v) return diff --git a/hyperstation/code/modules/resize/resizing.dm b/hyperstation/code/modules/resize/resizing.dm index 46b012a3..86352bee 100644 --- a/hyperstation/code/modules/resize/resizing.dm +++ b/hyperstation/code/modules/resize/resizing.dm @@ -98,7 +98,7 @@ mob/living/get_effective_size() //Smaller person being stepped on if(get_effective_size() > tmob.get_effective_size() && iscarbon(src)) - if(istype(H) && H.dna.features["taur"] == "Naga" || H.dna.features["taur"] == "Tentacle") + if(istype(H) && H.dna.features["taur"] == "Naga" || H.dna.features["taur"] == "Tentacle" || H.dna.features["taur"] == "Fat Naga") tmob.visible_message("[src] carefully slithers around [tmob].", "[src]'s huge tail slithers besides you.") else tmob.visible_message("[src] carefully steps over [tmob].", "[src] steps over you carefully.") @@ -141,7 +141,7 @@ mob/living/get_effective_size() H.add_movespeed_modifier(MOVESPEED_ID_STOMP, multiplicative_slowdown = 10) //Full stop addtimer(CALLBACK(H, /mob/.proc/remove_movespeed_modifier, MOVESPEED_ID_STOMP), 3) //0.3 seconds if(get_effective_size() > tmob.get_effective_size() && iscarbon(H)) - if(istype(H) && H.dna.features["taur"] == "Naga" || H.dna.features["taur"] == "Tentacle") + if(istype(H) && H.dna.features["taur"] == "Naga" || H.dna.features["taur"] == "Tentacle" || H.dna.features["taur"] == "Fat Naga") tmob.visible_message("[src] carefully rolls their tail over [tmob]!", "[src]'s huge tail rolls over you!") else tmob.visible_message("[src] carefully steps on [tmob]!", "[src] steps onto you with force!") @@ -170,7 +170,7 @@ mob/living/get_effective_size() addtimer(CALLBACK(H, /mob/.proc/remove_movespeed_modifier, MOVESPEED_ID_STOMP), 10) //1 second //H.Stun(20) if(get_effective_size() > tmob.get_effective_size() && iscarbon(H)) - if(istype(H) && H.dna.features["taur"] == "Naga" || H.dna.features["taur"] == "Tentacle") + if(istype(H) && H.dna.features["taur"] == "Naga" || H.dna.features["taur"] == "Tentacle" || H.dna.features["taur"] == "Fat Naga") tmob.visible_message("[src] mows down [tmob] under their tail!", "[src] plows their tail over you mercilessly!") else tmob.visible_message("[src] slams their foot down on [tmob], crushing them!", "[src] crushes you under their foot!") @@ -199,13 +199,13 @@ mob/living/get_effective_size() if(get_effective_size() > tmob.get_effective_size() && iscarbon(H)) var/feetCover = (H.wear_suit && (H.wear_suit.body_parts_covered & FEET)) || (H.w_uniform && (H.w_uniform.body_parts_covered & FEET) || (H.shoes && (H.shoes.body_parts_covered & FEET))) if(feetCover) - if(istype(H) && H.dna.features["taur"] == "Naga" || H.dna.features["taur"] == "Tentacle") + if(istype(H) && H.dna.features["taur"] == "Naga" || H.dna.features["taur"] == "Tentacle" || H.dna.features["taur"] == "Fat Naga") tmob.visible_message("[src] pins [tmob] under their tail!", "[src] pins you beneath their tail!") else tmob.visible_message("[src] pins [tmob] helplessly underfoot!", "[src] pins you underfoot!") return 1 else - if(istype(H) && H.dna.features["taur"] == "Naga" || H.dna.features["taur"] == "Tentacle") + if(istype(H) && H.dna.features["taur"] == "Naga" || H.dna.features["taur"] == "Tentacle" || H.dna.features["taur"] == "Fat Naga") tmob.visible_message("[src] snatches up [tmob] underneath their tail!", "[src]'s tail winds around you and snatches you in its coils!") //tmob.mob_pickup_micro_feet(H) SEND_SIGNAL(tmob, COMSIG_MICRO_PICKUP_FEET, H) diff --git a/modular_citadel/code/modules/mob/dead/new_player/sprite_accessories.dm b/modular_citadel/code/modules/mob/dead/new_player/sprite_accessories.dm index 8bd021a0..6e7d3a97 100644 --- a/modular_citadel/code/modules/mob/dead/new_player/sprite_accessories.dm +++ b/modular_citadel/code/modules/mob/dead/new_player/sprite_accessories.dm @@ -1884,6 +1884,11 @@ datum/sprite_accessory/mam_tails/insect icon_state = "naga" taur_mode = SNEK_TAURIC +/datum/sprite_accessory/taur/naga/fat //ported from Vorestation + name = "Fat Naga" + icon_state = "fatnaga" + taur_mode = SNEK_TAURIC + /datum/sprite_accessory/taur/otie name = "Otie" icon_state = "otie" diff --git a/modular_citadel/icons/mob/mam_taur.dmi b/modular_citadel/icons/mob/mam_taur.dmi index fc8486cd..e22b32a3 100644 Binary files a/modular_citadel/icons/mob/mam_taur.dmi and b/modular_citadel/icons/mob/mam_taur.dmi differ