-
-
Notifications
You must be signed in to change notification settings - Fork 420
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
* космические торговцы * фикусы * суммари * ещё * ладно у них не будет кучи мусора в трюме * переделываем под айтемс рандом * обошёл всё что есть в билде чтобы составить эти списки ахуеть можно * проебал две запятые * !!!! * всякое * щас буду мапдиф править * готов к полёту * Update trader_shuttle.dm * копипаст копипаст!!!!! * в пизду этот копипаст я своё напишу * добавляем им худ * вот щас работает почти как надо * должно быть всё * Update objects.dm * фух бля * исправил док тэги * минус труба * Update gamma.dmm * Update gamma.dmm * космобайк пока * перенёс анонс * Update spawners.dm * Update code/datums/spawners_menu/spawners.dm Co-authored-by: Alexander V. <[email protected]> * саммари * мапконфликты пока * вроде перенёс но меня пугает что никакие изменения ко мне не подтянулись * Update gamma.dmm * исправляем конфликты * Update code/game/gamemodes/objectives/traders_objectives.dm ладно Co-authored-by: KIBORG04 <[email protected]> * Update traders_objectives.dm * сумари * всё * Update code/game/machinery/computer/trader_shuttle.dm Co-authored-by: KIBORG04 <[email protected]> * Update code/game/gamemodes/objectives/traders_objectives.dm Co-authored-by: KIBORG04 <[email protected]> * Update boxstation.dmm * конфликты офф * исправления * ну пусть будет цель на 20к бачей * твики * девайс * gamma fix --------- Co-authored-by: Alexander V. <[email protected]> Co-authored-by: KIBORG04 <[email protected]>
- Loading branch information
3 people
committed
Sep 29, 2024
1 parent
fb36112
commit cea6e61
Showing
37 changed files
with
7,273 additions
and
5,860 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,33 @@ | ||
| /datum/outfit/space_trader | ||
| survival_box = TRUE | ||
| l_ear = /obj/item/device/radio/headset | ||
|
|
||
| /datum/outfit/space_trader/dealer | ||
| name = "Space Trader Dealer" | ||
| uniform = /obj/item/clothing/under/lawyer/oldman | ||
| suit = /obj/item/clothing/suit/storage/postal_dude_coat | ||
| glasses = /obj/item/clothing/glasses/sunglasses | ||
| shoes = /obj/item/clothing/shoes/boots | ||
| back = /obj/item/weapon/storage/backpack/satchel/norm | ||
|
|
||
| r_pocket = /obj/item/weapon/reagent_containers/spray/pepper | ||
|
|
||
| /datum/outfit/space_trader/guard | ||
| name = "Space Trader Guard" | ||
| uniform = /obj/item/clothing/under/syndicate | ||
| suit = /obj/item/clothing/suit/storage/flak | ||
| glasses = /obj/item/clothing/glasses/sunglasses | ||
| shoes = /obj/item/clothing/shoes/boots | ||
| belt = /obj/item/weapon/storage/belt/security/ert | ||
| back = /obj/item/weapon/storage/backpack/satchel/sec | ||
| gloves = /obj/item/clothing/gloves/security | ||
| suit_store = /obj/item/weapon/gun/energy/gun | ||
| backpack_contents = list(/obj/item/clothing/head/helmet) | ||
|
|
||
| r_pocket = /obj/item/clothing/accessory/holster | ||
|
|
||
| /datum/outfit/space_trader/porter | ||
| name = "Space Trader Porter" | ||
| uniform = /obj/item/clothing/under/rank/cargotech | ||
| shoes = /obj/item/clothing/shoes/boots/work | ||
| back = /obj/item/weapon/storage/backpack |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,33 @@ | ||
| /obj/effect/landmark/space_traders/product | ||
| name = "Space Traders Product" | ||
| icon = 'icons/obj/storage.dmi' | ||
| icon_state = "crate" | ||
|
|
||
| /obj/effect/landmark/space_traders/dealer | ||
| name = "Space Trader Dealer" | ||
| icon = 'icons/mob/landmarks.dmi' | ||
| icon_state = "Quartermaster" | ||
|
|
||
| /obj/effect/landmark/space_traders/guard | ||
| name = "Space Trader Guard" | ||
| icon = 'icons/mob/landmarks.dmi' | ||
| icon_state = "Blueshield Officer" | ||
|
|
||
| /obj/effect/landmark/space_traders/porter | ||
| name = "Space Trader Porter" | ||
| icon = 'icons/mob/landmarks.dmi' | ||
| icon_state = "Trader Porter" | ||
|
|
||
| /datum/faction/space_traders | ||
| name = F_SPACE_TRADERS | ||
| ID = F_SPACE_TRADERS | ||
|
|
||
| logo_state = "space_traders" | ||
| max_roles = 3 | ||
| roletype = /datum/role/space_trader | ||
|
|
||
| /datum/faction/space_traders/forgeObjectives() | ||
| if(!..()) | ||
| return FALSE | ||
| AppendObjective(/datum/objective/make_money/faction/traders) | ||
| return TRUE |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,102 @@ | ||
| /datum/objective/make_money | ||
| var/required_money | ||
|
|
||
| /datum/objective/make_money/New() | ||
| explanation_text = "Заработать [required_money] кредитов. В конце смены они должны находиться на вашем счёте." | ||
|
|
||
| /datum/objective/make_money/check_completion() | ||
| if(owner) | ||
| var/datum/money_account/MA = get_account(owner.get_key_memory(MEM_ACCOUNT_NUMBER)) | ||
| if(MA.money >= required_money) | ||
| return OBJECTIVE_WIN | ||
| return OBJECTIVE_LOSS | ||
|
|
||
| /datum/objective/make_money/faction/check_completion() | ||
| if(faction) | ||
| var/total_money = 0 | ||
| for(var/datum/role/R in faction.members) | ||
| var/datum/money_account/MA = get_account(R.antag.get_key_memory(MEM_ACCOUNT_NUMBER)) | ||
| total_money += MA.money | ||
| if(total_money >= required_money) | ||
| return OBJECTIVE_WIN | ||
| return OBJECTIVE_LOSS | ||
|
|
||
| /datum/objective/make_money/faction/traders | ||
| required_money = 20000 | ||
|
|
||
|
|
||
| /datum/objective/trader_purchase | ||
| var/list/items = list() | ||
| var/static/possible_items[] = list( | ||
| "эмиттер" = /obj/machinery/power/emitter, | ||
| "инкубатор вирусов" = /obj/machinery/disease2/incubator, | ||
| "хим диспенсер" = /obj/machinery/chem_dispenser, | ||
| "микроволновку" = /obj/machinery/kitchen_machine/microwave, | ||
| "бипски" = /obj/machinery/bot/secbot/beepsky, | ||
| "биогенератор" = /obj/machinery/biogenerator, | ||
| "экстрактор семян" = /obj/machinery/seed_extractor, | ||
| "бухломат" = /obj/machinery/vending/boozeomat, | ||
| "переносной флэшер" = /obj/machinery/flasher/portable, | ||
| "шкаф главы службы безопасности" = /obj/structure/closet/secure_closet/hos, | ||
| "канистру азота" = /obj/machinery/portable_atmospherics/canister/nitrogen, | ||
| "факс" = /obj/machinery/faxmachine, | ||
| "ядерную боеголовку" = /obj/machinery/nuclearbomb, | ||
| "раздатчик атмосферных труб" = /obj/machinery/pipedispenser, | ||
| "кошку главврача Дасти" = /mob/living/simple_animal/cat/dusty, | ||
| "плазменный дробовик" = /obj/item/weapon/gun/plasma/p104sass, | ||
| "ручной телепортер" = /obj/item/weapon/hand_tele, | ||
| "тыквяк" = /obj/item/weapon/reagent_containers/food/snacks/grown/gourd, | ||
| "имплант защиты разума" = /obj/item/weapon/implantcase/mindshield, | ||
| "смирительную рубашку" = /obj/item/clothing/suit/straight_jacket, | ||
| "капитанское жёлтое мыло" = /obj/item/weapon/reagent_containers/food/snacks/soap/deluxe, | ||
| "мулбота" = /obj/machinery/bot/mulebot, | ||
| "новогоднюю ёлку" = /obj/item/device/flashlight/lamp/fir, | ||
| "двухстволку бармена" = /obj/item/weapon/gun/projectile/revolver/doublebarrel, | ||
| "джукбокс" = /obj/machinery/media/jukebox/bar, | ||
| "полностью собранное ядро ИИ" = /obj/structure/AIcore/deactivated, | ||
| "алтарь священника" = /obj/structure/altar_of_gods) | ||
|
|
||
| /datum/objective/trader_purchase/New() | ||
| var/indx = rand(1, possible_items.len) | ||
| var/offset = rand(1, possible_items.len - 1) | ||
| var/new_indx = (indx + offset) % possible_items.len | ||
| items += possible_items[indx] | ||
| items += possible_items[new_indx == 0 ? possible_items.len : new_indx] | ||
| explanation_text = "Достать и притащить на наш шаттл [items[1]] и [items[2]]." | ||
|
|
||
| /datum/objective/trader_purchase/check_completion() | ||
| var/list/areas = list(/area/shuttle/trader/space, /area/shuttle/trader/station) | ||
| var/list/checks = list(FALSE, FALSE) | ||
| for(var/type in areas) | ||
| for(var/obj/O in get_area_by_type(type)) | ||
| if(istype(O, possible_items[items[1]])) | ||
| checks[1] = TRUE | ||
| else if(istype(O, possible_items[items[2]])) | ||
| checks[2] = TRUE | ||
| if(checks[1] && checks[2]) | ||
| return OBJECTIVE_WIN | ||
| else if(checks[1] || checks[2]) | ||
| return OBJECTIVE_HALFWIN | ||
| return OBJECTIVE_LOSS | ||
|
|
||
|
|
||
| /datum/objective/traders_escape | ||
| explanation_text = "Живыми улететь на своём шаттле со станции." | ||
|
|
||
| /datum/objective/traders_escape/check_completion() | ||
| var/counter = 0 | ||
| if(faction) | ||
| var/list/mems = faction.members | ||
| for(var/datum/role/R in mems) | ||
| var/mob/M = R.antag.current | ||
| if(!M || ((M.stat == DEAD) && !M.fake_death) || isbrain(M) || issilicon(M)) // alive? | ||
| continue | ||
| if(istype(get_area(M), /area/shuttle/trader/space)) // in space on shuttle? | ||
| counter++ | ||
| if(counter == mems.len) // ALL TRADERS ESCAPE ALIVE | ||
| return OBJECTIVE_WIN | ||
| else if(counter) // AT LEAST ONE TRADER ESCAPE ALIVE | ||
| return OBJECTIVE_HALFWIN | ||
| else | ||
| return OBJECTIVE_LOSS | ||
| return OBJECTIVE_LOSS |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,25 @@ | ||
| /datum/role/space_trader | ||
| name = SPACE_TRADER | ||
| id = SPACE_TRADER | ||
|
|
||
| disallow_job = TRUE | ||
| logo_state = "space_traders" | ||
|
|
||
| /datum/role/space_trader/Greet(greeting, custom) | ||
| . = ..() | ||
| to_chat(antag.current, {"<span class='notice'><b>Вы - космический торговец. Всего вас трое. | ||
| <BR>1. Барыга - он главный, он владеет всем, он нанимает остальных, он отдаёт приказы, он решает что делать. | ||
| Слушайтесь его и помогайте ему. | ||
| <BR>2. ЧОПовец - охранник корабля и товара, у него есть ствол и полное право использовать его на территории корабля. | ||
| Но даже в мыслях не имейте стреляться с кем-то на станции, это явно не понравится службе безопасности. | ||
| <BR>3. Грузчик - мальчик на побегушках, таскает товар, гоняет на станцию за едой и припасами. | ||
| <BR>Кем бы вы ни были, вы все имеете 3 общие цели. | ||
| <BR>1. Заработать денег. | ||
| В трюме корабля навалом товара, сбудьте его по как можно большей цене, торгуйтесь за каждую безделушку. | ||
| Не весь товар легален. В трюме, справа от постера, есть тайник, никто со станции не сможет его открыть, можете спокойно прятать там контрабанду. | ||
| Если товар распродан, оказывайте услуги, ради денег вы даже можете нарушить закон, но будьте готовы к соответствующей реакции со стороны службы безопасности. | ||
| <BR>2. Достать на шаттл какие-то вещи. | ||
| Для достижения цели можете делать что угодно. Попытаетесь вы выкупить или украсть, подрядите кого-то сделать или достать. | ||
| Главное чтобы нужные вещи были на корабле, когда смена на станции закончится. | ||
| <BR>3. Улететь со станции живыми. Крайне желательно сделать это в полном составе. | ||
| ------------------</b></span>"}) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.