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
Airlock Seals 2: I'm dumb and a fool edition #53114
Merged
Timberpoes
merged 35 commits into
tgstation:master
from
Jimmius:i-honestly-have-no-idea
Sep 13, 2020
Merged
Changes from 34 commits
Commits
Show all changes
35 commits
Select commit
Hold shift + click to select a range
45870af
Merge pull request #1 from tgstation/master
de9c54c
Merge branch 'master' of https://github.com/Jimmius/tgstation
899b812
Adds Door Seals
093bd2c
oops
ef3dd75
adds the concept of time
000ee0f
hopefully adds documentation unless my brain is smaller than I think
8b15074
makes the proc actually return a value if there's no seal
a907660
finally adds documentation for the proc
ab5aed0
adds the seal overlay sprite to a few more overlay files I forgot about
88f6815
adds the argument to the proc documentation
fa4f13d
changes a user message to be more consistent
df01515
hopefully adds more early returns unless I forgot one somewhere, also…
0096044
forgot to change a variable for an early return
e15ed66
removes a thing that I'm not sure what it does
de0850b
Adds the variable null stuff back in since that's not what's causing …
6db0de0
maybe more whitespace is the answer!
dfca952
alright let's just delete the attack verbs and see what happens
8257142
the seal now blocks RCDs to make athah happy
59e7960
Merge branch 'master' of https://github.com/tgstation/tgstation
0cbe48d
Merge branch 'master' into i-honestly-have-no-idea
bc6d570
adds the icon
1d87efc
Merge branch 'master' of https://github.com/Jimmius/tgstation
a1570e2
Merge branch 'master' into i-honestly-have-no-idea
9214f63
attempt to fix the merge conflict
116e53d
Merge branch 'master' of https://github.com/Jimmius/tgstation
9fc3e69
Merge branch 'master' into i-honestly-have-no-idea
37ac0ce
attempt to resolve second merge conflict
0266a8f
Merge branch 'master' of https://github.com/Jimmius/tgstation
beec330
Merge branch 'master' into i-honestly-have-no-idea
fdf1e78
I love fixing merge conflicts, I just love it
71a5af1
Merge branch 'master' of https://github.com/Jimmius/tgstation
582ee73
Merge branch 'master' into i-honestly-have-no-idea
b18471b
Merge Conflict IV: the Conflictening
328ef15
Correct documentation (I think), also changes the item sprite
603c6f9
its its its its its its
File filter
Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,25 @@ | ||
/obj/item/door_seal | ||
name = "pneumatic seal" | ||
desc = "A brace used to seal and reinforce an airlock. Useful for making areas inaccessible to those without opposable thumbs." | ||
icon = 'icons/obj/items_and_weapons.dmi' | ||
icon_state = "pneumatic_seal" | ||
lefthand_file = 'icons/mob/inhands/items_lefthand.dmi' | ||
righthand_file = 'icons/mob/inhands/items_righthand.dmi' | ||
flags_1 = CONDUCT_1 | ||
resistance_flags = FIRE_PROOF | ACID_PROOF | ||
force = 5 | ||
throwforce = 5 | ||
throw_speed = 2 | ||
throw_range = 1 | ||
w_class = WEIGHT_CLASS_BULKY | ||
custom_materials = list(/datum/material/iron=5000,/datum/material/plasma=500) | ||
/// how long the seal takes to place on the door | ||
var/seal_time = 3 SECONDS | ||
/// how long it takes to remove the seal from a door | ||
var/unseal_time = 2 SECONDS | ||
|
||
/obj/item/door_seal/suicide_act(mob/user) | ||
user.visible_message("<span class='suicide'>[user] is sealing [user.p_them()]self off from the world with [src]! It looks like [user.p_theyre()] trying to commit suicide!</span>") | ||
playsound(src, 'sound/items/jaws_pry.ogg', 30, TRUE) | ||
return(BRUTELOSS) | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Yes, I am being that pedantic! Muahahaha.
He, his. She, hers. It, its.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
fuck, how did I not notice this