-
Notifications
You must be signed in to change notification settings - Fork 92
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
[s] Spacebeast Revived #233
Closed
Closed
Changes from 4 commits
Commits
Show all changes
7 commits
Select commit
Hold shift + click to select a range
c5603fd
solider
AndroBetel 2add234
Merge remote-tracking branch 'upstream/master' into Warrior-Test
FslashN 6ef0e82
Soldier AI Behavior
FslashN a2f7b3b
Merge remote-tracking branch 'upstream/master' into Warrior-Test
FslashN 4e17ccc
Linters Fix
FslashN 07f5dcc
Small Cleanup
FslashN 1d6758c
Sprite Fix + Behavior Fix?
FslashN File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
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
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
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 |
---|---|---|
|
@@ -105,7 +105,7 @@ you will have to do something like if(client.admin_holder.rights & R_ADMIN) your | |
if(!other) | ||
return FALSE | ||
if(rights_required && other.admin_holder?.rank) | ||
if(check_client_rights(usr.client, rights_required, show_msg)) | ||
if(check_client_rights(other, rights_required, show_msg)) | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Runtime error fix. |
||
return TRUE | ||
else if(show_msg) | ||
to_chat(usr, SPAN_WARNING("You do not have sufficient rights to do that. You require one of the following flags:[rights2text(rights_required," ")].")) | ||
|
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 |
---|---|---|
|
@@ -8,7 +8,7 @@ | |
return | ||
if(istype(loc, /obj/structure/machinery/cryo_cell)) | ||
return | ||
if(species && (species.flags & NO_BREATHE || species.flags & IS_SYNTHETIC)) | ||
if(species && (species.flags & (NO_BREATHE|IS_SYNTHETIC))) | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. No need for two checks. Not really related to the rest of the PR. |
||
return | ||
|
||
var/list/air_info | ||
|
20 changes: 14 additions & 6 deletions
20
code/modules/mob/living/carbon/human/life/handle_grabbed.dm
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 |
---|---|---|
@@ -1,11 +1,19 @@ | ||
|
||
|
||
// Why is this proc in its own .dm file? | ||
/mob/living/carbon/proc/handle_grabbed() | ||
if(!pulledby) | ||
return | ||
if(pulledby.grab_level >= GRAB_AGGRESSIVE) | ||
drop_held_items() | ||
|
||
if(pulledby.grab_level >= GRAB_CHOKE) | ||
apply_damage(3, OXY) | ||
apply_stamina_damage(5) | ||
/// Rewrote this to be a little different, so that the normal effects don't apply to xeno grabs. | ||
switch(pulledby.grab_level) | ||
if(GRAB_AGGRESSIVE to GRAB_CARRY) | ||
drop_held_items() | ||
if(GRAB_CHOKE) | ||
drop_held_items() | ||
apply_damage(3, OXY) | ||
apply_stamina_damage(5) | ||
if(GRAB_XENO) /// Alien grabs inflict pain when the human is not incapacitated, but not the other effects. | ||
/// Ignoring restrained with (TRUE). The grab does *not* restrain by itself. See /mob/living/carbon/human/is_mob_restrained(check_grab = TRUE) | ||
/// This is too allow the human a chance to fight back, with guns or melee. | ||
return is_mob_incapacitated(TRUE) || pain.apply_pain(PAIN_XENO_DRAG) | ||
|
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
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
Oops, something went wrong.
Oops, something went wrong.
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.
You likely want to add it to the Ambush menu as well:
https://github.com/PvE-CMSS13/PvE-CMSS13/blob/bf5640215da02fdd6f420b9d2f560b70bebb2d34/code/modules/admin/game_master/game_master_submenu/ambush.dm#L3