Skip to content

Commit

Permalink
Upstream update (#4903)
Browse files Browse the repository at this point in the history
many missed mirrors by nova
  • Loading branch information
Iajret authored Aug 8, 2024
2 parents 2bc580e + 6f1b15f commit 83d1f6d
Show file tree
Hide file tree
Showing 95 changed files with 1,522 additions and 323 deletions.
978 changes: 978 additions & 0 deletions _maps/nova/lazy_templates/deathmatch/cybersun_sim.dmm

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions _maps/safehouses/bathroom.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
dir = 4
},
/obj/machinery/light/small/blacklight/directional/east,
/turf/open/floor/bitrunning_transport,
/turf/open/indestructible/bitrunning_transport,
/area/virtual_domain/safehouse)
"v" = (
/obj/machinery/light/small/blacklight/directional/east,
Expand Down Expand Up @@ -68,7 +68,7 @@
/obj/effect/turf_decal/loading_area{
dir = 4
},
/turf/open/floor/bitrunning_transport,
/turf/open/indestructible/bitrunning_transport,
/area/virtual_domain/safehouse)
"M" = (
/obj/effect/decal/cleanable/dirt,
Expand Down
4 changes: 2 additions & 2 deletions _maps/safehouses/den.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
/obj/effect/turf_decal/loading_area{
dir = 4
},
/turf/open/floor/bitrunning_transport,
/turf/open/indestructible/bitrunning_transport,
/area/virtual_domain/safehouse)
"e" = (
/obj/structure/table/reinforced/plastitaniumglass,
Expand Down Expand Up @@ -59,7 +59,7 @@
/obj/effect/turf_decal/loading_area{
dir = 4
},
/turf/open/floor/bitrunning_transport,
/turf/open/indestructible/bitrunning_transport,
/area/virtual_domain/safehouse)
"z" = (
/obj/effect/turf_decal/trimline/yellow/corner{
Expand Down
4 changes: 2 additions & 2 deletions _maps/safehouses/dig.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
dir = 8
},
/obj/effect/landmark/bitrunning/cache_goal_turf,
/turf/open/floor/bitrunning_transport,
/turf/open/indestructible/bitrunning_transport,
/area/virtual_domain/safehouse)
"i" = (
/obj/effect/turf_decal/siding/yellow{
Expand Down Expand Up @@ -98,7 +98,7 @@
/obj/effect/turf_decal/loading_area,
/obj/effect/turf_decal/box/corners,
/obj/effect/landmark/bitrunning/cache_goal_turf,
/turf/open/floor/bitrunning_transport,
/turf/open/indestructible/bitrunning_transport,
/area/virtual_domain/safehouse)
"T" = (
/obj/effect/landmark/bitrunning/hololadder_spawn,
Expand Down
4 changes: 2 additions & 2 deletions _maps/safehouses/ice.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@
/obj/effect/turf_decal/loading_area{
dir = 4
},
/turf/open/floor/bitrunning_transport,
/turf/open/indestructible/bitrunning_transport,
/area/virtual_domain/safehouse)
"p" = (
/obj/structure/railing,
Expand All @@ -69,7 +69,7 @@
/obj/effect/turf_decal/loading_area{
dir = 4
},
/turf/open/floor/bitrunning_transport,
/turf/open/indestructible/bitrunning_transport,
/area/virtual_domain/safehouse)
"u" = (
/obj/effect/decal/cleanable/dirt/dust,
Expand Down
2 changes: 1 addition & 1 deletion _maps/safehouses/lavaland_boss.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@
/obj/machinery/light/directional/east,
/obj/structure/railing,
/obj/effect/landmark/bitrunning/cache_goal_turf,
/turf/open/floor/bitrunning_transport,
/turf/open/indestructible/bitrunning_transport,
/area/virtual_domain/safehouse)
"A" = (
/obj/effect/turf_decal/trimline/brown/filled/line{
Expand Down
4 changes: 2 additions & 2 deletions _maps/safehouses/mine.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
},
/obj/machinery/light/directional/east,
/obj/effect/landmark/bitrunning/cache_goal_turf,
/turf/open/floor/bitrunning_transport,
/turf/open/indestructible/bitrunning_transport,
/area/virtual_domain/safehouse)
"B" = (
/obj/effect/turf_decal/trimline/brown/filled/line{
Expand All @@ -52,7 +52,7 @@
},
/obj/structure/railing,
/obj/effect/landmark/bitrunning/cache_goal_turf,
/turf/open/floor/bitrunning_transport,
/turf/open/indestructible/bitrunning_transport,
/area/virtual_domain/safehouse)
"H" = (
/obj/machinery/door/airlock/external/glass{
Expand Down
4 changes: 2 additions & 2 deletions _maps/safehouses/shuttle.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
/obj/effect/decal/cleanable/dirt,
/obj/effect/landmark/bitrunning/cache_goal_turf,
/obj/effect/turf_decal/loading_area,
/turf/open/floor/bitrunning_transport,
/turf/open/indestructible/bitrunning_transport,
/area/virtual_domain/safehouse)
"i" = (
/obj/effect/turf_decal/stripes/line{
Expand All @@ -41,7 +41,7 @@
/obj/machinery/light/small/directional/south,
/obj/effect/landmark/bitrunning/cache_goal_turf,
/obj/effect/turf_decal/loading_area,
/turf/open/floor/bitrunning_transport,
/turf/open/indestructible/bitrunning_transport,
/area/virtual_domain/safehouse)
"m" = (
/obj/modular_map_connector,
Expand Down
4 changes: 2 additions & 2 deletions _maps/safehouses/shuttle_space.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@
/obj/effect/decal/cleanable/dirt,
/obj/effect/landmark/bitrunning/cache_goal_turf,
/obj/effect/turf_decal/loading_area,
/turf/open/floor/bitrunning_transport,
/turf/open/indestructible/bitrunning_transport,
/area/virtual_domain/safehouse)
"z" = (
/obj/effect/turf_decal/stripes/line{
Expand Down Expand Up @@ -98,7 +98,7 @@
/obj/machinery/light/small/directional/south,
/obj/effect/landmark/bitrunning/cache_goal_turf,
/obj/effect/turf_decal/loading_area,
/turf/open/floor/bitrunning_transport,
/turf/open/indestructible/bitrunning_transport,
/area/virtual_domain/safehouse)
"E" = (
/obj/effect/turf_decal/stripes/line{
Expand Down
4 changes: 2 additions & 2 deletions _maps/safehouses/wood.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
/obj/effect/turf_decal/loading_area{
dir = 4
},
/turf/open/floor/bitrunning_transport,
/turf/open/indestructible/bitrunning_transport,
/area/virtual_domain/safehouse)
"v" = (
/obj/machinery/light/small/directional/east,
Expand Down Expand Up @@ -50,7 +50,7 @@
/obj/effect/turf_decal/loading_area{
dir = 4
},
/turf/open/floor/bitrunning_transport,
/turf/open/indestructible/bitrunning_transport,
/area/virtual_domain/safehouse)
"T" = (
/obj/effect/landmark/bitrunning/hololadder_spawn,
Expand Down
2 changes: 1 addition & 1 deletion _maps/virtual_domains/island_brawl.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -2540,7 +2540,7 @@
/area/virtual_domain)
"GD" = (
/obj/effect/landmark/bitrunning/permanent_exit,
/turf/open/floor/bitrunning_transport,
/turf/open/indestructible/bitrunning_transport,
/area/virtual_domain/protected_space/fullbright)
"GI" = (
/turf/open/floor/iron/dark/textured_large,
Expand Down
4 changes: 3 additions & 1 deletion code/__HELPERS/_dreamluau.dm
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
#define DREAMLUAU (world.system_type == MS_WINDOWS ? "dreamluau.dll" : "libdreamluau.so")
/* This comment bypasses grep checks */ /var/__dreamluau

#define DREAMLUAU (world.system_type == MS_WINDOWS ? "dreamluau.dll" : (__dreamluau || (__dreamluau = __detect_auxtools("dreamluau"))))

#define DREAMLUAU_CALL(func) call_ext(DREAMLUAU, "byond:[#func]")

Expand Down
2 changes: 1 addition & 1 deletion code/datums/components/gunpoint.dm
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@
RegisterSignals(targ, list(COMSIG_LIVING_DISARM_HIT, COMSIG_LIVING_GET_PULLED), PROC_REF(cancel))
RegisterSignals(weapon, list(COMSIG_ITEM_DROPPED, COMSIG_ITEM_EQUIPPED), PROC_REF(cancel))

var/distance = min(get_dist(shooter, target), 1) // treat 0 distance as adjacent
var/distance = max(get_dist(shooter, target), 1) // treat 0 distance as adjacent
var/distance_description = (distance <= 1 ? "point blank " : "")

shooter.visible_message(span_danger("[shooter] aims [weapon] [distance_description]at [target]!"),
Expand Down
2 changes: 2 additions & 0 deletions code/datums/components/uplink.dm
Original file line number Diff line number Diff line change
Expand Up @@ -295,6 +295,8 @@
if (uplink_handler.telecrystals <= 0)
return
var/desired_amount = tgui_input_number(ui.user, "How many raw telecrystals to buy?", "Buy Raw TC", default = uplink_handler.telecrystals, max_value = uplink_handler.telecrystals)
if(!desired_amount || desired_amount < 1)
return
uplink_handler.purchase_raw_tc(ui.user, desired_amount, parent)
if("lock")
if(!lockable)
Expand Down
2 changes: 2 additions & 0 deletions code/datums/diseases/_disease.dm
Original file line number Diff line number Diff line change
Expand Up @@ -146,6 +146,8 @@
cycles_to_beat = max(DISEASE_RECOVERY_SCALING, DISEASE_CYCLES_HARMFUL)
if(DISEASE_SEVERITY_BIOHAZARD)
cycles_to_beat = max(DISEASE_RECOVERY_SCALING, DISEASE_CYCLES_BIOHAZARD)
else
cycles_to_beat = max(DISEASE_RECOVERY_SCALING, DISEASE_CYCLES_NONTHREAT)
peaked_cycles += stage/max_stages //every cycle we spend sick counts towards eventually curing the virus, faster at higher stages
recovery_prob += DISEASE_RECOVERY_CONSTANT + (peaked_cycles / (cycles_to_beat / DISEASE_RECOVERY_SCALING)) //more severe viruses are beaten back more aggressively after the peak
if(stage_peaked)
Expand Down
2 changes: 1 addition & 1 deletion code/datums/diseases/advance/advance.dm
Original file line number Diff line number Diff line change
Expand Up @@ -265,7 +265,7 @@
properties["severity"] += round((properties["transmittable"] / 8), 1)
properties["severity"] = round((properties["severity"] / 2), 1)
properties["severity"] *= (symptoms.len / VIRUS_SYMPTOM_LIMIT) //fewer symptoms, less severity
properties["severity"] = clamp(properties["severity"], 1, 7)
properties["severity"] = round(clamp(properties["severity"], 1, 7), 1)
properties["capacity"] = get_symptom_weights()

// Assign the properties that are in the list.
Expand Down
95 changes: 95 additions & 0 deletions code/datums/elements/pet_collar.dm
Original file line number Diff line number Diff line change
@@ -0,0 +1,95 @@
/datum/element/wears_collar
element_flags = ELEMENT_BESPOKE
argument_hash_start_idx = 2
///our icon's pathfile
var/collar_icon
///our collar's icon state
var/collar_icon_state
///iconstate of our collar while resting
var/collar_resting_icon_state

/datum/element/wears_collar/Attach(datum/target, collar_icon = 'icons/mob/simple/pets.dmi', collar_resting_icon_state = FALSE, collar_icon_state)
. = ..()

if(!isliving(target))
return ELEMENT_INCOMPATIBLE

src.collar_icon = collar_icon
src.collar_icon_state = collar_icon_state
src.collar_resting_icon_state = collar_resting_icon_state

RegisterSignal(target, COMSIG_ATOM_ATTACKBY, PROC_REF(attach_collar))
RegisterSignal(target, COMSIG_ATOM_UPDATE_OVERLAYS, PROC_REF(on_overlays_updated))
RegisterSignal(target, COMSIG_ATOM_EXITED, PROC_REF(on_content_exit))
RegisterSignal(target, COMSIG_ATOM_ENTERED, PROC_REF(on_content_enter))
RegisterSignal(target, COMSIG_LIVING_RESTING, PROC_REF(on_rest))
RegisterSignal(target, COMSIG_MOB_STATCHANGE, PROC_REF(on_stat_change))

/datum/element/wears_collar/Detach(datum/target)
. = ..()
UnregisterSignal(target, list(
COMSIG_ATOM_ATTACKBY,
COMSIG_ATOM_UPDATE_OVERLAYS,
COMSIG_ATOM_EXITED,
COMSIG_ATOM_ENTERED,
COMSIG_LIVING_RESTING,
COMSIG_MOB_STATCHANGE,
))

/datum/element/wears_collar/proc/on_stat_change(mob/living/source)
SIGNAL_HANDLER

if(collar_icon_state)
source.update_icon(UPDATE_OVERLAYS)

/datum/element/wears_collar/proc/on_content_exit(mob/living/source, atom/moved)
SIGNAL_HANDLER

if(!istype(moved, /obj/item/clothing/neck/petcollar))
return
source.fully_replace_character_name(null, source::name)
if(collar_icon_state)
source.update_appearance()

/datum/element/wears_collar/proc/on_content_enter(mob/living/source, obj/item/clothing/neck/petcollar/new_collar)
SIGNAL_HANDLER

if(!istype(new_collar))
return

source.fully_replace_character_name(null, "\proper [new_collar.tagname]")
if(collar_icon_state)
source.update_appearance()

/datum/element/wears_collar/proc/attach_collar(atom/source, atom/movable/attacking_item, atom/user, params)
SIGNAL_HANDLER

if(!istype(attacking_item, /obj/item/clothing/neck/petcollar))
return NONE
if(locate(/obj/item/clothing/neck/petcollar) in source)
user.balloon_alert(source, "already wearing a collar!")
return NONE
attacking_item.forceMove(source)
return COMPONENT_NO_AFTERATTACK

/datum/element/wears_collar/proc/on_overlays_updated(mob/living/source, list/overlays)
SIGNAL_HANDLER

if(!locate(/obj/item/clothing/neck/petcollar) in source)
return

var/icon_tag = ""

if(source.stat == DEAD || HAS_TRAIT(source, TRAIT_FAKEDEATH))
icon_tag = "_dead"
else if(collar_resting_icon_state && source.resting)
icon_tag = "_rest"

overlays += mutable_appearance(collar_icon, "[collar_icon_state][icon_tag]collar")
overlays += mutable_appearance(collar_icon, "[collar_icon_state][icon_tag]tag")


/datum/element/wears_collar/proc/on_rest(atom/movable/source)
SIGNAL_HANDLER

source.update_icon(UPDATE_OVERLAYS)
Loading

0 comments on commit 83d1f6d

Please sign in to comment.