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

Fixes harddel of container and brainmob #306

Merged
merged 2 commits into from
Sep 13, 2024
Merged

Fixes harddel of container and brainmob #306

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
19b840d
Update brain.dm
Helg2 Sep 12, 2024
0d61b5e
Update limb_objects.dm
Helg2 Sep 12, 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
6 changes: 4 additions & 2 deletions code/modules/mob/living/brain/brain.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
/mob/living/brain
icon = 'icons/obj/items/organs.dmi'
icon_state = "brain1"
var/obj/item/container = null
var/timeofhostdeath = 0
var/emp_damage = 0//Handles a type of MMI damage
var/alert = null
icon = 'icons/obj/items/organs.dmi'
icon_state = "brain1"

/mob/living/brain/Initialize(mapload)
. = ..()
Expand All @@ -18,6 +18,8 @@
if(stat != DEAD)
death()
ghostize()
if(!isnull(container))
container = null
return ..()

/mob/living/brain/ghost()
Expand Down
1 change: 1 addition & 0 deletions code/modules/organs/limb_objects.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -128,6 +128,7 @@

/obj/item/limb/head/Destroy()
GLOB.head_list -= src
QDEL_NULL(brainmob)
return ..()

/obj/item/limb/head/proc/transfer_identity(mob/living/carbon/human/H)//Same deal as the regular brain proc. Used for human-->head
Expand Down
Loading