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

SyxBox New Box Station/ #5971

Closed
wants to merge 29 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
29 commits
Select commit Hold shift + click to select a range
ce8a3f3
почти готов
Ravgolin Sep 11, 2024
1881ec5
Бахнул Камеры
Ravgolin Sep 13, 2024
65d9d50
ёбнул навигаторы
Ravgolin Sep 13, 2024
47d3061
начало ареи и детализация
Ravgolin Sep 14, 2024
4bb2d30
зелёные мыши, ареи.
Ravgolin Sep 18, 2024
db2db22
вот щас почти всё.. вот вот немного щас ошибки исправить и вообще кру…
Ravgolin Sep 18, 2024
95023ed
КАРТА ЗАВЕРШЕНА ЕБААА ЕЕЕ КРУТО ПРАЗНИК СМЕГМАСТЕЙШЕН !!!!!
Ravgolin Sep 18, 2024
4ab3679
Merge branch 'master220' into Segmentstation
Ravgolin Sep 18, 2024
b07b7ae
Merge remote-tracking branch 'upstream/master220' into Segmentstation
Ravgolin Sep 19, 2024
f8b3555
доп
Ravgolin Sep 19, 2024
82a3e1a
Merge branch 'Segmentstation' of https://github.com/Ravgolin/Paradick…
Ravgolin Sep 19, 2024
b995988
доп изменения
Ravgolin Sep 20, 2024
2b10a3d
каки пуки
Ravgolin Sep 22, 2024
add4aa1
пуки
Ravgolin Sep 22, 2024
0558835
каки
Ravgolin Sep 22, 2024
7506725
обратная дельтофикация
Ravgolin Sep 25, 2024
309e6aa
микро доработочка
Ravgolin Sep 25, 2024
b7e095b
ещё микрошняги
Ravgolin Sep 25, 2024
d9f39dd
лаваленд
Ravgolin Sep 25, 2024
bb44438
Merge remote-tracking branch 'upstream/master220' into Segmentstation
Ravgolin Sep 26, 2024
3f8947f
столы работают как надо благодаря хелперу, круто.
Ravgolin Sep 26, 2024
7266d1c
плюс арея и смачной лаваленд
Ravgolin Sep 27, 2024
b874e8c
лава
Ravgolin Sep 27, 2024
4eed336
первый коммит
Ravgolin Oct 2, 2024
b9dae39
новые предметы, таблички, иконочки, ну и техи.
Ravgolin Oct 3, 2024
1c64ecf
тихий и стандартный коммит (опять с мёрж конфликтом)
Ravgolin Oct 4, 2024
8bd8237
вроде бы мёрдж конфликта нету. Так же добавил техи-отсылочки.
Ravgolin Oct 4, 2024
8eee2ca
работа над бригом
Ravgolin Oct 6, 2024
6a872d7
не помню
Ravgolin Oct 14, 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
144,294 changes: 144,294 additions & 0 deletions _maps/map_files/event/Station/Syx.dmm

Large diffs are not rendered by default.

146 changes: 146 additions & 0 deletions code/game/area/ss13_areas.dm
Original file line number Diff line number Diff line change
Expand Up @@ -729,6 +729,10 @@ This applies to all STANDARD station areas
name = "Labor Camp"
icon_state = "brig"

/area/mine/laborcamp/old

name = "Old Labor Camp"

/area/mine/laborcamp/security
name = "Labor Camp Security"
icon_state = "security"
Expand Down Expand Up @@ -783,6 +787,10 @@ This applies to all STANDARD station areas
name = "North-West Maintenance"
icon_state = "fpmaint"

/area/maintenance/fpmaint2
icon_state = "smaint"
name = "Second North-West Maintenance"

/area/maintenance/fsmaint
name = "Dormitory Maintenance"
icon_state = "fsmaint"
Expand Down Expand Up @@ -851,6 +859,10 @@ This applies to all STANDARD station areas
name = "East Secondary Maintenance"
icon_state = "smaint"

/area/maintenance/east
icon_state = "smaint"
name = "East Mainteance"

/area/maintenance/port
name = "West Maintenance"
icon_state = "pmaint"
Expand Down Expand Up @@ -919,6 +931,70 @@ This applies to all STANDARD station areas
/area/maintenance/disposal/external/north
name = "Northern External Waste Belt"

// Segmenstaation tonels
/area/maintenance/tonel
name = "Maintenance Tonel"
icon_state = "green"

/area/maintenance/tonel/west
name = "West Maintenance Tonel"

/area/maintenance/tonel/west2
name = "Second West Maintenance Tonel"

/area/maintenance/tonel/south
name = "South Maintenance Tonel"

/area/maintenance/tonel/south2
name = "Second South Maintenance Tonel"

/area/maintenance/tonel/north
name = "North Maintenance Tonel"

/area/maintenance/tonel/north2
name = "Second North Maintenance Tonel"

/area/maintenance/tonel/northwest
name = "North-West Maintenance Tonel"

/area/maintenance/tonel/northwest2
name = "Second North-West Maintenance Tonel"

/area/maintenance/tonel/northeast
name = "North-East Maintenance Tonel"

/area/maintenance/tonel/northeast2
name = "Second North-East Maintenance Tonel"

/area/maintenance/tonel/east
name = "East Maintenance Tonel"

/area/maintenance/tonel/east2
name = "Second East Maintenance Tonel"

/area/maintenance/tonel/southeast
name = "South-East Maintenance Tonel"

/area/maintenance/tonel/southeast2
name = "Second South-East Maintenance Tonel"

/area/maintenance/clownscience
icon_state = "clown_office"
name = "Abandoned Clown Science Office"

/area/maintenance/Voxzone
icon_state = "orange"
name = "Vox zone"

/area/maintenance/abandonedplaying
icon_state = "fitness"
name = "Abandoned Playing Area"

/area/maintenance/RDabandoned
icon_state = "head_quarters"
name = "Abandoned Research Director's Office"


/area/maintenance/genetics
name = "Genetics Maintenance"
icon_state = "asmaint"
Expand Down Expand Up @@ -1026,6 +1102,43 @@ This applies to all STANDARD station areas
name = "Trading area"
icon_state = "yellow"

/area/maintenance/pharmacy
name = "Abandoned Pharmacy"
icon_state = "brown"

/area/maintenance/delivery
name = "Abandoned Delivery"
icon_state = "brown"

/area/maintenance/spacerest
icon_state = "kitchen"
name = "Space Restaurant"

/area/maintenance/Oldrndhallway
icon_state = "research"
name = "Old RnD Hallway"

/area/maintenance/cargo
icon_state = "quartstorage"
name = "Abandoned Cargo"

/area/maintenance/brig
name = "Abandoned Brig"

/area/maintenance/service
icon_state = "kitchen"
name = "Service Storage"

/area/maintenance/debris
icon_state = "purple"
name = "Debris"

/area/maintenance/debris/North
name = "North Debris"

/area/maintenance/debris/South
name = "South Debris"

/area/maintenance/server
name = "Abandoned Server Room"
icon_state = "yellow"
Expand Down Expand Up @@ -1135,6 +1248,14 @@ This applies to all STANDARD station areas
/area/hallway/primary/central/sw
/area/hallway/primary/central/se


/area/hallway/primary/central/satell
/area/hallway/primary/central/satell
/area/hallway/primary/central/satell/west
/area/hallway/primary/central/satell/east
/area/hallway/primary/central/satell/south
/area/hallway/primary/central/satell/north

/area/hallway/primary/command
name = "Command Primary Hallway"
icon_state = "hallC"
Expand Down Expand Up @@ -1231,12 +1352,20 @@ This applies to all STANDARD station areas
/area/hallway/secondary/entry/additional
name = "Arrival Additional West Hallway"

/area/hallway/secondary/entry/additional
name = "Arrival Additional South Hallway"

/area/hallway/secondary/entry/commercial
name = "Arrival Commercial West Hallway"

/area/hallway/secondary/entry/commercialnorth
name = "Arrival Commercial North Hallway"

/area/hallway/secondary/entry/north
name = "Arrival North Hallway"

/area/hallway/secondary/entry/south
name = "Arrival South Hallway"

/area/hallway/secondary/entry/lounge
name = "Arrivals Lounge"
Expand All @@ -1250,6 +1379,9 @@ This applies to all STANDARD station areas
ambientsounds = list('sound/ambience/signal.ogg')
sound_environment = SOUND_AREA_STANDARD_STATION

/area/bridge/park
name = "Bridge Park"

/area/bridge/meeting_room
name = "Heads of Staff Meeting Room"
icon_state = "meeting"
Expand Down Expand Up @@ -1695,6 +1827,20 @@ This applies to all STANDARD station areas
name = "Supermatter Engine"
icon_state = "engine"
sound_environment = SOUND_AREA_SMALL_ENCLOSED
//Engineering-dop shkibidi

/area/engine/mechanic_workshop/hangar
name = "General Hangar"

/area/engine/mechanic_workshop/hangar2
name = "Satellite General Hangar"

/area/engine/Generator
icon_state = "yellow"
name = "Generator room"

/area/atmos/mini
name = "Mini Atmospherics"

//Solars

Expand Down
Empty file.
22 changes: 22 additions & 0 deletions code/game/objects/structures/signs.dm
Original file line number Diff line number Diff line change
Expand Up @@ -249,13 +249,35 @@
does_emissive = TRUE
blocks_emissive = FALSE

/obj/structure/sign/Atele
name = "\improper label of the atelier"
desc = "This sign is silent and standard."
icon = 'icons/obj/barsigns.dmi'
icon_state = "quietden"
does_emissive = TRUE
blocks_emissive = FALSE

/obj/structure/sign/chinese
name = "\improper chinese restaurant sign"
desc = "A glowing dragon invites you in."
icon_state = "chinese"
does_emissive = TRUE
blocks_emissive = FALSE

/obj/structure/sign/portrait
name = "\improper creepy portrait"
desc = "A terrible picture"
icon_state = "Boo"
does_emissive = TRUE
blocks_emissive = FALSE

/obj/structure/sign/carps
name = "\improper carp restaurant sign"
desc = "Incredibly delicious cartoon"
icon_state = "Carps"
does_emissive = TRUE
blocks_emissive = FALSE

/obj/structure/sign/science
name = "\improper SCIENCE!"
desc = "A warning sign which reads 'SCIENCE!'"
Expand Down
113 changes: 113 additions & 0 deletions code/modules/food_and_drinks/item_food/eat_items.dm
Original file line number Diff line number Diff line change
@@ -0,0 +1,113 @@
/obj/item/proc/check_item_eat(mob/target, mob/user)
switch(material_type)
if(MATERIAL_CLASS_NONE)
return FALSE
if(MATERIAL_CLASS_CLOTH)
if(!ismoth(target))
return FALSE
if(MATERIAL_CLASS_TECH)
if(!isvox(target))
return FALSE
if(MATERIAL_CLASS_SOAP)
if(!isdrask(target))
return FALSE
if(is_only_grab_intent && user.a_intent != INTENT_GRAB)
return FALSE
return TRUE

/obj/item/proc/item_string_material(mob/user)
var/material_string
var/material_promt = "Вкуснятина! [is_only_grab_intent ? "\nНужно аккуратно есть." : ""]"
switch(material_type)
if(MATERIAL_CLASS_CLOTH)
material_string = "\nТканевый предмет. [ismoth(user) ? material_promt : ""]"
if(MATERIAL_CLASS_TECH)
material_string = "\nТехнологичный предмет. [isvox(user) ? material_promt : ""]"
if(MATERIAL_CLASS_SOAP)
material_string = "\nМыльный предмет. [isdrask(user) ? material_promt : ""]"

var/bites_split = max_bites > 3 ? round(max_bites / 4) : 1
var/bites_damage_string = ""
if(current_bites >= 1 && current_bites <= bites_split)
bites_damage_string = "Выглядит покусанным..."
else if(current_bites >= bites_split && current_bites <= (bites_split * 2))
bites_damage_string = "Видны оторванные части..."
else if((current_bites >= bites_split * 2) && current_bites <= (bites_split * 3))
bites_damage_string = "Видна внутренняя часть..."
else if((current_bites >= bites_split * 3))
bites_damage_string = "Осталась одна труха..."
if(bites_damage_string)
material_string += "\n[bites_damage_string]"

return material_string


/obj/item/proc/try_item_eat(mob/living/carbon/target, mob/user)
if(ishuman(target) && check_item_eat(target, user))
INVOKE_ASYNC(src, PROC_REF(item_eat), target, user)
return TRUE
return FALSE

//Eat all thing in my hand
/obj/item/proc/item_eat(mob/living/carbon/target, mob/user)
var/chat_message_to_user = "Вы кормите [target] [name]."
var/chat_message_to_target = "[user] покормил вас [name]."
switch(user.a_intent)
if(INTENT_HELP, INTENT_GRAB)
if(target.nutrition >= NUTRITION_LEVEL_FULL)
chat_message_to_user = "В [target == user ? "вас" : target] больше не лезет [name]. [target == user ? "Вы" : target] наел[target == user ? "ись" : genderize_ru(target.gender,"ся","ась","ось","ись")]!"
return
else if(target == user)
chat_message_to_user = "Вы откусили от [name]. Вкуснятина!"
if(INTENT_HARM)
chat_message_to_user = "В [target == user ? "вас" : target] больше не лезет. Но [target == user ? "вы" : user] насильно запихива[target == user ? "ете" : pluralize_ru(user.gender,"ет","ют")] [src.name] в рот!"
if(target != user)
chat_message_to_target = "В ваш рот насильно запихивают [name]!"
if(target.nutrition >= NUTRITION_LEVEL_FULL)
target.vomit(nutritional_value + 20)
target.adjustStaminaLoss(15)

if(target != user)
if(!forceFed(target, user, FALSE))
return
to_chat(target, span_notice("[chat_message_to_target]"))
add_attack_logs(user, src, "Force Fed [target], item [src]")

to_chat(user, span_notice("[chat_message_to_user]"))

current_bites++
playsound(target.loc, 'sound/items/eatfood.ogg', 50, FALSE)
if(!isvampire(target)) //Dont give nutrition to vampires
target.adjust_nutrition(nutritional_value)
obj_integrity = max(obj_integrity - integrity_bite, 0)
colour_change()
if(current_bites >= max_bites)
to_chat(user, span_notice("[target == user ? "Вы доели" : "[target] доел"] [name]."))
qdel(src)

SSticker.score.score_food_eaten++


/obj/item/proc/forceFed(mob/living/carbon/target, mob/user, var/instant_application = FALSE)
if(!instant_application)
visible_message("<span class='warning'>[user] пытается накормить [target], запихивая в рот [src.name].</span>")

if(!instant_application)
if(!do_after(user, 2 SECONDS, target, NONE))
return FALSE
return TRUE

/obj/item/proc/colour_change()
var/bites_split = max_bites > 3 ? round(max_bites / 4) : 1
var/colour
if(current_bites >= 1 && current_bites <= bites_split)
colour = "#d9e0e7ff"
else if(current_bites >= bites_split && current_bites <= (bites_split * 2))
colour = "#b7c3ccff"
else if((current_bites >= bites_split * 2) && current_bites <= (bites_split * 3))
colour = "#929eabff"
else if((current_bites >= bites_split * 3))
colour = "#697581ff"

if (colour)
add_atom_colour(colour, FIXED_COLOUR_PRIORITY)
Loading