Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Adds giant lizards to LV-624 #6882

Merged
merged 11 commits into from
Aug 24, 2024
2 changes: 1 addition & 1 deletion code/datums/pain/_pain.dm
Original file line number Diff line number Diff line change
Expand Up @@ -193,7 +193,7 @@
if(!isnull(threshold_horrible))
activate_horrible()

if(new_level >= PAIN_LEVEL_SEVERE)
if(new_level >= PAIN_LEVEL_SEVERE && feels_pain)
RegisterSignal(source_mob, COMSIG_MOB_DRAGGED, PROC_REF(oxyloss_drag), override = TRUE)
RegisterSignal(source_mob, COMSIG_MOB_DEVOURED, PROC_REF(handle_devour), override = TRUE)
RegisterSignal(source_mob, COMSIG_MOVABLE_PRE_THROW, PROC_REF(oxy_kill), override = TRUE)
Expand Down
9 changes: 9 additions & 0 deletions code/game/objects/effects/landmarks/landmarks.dm
Original file line number Diff line number Diff line change
Expand Up @@ -121,6 +121,15 @@
GLOB.monkey_spawns -= src
return ..()

/obj/effect/landmark/lizard_spawn
name = "lizard spawn"
icon_state = "lizard_spawn"

/obj/effect/landmark/lizard_spawn/Initialize(mapload, ...)
. = ..()
if(prob(66))
new /mob/living/simple_animal/hostile/retaliate/giant_lizard(loc)

/obj/effect/landmark/latewhiskey
name = "Whiskey Outpost Late join"

Expand Down
7 changes: 7 additions & 0 deletions code/game/objects/items/reagent_containers/food.dm
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,16 @@
volume = 50 //Sets the default container amount for all food items.
flags_atom = CAN_BE_SYRINGED
var/filling_color = COLOR_WHITE //Used by sandwiches.
var/last_dropped_by

/obj/item/reagent_container/food/Initialize()
. = ..()
if (!pixel_x && !pixel_y)
src.pixel_x = rand(-6.0, 6) //Randomizes postion
src.pixel_y = rand(-6.0, 6)
RegisterSignal(src, COMSIG_ITEM_DROPPED, PROC_REF(update_last_dropped_by))

/obj/item/reagent_container/food/proc/update_last_dropped_by(datum/source, mob/user)
SIGNAL_HANDLER

last_dropped_by = user
4 changes: 4 additions & 0 deletions code/game/sound.dm
Original file line number Diff line number Diff line change
Expand Up @@ -398,6 +398,10 @@
sound = pick('sound/voice/pred_pain1.ogg','sound/voice/pred_pain2.ogg','sound/voice/pred_pain3.ogg','sound/voice/pred_pain4.ogg','sound/voice/pred_pain5.ogg',5;'sound/voice/pred_pain_rare1.ogg')
if("clownstep")
sound = pick('sound/effects/clownstep1.ogg', 'sound/effects/clownstep2.ogg')
if("giant_lizard_growl")
sound = pick('sound/effects/giant_lizard_growl1.ogg', 'sound/effects/giant_lizard_growl2.ogg')
if("giant_lizard_hiss")
sound = pick('sound/effects/giant_lizard_hiss1.ogg', 'sound/effects/giant_lizard_hiss2.ogg')
return sound

/client/proc/generate_sound_queues()
Expand Down
4 changes: 3 additions & 1 deletion code/modules/mob/living/carbon/xenomorph/attack_alien.dm
Original file line number Diff line number Diff line change
Expand Up @@ -258,14 +258,16 @@
if(M.frenzy_aura > 0)
damage += (M.frenzy_aura * FRENZY_DAMAGE_MULTIPLIER)

M.animation_attack_on(src)
//Somehow we will deal no damage on this attack
if(!damage)
playsound(M.loc, 'sound/weapons/alien_claw_swipe.ogg', 25, 1)
M.animation_attack_on(src)

M.visible_message(SPAN_DANGER("[M] lunges at [src]!"), \
SPAN_DANGER("We lunge at [src]!"), null, 5, CHAT_TYPE_XENO_COMBAT)
return XENO_ATTACK_ACTION

handle_blood_splatter(get_dir(M.loc, loc))
last_damage_data = create_cause_data(initial(M.name), M)
M.visible_message(SPAN_DANGER("[M] [M.slashes_verb] [src]!"), \
SPAN_DANGER("We [M.slash_verb] [src]!"), null, 5, CHAT_TYPE_XENO_COMBAT)
Expand Down
Loading
Loading