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

Now crate can be pulled out of the APC. #770

Merged
merged 9 commits into from
Dec 13, 2024
Merged

Now crate can be pulled out of the APC. #770

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
da36831
Now crate can be pulled out of the APC.
kukurua Dec 5, 2024
d5c32a2
We use the easy_load_list list instead of the explicitly specified th…
kukurua Dec 8, 2024
32aba1a
These two returns are superfluous here
kukurua Dec 9, 2024
26dd446
Update interior_tank.dm
kukurua Dec 10, 2024
64156cb
Merge branch 'master' into boxes-from-the-APC
kukurua Dec 12, 2024
bd71761
Update code/datums/interior/interior_tank.dm
Helg2 Dec 13, 2024
39ff04c
Update interior_tank.dm
Helg2 Dec 13, 2024
2544097
Update interior_tank.dm
Helg2 Dec 13, 2024
a6832b9
Update interior_tank.dm
Helg2 Dec 13, 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
2 changes: 2 additions & 0 deletions code/__DEFINES/is_helpers.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -229,6 +229,8 @@

#define isladder(A) (istype(A, /obj/structure/ladder))

#define iscrate(A) (istype(A, /obj/structure/closet/crate))

#define ismachinery(A) (istype(A, /obj/machinery))

#define ispowermachinery(A) (istype(A, /obj/machinery/power))
Expand Down
29 changes: 22 additions & 7 deletions code/datums/interior/interior_tank.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,15 +117,30 @@
. = ..()
owner.interior.mob_leave(user)

/turf/closed/interior/tank/door/MouseDrop_T(atom/movable/dropping, mob/M)
if(!ismob(dropping))
return ..()
owner.interior.mob_leave(dropping)
/turf/closed/interior/tank/door/MouseDrop_T(atom/movable/dropping, mob/user)
if(ismob(dropping))
owner.interior.mob_leave(dropping)
return
if(is_type_in_typecache(dropping.type, owner.easy_load_list))
if(isitem(dropping))
user.temporarilyRemoveItemFromInventory(dropping)
dropping.forceMove(owner.exit_location(dropping))
user.balloon_alert(user, "item thrown outside")
return
return ..()

/turf/closed/interior/tank/door/grab_interact(obj/item/grab/grab, mob/user, base_damage, is_sharp)
if(!ismob(grab.grabbed_thing))
return ..()
owner.interior.mob_leave(grab.grabbed_thing)
if(ismob(grab.grabbed_thing))
user.balloon_alert(user, grab.grabbed_thing.name + " thrown outside")
owner.interior.mob_leave(grab.grabbed_thing)
return
if(is_type_in_typecache(grab.grabbed_thing.type, owner.easy_load_list))
if(isitem(grab.grabbed_thing.type))
user.temporarilyRemoveItemFromInventory(grab.grabbed_thing)
user.balloon_alert(user, "item thrown outside")
grab.grabbed_thing.forceMove(owner.exit_location(grab.grabbed_thing))
return
return ..()

///returns where we want to spit out new enterers
/turf/closed/interior/tank/door/proc/get_enter_location()
Expand Down
2 changes: 1 addition & 1 deletion code/modules/vehicles/armored/_multitile.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
/obj/vehicle/sealed/armored/multitile/enter_locations(atom/movable/entering_thing)
return list(get_step_away(get_step(src, REVERSE_DIR(dir)), src, 2))

/obj/vehicle/sealed/armored/multitile/exit_location(mob/M)
/obj/vehicle/sealed/armored/multitile/exit_location(atom/movable/M)
return pick(enter_locations(M))

/obj/vehicle/sealed/armored/multitile/enter_checks(mob/entering_mob, loc_override = FALSE)
Expand Down
Loading