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.

Sign up for GitHub

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

Small and tiny mobs cannot bump open doors (when AI controlled) #611

Merged
merged 2 commits into from
Nov 5, 2024
Merged

Small and tiny mobs cannot bump open doors (when AI controlled) #611

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5851a57
Roaches be gone
MrMelbert Nov 4, 2024
5acd547
Makes it work
MrMelbert Nov 5, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions code/game/machinery/doors/door.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -267,6 +267,11 @@
if(!density || (obj_flags & EMAGGED))
return

if(isliving(user) && isnull(user.mind))
var/mob/living/living_user = user
if(living_user.mob_size < MOB_SIZE_HUMAN)
return

if(elevator_mode && elevator_status == LIFT_PLATFORM_UNLOCKED)
open()
else if(requiresID() && allowed(user))
Expand Down
8 changes: 5 additions & 3 deletions code/game/machinery/doors/windowdoor.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -148,13 +148,15 @@
return

add_fingerprint(user)
if(!requiresID())
user = null
if(isliving(user) && isnull(user.mind))
var/mob/living/living_user = user
if(living_user.mob_size < MOB_SIZE_HUMAN)
return

if(elevator_mode && elevator_status == LIFT_PLATFORM_UNLOCKED)
open()

else if(allowed(user))
else if(requiresID() && allowed(user))
open_and_close()

else
Expand Down
2 changes: 1 addition & 1 deletion code/modules/mob/living/basic/farm_animals/bee/_bee.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
response_harm_continuous = "squashes"
response_harm_simple = "squash"

mob_size = MOB_SIZE_LARGE
mob_size = MOB_SIZE_SMALL
pixel_x = -16
base_pixel_x = -16

Expand Down
2 changes: 1 addition & 1 deletion code/modules/mob/living/basic/jungle/leaper/leaper.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
lighting_cutoff_red = 5
lighting_cutoff_green = 20
lighting_cutoff_blue = 25
mob_size = MOB_SIZE_LARGE
mob_size = MOB_SIZE_HUGE
ai_controller = /datum/ai_controller/basic_controller/leaper
move_resist = MOVE_FORCE_VERY_STRONG
pull_force = MOVE_FORCE_VERY_STRONG
Expand Down
2 changes: 1 addition & 1 deletion code/modules/mob/living/basic/jungle/mega_arachnid/mega_arachnid.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
lighting_cutoff_red = 5
lighting_cutoff_green = 20
lighting_cutoff_blue = 25
mob_size = MOB_SIZE_LARGE
mob_size = MOB_SIZE_HUGE

speak_emote = list("chitters")
attack_sound = 'sound/weapons/bladeslice.ogg'
Expand Down
2 changes: 1 addition & 1 deletion code/modules/mob/living/basic/space_fauna/space_dragon/space_dragon.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
melee_damage_upper = 35
melee_damage_lower = 35
melee_attack_cooldown = CLICK_CD_MELEE
mob_size = MOB_SIZE_LARGE
mob_size = MOB_SIZE_HUGE
armour_penetration = 30
pixel_x = -16
base_pixel_x = -16
Expand Down
2 changes: 1 addition & 1 deletion code/modules/mob/living/carbon/alien/adult/queen.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
maptext_height = 64
maptext_width = 64
bubble_icon = "alienroyal"
mob_size = MOB_SIZE_LARGE
mob_size = MOB_SIZE_HUGE
layer = LARGE_MOB_LAYER //above most mobs, but below speechbubbles
pressure_resistance = 200 //Because big, stompy xenos should not be blown around like paper.
butcher_results = list(/obj/item/food/meat/slab/xeno = 20, /obj/item/stack/sheet/animalhide/xeno = 3)
Expand Down
2 changes: 1 addition & 1 deletion code/modules/mob/living/simple_animal/hostile/alien.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -139,7 +139,7 @@
health = 400
butcher_results = list(/obj/item/food/meat/slab/xeno = 10,
/obj/item/stack/sheet/animalhide/xeno = 2)
mob_size = MOB_SIZE_LARGE
mob_size = MOB_SIZE_HUGE
gold_core_spawnable = NO_SPAWN

/mob/living/simple_animal/hostile/alien/maid
Expand Down
Loading