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

Новая карта Nostromo. Новый ивент режим Alien. [MDB IGNORE] [WIP] #13231

Closed
wants to merge 98 commits into from
Closed
Show file tree
Hide file tree
Changes from 16 commits
Commits
Show all changes
98 commits
Select commit Hold shift + click to select a range
ad87ec5
1
Tap0r Jun 23, 2024
7cb6b18
2
Tap0r Jun 23, 2024
14baeda
3
Tap0r Jun 25, 2024
18908cd
4
Tap0r Jun 26, 2024
1a8a951
5 уаауаааааа
Tap0r Jun 27, 2024
4562a28
6 еееее
Tap0r Jun 28, 2024
17e3979
Merge remote-tracking branch 'upstream/master' into lowpop_alien
Tap0r Jun 29, 2024
802adf3
какие-то изменения в других мапах хз
Tap0r Jun 29, 2024
f57e3ad
чистим
Tap0r Jun 30, 2024
ff8481e
7 цели и чет еще
Tap0r Jun 30, 2024
fa3b33b
latejoin
Tap0r Jun 30, 2024
d7bb9f4
цельки
Tap0r Jun 30, 2024
3bdc2dd
очередной ренейминг всего что только можно
Tap0r Jun 30, 2024
7c27456
Create job_changes.dm
Tap0r Jun 30, 2024
a103758
рывочек
Tap0r Jun 30, 2024
b875579
ааа негры
Tap0r Jun 30, 2024
2b2a1e5
tgm формат карты
Tap0r Jun 30, 2024
1b0fbb2
Котик Джонси
Tap0r Jul 1, 2024
fd27ed4
зачаток системы страшных эмбиенсов и звуков
Tap0r Jul 2, 2024
2d56df9
продолжаем заливать какашки на гитхаб тау цети
Tap0r Jul 5, 2024
a8a2d2c
пох короче пусть палится медиками, отберем у них анализаторы прост хе…
Tap0r Jul 5, 2024
9793af9
тгм хидер для временного файла ватафак
Tap0r Jul 5, 2024
48d54e7
оверлеи огня и ограничение пинпоинтера
Tap0r Jul 5, 2024
7522904
итак ещё одна гавяшка
Tap0r Jul 5, 2024
7833433
боремся с дрим чекером
Tap0r Jul 5, 2024
55f2171
добивочная
Tap0r Jul 5, 2024
1ceaedb
я один дефайн юзаю для роли, фракции и расы, я бля адекватный ваще нет?
Tap0r Jul 5, 2024
69fa832
правочки
Tap0r Jul 6, 2024
a0e0353
допустим
Tap0r Jul 6, 2024
7457f28
исчезала иконка голода при сет_спешиес на синта, это бы в целом пофик…
Tap0r Jul 6, 2024
96d970d
контейнеры
Tap0r Jul 9, 2024
dc88164
отвязываем эмбиенс от зоны
Tap0r Jul 10, 2024
9c05e1c
ящик с помощью появляется на складе когда ксенос начинает отжираться
Tap0r Jul 10, 2024
a4e5577
Update lone_hunter.dm
Tap0r Jul 10, 2024
e0d8545
var!!!!
Tap0r Jul 10, 2024
8e7be29
аааааа!
Tap0r Jul 10, 2024
b9e358d
всякое разное
Tap0r Jul 11, 2024
55b633b
и ещё
Tap0r Jul 11, 2024
c1acc03
твики
Tap0r Jul 13, 2024
b28ba76
пока что откажусб временно от 3-ех палубника
Tap0r Jul 14, 2024
56f1cb6
меня вроде дримчекер в прошлый раз за такое ебал щас попробуем снова
Tap0r Jul 14, 2024
f9820c5
вроде адекватно переписанный майнд для лон ксена
Tap0r Jul 14, 2024
20b2d2f
дооформляем эквип экипажа
Tap0r Jul 14, 2024
65bf463
всякое допиливание
Tap0r Jul 14, 2024
652d95f
шаттл эвакуации!!!
Tap0r Jul 14, 2024
cca59aa
опа
Tap0r Jul 14, 2024
40a51ea
тгм хидер?????? ватафак
Tap0r Jul 14, 2024
068a0d1
чето я не выкупаю уже че ему надо
Tap0r Jul 14, 2024
4a6e3c7
Merge remote-tracking branch 'upstream/master' into lowpop_alien
Tap0r Jul 16, 2024
1b6ec98
ааааа!
Tap0r Jul 21, 2024
64b94c7
Merge remote-tracking branch 'upstream/master' into lowpop_alien
Tap0r Jul 21, 2024
63f20c2
вычищаем говно, объявляем перестройку
Tap0r Jul 21, 2024
889ff9b
ооооооо
Tap0r Jul 23, 2024
6d2da3e
суммари
Tap0r Jul 24, 2024
3195d71
контентик пошел
Tap0r Jul 26, 2024
662f0c1
запрет лодаута, ксено трава, смес, консоль мостиковская
Tap0r Jul 28, 2024
9dab343
Merge remote-tracking branch 'upstream/master' into lowpop_alien
Tap0r Jul 28, 2024
5e3a35c
решаем конфликты
Tap0r Jul 28, 2024
878404f
опа
Tap0r Jul 28, 2024
2019dc5
a
Tap0r Jul 28, 2024
304b82b
Merge remote-tracking branch 'upstream/master' into lowpop_alien
Tap0r Aug 1, 2024
a3bcd21
убиваем конфликты
Tap0r Aug 1, 2024
22f67da
всяк так сяк
Tap0r Aug 1, 2024
4bd040e
фиксы
Tap0r Aug 3, 2024
4874329
ещё!
Tap0r Aug 4, 2024
e4e7c0a
Update nuclearbomb.dm
Tap0r Aug 4, 2024
ab0862d
механизм самоуничтожения
Tap0r Aug 5, 2024
b8d60ec
Update smes.dm
Tap0r Aug 5, 2024
7bec36d
Update alien.dm
Tap0r Aug 5, 2024
6707c2c
ae
Tap0r Aug 5, 2024
6128c01
фиксы
Tap0r Aug 5, 2024
10bb62b
движ
Tap0r Aug 5, 2024
40ddafb
Update paper.dm
Tap0r Aug 10, 2024
6fc9436
Merge remote-tracking branch 'upstream/master' into lowpop_alien
Tap0r Aug 11, 2024
6300e17
решаем конфликты
Tap0r Aug 11, 2024
a5a34d2
рефакторинг всего ваще
Tap0r Aug 13, 2024
ecfa96a
pip
Tap0r Aug 13, 2024
19caea9
Update alien.dm
Tap0r Aug 13, 2024
d4ad4ac
суммари
Tap0r Aug 13, 2024
3055990
Update lone_hunter.dm
Tap0r Aug 13, 2024
fa22538
Merge remote-tracking branch 'upstream/master' into lowpop_alien
Tap0r Aug 13, 2024
3ff2d0b
пупупу
Tap0r Aug 15, 2024
3f8b328
самара
Tap0r Aug 18, 2024
664b277
уляля
Tap0r Aug 25, 2024
67f22b1
решаем конфликты
Tap0r Aug 25, 2024
6ddbe80
ещё
Tap0r Aug 25, 2024
c483aba
Merge remote-tracking branch 'upstream/master' into lowpop_alien
Tap0r Aug 25, 2024
05e8292
всё решено мама я гей
Tap0r Aug 25, 2024
86242eb
вуп
Tap0r Aug 25, 2024
d492465
Update lone_hunter.dm
Tap0r Aug 25, 2024
be6c9db
/
Tap0r Aug 25, 2024
d1ece53
ещё приколы
Tap0r Aug 25, 2024
f6066b1
аааа
Tap0r Aug 25, 2024
914be51
в душе не ебу какие-то сташед ченгес
Tap0r Sep 28, 2024
97ae54d
конфликты нахуй
Tap0r Sep 28, 2024
4032879
Merge remote-tracking branch 'upstream/master' into lowpop_alien
Tap0r Sep 28, 2024
4807c59
восстанавливаемся
Tap0r Sep 28, 2024
ed83b61
хуй знает погнали
Tap0r Sep 28, 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
4 changes: 4 additions & 0 deletions code/__DEFINES/gamemodes.dm
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,8 @@
#define F_SPIDERCLAN "Spider Clan"
#define F_WIZFEDERATION "Wizard Federation"
#define F_XENOMORPH_HIVE "Alien Hivemind"
#define F_XENOMORPH "Alien"
#define F_NOSTROMO_CREW "Nostromo Crew"
#define F_ZOMBIES "Zobmies"
#define F_REPLICATORS "Replicators"

Expand Down Expand Up @@ -64,6 +66,8 @@
#define WIZARD "Wizard"
#define WIZ_APPRENTICE "Wizard Apprentice"
#define XENOMORPH "Xenomorph"
#define LONE_XENOMORPH "Lone Xenomorph"
#define NOSTROMO_CREWMATE "Nostromo Crewmate"
#define REPLICATOR "Replicator"
#define PIRATE "Pirate"
#define PRISONER "Prisoner"
Expand Down
2 changes: 1 addition & 1 deletion code/__DEFINES/is_helpers.dm
Original file line number Diff line number Diff line change
Expand Up @@ -225,7 +225,7 @@

#define iszombie(H) (H.get_species() in global.all_zombie_species_names)

#define isalien(H) isrole(XENOMORPH, H)
#define isalien(H) (isrole(XENOMORPH, H) || isrole(LONE_XENOMORPH, H))

#define isgangster(H) isrole(GANGSTER, H)

Expand Down
3 changes: 3 additions & 0 deletions code/__DEFINES/map_modules.dm
Original file line number Diff line number Diff line change
Expand Up @@ -14,3 +14,6 @@
#define FORTS_ROLE_COMMANDER "Commander"

#define FORTS_ROLES list(FORTS_ROLE_MEMBER, FORTS_ROLE_MEDIC, FORTS_ROLE_ARTILLERYMAN, FORTS_ROLE_ENGINEER, FORTS_ROLE_OFFICER, FORTS_ROLE_COMMANDER)


#define MAP_MODULE_ALIEN "Alien"
1 change: 1 addition & 0 deletions code/__DEFINES/xenomorph.dm
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
#define ALIEN_DRONE "Трутни"
#define ALIEN_SENTINEL "Стражи"
#define ALIEN_HUNTER "Охотники"
#define ALIEN_LONE_HUNTER "Одинокий охотник"
#define ALIEN_LARVA "Грудоломы"
#define ALIEN_FACEHUGGER "Лицехваты"
#define ALIEN_MAID "Горничные"
Expand Down
1 change: 1 addition & 0 deletions code/_globalvars/lists/mob.dm
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ var/global/list/alien_list = list(
ALIEN_DRONE = list(),
ALIEN_SENTINEL = list(),
ALIEN_HUNTER = list(),
ALIEN_LONE_HUNTER = list(),
ALIEN_LARVA = list(),
ALIEN_FACEHUGGER = list(),
ALIEN_MAID = list()
Expand Down
7 changes: 4 additions & 3 deletions code/controllers/configuration.dm
Original file line number Diff line number Diff line change
Expand Up @@ -44,20 +44,21 @@ var/global/bridge_secret = null
var/fps = 20
var/list/resource_urls = null
var/antag_hud_allowed = 0 // Ghosts can turn on Antagovision to see a HUD of who is the bad guys this round.
var/antag_hud_restricted = 0 // Ghosts that turn on Antagovision cannot rejoin the round.
var/antag_hud_restricted = 0 // Ghosts that turn on Antagovision cannot rejoin the round.
var/list/mode_names = list()
var/list/config_name_by_real = list()
var/list/probabilities = list() // relative probability of each mode
var/humans_need_surnames = 0
var/allow_random_events = 1 // enables random events mid-round when set to 1
var/alt_lobby_menu = 0 // event lobby
var/alt_lobby_menu = 0 // event lobby
var/event_cryopod_latejoin = 0 // event cryopod latejoin spawn
var/allow_ai = 1 // allow ai job
var/hostedby = null
var/respawn = 1
var/usewhitelist = 0
var/mods_are_mentors = 0
var/kick_inactive = 0 //force disconnect for inactive players
var/afk_time_bracket = 6000 // 10 minutes
var/afk_time_bracket = 6000 // 10 minutes
var/load_jobs_from_txt = 0
var/automute_on = 0 //enables automuting/spam prevention

Expand Down
6 changes: 3 additions & 3 deletions code/controllers/subsystem/mapping.dm
Original file line number Diff line number Diff line change
Expand Up @@ -37,12 +37,12 @@ SUBSYSTEM_DEF(mapping)
system_name = config.system_name
system_name = config.system_name_ru

if(config.map_module)
load_map_module(config.map_module)

loadWorld()
renameAreas()

if(config.map_module)
load_map_module(config.map_module)

process_teleport_locs() //Sets up the wizard teleport locations
process_ghost_teleport_locs() //Sets up ghost teleport locations.

Expand Down
15 changes: 15 additions & 0 deletions code/datums/mind.dm
Original file line number Diff line number Diff line change
Expand Up @@ -774,6 +774,21 @@
..()
mind.special_role = "Drone"

//XENO SOLO
/mob/living/carbon/xenomorph/humanoid/hunter/lone/mind_initialize()

Check failure on line 778 in code/datums/mind.dm

View workflow job for this annotation

GitHub Actions / DreamChecker

proc never calls parent, required by /mob/proc/mind_initialize
if(mind)
mind.key = key
else
create_mind()
if(!mind.name) mind.name = real_name
mind.set_current(src)

mind.assigned_role = "Alien"

var/datum/faction/alien/A = create_uniq_faction(/datum/faction/alien)
add_faction_member(A, src, TRUE)
mind.special_role = "Lone Hunter"

//AI
/mob/living/silicon/ai/mind_initialize()
..()
Expand Down
80 changes: 80 additions & 0 deletions code/game/gamemodes/factions/alien.dm
Original file line number Diff line number Diff line change
@@ -0,0 +1,80 @@
/datum/faction/alien
name = F_XENOMORPH
ID = F_XENOMORPH
logo_state = "alien-logo"
required_pref = ROLE_ALIEN

initroletype = /datum/role/alien

min_roles = 0
max_roles = 1

var/last_check = 0

/datum/faction/alien/can_setup(num_players)
if(!..())
return FALSE
if(xeno_spawn.len > 0)
return TRUE
return FALSE

/datum/faction/alien/check_win()
return check_crew() == 0

/datum/faction/alien/OnPostSetup()
var/datum/role/role = pick(members)
var/start_point = xeno_spawn[1]

var/mob/living/carbon/human/H = new (get_turf(start_point))
H.equip_to_slot_or_del(new /obj/item/clothing/under/color/white, SLOT_W_UNIFORM)
H.equip_to_slot_or_del(new /obj/item/clothing/shoes/white, SLOT_SHOES)
H.name = "Gilbert Kane"
H.real_name = "Gilbert Kane"
H.voice_name = "Gilbert Kane"
H.h_style = "Combover"

var/obj/item/alien_embryo/new_embryo = new /obj/item/alien_embryo(H)
var/mob/living/carbon/xenomorph/larva/new_xeno = new /mob/living/carbon/xenomorph/larva/lone(new_embryo)
new_xeno.loc = new_embryo
new_embryo.baby = new_xeno
new_embryo.controlled_by_ai = FALSE
new_embryo.stage = 5
role.antag.transfer_to(new_xeno)
QDEL_NULL(role.antag.original)

return ..()

/datum/faction/alien/check_crew()
var/total_human = 0
for(var/mob/living/carbon/human/H as anything in human_list)
var/turf/human_loc = get_turf(H)
if(!human_loc || !is_station_level(human_loc.z))
continue
if(H.stat == DEAD)
continue
if(H.species.flags[IS_SYNTHETIC] || H.species.flags[IS_PLANT])
continue
total_human++
return total_human


/datum/faction/nostromo_crew
name = F_NOSTROMO_CREW
ID = F_NOSTROMO_CREW
logo_state = "nostromo-logo"

accept_latejoiners = TRUE
initroletype = /datum/role/nostromo_crewmate
min_roles = 0
max_roles = 7

/datum/faction/nostromo_crew/forgeObjectives()
if(!..())
return FALSE
AppendObjective(/datum/objective/kill_alien)
return TRUE

/datum/faction/nostromo_crew/check_win()
if(global.alien_list[ALIEN_LONE_HUNTER].len == 0)

Check warning on line 78 in code/game/gamemodes/factions/alien.dm

View workflow job for this annotation

GitHub Actions / DreamChecker

field access requires static type: "len"
return TRUE
return global.alien_list[ALIEN_LONE_HUNTER][1].stat == DEAD

Check warning on line 80 in code/game/gamemodes/factions/alien.dm

View workflow job for this annotation

GitHub Actions / DreamChecker

field access requires static type: "stat"
12 changes: 12 additions & 0 deletions code/game/gamemodes/modes_declares/alien.dm
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
/datum/game_mode/alien
name = "Alien"
config_name = "alien"

factions_allowed = list(/datum/faction/alien, /datum/faction/nostromo_crew)

minimum_player_count = 1
minimum_players_bundles = 8

/datum/game_mode/alien/announce()
to_chat(world, "<b>Текущий режим игры - Чужой!</b>")
to_chat(world, "<b><span class='userdanger'>Ксеноморф</span> на корабле! Экипаж, убейте эту тварь как можно скорее!</b>")
32 changes: 32 additions & 0 deletions code/game/gamemodes/modes_gameplays/nuclear/pinpointer.dm
Original file line number Diff line number Diff line change
Expand Up @@ -245,5 +245,37 @@

return attack_self(usr)

/obj/item/weapon/pinpointer/lone_alien
mode = SEARCH_FOR_OBJECT

/obj/item/weapon/pinpointer/lone_alien/attack_self(mob/user)
if(alien_list[ALIEN_LONE_HUNTER].len == 0)

Check warning on line 252 in code/game/gamemodes/modes_gameplays/nuclear/pinpointer.dm

View workflow job for this annotation

GitHub Actions / DreamChecker

field access requires static type: "len"
to_chat(user, "<span class='warning'>The target is missing</span>")
return
else
target = alien_list[ALIEN_LONE_HUNTER][1]
..()

/obj/item/weapon/pinpointer/lone_alien/process()
if(!active)
return
var/mob/living/carbon/xenomorph/humanoid/hunter/H = target
if(H.invisible)
icon_state = "pinonnull"
return
set_dir(get_dir(src, target))
var/turf/self_turf = get_turf(src)
var/turf/target_turf = get_turf(target)
if(target_turf.z != self_turf.z)
icon_state = "pinonalert"
else if(target_turf == self_turf)
icon_state = "pinondirect"
else
switch(get_dist(target_turf, self_turf))
if(1 to 5)
icon_state = "pinonalert"
if(6 to INFINITY)
icon_state = "pinonfar"

#undef SEARCH_FOR_DISK
#undef SEARCH_FOR_OBJECT
24 changes: 24 additions & 0 deletions code/game/gamemodes/objectives/bloodbath.dm
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
/datum/objective/bloodbath
explanation_text = "Убей их всех."

/datum/objective/reproduct/check_completion()
for(var/mob/living/carbon/human/H as anything in human_list)
var/turf/human_loc = get_turf(H)
if(!human_loc || !is_station_level(human_loc.z))
continue
if(H.stat == DEAD)
continue
if(H.species.flags[IS_SYNTHETIC] || H.species.flags[IS_PLANT])
continue
return OBJECTIVE_LOSS
return OBJECTIVE_WIN

/datum/objective/kill_alien
explanation_text = "Ксеноморф на корабле! Убейте эту тварь как можно скорее!"

/datum/objective/kill_alien/check_completion()
if(alien_list[ALIEN_LONE_HUNTER].len == 0)

Check warning on line 20 in code/game/gamemodes/objectives/bloodbath.dm

View workflow job for this annotation

GitHub Actions / DreamChecker

field access requires static type: "len"
return OBJECTIVE_WIN
if(alien_list[ALIEN_LONE_HUNTER][1].stat == DEAD)

Check warning on line 22 in code/game/gamemodes/objectives/bloodbath.dm

View workflow job for this annotation

GitHub Actions / DreamChecker

field access requires static type: "stat"
return OBJECTIVE_WIN
return OBJECTIVE_LOSS
41 changes: 30 additions & 11 deletions code/game/gamemodes/roles/alien.dm
Original file line number Diff line number Diff line change
@@ -1,23 +1,42 @@
/datum/role/alien
name = XENOMORPH
id = XENOMORPH
name = LONE_XENOMORPH
id = LONE_XENOMORPH
required_pref = ROLE_ALIEN
disallow_job = TRUE

antag_hud_type = ANTAG_HUD_ALIEN
antag_hud_name = "hudalien"
logo_state = "alien-logo"

logo_state = "xeno-logo"
/datum/role/alien/forgeObjectives()
if(!..())
return FALSE
AppendObjective(/datum/objective/bloodbath)
return TRUE

/datum/role/alien/Greet(greeting, custom)
. = ..()
to_chat(antag.current, {"<span class='notice'><b>Вы - ксеноморф. Ваша текущая форма - грудолом.
Сейчас вы очень слабы и вас легко убить.
Прячьтесь под предметами и передвигайтесь по вентиляции, что бы сохранить свою жизнь.
Ваша главная задача - вырасти во взрослого ксеноморфа. Прогресс роста указан во вкладке Status.
Когда прогресс роста дойдет до конца, вы сможете эволюционировать в оду из трех взрослых форм.
Договоритесь со своими сестрами, кто и в какую форму будет эволюционировать.
Для общения внутри улья поставьте :ф перед сообщением.
Кто-то обязательно должен стать трутнем, это единственная форма, способная вырасти в королеву.
to_chat(antag.current, {"<span class='notice'><b>
Вы - одинокий ксеноморф. Ваша текущая форма - грудолом.
Жмите кнопку внизу, чтобы пробиться сквозь грудную клетку своего носителя.
Выбравшись наружу - бегите и прячьтесь, сейчас вы очень слабы и вас легко убить.
Ваша задача - вырасти во взрослого ксеноморфа. Прогресс роста указан во вкладке Status.
На этом процесс эволюции не закончится, даже будучи взрослой особью вам есть куда расти.
Вы пассивно накапливаете очки эволюции, за которые будут открываться новые стадии развития и способности.
Этот процесс можно ускорить, нападая на экипаж. Вам будут выдаваться очки за успешные агрессивные действия.
Информация о ходе эволюции находится во вкладке Status.
------------------</b></span>"})


/datum/role/nostromo_crewmate
name = NOSTROMO_CREWMATE
id = NOSTROMO_CREWMATE
logo_state = "nostromo-logo"
change_to_maximum_skills = FALSE

/datum/role/nostromo_crewmate/Greet(greeting, custom)
. = ..()
to_chat(antag.current, {"<span class='notice'><b>
Вы - член экипажа межзвездного буксировщика Ностромо, на борту которого находится ксеноморф.
Как можно скорее изничтожьте эту тварь, пока не стало слишком поздно.
------------------</b></span>"})
14 changes: 14 additions & 0 deletions code/game/machinery/cryopod_event.dm
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
var/global/list/event_cryopods = list()

/obj/machinery/cryopod_event
name = "cryogenic freezer"
desc = "A man-sized pod for entering suspended animation."
icon = 'icons/obj/Cryogenic3.dmi'
icon_state = "cryosleeper_cl"
density = TRUE
anchored = TRUE
resistance_flags = FULL_INDESTRUCTIBLE

/obj/machinery/cryopod_event/New(loc)
..()
event_cryopods += loc
12 changes: 12 additions & 0 deletions code/game/machinery/recharger.dm
Original file line number Diff line number Diff line change
Expand Up @@ -210,3 +210,15 @@
icon_state = "wrecharger1"
else
icon_state = "wrecharger0"

/obj/machinery/recharger/indestructible
resistance_flags = FULL_INDESTRUCTIBLE

/obj/machinery/recharger/indestructible/attackby(obj/item/weapon/G, mob/user)
if(iswrenching(G))
to_chat(user, "<span class='warning'>It's wrenched down tight!</span>")
return
if(isscrewing(G))
to_chat(user, "<span class='warning'>It's screwed down tight!</span>")
return
. = ..()
5 changes: 4 additions & 1 deletion code/game/mecha/combat/gygax.dm
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,10 @@
cell = C
return
cell = new(src)
cell.charge = 30000
if(map_discharged)
cell.charge = 0
else
cell.charge = 30000
cell.maxcharge = 30000


Expand Down
7 changes: 6 additions & 1 deletion code/game/mecha/mecha.dm
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,8 @@
//the values in this list show how much damage will pass through, not how much will be absorbed.
var/list/damage_absorption = list(BRUTE=0.8,BURN=1.2,BULLET=0.9,LASER=1,ENERGY=1,BOMB=1)
var/obj/item/weapon/stock_parts/cell/cell
//spawn with empty battery
var/map_discharged = FALSE
var/state = 0
var/list/log = new
var/last_message = 0
Expand Down Expand Up @@ -148,7 +150,10 @@
return
cell = new(src)
cell.name = "high-capacity power cell"
cell.charge = 15000
if(map_discharged)
cell.charge = 0
else
cell.charge = 15000
cell.maxcharge = 15000

/obj/mecha/proc/add_cabin()
Expand Down
Loading
Loading