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.

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

Awaymission: Caves #366

Merged
merged 44 commits into from
Oct 17, 2023
Merged
Show file tree
Hide file tree
Changes from 39 commits
Commits
Show all changes
44 commits
Select commit Hold shift + click to select a range
3ed9551
caves
konushi Oct 8, 2023
0661a12
Create demon2.ogg
konushi Oct 8, 2023
a25047f
кнопки
konushi Oct 8, 2023
be5ae29
почалось..
konushi Oct 8, 2023
2b77f0d
зоны
konushi Oct 8, 2023
08e3ab7
Merge remote-tracking branch 'upstream/master' into Awaymission-caves
konushi Oct 9, 2023
42d57be
камни, спаны, спавн, книжка, зоны, турфы
konushi Oct 9, 2023
f437b4d
Update objects.dm
konushi Oct 9, 2023
82ae17d
Update objects.dm
konushi Oct 9, 2023
9283c73
скрипт
konushi Oct 9, 2023
2482b5d
Merge branch 'master' into Awaymission-caves
konushi Oct 9, 2023
80d9ee7
Update mobs.dm
konushi Oct 9, 2023
8f67ed0
Merge branch 'Awaymission-caves' of https://github.com/konushi/Paradi…
konushi Oct 9, 2023
76b2117
проблемы с границей атмоса в лаборатории, турели снова видят, бейзтур…
konushi Oct 10, 2023
a804245
скрипт на окна, теперь с решетками
konushi Oct 10, 2023
04e622b
Merge branch 'master' into Awaymission-caves
konushi Oct 10, 2023
9dd1c9e
забыл про костянов
konushi Oct 10, 2023
b3b4af6
Merge branch 'Awaymission-caves' of https://github.com/konushi/Paradi…
konushi Oct 10, 2023
75be8b3
убрал планетарный атмос со стен и камней
konushi Oct 10, 2023
1f609c7
Update caves.dmm
konushi Oct 11, 2023
f90b508
Merge remote-tracking branch 'upstream/master' into Awaymission-caves
konushi Oct 11, 2023
c4b5aa2
сделал 4 пещеру более тунельной
konushi Oct 11, 2023
2f9b57a
Merge branch 'master' into Awaymission-caves
konushi Oct 11, 2023
0e829b8
Merge remote-tracking branch 'upstream/master' into Awaymission-caves
konushi Oct 11, 2023
b751d0d
Merge branch 'Awaymission-caves' of https://github.com/konushi/Paradi…
konushi Oct 11, 2023
deba355
поменял пол, сделал пару стен неразрушаемыми
konushi Oct 12, 2023
a24fd09
прок, вары, пробелы, коллбек хз как сделать сжальтесь
konushi Oct 13, 2023
ab3bf20
Merge remote-tracking branch 'upstream/master' into Awaymission-caves
konushi Oct 13, 2023
fbb5106
Update objects.dm
konushi Oct 13, 2023
b091989
Merge remote-tracking branch 'upstream/master' into Awaymission-caves
konushi Oct 14, 2023
d2a3c4a
Merge remote-tracking branch 'upstream/master' into Awaymission-caves
konushi Oct 14, 2023
a2253aa
выдало что есть активные турфы, вроде убрал
konushi Oct 14, 2023
e572dd2
опять поддувает
konushi Oct 14, 2023
f6bae3e
описание пода
konushi Oct 14, 2023
6a98f33
Merge remote-tracking branch 'upstream/master' into Awaymission-caves
konushi Oct 14, 2023
278fe73
Merge remote-tracking branch 'upstream/master' into Awaymission-caves
konushi Oct 15, 2023
f6a1d9c
Merge remote-tracking branch 'upstream/master' into Awaymission-caves
konushi Oct 15, 2023
47f05d1
кольцо
konushi Oct 15, 2023
3df774c
Merge remote-tracking branch 'upstream/master' into Awaymission-caves
konushi Oct 15, 2023
cba0cc5
клон урон
konushi Oct 15, 2023
cd5e331
числовая переменная в инвизе
konushi Oct 15, 2023
2b12f4d
Merge remote-tracking branch 'upstream/master' into Awaymission-caves
konushi Oct 15, 2023
6b7a0d5
Merge remote-tracking branch 'upstream/master' into Awaymission-caves
konushi Oct 16, 2023
cdbd9f7
Merge remote-tracking branch 'upstream/master' into Awaymission-caves
konushi Oct 16, 2023
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
54,148 changes: 54,148 additions & 0 deletions _maps/map_files220/RandomZLevels/caves.dmm

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions config/example/config.toml
Original file line number Diff line number Diff line change
Expand Up @@ -852,6 +852,7 @@ enabled_away_missions = [
"_maps/map_files220/RandomZLevels/wildwest.dmm",
"_maps/map_files220/RandomZLevels/blackmarketpackers.dmm",
"_maps/map_files220/RandomZLevels/gate_lizard.dmm",
"_maps/map_files220/RandomZLevels/caves.dmm",
]


Expand Down
Binary file not shown.
19 changes: 19 additions & 0 deletions modular_ss220/maps220/code/Areas/gateway.dm
Original file line number Diff line number Diff line change
Expand Up @@ -269,3 +269,22 @@
name = "MC-16"
icon_state = "awaycontent9"
ambientsounds = list('modular_ss220/aesthetics_sounds/sound/area_ambient/ambient_pulse1.ogg', 'modular_ss220/aesthetics_sounds/sound/area_ambient/ambient_pulse2.ogg')

/* Caves */
/area/awaymission/caves
name = "Caves"
icon_state = "away"
report_alerts = FALSE
always_unpowered = TRUE
dynamic_lighting = DYNAMIC_LIGHTING_FORCED

/area/awaymission/caves/build
name = "Abandoned building"
icon_state = "awaycontent1"
always_unpowered = FALSE
requires_power = FALSE

/area/awaymission/caves/build/reqpower_build
name = "Research Сomplex ''Mirror''"
icon_state = "awaycontent2"
requires_power = TRUE
9 changes: 9 additions & 0 deletions modular_ss220/maps220/code/effects.dm
Original file line number Diff line number Diff line change
Expand Up @@ -51,3 +51,12 @@

/obj/effect/turf_decal/siding/black/full
icon_state = "bs_full"

/* Awaymission - Caves */
//Decals
/obj/effect/decal/solgov_logo
name = "SolGov logo"
icon = 'modular_ss220/maps220/icons/syndie_logo.dmi'
icon_state = "sol_logo1"
layer = TURF_LAYER
desc = "Glory to humanity!"
51 changes: 51 additions & 0 deletions modular_ss220/maps220/code/mobs.dm
Original file line number Diff line number Diff line change
Expand Up @@ -188,6 +188,29 @@
melee_damage_upper = 30
speed = -1

/mob/living/simple_animal/hostile/skeleton/deadwizard
name = "древний маг"
desc = "Древний волшебник, тысячелетиями властвующий над проклятым могильником."
icon = 'modular_ss220/maps220/icons/simple_human.dmi'
icon_living = "deadwizard"
icon_state = "deadwizard"
maxHealth = 300
health = 300
ranged = 1
rapid = 4
rapid_fire_delay = 1
retreat_distance = 4
minimum_distance = 4
del_on_death = 1
projectiletype = /obj/item/projectile/magic/arcane_barrage
projectilesound = 'sound/magic/blind.ogg'
loot = list(
/obj/effect/decal/remains/human,
/obj/item/clothing/head/crown,
/obj/item/clothing/suit/imperium_monk,
/obj/effect/particle_effect/smoke/bad,
/obj/item/necromantic_stone)

/* Vox Raiders */
/mob/living/simple_animal/hostile/vox
name = "Vox Raider"
Expand Down Expand Up @@ -569,3 +592,31 @@
faction = list("spooky")
del_on_death = TRUE
random_color = FALSE

/* Clown */
/mob/living/simple_animal/hostile/clown/mutant
name = "неизвестный"
desc = "Что бы это не было, уничтожь его!"
icon = 'modular_ss220/maps220/icons/clown_mobs.dmi'
icon_state = "mutant"
icon_living = "mutant"
move_resist = INFINITY
turns_per_move = 10
response_help = "осторожно погружает палец в"
response_disarm = "втягивается в"
response_harm = "втягивается в"
speak = list("уааааааааа-хааууууууаааааа!", "ААААаааууАААУааХУААААА!!!", "уууууууухххх.... ххххх-ххьооооонкккхх....", "ХХХХУУАААООНККК!!!")
speak_emote = list("извивается", "корчится", "пульсирует", "бурлит", "расползается")
speak_chance = 10
tts_seed = "Kleiner"
maxHealth = 500
health = 500
pixel_x = -16
speed = 3
move_to_delay = 3
harm_intent_damage = 10
melee_damage_lower = 30
melee_damage_upper = 40
attacktext = "неловко замахивается на"
loot = list(/obj/item/clothing/mask/gas/clown_hat, /obj/effect/gibspawner/human, /obj/effect/gibspawner/human, /obj/item/grown/bananapeel, /obj/item/bikehorn/golden)
wander = FALSE
68 changes: 68 additions & 0 deletions modular_ss220/maps220/code/objects.dm
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,22 @@
icon_opened = "crate_barrel_open"
icon_closed = "crate_barrel"

/obj/structure/closet/crate/grave
name = "grave mound"
desc = "A simple and reliable way to keep the dead away."
icon = 'modular_ss220/maps220/icons/crates.dmi'
icon_state = "grave"
icon_opened = "graveopen"
icon_closed = "grave"
open_sound = 'sound/effects/shovel_dig.ogg'
close_sound = 'sound/effects/shovel_dig.ogg'

/obj/structure/closet/crate/grave/gravelead
name = "ominous grave mound"
icon_state = "grave_lead"
icon_opened = "grave_leadopen"
icon_closed = "grave_lead"

/* Syndicate Base - Mothership */
// Machinery
/obj/machinery/photocopier/syndie
Expand Down Expand Up @@ -231,3 +247,55 @@
projectile = /obj/item/projectile/bullet/midbullet2
fire_sound = 'sound/weapons/gunshots/gunshot_smg.ogg'
projectile_energy_cost = 14

//Immortality ring
/obj/item/clothing/gloves/ring/immortality_ring
name = "старое кольцо"
icon_state = "shadowring"
ring_color = "shadow"
material = "shadow"
desc = "Кольцо цвета оникса из неизвестного материала. Позолоченные надписи на внешней стороне причудливо пульсируют, испуская зловещую дымку. Надеть его кажется не лучшей идеей..."
resistance_flags = INDESTRUCTIBLE | FIRE_PROOF | UNACIDABLE | ACID_PROOF
actions_types = list(/datum/action/item_action/immortality)
var/ability_delay = 100 SECONDS

/datum/action/item_action/immortality
name = "Ring ability"

/obj/item/clothing/gloves/ring/immortality_ring/proc/ring_ability(mob/user)
if(cooldown > world.time)
to_chat(user, span_warning("[name] еще перезаряжается!"))
return
cooldown = world.time + ability_delay
user.status_flags |= GODMODE
user.invisibility |= INVISIBILITY_MAXIMUM
konushi marked this conversation as resolved.
Show resolved Hide resolved
visible_message(span_danger("[user] исчезает из реальности!"))
to_chat(user, span_cultitalic("Ты чувствуешь чье-то ужасающее присутствие..."))
SEND_SOUND (user, sound('sound/hallucinations/i_see_you2.ogg'))
addtimer(CALLBACK(src, PROC_REF(ring_ability_end), user), 8 SECONDS)

/obj/item/clothing/gloves/ring/immortality_ring/proc/ring_ability_end(mob/user)
user.status_flags &= ~GODMODE
user.invisibility &= ~INVISIBILITY_MAXIMUM
konushi marked this conversation as resolved.
Show resolved Hide resolved
visible_message(span_danger("[user] возвращается в реальность!"))
if(!ishuman(user))
return
var/mob/living/carbon/human/H = user
H.apply_damage(rand(10, 40), BURN, pick("r_hand"))
H.adjustBrainLoss(30, TRUE)

/obj/item/clothing/gloves/ring/immortality_ring/ui_action_click(mob/user, immortality)
ring_ability(user)

/obj/item/clothing/gloves/ring/immortality_ring/item_action_slot_check(slot, mob/user, immortality)
if(slot == SLOT_HUD_GLOVES)
return TRUE

/obj/item/clothing/gloves/ring/immortality_ring/equipped(mob/user, slot)
..()
var/mob/living/carbon/human/H = user
if(istype(H) && slot == SLOT_HUD_GLOVES)
flags = NODROP
to_chat(user, span_danger("[name] туго обвивается вокруг твоего пальца!"))
SEND_SOUND (user, sound('modular_ss220/aesthetics_sounds/sound/creepy/demon2.ogg'))

2 changes: 1 addition & 1 deletion modular_ss220/maps220/code/walls.dm
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
icon = 'icons/turf/walls//smoothrocks.dmi'
icon_state = "smoothrocks-0"
base_icon_state = "smoothrocks"
color = COLOR_ANCIENT_ROCK
color = COLOR_ROCK
smoothing_flags = SMOOTH_BITMASK | SMOOTH_BORDER
smoothing_groups = list(SMOOTH_GROUP_SIMULATED_TURFS, SMOOTH_GROUP_MINERAL_WALLS)
canSmoothWith = list(SMOOTH_GROUP_MINERAL_WALLS)
Expand Down
Binary file added modular_ss220/maps220/icons/clown_mobs.dmi
Binary file not shown.
Binary file modified modular_ss220/maps220/icons/crates.dmi
Binary file not shown.
Binary file added modular_ss220/maps220/icons/misc_objects.dmi
Binary file not shown.
Binary file modified modular_ss220/maps220/icons/simple_human.dmi
Binary file not shown.
Binary file modified modular_ss220/maps220/icons/syndie_logo.dmi
Binary file not shown.
Loading