diff --git a/code/controllers/configuration/entries/game_options.dm b/code/controllers/configuration/entries/game_options.dm index 867460f861..5508d5e168 100644 --- a/code/controllers/configuration/entries/game_options.dm +++ b/code/controllers/configuration/entries/game_options.dm @@ -12,10 +12,12 @@ /datum/config_entry/flag/limbs_can_break /datum/config_entry/number/organ_health_multiplier - default = 1 + integer = FALSE + default = 1.0 /datum/config_entry/number/organ_regeneration_multiplier - default = 1 + integer = FALSE + default = 1.0 // FIXME: Unused ///datum/config_entry/flag/revival_pod_plants diff --git a/code/game/objects/items/devices/communicator/communicator.dm b/code/game/objects/items/devices/communicator/communicator.dm index 56209fc53c..cb0b7e7b7a 100644 --- a/code/game/objects/items/devices/communicator/communicator.dm +++ b/code/game/objects/items/devices/communicator/communicator.dm @@ -279,11 +279,10 @@ var/global/list/obj/item/communicator/all_communicators = list() // Parameters: None // Description: Removes the ghost's address and nulls the exonet datum, to allow qdel()ing. /mob/observer/dead/Destroy() - . = ..() if(exonet) exonet.remove_address() qdel_null(exonet) - return ..() + . = ..() // Proc: register_device() // Parameters: 1 (user - the person to use their name for) diff --git a/code/modules/mob/mob_planes_vr.dm b/code/modules/mob/mob_planes_vr.dm index 9f5b30f579..9928180070 100644 --- a/code/modules/mob/mob_planes_vr.dm +++ b/code/modules/mob/mob_planes_vr.dm @@ -21,8 +21,9 @@ my_mob = M /obj/screen/plane_master/augmented/Destroy() + entopic_users -= my_mob my_mob = null - return ..() + . = ..() /obj/screen/plane_master/augmented/set_visibility(var/want = FALSE) . = ..() diff --git a/config/example/game_options.txt b/config/example/game_options.txt index 67322ac49a..f5b43ecb36 100644 --- a/config/example/game_options.txt +++ b/config/example/game_options.txt @@ -18,12 +18,12 @@ BONES_CAN_BREAK 1 LIMBS_CAN_BREAK 1 ## multiplier which enables organs to take more damage before bones breaking or limbs being destroyed -## 100 means normal, 50 means half -ORGAN_HEALTH_MULTIPLIER 100 +## 1.0 means normal, 0.5 means half +ORGAN_HEALTH_MULTIPLIER 1.0 ## multiplier which influences how fast organs regenerate naturally -## 100 means normal, 50 means half -ORGAN_REGENERATION_MULTIPLIER 50 +## 1.0 means normal, 0.5 means half +ORGAN_REGENERATION_MULTIPLIER 0.5 ### REVIVAL ###