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

Makes Dogtags removable on death immediately #514

Merged
merged 8 commits into from
Oct 24, 2024
Merged

Makes Dogtags removable on death immediately #514

Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
3c04a8e
Makes Dogtags removable after 30 seconds
GriffinMan4455 Oct 22, 2024
95a175c
Update code/modules/mob/living/carbon/human/life.dm
GriffinMan4455 Oct 23, 2024
4c06d40
Update code/modules/mob/living/carbon/human/human_defines.dm
GriffinMan4455 Oct 23, 2024
054d823
Merge branch 'master' into Tags-Fix
GriffinMan4455 Oct 23, 2024
b7a900c
Merge branch 'master' into Tags-Fix
GriffinMan4455 Oct 24, 2024
5a06dbe
Here's what I did but it didn't work? Dunno if I missed something
GriffinMan4455 Oct 24, 2024
68924f4
Update code/modules/mob/living/carbon/human/human_stripping.dm
GriffinMan4455 Oct 24, 2024
5801bb8
Update code/modules/mob/living/carbon/human/human_stripping.dm
GriffinMan4455 Oct 24, 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
4 changes: 1 addition & 3 deletions code/modules/mob/living/carbon/human/human_stripping.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -209,7 +209,7 @@ GLOBAL_LIST_INIT(strippable_human_items, create_strippable_list(list(
var/mob/living/carbon/human/sourcemob = source
if (!istype(tag))
return
if (!sourcemob.undefibbable && (!skillcheck(user, SKILL_POLICE, SKILL_POLICE_SKILLED) || sourcemob.stat != DEAD))
if (sourcemob.stat != DEAD)
return
return tag.dogtag_taken ? null : "retrieve_tag"

Expand All @@ -224,8 +224,6 @@ GLOBAL_LIST_INIT(strippable_human_items, create_strippable_list(list(
return
if(!istype(sourcemob.wear_id, /obj/item/card/id/dogtag))
return
if (!sourcemob.undefibbable && !skillcheck(user, SKILL_POLICE, SKILL_POLICE_SKILLED))
return
var/obj/item/card/id/dogtag/tag = sourcemob.wear_id
if(tag.dogtag_taken)
to_chat(user, SPAN_WARNING("Someone's already taken [sourcemob]'s information tag."))
Expand Down
Loading