Skip to content

Commit

Permalink
Merge upstream 19.11.24 (#765)
Browse files Browse the repository at this point in the history
## About The Pull Request
Мегре апстрим
  • Loading branch information
larentoun authored Nov 19, 2024
2 parents 79e9c3f + 0d68ca2 commit a08d918
Show file tree
Hide file tree
Showing 54 changed files with 458 additions and 292 deletions.
6 changes: 4 additions & 2 deletions _maps/map_files/MetaStation/MetaStation.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -20217,7 +20217,6 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/obj/structure/disposalpipe/segment,
/obj/item/radio/intercom/directional/east,
/obj/effect/turf_decal/trimline/brown/filled/line,
/turf/open/floor/iron,
/area/station/cargo/miningoffice)
Expand Down Expand Up @@ -34053,7 +34052,6 @@
/turf/open/floor/iron/dark,
/area/station/science/ordnance)
"mhM" = (
/obj/structure/disposalpipe/segment,
/obj/structure/table/reinforced,
/obj/machinery/door/firedoor,
/obj/structure/desk_bell{
Expand Down Expand Up @@ -47643,6 +47641,7 @@
/obj/structure/railing{
dir = 8
},
/obj/item/radio/intercom/directional/south,
/turf/open/floor/iron,
/area/station/cargo/miningoffice)
"qTz" = (
Expand Down Expand Up @@ -65415,6 +65414,9 @@
/obj/effect/mapping_helpers/airlock/access/any/service/maintenance,
/obj/effect/mapping_helpers/airlock/access/any/supply/maintenance,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/effect/mapping_helpers/airlock/unres{
dir = 1
},
/turf/open/floor/plating,
/area/station/maintenance/disposal)
"wXF" = (
Expand Down
182 changes: 86 additions & 96 deletions _maps/map_files/NebulaStation/NebulaStation.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -13469,9 +13469,6 @@
},
/turf/open/floor/plating,
/area/station/maintenance/port/central)
"bZE" = (
/turf/open/floor/glass/reinforced,
/area/space/nearstation)
"bZJ" = (
/obj/effect/turf_decal/siding/wideplating_new/dark{
dir = 8
Expand Down Expand Up @@ -115698,9 +115695,6 @@
dir = 8
},
/area/station/maintenance/starboard/fore)
"rgi" = (
/turf/open/openspace,
/area/space)
"rgl" = (
/obj/machinery/atmospherics/components/binary/pump/on{
dir = 1;
Expand Down Expand Up @@ -153613,10 +153607,6 @@
},
/turf/open/floor/iron/dark/textured,
/area/station/security/prison)
"wRv" = (
/obj/effect/decal/cleanable/dirt/dust,
/turf/open/floor/glass/reinforced,
/area/space/nearstation)
"wRx" = (
/obj/structure/flora/bush/sparsegrass/style_random,
/obj/structure/flora/grass/jungle/b/style_random,
Expand Down Expand Up @@ -260333,11 +260323,11 @@ xaB
mIv
kJl
cNP
rgi
rgi
rgi
rgi
rgi
txW
txW
txW
txW
txW
dOr
kJl
tTV
Expand Down Expand Up @@ -260589,13 +260579,13 @@ ijB
wgT
wgT
wgT
rgi
rgi
rgi
rgi
rgi
rgi
rgi
txW
txW
txW
txW
txW
txW
txW
wgT
wgT
tWk
Expand Down Expand Up @@ -260846,13 +260836,13 @@ tGJ
sMq
fGO
vQQ
rgi
rgi
rgi
rgi
rgi
rgi
rgi
txW
txW
txW
txW
txW
txW
txW
sMq
fGO
vQQ
Expand Down Expand Up @@ -261103,13 +261093,13 @@ nQo
wgT
wgT
wgT
rgi
rgi
rgi
rgi
rgi
rgi
rgi
txW
txW
txW
txW
txW
txW
txW
wgT
wgT
wgT
Expand Down Expand Up @@ -261360,13 +261350,13 @@ czV
lro
gjO
cvQ
rgi
rgi
rgi
rgi
rgi
rgi
rgi
txW
txW
txW
txW
txW
txW
txW
cvQ
sXX
jRA
Expand Down Expand Up @@ -261618,11 +261608,11 @@ hkb
okW
cvQ
anE
rgi
rgi
rgi
rgi
rgi
txW
txW
txW
txW
txW
anE
cvQ
nAq
Expand Down Expand Up @@ -261875,11 +261865,11 @@ olS
glP
cvQ
cvQ
rgi
rgi
rgi
rgi
rgi
txW
txW
txW
txW
txW
cvQ
cvQ
glP
Expand Down Expand Up @@ -262132,11 +262122,11 @@ rOL
eiY
cvQ
anE
rgi
rgi
rgi
rgi
rgi
txW
txW
txW
txW
txW
anE
cvQ
lSF
Expand Down Expand Up @@ -262388,13 +262378,13 @@ vSF
hrZ
ahD
cvQ
rgi
rgi
rgi
rgi
rgi
rgi
rgi
txW
txW
txW
txW
txW
txW
txW
cvQ
xvt
lro
Expand Down Expand Up @@ -262645,13 +262635,13 @@ erP
wgT
wgT
wgT
rgi
rgi
rgi
rgi
rgi
rgi
rgi
txW
txW
txW
txW
txW
txW
txW
wgT
wgT
wgT
Expand Down Expand Up @@ -262902,13 +262892,13 @@ tGJ
sMq
fGO
vQQ
rgi
rgi
rgi
rgi
rgi
rgi
rgi
txW
txW
txW
txW
txW
txW
txW
sMq
fGO
vQQ
Expand Down Expand Up @@ -263159,13 +263149,13 @@ ijB
wgT
wgT
wgT
rgi
rgi
rgi
rgi
rgi
rgi
rgi
txW
txW
txW
txW
txW
txW
txW
wgT
wgT
wgT
Expand Down Expand Up @@ -263417,11 +263407,11 @@ xmr
hFM
kJl
cNP
rgi
rgi
rgi
rgi
rgi
txW
txW
txW
txW
txW
dOr
kJl
skU
Expand Down Expand Up @@ -266523,11 +266513,11 @@ dPt
tao
dtb
dtb
bZE
wRv
bZE
bZE
bZE
uty
tzp
uty
uty
uty
rUO
uQr
wBL
Expand Down
41 changes: 41 additions & 0 deletions code/datums/components/item_killsound.dm
Original file line number Diff line number Diff line change
@@ -0,0 +1,41 @@
/datum/component/item_killsound
/// list of allowed types, not null/empty
var/list/allowed_mobs
/// list of blacklisted types
var/list/blacklisted_mobs
var/killsound
var/killsound_volume = 100
/**
* on true will act as replacement for mob's death sound,
* otherwise it will just play sound on death
*/
var/replace_default_death_sound

/datum/component/item_killsound/Initialize(
allowed_mobs,
blacklisted_mobs,
killsound,
killsound_volume = 100,
replace_default_death_sound = FALSE
)
src.allowed_mobs = allowed_mobs
src.blacklisted_mobs = blacklisted_mobs
src.killsound = killsound
src.killsound_volume = killsound_volume
src.replace_default_death_sound = replace_default_death_sound

/datum/component/item_killsound/RegisterWithParent()
var/obj/item/item_parent = parent
RegisterSignal(item_parent, COMSIG_ITEM_ATTACK, PROC_REF(on_attack))

/datum/component/item_killsound/proc/on_attack(host, target_mob, user, params)
SIGNAL_HANDLER

if(!allowed_mobs || is_type_in_list(target_mob, allowed_mobs))
if(is_type_in_list(target_mob, blacklisted_mobs))
return
var/mob/living/mob = target_mob
if(replace_default_death_sound)
mob.apply_status_effect(/datum/status_effect/replace_death_sound, 1 SECONDS, killsound)
else
mob.apply_status_effect(/datum/status_effect/death_sound, 1 SECONDS, killsound, killsound_volume)
Loading

0 comments on commit a08d918

Please sign in to comment.