mirror of
https://github.com/VOREStation/VOREStation.git
synced 2026-08-22 19:47:47 +01:00
@@ -43,7 +43,7 @@
|
||||
|
||||
for(var/obj/item/organ/E in H.bad_external_organs) // Fix bones
|
||||
var/obj/item/organ/external/affected = E
|
||||
if((affected.damage < affected.min_broken_damage * config.organ_health_multiplier) && (affected.status & ORGAN_BROKEN))
|
||||
if((affected.damage < affected.min_broken_damage * CONFIG_GET(number/organ_health_multiplier)) && (affected.status & ORGAN_BROKEN))
|
||||
affected.status &= ~ORGAN_BROKEN
|
||||
|
||||
for(var/datum/wound/W in affected.wounds) // Fix IB
|
||||
|
||||
@@ -270,7 +270,7 @@
|
||||
req_component_names[ct] = initial(ct.name)
|
||||
|
||||
/obj/structure/frame/Initialize(mapload, var/dir, var/building = 0, var/datum/frame/frame_types/type, mob/user as mob)
|
||||
..()
|
||||
. = ..()
|
||||
if(building)
|
||||
frame_type = type
|
||||
state = FRAME_PLACED
|
||||
|
||||
@@ -110,10 +110,7 @@
|
||||
var/datum/looping_sound/supermatter/soundloop
|
||||
|
||||
/obj/machinery/power/supermatter/Initialize(mapload)
|
||||
. = ..()
|
||||
uid = gl_uid++
|
||||
|
||||
/obj/machinery/power/supermatter/Initialize(mapload)
|
||||
soundloop = new(list(src), TRUE)
|
||||
return ..()
|
||||
|
||||
|
||||
@@ -1,7 +1,6 @@
|
||||
// #### Relays ####
|
||||
// Telecomms doesn't know about connected z-levels, so we need relays even for the other surface levels.
|
||||
/obj/machinery/telecomms/relay/preset/station/Initialize(mapload)
|
||||
. = ..()
|
||||
/obj/machinery/telecomms/relay/preset/station
|
||||
id = "groundbase Relay"
|
||||
autolinkers = list("groundbase_relay")
|
||||
|
||||
|
||||
@@ -388,4 +388,4 @@
|
||||
SSatc.msg(message)
|
||||
|
||||
/obj/effect/overmap/visitable/sector/virgo3b/get_space_zlevels()
|
||||
return list(Z_NAME_SPACE_ROCKS)
|
||||
return list(GLOB.map_templates_loaded[Z_NAME_SPACE_ROCKS])
|
||||
|
||||
@@ -169,4 +169,4 @@
|
||||
SSatc.msg(message)
|
||||
|
||||
/obj/effect/overmap/visitable/sector/virgo3b/get_space_zlevels()
|
||||
return list(Z_NAME_SPACE_ROCKS)
|
||||
return list(GLOB.map_templates_loaded[Z_NAME_SPACE_ROCKS])
|
||||
|
||||
@@ -1,10 +1,10 @@
|
||||
// #### Relays ####
|
||||
// Telecomms doesn't know about connected z-levels, so we need relays even for the other surface levels.
|
||||
/obj/machinery/telecomms/relay/preset/station/Initialize(mapload)
|
||||
. = ..()
|
||||
/obj/machinery/telecomms/relay/preset/station
|
||||
id = "SD Relay"
|
||||
autolinkers = list("sd_relay")
|
||||
|
||||
|
||||
/datum/map/sd/default_internal_channels()
|
||||
return list(
|
||||
num2text(PUB_FREQ) = list(),
|
||||
|
||||
@@ -287,7 +287,7 @@
|
||||
announce_atc(AM,going = TRUE)
|
||||
|
||||
/obj/effect/overmap/visitable/sector/virgo3b/get_space_zlevels()
|
||||
return list(Z_LEVEL_TETHER_SPACE_LOW)
|
||||
return list(GLOB.map_templates_loaded[Z_LEVEL_TETHER_SPACE_LOW])
|
||||
|
||||
/obj/effect/overmap/visitable/sector/virgo3b/announce_atc(var/atom/movable/AM, var/going = FALSE)
|
||||
if(istype(AM, /obj/effect/overmap/visitable/ship/simplemob))
|
||||
|
||||
@@ -1,7 +1,6 @@
|
||||
// #### Relays ####
|
||||
// Telecomms doesn't know about connected z-levels, so we need relays even for the other surface levels.
|
||||
/obj/machinery/telecomms/relay/preset/station/Initialize(mapload)
|
||||
. = ..()
|
||||
/obj/machinery/telecomms/relay/preset/station
|
||||
id = "Tether Relay"
|
||||
autolinkers = list("tether_relay")
|
||||
|
||||
|
||||
Reference in New Issue
Block a user