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

Jump to bottom

Xeno Tunnel and Shuttle Building/Anchoring Changes #4831

Merged
merged 3 commits into from
Nov 6, 2023
Merged

Xeno Tunnel and Shuttle Building/Anchoring Changes #4831

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
421f6c1
theyre in the walls
toolmind Nov 3, 2023
210bce2
catching things up to standard
toolmind Nov 3, 2023
910f51b
very small touchup
toolmind Nov 3, 2023
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/objects/items/stacks/stack.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -182,6 +182,11 @@ Also change the icon to reflect the amount of sheets, if possible.*/
to_chat(usr, SPAN_WARNING("The [R.title] cannot be built here!")) //might cause some friendly fire regarding other items like barbed wire, shouldn't be a problem?
return

var/obj/structure/tunnel/tunnel = locate(/obj/structure/tunnel) in usr.loc
if(tunnel)
to_chat(usr, SPAN_WARNING("The [R.title] cannot be constructed on a tunnel!"))
return

if((R.flags & RESULT_REQUIRES_SNOW) && !(istype(usr.loc, /turf/open/snow) || istype(usr.loc, /turf/open/auto_turf/snow)))
to_chat(usr, SPAN_WARNING("The [R.title] must be built on snow!"))
return
Expand Down
8 changes: 8 additions & 0 deletions code/game/objects/structures/girders.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -173,6 +173,14 @@
return do_reinforced_wall(W, user)
if(STATE_DISPLACED)
if(HAS_TRAIT(W, TRAIT_TOOL_CROWBAR))
var/turf/open/floor = loc
if(!floor.allow_construction)
to_chat(user, SPAN_WARNING("The girder must be secured on a proper surface!"))
return
var/obj/structure/tunnel/tunnel = locate(/obj/structure/tunnel) in loc
if(tunnel)
to_chat(user, SPAN_WARNING("The girder cannot be secured on a tunnel!"))
return
playsound(loc, 'sound/items/Crowbar.ogg', 25, 1)
to_chat(user, SPAN_NOTICE("Now securing the girder..."))
if(!do_after(user, 40 * user.get_skill_duration_multiplier(SKILL_CONSTRUCTION), INTERRUPT_ALL|BEHAVIOR_IMMOBILE, BUSY_ICON_BUILD))
Expand Down