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

Almayer AntiTheft measures. #5100

Merged
merged 5 commits into from
Dec 12, 2023

Conversation

realforest2001
Copy link
Member

@realforest2001 realforest2001 commented Dec 2, 2023

STOP STEALING SHIT

About the pull request

Adds a subtype of reinforced hull for the Almayer that changes between indestructible hull and normal reinforced wall after hijack.
Uses this wall type around uniform vendors, the separation wall in the firing range and around engineering storage.

Explain why it's good for the game

Having the engineering storage looted at round start is just silly avoidance of the "don't deconstruct the whole ship without a reason" rule.

Testing Photographs and Procedure

I have verified that all works as intended, the walls cannot be harmed prior to hijack, and shutters function as advertised.

Changelog

🆑
add: Added a new almayer hull type (heavy reinforced) which is indestructible by normal means until after hijack collision.
add: Added a new subtype of shutter that automatically opens or closes depending on security level.
maptweak: Maps both of the above around the engineering storeroom. Also adds the walls between the firing ranges and around uniform vendors.
maptweak: Manual control button for shutters over engineering storage in the CEs office.
code: Changes hijack structural changes (walls/windows/windoors/ladders) to use signals.
/:cl:

STOP STEALING SHIT
@github-actions github-actions bot added Sprites Remove the soul from the game. Mapping did you remember to save in tgm format? Feature Feature coder badge labels Dec 2, 2023
code/modules/shuttle/dropship_hijack.dm Outdated Show resolved Hide resolved
code/modules/shuttles/marine_ferry.dm Outdated Show resolved Hide resolved
@@ -155,3 +155,24 @@
if(HAS_TRAIT(attacking_item, TRAIT_TOOL_CROWBAR))
return
..()

/obj/structure/machinery/door/poddoor/shutters/almayer/uniform_vendors/antitheft
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

are them being uniform_vendor subtype intended??

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yah, pre-existing overrides to damage stuff on /uniform_vendors

code/game/turfs/walls/wall_types.dm Outdated Show resolved Hide resolved
@Diegoflores31
Copy link
Contributor

i think making indestructible walls on engineering may not be a good idea. adding too much mechanical protection makes MPs a lil useless dont you think ? . the best would be first to make sure only MTs and CE have access to the Storage room and maybe using reinforced Doors to prevent easy hacking

@realforest2001
Copy link
Member Author

i think making indestructible walls on engineering may not be a good idea. adding too much mechanical protection makes MPs a lil useless dont you think ? . the best would be first to make sure only MTs and CE have access to the Storage room and maybe using reinforced Doors to prevent easy hacking

It already has reinforced doors and MT/CE access only. Insufficient to deter people rushing it at round start, so here we are.

@zzzmike
Copy link
Contributor

zzzmike commented Dec 3, 2023

adding too much mechanical protection makes MPs a lil useless dont you think ?

As someone with a lot of MP hours, I'm not concerned at all with this change. There is so, so much more to do.

Copy link
Member

@Nanu308 Nanu308 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Mapping seems fine

@Nanu308 Nanu308 added the Mapping Approved adds 500 new dict keys label Dec 6, 2023
@cm13-github cm13-github added the Merge Conflict PR can't be merged because it touched too much code label Dec 7, 2023
@cm13-github
Copy link
Contributor

This pull request has conflicts, please resolve those before we can evaluate the pull request.

@cm13-github
Copy link
Contributor

Conflicts have been resolved. A maintainer will review the pull request shortly.

@cm13-github cm13-github removed the Merge Conflict PR can't be merged because it touched too much code label Dec 11, 2023
@BroseidonMOO BroseidonMOO added this pull request to the merge queue Dec 12, 2023
Merged via the queue into cmss13-devs:master with commit e7816d9 Dec 12, 2023
26 checks passed
cm13-github added a commit that referenced this pull request Dec 12, 2023
@realforest2001 realforest2001 deleted the forest/antitheft branch March 29, 2024 04:55
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Feature Feature coder badge Mapping Approved adds 500 new dict keys Mapping did you remember to save in tgm format? Sprites Remove the soul from the game.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

7 participants