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

Prime Event: Hirkha #1623

Draft
wants to merge 42 commits into
base: master
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from 40 commits
Commits
Show all changes
42 commits
Select commit Hold shift + click to select a range
ec646df
хирка ага
konushi Oct 28, 2024
077b544
Update Arrakis.dmm
konushi Oct 28, 2024
7c78740
пески пока
konushi Oct 28, 2024
a054daa
не дружу с киданами
konushi Oct 28, 2024
44edca5
Update Arrakis.dmm
konushi Oct 28, 2024
6c27bc7
фиксы
konushi Oct 28, 2024
ec6564a
Update turfs.dm
konushi Oct 28, 2024
a985db3
Update Arrakis.dmm
konushi Oct 28, 2024
2334f37
Update Arrakis.dmm
konushi Oct 28, 2024
b8e8cb0
пробелы
konushi Oct 28, 2024
2eec7d5
дверь
konushi Oct 28, 2024
c16b5e5
Update Arrakis.dmm
konushi Oct 28, 2024
1ca1529
я хз
konushi Oct 28, 2024
b7ad22b
Update Arrakis.dmm
konushi Oct 28, 2024
c2479c7
табы
konushi Oct 28, 2024
375ea31
Update Arrakis.dmm
konushi Oct 28, 2024
3957478
апдейт хирки для будущего гейта (наверное))
konushi Oct 28, 2024
d5671e4
зима на хирке
konushi Oct 29, 2024
902f5cf
фикс
konushi Oct 29, 2024
d379756
квиксенды
konushi Oct 29, 2024
bd9923f
фикс
konushi Oct 29, 2024
3c1c1ac
дубликаты заебали
konushi Oct 29, 2024
f893b1c
реди
konushi Oct 29, 2024
45daa0a
на хирке снова лето
konushi Oct 29, 2024
5c9e344
киданы симплы
konushi Oct 29, 2024
f5be587
жары не будет
konushi Oct 29, 2024
563ad31
снова холодно пиздец
konushi Oct 30, 2024
eadec0a
забыль
konushi Oct 30, 2024
493f42b
Merge remote-tracking branch 'upstream/master' into hirka_away
konushi Oct 30, 2024
6f098ac
линтер фикс
konushi Oct 30, 2024
9603d7a
активный атмос
konushi Oct 30, 2024
1486109
не ну
konushi Oct 30, 2024
13e5cbb
последний фикс атмоса
konushi Oct 30, 2024
7abab91
одежка полуночника
konushi Nov 4, 2024
8c6d960
Merge remote-tracking branch 'upstream/master' into hirka_away
konushi Nov 4, 2024
a14c1c5
мезоны то забрали
konushi Nov 4, 2024
54654ef
Стелс костюмчик
Fullonibus Nov 4, 2024
189a5aa
правочки для ивентуса
konushi Nov 4, 2024
e39e7f8
фикс
konushi Nov 4, 2024
1298371
снег
konushi Nov 4, 2024
39195d4
Update modular_ss220/dunes_map/code/objects.dm
Fullonibus Nov 4, 2024
5909f94
Update modular_ss220/dunes_map/code/objects.dm
Fullonibus Nov 4, 2024
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
76,080 changes: 76,080 additions & 0 deletions _maps/map_files220/RandomZLevels/Arrakis.dmm

Large diffs are not rendered by default.

27,565 changes: 15,061 additions & 12,504 deletions _maps/map_files220/generic/centcomm.dmm

Large diffs are not rendered by default.

80 changes: 80 additions & 0 deletions modular_ss220/clothing/code/suits.dm
Original file line number Diff line number Diff line change
Expand Up @@ -437,3 +437,83 @@
lefthand_file = 'modular_ss220/clothing/icons/inhands/left_hand.dmi'
righthand_file = 'modular_ss220/clothing/icons/inhands/right_hand.dmi'

/obj/item/clothing/suit/storage/midnight_coat
name = "потрёпанное пальто"
desc = "Чёрное пальто с меховым воротником, подклатка которого подшита плотным слоем дюраткани. На внутренней стороне имеется нашивка в виде букв ''M.B.'', вплетенных в символ звезды."
icon = 'modular_ss220/clothing/icons/object/suits.dmi'
icon_state = "midnight_coat"
icon_override = 'modular_ss220/clothing/icons/mob/suits.dmi'
body_parts_covered = UPPER_TORSO|LOWER_TORSO|ARMS
cold_protection = UPPER_TORSO|LOWER_TORSO|ARMS
armor = list(MELEE = 15, BULLET = 5, LASER = 5, ENERGY = 5, BOMB = 0, RAD = 0, FIRE = 10, ACID = 5)
allowed = list(/obj/item/gun, /obj/item/flashlight, /obj/item/tank/internals, /obj/item/melee/baton, /obj/item/ammo_box, /obj/item/ammo_casing, /obj/item/restraints/handcuffs, /obj/item/dualsaber)
sprite_sheets = list(
"Human" = 'modular_ss220/clothing/icons/mob/suits.dmi',
"Tajaran" = 'modular_ss220/clothing/icons/mob/suits.dmi',
"Vulpkanin" = 'modular_ss220/clothing/icons/mob/suits.dmi',
"Kidan" = 'modular_ss220/clothing/icons/mob/suits.dmi',
"Skrell" = 'modular_ss220/clothing/icons/mob/suits.dmi',
"Nucleation" = 'modular_ss220/clothing/icons/mob/suits.dmi',
"Skeleton" = 'modular_ss220/clothing/icons/mob/suits.dmi',
"Slime People" = 'modular_ss220/clothing/icons/mob/suits.dmi',
"Unathi" = 'modular_ss220/clothing/icons/mob/suits.dmi',
"Grey" = 'modular_ss220/clothing/icons/mob/suits.dmi',
"Abductor" = 'modular_ss220/clothing/icons/mob/suits.dmi',
"Golem" = 'modular_ss220/clothing/icons/mob/suits.dmi',
"Machine" = 'modular_ss220/clothing/icons/mob/suits.dmi',
"Diona" = 'modular_ss220/clothing/icons/mob/suits.dmi',
"Nian" = 'modular_ss220/clothing/icons/mob/suits.dmi',
"Shadow" = 'modular_ss220/clothing/icons/mob/suits.dmi',
"Vox" = 'modular_ss220/clothing/icons/mob/suits.dmi',
"Drask" = 'modular_ss220/clothing/icons/mob/suits.dmi',
)
var/datum/action/item_action/chameleon/stealth/stealth_action

/datum/action/item_action/chameleon/stealth
name = "стелс-режим"
button_overlay_icon_state = "mech_lights_off"
var/stealth_alpha = 75
var/equiped = 0

/datum/action/item_action/chameleon/stealth/Grant(mob/M)
..()

/datum/action/item_action/chameleon/change/Remove(mob/M)
if(M && (M == owner))
M.alpha = initial(M.alpha)
LAZYREMOVE(M.actions, src)
..()

/datum/action/item_action/chameleon/stealth/Trigger(left_click)
. = ..()
set_stealth(owner)

/datum/action/item_action/chameleon/stealth/proc/set_stealth(mob/user)
if(user.alpha != stealth_alpha)
user.alpha = stealth_alpha
else
user.alpha = initial(user.alpha)


/obj/item/clothing/suit/storage/midnight_coat/Initialize(mapload)
. = ..()
stealth_action = new(src)

/obj/item/clothing/suit/storage/midnight_coat/Destroy()
QDEL_NULL(stealth_action)
return ..()


/obj/item/clothing/suit/storage/midnight_coat/item_action_slot_check(slot, mob/user)
. = ..()
if(slot == SLOT_HUD_OUTER_SUIT)
return TRUE
else
user.alpha = initial(user.alpha)

/obj/item/clothing/suit/storage/midnight_coat/midnight_mantle
name = "чёрная мантия"
desc = "Стильная лёгкая мантия, позволяющая владельцу скрываться в объятиях тьмы. Во всяком случае, так заявлял продавец. \
На внутренней стороне имеется нашивка в виде букв ''M.B.'', вплетенных в символ звезды."
icon = 'modular_ss220/clothing/icons/object/suits.dmi'
icon_state = "midnight_mantle"
29 changes: 29 additions & 0 deletions modular_ss220/clothing/code/under.dm
Original file line number Diff line number Diff line change
Expand Up @@ -314,3 +314,32 @@
"Vox" = 'modular_ss220/clothing/icons/mob/species/vox/under.dmi',
"Drask" = 'modular_ss220/clothing/icons/mob/species/drask/under.dmi',
)

/obj/item/clothing/under/midnight_under
name = "профессиональный тактический костюм"
desc = "Костюм настоящих профессионалов. Лёгкий и практичный, обладает встроенной активной терморегуляционной системой и повышенной прочностью за счет вплетенных пластитановых волокон. \
Надевая его вы чувстуете себя менее заметным."
icon = 'modular_ss220/clothing/icons/object/under.dmi'
icon_state = "midnight_under"
item_color = "midnight_under"
sprite_sheets = list(
"Human" = 'modular_ss220/clothing/icons/mob/under.dmi',
"Tajaran" = 'modular_ss220/clothing/icons/mob/under.dmi',
"Vulpkanin" = 'modular_ss220/clothing/icons/mob/under.dmi',
"Kidan" = 'modular_ss220/clothing/icons/mob/under.dmi',
"Skrell" = 'modular_ss220/clothing/icons/mob/under.dmi',
"Nucleation" = 'modular_ss220/clothing/icons/mob/under.dmi',
"Skeleton" = 'modular_ss220/clothing/icons/mob/under.dmi',
"Slime People" = 'modular_ss220/clothing/icons/mob/under.dmi',
"Unathi" = 'modular_ss220/clothing/icons/mob/under.dmi',
"Grey" = 'modular_ss220/clothing/icons/mob/under.dmi',
"Abductor" = 'modular_ss220/clothing/icons/mob/under.dmi',
"Golem" = 'modular_ss220/clothing/icons/mob/under.dmi',
"Machine" = 'modular_ss220/clothing/icons/mob/under.dmi',
"Diona" = 'modular_ss220/clothing/icons/mob/under.dmi',
"Nian" = 'modular_ss220/clothing/icons/mob/under.dmi',
"Shadow" = 'modular_ss220/clothing/icons/mob/under.dmi',
"Vox" = 'modular_ss220/clothing/icons/mob/under.dmi',
"Drask" = 'modular_ss220/clothing/icons/mob/under.dmi',
)
armor = list(MELEE = 10, BULLET = 10, LASER = 5, ENERGY = 5, BOMB = 5, RAD = 0, FIRE = 5, ACID = 50)
Binary file modified modular_ss220/clothing/icons/mob/suits.dmi
Binary file not shown.
Binary file modified modular_ss220/clothing/icons/mob/under.dmi
Binary file not shown.
Binary file modified modular_ss220/clothing/icons/object/suits.dmi
Binary file not shown.
Binary file modified modular_ss220/clothing/icons/object/under.dmi
Binary file not shown.
44 changes: 44 additions & 0 deletions modular_ss220/dunes_map/_dunes_map.dm
Original file line number Diff line number Diff line change
@@ -0,0 +1,44 @@
/datum/modpack/dunes_map
name = "Дюны"
desc = "Особая карта использованная для ивента. Возможно используется в качестве гейта."
author = "grombila, furior, aylong, dj-34"

/datum/modpack/dunes_map/pre_initialize()
. = ..()

/datum/modpack/dunes_map/initialize()
. = ..()

#define DESERT_SOUNDS_START list('modular_ss220/dunes_map/sound/music/welcometohell.ogg')

#define DESERT_SOUNDS list('modular_ss220/dunes_map/sound/music/desert1.ogg',\
'modular_ss220/dunes_map/sound/music/desert2.ogg',\
'modular_ss220/dunes_map/sound/music/desert3.ogg',\
'modular_ss220/dunes_map/sound/music/desert4.ogg',\
'modular_ss220/dunes_map/sound/music/desert5.ogg',\
'modular_ss220/dunes_map/sound/music/desert6.ogg',\
'modular_ss220/dunes_map/sound/music/desert7.ogg',\
'modular_ss220/dunes_map/sound/music/desert8.ogg',\
'modular_ss220/dunes_map/sound/music/desert9.ogg')

#define DESERT_SOUNDS_ROCK list('modular_ss220/dunes_map/sound/music/rock1.ogg',\
'modular_ss220/dunes_map/sound/music/rock2.ogg',\
'modular_ss220/dunes_map/sound/music/rock3.ogg')

#define DESERT_SOUNDS_VAULT list('modular_ss220/dunes_map/sound/music/vault1.ogg',\
'modular_ss220/dunes_map/sound/music/vault2.ogg',\
'modular_ss220/dunes_map/sound/music/vault3.ogg',\
'modular_ss220/dunes_map/sound/music/vault4.ogg',\
'modular_ss220/dunes_map/sound/music/vault5.ogg',\
'modular_ss220/dunes_map/sound/music/vault6.ogg',\
'modular_ss220/dunes_map/sound/music/vault7.ogg')

#define DESERT_SOUNDS_SECRET list('modular_ss220/dunes_map/sound/music/whatdowefound.ogg')

#define CC_IS_UNDER_ATTACK list('modular_ss220/dunes_map/sound/music/cc_attack.ogg',\
'modular_ss220/dunes_map/sound/music/cc_attack2.ogg',\
'modular_ss220/dunes_map/sound/music/cc_ship.ogg',\
'modular_ss220/dunes_map/sound/music/cc_ship2.ogg')

/datum/modpack/dunes_map/post_initialize()
. = ..()
26 changes: 26 additions & 0 deletions modular_ss220/dunes_map/_dunes_map.dme
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
#include "_dunes_map.dm"

#include "code/areas.dm"
#include "code/fauna.dm"
#include "code/flora.dm"
#include "code/misc.dm"
#include "code/objects.dm"
#include "code/turfs.dm"
#include "code/shuttle.dm"
#include "code/rubble.dm"
#include "code/decals.dm"
#include "code/weather.dm"
#include "code/vehicle.dm"
#include "code/mobs.dm"
#include "code/dummy.dm"
#include "code/gate.dm"
#include "code/holofix.dm"
// BEGIN_INTERNALS
// END_INTERNALS
// BEGIN_FILE_DIR
#define FILE_DIR .
// END_FILE_DIR
// BEGIN_PREFERENCES
// END_PREFERENCES
// BEGIN_INCLUDE
// END_INCLUDE
205 changes: 205 additions & 0 deletions modular_ss220/dunes_map/code/areas.dm
Original file line number Diff line number Diff line change
@@ -0,0 +1,205 @@
/area/awaymission/arrakis
name = "\improper Пустыня"
icon_state = "away"
requires_power = FALSE
has_gravity = TRUE
always_unpowered = TRUE
dynamic_lighting = DYNAMIC_LIGHTING_FORCED
there_can_be_many = TRUE
nad_allowed = TRUE
min_ambience_cooldown = 3 MINUTES
max_ambience_cooldown = 3 MINUTES

/area/awaymission/arrakis/outside_building
name = "\improper Пустыня - Ангары"
icon_state = "awaycontent18"
dynamic_lighting = DYNAMIC_LIGHTING_ENABLED
requires_power = TRUE
always_unpowered = FALSE
ambientsounds = RUINS_SOUNDS
min_ambience_cooldown = 5 MINUTES
max_ambience_cooldown = 5 MINUTES

/area/awaymission/arrakis/outside_building/raider_base
name = "\improper Пустыня - База рейдеров"
icon_state = "awaycontent14"

/area/awaymission/arrakis/outside_building/abandoned_house
name = "\improper Пустыня - Заброшенный дом"
icon_state = "awaycontent13"

/area/awaymission/arrakis/outside_building/mining_storage_outpost
name = "\improper Пустыня - Шахтёрский аванпост"
icon_state = "awaycontent28"

/area/awaymission/arrakis/outside_building/hermit_shack
name = "\improper Пустыня - Хижина отшельника"
icon_state = "awaycontent30"

/area/awaymission/arrakis/outside
name = "\improper Пустыня - Дюны"
icon_state = "syndie-outside"
ambientsounds = DESERT_SOUNDS

/area/awaymission/arrakis/outside/outside1
name = "\improper Пустыня - Прибытие"
icon_state = "awaycontent1"
ambientsounds = DESERT_SOUNDS_START
min_ambience_cooldown = 5 MINUTES
max_ambience_cooldown = 5 MINUTES

/area/awaymission/arrakis/outside/outside2
name = "\improper Пустыня - Дюны"
icon_state = "awaycontent2"

/area/awaymission/arrakis/outside/outside3
name = "\improper Пустыня - Дюны"
icon_state = "awaycontent3"

/area/awaymission/arrakis/outside/outside4
name = "\improper Пустыня - Дюны"
icon_state = "awaycontent4"

/area/awaymission/arrakis/outside/outside5
name = "\improper Пустыня - Дюны"
icon_state = "awaycontent5"

/area/awaymission/arrakis/outside/outside6
name = "\improper Пустыня - Дюны"
icon_state = "awaycontent6"

/area/awaymission/arrakis/outside/outside7
name = "\improper Пустыня - Дюны"
icon_state = "awaycontent7"

/area/awaymission/arrakis/outside/mining_town
name = "\improper Пустыня - Шахтёрский городок"
icon_state = "awaycontent8"

/area/awaymission/arrakis/outside/shuttle
name = "\improper Пустыня - Шаттл"
icon_state = "unknown"

/area/awaymission/arrakis/outside/syndi_shuttle
name = "\improper Пустыня - Шаттл Синдиката"
icon_state = "unknown"

/area/awaymission/arrakis/cave
name = "\improper Пустыня - Скалы"
dynamic_lighting = DYNAMIC_LIGHTING_FORCED
icon_state = "space_near"
ambientsounds = DESERT_SOUNDS_ROCK

/area/awaymission/arrakis/cave/cave
name = "\improper Пустыня - Пещера"

/area/awaymission/arrakis/cave/cave1
name = "\improper Пустыня - Здание"
requires_power = TRUE
always_unpowered = FALSE

/area/awaymission/arrakis/cave/cave2
name = "\improper Пустыня - Храм"
requires_power = FALSE
always_unpowered = FALSE

/area/awaymission/arrakis/bunker
name = "\improper Пустыня - Вход в бункер"
icon = 'modular_ss220/dunes_map/icons/areas.dmi'
icon_state = "desert_entry"
dynamic_lighting = DYNAMIC_LIGHTING_FORCED
requires_power = TRUE
always_unpowered = FALSE
ambientsounds = DESERT_SOUNDS_VAULT

/area/awaymission/arrakis/bunker/hallway
name = "\improper Бункер - Холл"
icon_state = "desert_hall"

/area/awaymission/arrakis/bunker/brig
name = "\improper Бункер - Охрана"
icon_state = "desert_brig"

/area/awaymission/arrakis/bunker/brig/bsa
name = "\improper Бункер - ???"
requires_power = FALSE

/area/awaymission/arrakis/bunker/engie
name = "\improper Бункер - Инженерия"
icon_state = "desert_engie"

/area/awaymission/arrakis/bunker/hydro
name = "\improper Бункер - Гидропоника"
icon_state = "desert_hydro"

/area/awaymission/arrakis/bunker/rnd
name = "\improper Бункер - Отдел исследований"
icon_state = "desert_science"

/area/awaymission/arrakis/bunker/medbay
name = "\improper Бункер - Больница"
icon_state = "desert_medbay"

/area/awaymission/arrakis/bunker/kitchen
name = "\improper Бункер - Кухня"
icon_state = "desert_kitchen"

/area/awaymission/arrakis/bunker/bar
name = "\improper Бункер - Бар"
icon_state = "desert_bar"

/area/awaymission/arrakis/bunker/clowns
name = "\improper Бункер - Театр"
icon_state = "desert_theatre"

/area/awaymission/arrakis/bunker/janitor
name = "\improper Бункер - Уборщик"
icon_state = "desert_janitor"

/area/awaymission/arrakis/bunker/bridge
name = "\improper Бункер - Мостик"
icon_state = "desert_bridge"

/area/awaymission/arrakis/bunker/dorms
name = "\improper Бункер - Дормы"
icon = 'icons/turf/areas.dmi'
icon_state = "dorms"

/area/awaymission/arrakis/bunker/cryo
name = "\improper Бункер - Крио"
icon = 'icons/turf/areas.dmi'
icon_state = "Sleep"
lightswitch = FALSE

/area/awaymission/arrakis/bunker/cryo/second

/area/awaymission/arrakis/bunker/bedrooms
name = "\improper Бункер - Спальни"
icon = 'icons/turf/areas.dmi'
icon_state = "dorms"

/area/awaymission/arrakis/bunker/storage
name = "\improper Бункер - Хранилище"
icon = 'icons/turf/areas.dmi'
icon_state = "dorms"

/area/awaymission/arrakis/bunker/tanya_cyborg_blyat_lab
name = "\improper Бункер - ???"
icon = 'icons/turf/areas.dmi'
icon_state = "purple"
ambientsounds = DESERT_SOUNDS_SECRET

/area/awaymission/arrakis/bunker/normandy_mi_v_shkafu_pryachemsya
name = "\improper Бункер - Офис Центрального Командования"
icon = 'icons/turf/areas.dmi'
icon_state = "green"

/area/centcom/ss220
name = "\improper ЦК"
icon_state = "centcom"
requires_power = FALSE
dynamic_lighting = DYNAMIC_LIGHTING_FORCED
nad_allowed = TRUE
ambientsounds = CC_IS_UNDER_ATTACK
min_ambience_cooldown = 3 MINUTES
max_ambience_cooldown = 3 MINUTES
Loading
Loading