forked from infinitystation/Baystation12
-
Notifications
You must be signed in to change notification settings - Fork 69
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Feat: fix, tweak and upgrade exosiuts. update mercenary uplink exosui…
…ts (#685) Данный ПР - сборник новвоведений в мехах, которые больше касаются нюки и ОБР. -Теперь, нюка может вызвать меха (Максимум 2 единицы) только при войне. Цена меха - 400 ТК. -ОБР получили своего меха, с автодробовиком на 9 патронов(UPD 16 патронов)(Имеется выбор между Слагами/Манстоперами/Горохом) и лазеркэнаном. В остальном, это мех нюки. EDITED: ОБР получило 2 экземпляра продвинутой ионки с доп режимом, что садит меху щиты и замедляет в 2.5 раз на 10 секунд. -Исправлен повторяющийся спрайт у катапульты. -На будущее, создана заготовка наплечного ракетомёта на меха (Не гибает, в будущем будет установлен на меха дедов). -Как приятный бонус, исправлен баг, позволяющий бесконечно объявлять войну. (Да, я в курсе что на втором скрине по пизде пошла иконка катапульты, я это уже исправил, а новые скрины делать лень) ![image](https://github.com/ss220-space/Baystation12/assets/88627712/97cf1c38-16e1-4d6c-8d3f-ef0a11205e6f) ![image](https://github.com/ss220-space/Baystation12/assets/88627712/79b1ef6a-0638-4b2e-801c-966da72c2304) ![image](https://github.com/ss220-space/Baystation12/assets/88627712/5d2355bd-7604-474c-992c-dfda24dbf25f) (https://youtu.be/Ke9i88DyWvk)
- Loading branch information
Showing
19 changed files
with
243 additions
and
32 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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,3 +1,5 @@ | ||
#define ANTAG_SERVANT "servant" | ||
#define ANTAG_APPRENTICE "apprentice" | ||
#define ANTAG_WIZARD "Space Wizard" | ||
#define ANTAG_WIZARD "Space Wizard" | ||
GLOBAL_VAR_INIT(max_mech, 0) | ||
GLOBAL_VAR_INIT(war_declared, FALSE) |
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
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
Binary file not shown.
Binary file not shown.
Binary file not shown.
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
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,85 @@ | ||
/mob/living/exosuit/premade/ert | ||
name = "Nanotrasen special combat mech" | ||
desc = "A sleek, modern combat exosuit created by Nanotrasen for specific missions." | ||
|
||
/mob/living/exosuit/premade/ert/Initialize() | ||
if(!arms) | ||
arms = new /obj/item/mech_component/manipulators/ert(src) | ||
arms.color = COLOR_CYAN_BLUE | ||
if(!legs) | ||
legs = new /obj/item/mech_component/propulsion/merc(src) | ||
legs.color = COLOR_CYAN_BLUE | ||
if(!head) | ||
head = new /obj/item/mech_component/sensors/merc(src) | ||
head.color = COLOR_WHITE | ||
if(!body) | ||
body = new /obj/item/mech_component/chassis/merc(src) | ||
body.color = COLOR_WHITE | ||
|
||
. = ..() | ||
|
||
/mob/living/exosuit/premade/ert/spawn_mech_equipment() | ||
..() | ||
install_system(new /obj/item/mech_equipment/mounted_system/taser/laser/Ert(src), HARDPOINT_RIGHT_HAND) | ||
install_system(new /obj/item/mech_equipment/mounted_system/taser/shotgun(src), HARDPOINT_LEFT_HAND) | ||
install_system(new /obj/item/mech_equipment/shields(src), HARDPOINT_BACK) | ||
install_system(new /obj/item/mech_equipment/light(src), HARDPOINT_RIGHT_SHOULDER) | ||
install_system(new /obj/item/mech_equipment/flash(src), HARDPOINT_LEFT_SHOULDER) | ||
|
||
/obj/item/mech_component/manipulators/ert | ||
name = "Nanotrasen combat arms" | ||
exosuit_desc_string = "flexible, advanced manipulators" | ||
icon_state = "combat_arms" | ||
melee_damage = 40 | ||
action_delay = 10 | ||
power_use = 50 | ||
|
||
/obj/item/mech_component/propulsion/ert | ||
name = "Nanotrasen combat legs" | ||
exosuit_desc_string = "sleek hydraulic legs" | ||
icon_state = "combat_legs" | ||
move_delay = 3 | ||
turn_delay = 3 | ||
power_use = 20 | ||
|
||
/obj/item/mech_component/sensors/ert | ||
name = "Nanotrasen combat sensors" | ||
gender = PLURAL | ||
exosuit_desc_string = "high-resolution thermal sensors" | ||
icon_state = "combat_head" | ||
vision_flags = SEE_MOBS | ||
see_invisible = SEE_INVISIBLE_NOLIGHTING | ||
power_use = 200 | ||
|
||
/obj/item/mech_component/sensors/ert/prebuild() | ||
..() | ||
software = new(src) | ||
software.installed_software = list(MECH_SOFTWARE_WEAPONS,MECH_SOFTWARE_UTILITY) | ||
|
||
|
||
/obj/item/mech_component/chassis/ert | ||
name = "sealed exosuit chassis" | ||
hatch_descriptor = "canopy" | ||
pilot_coverage = 100 | ||
exosuit_desc_string = "an armoured chassis" | ||
icon_state = "combat_body" | ||
power_use = 40 | ||
|
||
/obj/item/mech_component/chassis/ert/prebuild() | ||
. = ..() | ||
QDEL_NULL(cell) | ||
cell = new /obj/item/cell/hyper(src) | ||
m_armour = new /obj/item/robot_parts/robot_component/armour/exosuit/combat/syndie(src) | ||
|
||
|
||
/obj/item/mech_component/chassis/ert/Initialize() | ||
pilot_positions = list( | ||
list( | ||
"[NORTH]" = list("x" = 8, "y" = 8), | ||
"[SOUTH]" = list("x" = 8, "y" = 8), | ||
"[EAST]" = list("x" = 4, "y" = 8), | ||
"[WEST]" = list("x" = 12, "y" = 8) | ||
) | ||
) | ||
|
||
. = ..() |
Oops, something went wrong.