cyberpresidentvanellope/S.P.L.U.R.T-Station-13
1
0
Fork 0
mirror of https://github.com/SPLURT-Station/S.P.L.U.R.T-Station-13.git synced 2025-12-09 16:07:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

Modularize everything

Browse Source 
this seems to be working I thibk
This commit is contained in:
BongaTheProto
2022-08-06 17:35:53 -05:00
parent af9ec000a9
commit 509b8df511
43 changed files with 428 additions and 389 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
code/__DEFINES/cooldowns.dm
View File

@@ -38,8 +38,6 @@
#define COOLDOWN_MECHA_ARMOR "mecha_armor"
#define COOLDOWN_MECHA_MELEE_ATTACK "mecha_melee"
#define COOLDOWN_MECHA_SMOKE "mecha_smoke"
#define COOLDOWN_MECHA_SKYFALL "mecha_skyfall"
#define COOLDOWN_MECHA_MISSILE_STRIKE "mecha_missile_strike"
//car cooldowns
#define COOLDOWN_CAR_HONK "car_honk"

2
code/__DEFINES/exosuit_fabs.dm
View File

@@ -26,7 +26,7 @@
#define EXOSUIT_MODULE_PHAZON (1<<6)
/// Module is compatable with N models
#define EXOSUIT_MODULE_GYGAX_MED (1<<7)
/// Module is compatible with Savannah Exosuit models
/// Module is compatible with Savannah Exosuit models - SPLURT ADDITION
#define EXOSUIT_MODULE_SAVANNAH (1<<8)
/// Module is compatible with "Working" Exosuit models - Ripley and Clarke

5
code/__SPLURTCODE/DEFINES/cooldowns.dm
View File

@@ -8,3 +8,8 @@
#define COOLDOWN_DOMINANT_SNAP "dominant_snap"
#define COOLDOWN_DOMINANT_EXAMINE "dominant_examine"
#define COOLDOWN_EMOTE_FART "emote_fart"
//Mecha cooldowns
#define COOLDOWN_MECHA_SKYFALL "mecha_skyfall"
#define COOLDOWN_MECHA_MISSILE_STRIKE "mecha_missile_strike"

4
code/_rendering/fullscreen/fullscreen.dm
View File

@@ -232,7 +232,3 @@
layer = LIGHTING_LAYER
blend_mode = BLEND_ADD
show_when_dead = TRUE
/atom/movable/screen/fullscreen/ivanov_display
icon_state = "ivanov"
alpha = 180

4
code/game/objects/items/toys.dm
View File

@@ -641,10 +641,6 @@
icon_state = "reticenceprize"
quiet = 1
/obj/item/toy/prize/savannahivanov
name = "toy Savannah-Ivanov"
icon_state = "savannahivanovtoy"
desc = "Mini-Mecha action figure! Collect them all! 13/12."
/obj/item/toy/talking
name = "talking action figure"

1
code/modules/cargo/packs/costumes_toys.dm
View File

@@ -168,7 +168,6 @@
/obj/item/toy/prize/odysseus,
/obj/item/toy/prize/phazon,
/obj/item/toy/prize/reticence,
/obj/item/toy/prize/savannahivanov,
/obj/item/toy/cards/deck,
/obj/item/toy/nuke,
/obj/item/toy/minimeteor,

5
code/modules/cargo/supplypod.dm
View File

@@ -64,11 +64,6 @@
bluespace = TRUE
explosionSize = list(0,0,1,2)
//type used for one drop spawning items. doesn't have a style as style is set by the helper that creates this
/obj/structure/closet/supplypod/podspawn
bluespace = TRUE
explosionSize = list(0,0,0,0)
/obj/structure/closet/supplypod/extractionpod
name = "Syndicate Extraction Pod"
desc = "A specalised, blood-red styled pod for extracting high-value targets out of active mission areas. <b>Targets must be manually stuffed inside the pod for proper delivery.</b>"

6
code/modules/research/designs/autoylathe_designs.dm
View File

@@ -153,12 +153,6 @@
build_path = /obj/item/toy/prize/reticence
category = list("hacked", "Figurines")
/datum/design/autoylathe/mech/model13
name = "toy Savannah-Ivanov"
id = "toymech13"
materials = list(/datum/material/plastic = 250)
build_path = /obj/item/toy/prize/savannahivanov
/datum/design/autoylathe/talking/AI
name = "Toy AI"
id = "ToyAICore"

24
code/modules/research/designs/mecha_designs.dm
View File

@@ -133,30 +133,6 @@
category = list("Exosuit Modules")
departmental_flags = DEPARTMENTAL_FLAG_SCIENCE
/datum/design/board/savannah_ivanov_main
name = "\"Savannah-Ivanov\" Central Control module"
desc = "Allows for the construction of a \"Savannah-Ivanov\" Central Control module."
id = "savannah_ivanov_main"
build_path = /obj/item/circuitboard/mecha/savannah_ivanov/main
category = list("Exosuit Modules")
departmental_flags = DEPARTMENTAL_FLAG_SCIENCE
/datum/design/board/savannah_ivanov_peri
name = "\"Savannah-Ivanov\" Peripherals Control module"
desc = "Allows for the construction of a \"Savannah-Ivanov\" Peripheral Control module."
id = "savannah_ivanov_peri"
build_path = /obj/item/circuitboard/mecha/savannah_ivanov/peripherals
category = list("Exosuit Modules")
departmental_flags = DEPARTMENTAL_FLAG_SCIENCE
/datum/design/board/savannah_ivanov_targ
name = "\"Savannah-Ivanov\" Weapons & Targeting Control module"
desc = "Allows for the construction of a \"Savannah-Ivanov\" Weapons & Targeting Control module."
id = "savannah_ivanov_targ"
build_path = /obj/item/circuitboard/mecha/savannah_ivanov/targeting
category = list("Exosuit Modules")
departmental_flags = DEPARTMENTAL_FLAG_SCIENCE
////////////////////////////////////////
/////////// Mecha Equpment /////////////
////////////////////////////////////////

118
code/modules/research/designs/mechfabricator_designs.dm
View File

@@ -548,124 +548,6 @@
construction_time = 300
category = list("Phazon")
//Savannah-Ivanov
/datum/design/savannah_ivanov_chassis
name = "Exosuit Chassis (\"Savannah-Ivanov\")"
id = "savannah_ivanov_chassis"
build_type = MECHFAB
build_path = /obj/item/mecha_parts/chassis/savannah_ivanov
materials = list(/datum/material/iron=20000)
construction_time = 100
category = list("Savannah-Ivanov")
/datum/design/savannah_ivanov_torso
name = "Exosuit Torso (\"Savannah-Ivanov\")"
id = "savannah_ivanov_torso"
build_type = MECHFAB
build_path = /obj/item/mecha_parts/part/savannah_ivanov_torso
materials = list(/datum/material/iron=20000,/datum/material/glass = 7500)
construction_time = 200
category = list("Savannah-Ivanov")
/datum/design/savannah_ivanov_head
name = "Exosuit Head (\"Savannah-Ivanov\")"
id = "savannah_ivanov_head"
build_type = MECHFAB
build_path = /obj/item/mecha_parts/part/savannah_ivanov_head
materials = list(/datum/material/iron=6000,/datum/material/glass = 10000)
construction_time = 100
category = list("Savannah-Ivanov")
/datum/design/savannah_ivanov_left_arm
name = "Exosuit Left Arm (\"Savannah-Ivanov\")"
id = "savannah_ivanov_left_arm"
build_type = MECHFAB
build_path = /obj/item/mecha_parts/part/savannah_ivanov_left_arm
materials = list(/datum/material/iron=15000)
construction_time = 150
category = list("Savannah-Ivanov")
/datum/design/savannah_ivanov_right_arm
name = "Exosuit Right Arm (\"Savannah-Ivanov\")"
id = "savannah_ivanov_right_arm"
build_type = MECHFAB
build_path = /obj/item/mecha_parts/part/savannah_ivanov_right_arm
materials = list(/datum/material/iron=15000)
construction_time = 150
category = list("Savannah-Ivanov")
/datum/design/savannah_ivanov_chassis
name = "Exosuit Chassis (\"Savannah-Ivanov\")"
id = "savannah_ivanov_chassis"
build_type = MECHFAB
build_path = /obj/item/mecha_parts/chassis/savannah_ivanov
materials = list(/datum/material/iron=25000)
construction_time = 100
category = list("Savannah-Ivanov")
/datum/design/savannah_ivanov_torso
name = "Exosuit Torso (\"Savannah-Ivanov\")"
id = "savannah_ivanov_torso"
build_type = MECHFAB
build_path = /obj/item/mecha_parts/part/savannah_ivanov_torso
materials = list(/datum/material/iron=25000, /datum/material/glass = 10000,/datum/material/silver=10000)
construction_time = 300
category = list("Savannah-Ivanov")
/datum/design/savannah_ivanov_head
name = "Exosuit Head (\"Savannah-Ivanov\")"
id = "savannah_ivanov_head"
build_type = MECHFAB
build_path = /obj/item/mecha_parts/part/savannah_ivanov_head
materials = list(/datum/material/iron=10000,/datum/material/glass = 15000,/datum/material/silver=2000)
construction_time = 200
category = list("Savannah-Ivanov")
/datum/design/savannah_ivanov_left_arm
name = "Exosuit Left Arm (\"Savannah-Ivanov\")"
id = "savannah_ivanov_left_arm"
build_type = MECHFAB
build_path = /obj/item/mecha_parts/part/savannah_ivanov_left_arm
materials = list(/datum/material/iron=10000,/datum/material/silver=4000)
construction_time = 200
category = list("Savannah-Ivanov")
/datum/design/savannah_ivanov_right_arm
name = "Exosuit Right Arm (\"Savannah-Ivanov\")"
id = "savannah_ivanov_right_arm"
build_type = MECHFAB
build_path = /obj/item/mecha_parts/part/savannah_ivanov_right_arm
materials = list(/datum/material/iron=10000,/datum/material/silver=4000)
construction_time = 200
category = list("Savannah-Ivanov")
/datum/design/savannah_ivanov_left_leg
name = "Exosuit Left Leg (\"Savannah-Ivanov\")"
id = "savannah_ivanov_left_leg"
build_type = MECHFAB
build_path = /obj/item/mecha_parts/part/savannah_ivanov_left_leg
materials = list(/datum/material/iron=15000,/datum/material/silver=4000)
construction_time = 200
category = list("Savannah-Ivanov")
/datum/design/savannah_ivanov_right_leg
name = "Exosuit Right Leg (\"Savannah-Ivanov\")"
id = "savannah_ivanov_right_leg"
build_type = MECHFAB
build_path = /obj/item/mecha_parts/part/savannah_ivanov_right_leg
materials = list(/datum/material/iron=15000,/datum/material/silver=4000)
construction_time = 200
category = list("Savannah-Ivanov")
/datum/design/savannah_ivanov_armor
name = "Exosuit Armor (\"Savannah-Ivanov\")"
id = "savannah_ivanov_armor"
build_type = MECHFAB
build_path = /obj/item/mecha_parts/part/savannah_ivanov_armor
materials = list(/datum/material/iron=30000,/datum/material/uranium=25000,/datum/material/titanium=20000)
construction_time = 600
category = list("Savannah-Ivanov")
//Exosuit Equipment
/datum/design/mech_hydraulic_clamp
name = "Exosuit Engineering Equipment (Hydraulic Clamp)"

20
code/modules/research/techweb/nodes/mecha_nodes.dm
View File

@@ -68,26 +68,6 @@
"phazon_peri", "phazon_targ", "phazon_armor")
research_costs = list(TECHWEB_POINT_TYPE_GENERIC = 3000)
/datum/techweb_node/savannah_ivanov
id = "mecha_savannah_ivanov"
display_name = "EXOSUIT: Savannah-Ivanov"
description = "Savannah-Ivanov exosuit designs"
prereq_ids = list("adv_mecha", "weaponry", "exp_tools")
design_ids = list(
"savannah_ivanov_chassis",
"savannah_ivanov_torso",
"savannah_ivanov_head",
"savannah_ivanov_left_arm",
"savannah_ivanov_left_leg",
"savannah_ivanov_right_arm",
"savannah_ivanov_right_leg",
"savannah_ivanov_armor",
"savannah_ivanov_main",
"savannah_ivanov_peri",
"savannah_ivanov_targ",
)
research_costs = list(TECHWEB_POINT_TYPE_GENERIC = 5000)
/datum/techweb_node/adv_mecha_tools
id = "adv_mecha_tools"
display_name = "Advanced Exosuit Equipment"

1
code/modules/vehicles/mecha/mech_fabricator.dm
View File

@@ -54,7 +54,6 @@
"Durand",
"H.O.N.K",
"Phazon",
"Savannah-Ivanov",
"Power Armor",
"Exosuit Equipment",
"Exosuit Ammunition",

133
code/modules/vehicles/mecha/mecha_construction_paths.dm
View File

@@ -1446,136 +1446,3 @@
else
user.visible_message("<span class='notice'>[user] unfastens the external armor layer.</span>", "<span class='notice'>You unfasten the external armor layer.</span>")
return TRUE
//SAVANNAH-IVANOV
/datum/component/construction/unordered/mecha_chassis/savannah_ivanov
result = /datum/component/construction/mecha/savannah_ivanov
steps = list(
/obj/item/mecha_parts/part/savannah_ivanov_torso,
/obj/item/mecha_parts/part/savannah_ivanov_head,
/obj/item/mecha_parts/part/savannah_ivanov_left_arm,
/obj/item/mecha_parts/part/savannah_ivanov_right_arm,
/obj/item/mecha_parts/part/savannah_ivanov_left_leg,
/obj/item/mecha_parts/part/savannah_ivanov_right_leg
)
/datum/component/construction/mecha/savannah_ivanov
result = /obj/vehicle/sealed/mecha/combat/savannah_ivanov
base_icon = "savannah_ivanov"
//has_weapons_module = TRUE
circuit_control = /obj/item/circuitboard/mecha/savannah_ivanov/main
circuit_periph = /obj/item/circuitboard/mecha/savannah_ivanov/peripherals
circuit_weapon = /obj/item/circuitboard/mecha/savannah_ivanov/targeting
inner_plating = /obj/item/stack/sheet/plasteel
inner_plating_amount = 10
outer_plating = /obj/item/mecha_parts/part/savannah_ivanov_armor
outer_plating_amount = 1
/datum/component/construction/mecha/savannah_ivanov/custom_action(obj/item/I, mob/living/user, diff)
if(!..())
return FALSE
//TODO: better messages.
switch(index)
if(1)
user.visible_message("<span class='notice'>[user] connects [parent] hydraulic systems.</span>", "<span class='notice'>You connect [parent] hydraulic systems.</span>")
if(2)
if(diff==FORWARD)
user.visible_message("<span class='notice'>[user] activates [parent] hydraulic systems.</span>", "<span class='notice'>You activate [parent] hydraulic systems.</span>")
else
user.visible_message("<span class='notice'>[user] disconnects [parent] hydraulic systems.</span>", "<span class='notice'>You disconnect [parent] hydraulic systems.</span>")
if(3)
if(diff==FORWARD)
user.visible_message("<span class='notice'>[user] adds the wiring to [parent].</span>", "<span class='notice'>You add the wiring to [parent].</span>")
else
user.visible_message("<span class='notice'>[user] deactivates [parent] hydraulic systems.</span>", "<span class='notice'>You deactivate [parent] hydraulic systems.</span>")
if(4)
if(diff==FORWARD)
user.visible_message("<span class='notice'>[user] adjusts the wiring of [parent].</span>", "<span class='notice'>You adjust the wiring of [parent].</span>")
else
user.visible_message("<span class='notice'>[user] removes the wiring from [parent].</span>", "<span class='notice'>You remove the wiring from [parent].</span>")
if(5)
if(diff==FORWARD)
user.visible_message("<span class='notice'>[user] installs [I] into [parent].</span>", "<span class='notice'>You install [I] into [parent].</span>")
else
user.visible_message("<span class='notice'>[user] disconnects the wiring of [parent].</span>", "<span class='notice'>You disconnect the wiring of [parent].</span>")
if(6)
if(diff==FORWARD)
user.visible_message("<span class='notice'>[user] secures the mainboard.</span>", "<span class='notice'>You secure the mainboard.</span>")
else
user.visible_message("<span class='notice'>[user] removes the central control module from [parent].</span>", "<span class='notice'>You remove the central computer mainboard from [parent].</span>")
if(7)
if(diff==FORWARD)
user.visible_message("<span class='notice'>[user] installs [I] into [parent].</span>", "<span class='notice'>You install [I] into [parent].</span>")
else
user.visible_message("<span class='notice'>[user] unfastens the mainboard.</span>", "<span class='notice'>You unfasten the mainboard.</span>")
if(8)
if(diff==FORWARD)
user.visible_message("<span class='notice'>[user] secures the peripherals control module.</span>", "<span class='notice'>You secure the peripherals control module.</span>")
else
user.visible_message("<span class='notice'>[user] removes the peripherals control module from [parent].</span>", "<span class='notice'>You remove the peripherals control module from [parent].</span>")
if(9)
if(diff==FORWARD)
user.visible_message("<span class='notice'>[user] installs [I] into [parent].</span>", "<span class='notice'>You install [I] into [parent].</span>")
else
user.visible_message("<span class='notice'>[user] unfastens the peripherals control module.</span>", "<span class='notice'>You unfasten the peripherals control module.</span>")
if(10)
if(diff==FORWARD)
user.visible_message("<span class='notice'>[user] secures the scanner module.</span>", "<span class='notice'>You secure the scanner module.</span>")
else
user.visible_message("<span class='notice'>[user] removes the scanner module from [parent].</span>", "<span class='notice'>You remove the scanner module from [parent].</span>")
if(11)
if(diff==FORWARD)
user.visible_message("<span class='notice'>[user] installs [I] to [parent].</span>", "<span class='notice'>You install [I] to [parent].</span>")
else
user.visible_message("<span class='notice'>[user] unfastens the scanner module.</span>", "<span class='notice'>You unfasten the scanner module.</span>")
if(12)
if(diff==FORWARD)
user.visible_message("<span class='notice'>[user] secures the capacitor.</span>", "<span class='notice'>You secure the capacitor.</span>")
else
user.visible_message("<span class='notice'>[user] removes the capacitor from [parent].</span>", "<span class='notice'>You remove the capacitor from [parent].</span>")
if(13)
if(diff==FORWARD)
user.visible_message("<span class='notice'>[user] installs [I] into [parent].</span>", "<span class='notice'>You install [I] into [parent].</span>")
else
user.visible_message("<span class='notice'>[user] unfastens the capacitor.</span>", "<span class='notice'>You unfasten the capacitor.</span>")
if(14)
if(diff==FORWARD)
user.visible_message("<span class='notice'>[user] secures the power cell.</span>", "<span class='notice'>You secure the power cell.</span>")
else
user.visible_message("<span class='notice'>[user] pries the power cell from [parent].</span>", "<span class='notice'>You pry the power cell from [parent].</span>")
if(15)
if(diff==FORWARD)
user.visible_message("<span class='notice'>[user] installs the internal armor layer to [parent].</span>", "<span class='notice'>You install the internal armor layer to [parent].</span>")
else
user.visible_message("<span class='notice'>[user] unfastens the power cell.</span>", "<span class='notice'>You unfasten the power cell.</span>")
if(16)
if(diff==FORWARD)
user.visible_message("<span class='notice'>[user] secures the internal armor layer.</span>", "<span class='notice'>You secure the internal armor layer.</span>")
else
user.visible_message("<span class='notice'>[user] pries internal armor layer from [parent].</span>", "<span class='notice'>You pry internal armor layer from [parent].</span>")
if(17)
if(diff==FORWARD)
user.visible_message("<span class='notice'>[user] welds the internal armor layer to [parent].</span>", "<span class='notice'>You weld the internal armor layer to [parent].</span>")
else
user.visible_message("<span class='notice'>[user] unfastens the internal armor layer.</span>", "<span class='notice'>You unfasten the internal armor layer.</span>")
if(18)
if(diff==FORWARD)
user.visible_message("<span class='notice'>[user] installs the external armor layer to [parent].</span>", "<span class='notice'>You install the external reinforced armor layer to [parent].</span>")
else
user.visible_message("<span class='notice'>[user] cuts the internal armor layer from [parent].</span>", "<span class='notice'>You cut the internal armor layer from [parent].</span>")
if(19)
if(diff==FORWARD)
user.visible_message("<span class='notice'>[user] secures the external armor layer.</span>", "<span class='notice'>You secure the external reinforced armor layer.</span>")
else
user.visible_message("<span class='notice'>[user] pries the external armor layer from [parent].</span>", "<span class='notice'>You pry the external armor layer from [parent].</span>")
if(20)
if(diff==FORWARD)
user.visible_message("<span class='notice'>[user] welds the external armor layer to [parent].</span>", "<span class='notice'>You weld the external armor layer to [parent].</span>")
else
user.visible_message("<span class='notice'>[user] unfastens the external armor layer.</span>", "<span class='notice'>You unfasten the external armor layer.</span>")
return TRUE

53
code/modules/vehicles/mecha/mecha_parts.dm
View File

@@ -313,47 +313,6 @@
desc="Phazon armor plates. They are layered with plasma to protect the pilot from the stress of phasing and have unusual properties."
icon_state = "phazon_armor"
// Savannah-Ivanov
/obj/item/mecha_parts/chassis/savannah_ivanov
name = "\improper Savannah-Ivanov chassis"
construct_type = /datum/component/construction/unordered/mecha_chassis/savannah_ivanov
/obj/item/mecha_parts/part/savannah_ivanov_torso
name="\improper Savannah-Ivanov torso"
desc="A Savannah-Ivanov torso part. It's missing a huge chunk of space..."
icon_state = "savannah_ivanov_harness"
/obj/item/mecha_parts/part/savannah_ivanov_head
name="\improper Savannah-Ivanov head"
desc="A Savannah-Ivanov head. It's sensors have been adjusted to support graceful landings."
icon_state = "savannah_ivanov_head"
/obj/item/mecha_parts/part/savannah_ivanov_left_arm
name="\improper Savannah-Ivanov left arm"
desc="A Savannah-Ivanov left arm. Hidden rocket fabrication included in the wrists."
icon_state = "savannah_ivanov_l_arm"
/obj/item/mecha_parts/part/savannah_ivanov_right_arm
name="\improper Savannah-Ivanov right arm"
desc="A Savannah-Ivanov left arm. Hidden rocket fabrication included in the wrists."
icon_state = "savannah_ivanov_r_arm"
/obj/item/mecha_parts/part/savannah_ivanov_left_leg
name="\improper Savannah-Ivanov left leg"
desc="A Savannah-Ivanov left leg. In production they were designed to carry more than two passengers, so the leaping functionality was added as to not waste potential."
icon_state = "savannah_ivanov_l_leg"
/obj/item/mecha_parts/part/savannah_ivanov_right_leg
name="\improper Savannah-Ivanov right leg"
desc="A Savannah-Ivanov left leg. In production they were designed to carry more than two passengers, so the leaping functionality was added as to not waste potential."
icon_state = "savannah_ivanov_r_leg"
/obj/item/mecha_parts/part/savannah_ivanov_armor
name="Savannah-Ivanov armor"
desc="Savannah-Ivanov armor plates. They are uniquely shaped and reinforced to deal with the stresses of two pilots, grandiose leaps, and missiles."
icon_state = "savannah_ivanov_armor"
///////// Circuitboards
/obj/item/circuitboard/mecha
@@ -440,15 +399,3 @@
/obj/item/circuitboard/mecha/clarke/main
name = "Clarke Central Control module (Exosuit Board)"
icon_state = "mainboard"
/obj/item/circuitboard/mecha/savannah_ivanov/peripherals
name = "Savannah Peripherals Control module (Exosuit Board)"
icon_state = "mcontroller"
/obj/item/circuitboard/mecha/savannah_ivanov/targeting
name = "Ivanov Weapon Control and Targeting module (Exosuit Board)"
icon_state = "mcontroller"
/obj/item/circuitboard/mecha/savannah_ivanov/main
name = "Savannah-Ivanov Combination Control Lock module (Exosuit Board)"
icon_state = "mainboard"

12
code/modules/vehicles/mecha/mecha_wreckage.dm
View File

@@ -220,15 +220,3 @@
/obj/item/mecha_parts/part/odysseus_right_arm,
/obj/item/mecha_parts/part/odysseus_left_leg,
/obj/item/mecha_parts/part/odysseus_right_leg)
/obj/structure/mecha_wreckage/savannah_ivanov
name = "\improper Savannah-Ivanov wreckage"
icon = 'icons/mecha/coop_mech.dmi'
icon_state = "savannah_ivanov-broken"
parts = list(
/obj/item/mecha_parts/part/savannah_ivanov_torso,
/obj/item/mecha_parts/part/savannah_ivanov_head,
/obj/item/mecha_parts/part/savannah_ivanov_left_arm,
/obj/item/mecha_parts/part/savannah_ivanov_right_arm,
/obj/item/mecha_parts/part/savannah_ivanov_left_leg,
/obj/item/mecha_parts/part/savannah_ivanov_right_leg)

BIN
icons/mecha/mech_construct.dmi
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 41 KiB

After

Width:  |  Height:  |  Size: 38 KiB

BIN
icons/mob/actions/actions_mecha.dmi
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 12 KiB

After

Width:  |  Height:  |  Size: 9.6 KiB

BIN
icons/obj/toy.dmi
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 38 KiB

After

Width:  |  Height:  |  Size: 36 KiB

BIN
icons/screen/fullscreen_15x15.dmi
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 4.1 MiB

After

Width:  |  Height:  |  Size: 4.1 MiB

7
code/__HELPERS/spawns.dm → modular_splurt/code/__HELPERS/spawns.dm
View File

@@ -22,7 +22,12 @@
landing_location = get_turf(landing_location)
if(!spawn_type)
spawn_type = /obj/structure/closet/supplypod/podspawn
var/obj/structure/closet/supplypod/podspawn/pod = new spawn_type(null, style)
//Copypaste from podspawn_atom()
var/area/pod_storage_area = locate(/area/centcom/supplypod/podStorage) in GLOB.sortedAreas
pod_storage_area = pick(get_area_turfs(pod_storage_area))
var/obj/structure/closet/supplypod/podspawn/pod = new spawn_type(pod_storage_area, style)
if(paths_to_spawn && !islist(paths_to_spawn))
paths_to_spawn = list(paths_to_spawn)
for(var/atom/movable/path as anything in paths_to_spawn)

4
modular_splurt/code/_rendering/fullscreen/fullscreen.dm Normal file
View File

@@ -0,0 +1,4 @@
/atom/movable/screen/fullscreen/ivanov_display
icon = 'modular_splurt/icons/screen/fullscreen_15x15.dmi'
icon_state = "ivanov"
alpha = 180

5
modular_splurt/code/game/object/items/toys.dm Normal file
View File

@@ -0,0 +1,5 @@
/obj/item/toy/prize/savannahivanov
name = "toy Savannah-Ivanov"
icon = 'modular_splurt/icons/obj/toy.dmi'
icon_state = "savannahivanovtoy"
desc = "Mini-Mecha action figure! Collect them all! 13/12."

7
modular_splurt/code/modules/cargo/packs/costumes_toys.dm Normal file
View File

@@ -0,0 +1,7 @@
/datum/supply_pack/costumes_toys/randomised/toys/New()
var/list/extra_contains = list(
/obj/item/toy/prize/savannahivanov
)
LAZYADD(contains, extra_contains)
. = ..()

4
modular_splurt/code/modules/cargo/supplypod.dm Normal file
View File

@@ -0,0 +1,4 @@
//type used for one drop spawning items. doesn't have a style as style is set by the helper that creates this
/obj/structure/closet/supplypod/podspawn
bluespace = TRUE
explosionSize = list(0,0,0,0)

5
modular_splurt/code/modules/research/designs/autoylathe_designs.dm Normal file
View File

@@ -0,0 +1,5 @@
/datum/design/autoylathe/mech/model13
name = "toy Savannah-Ivanov"
id = "toymech13"
materials = list(/datum/material/plastic = 250)
build_path = /obj/item/toy/prize/savannahivanov

23
modular_splurt/code/modules/research/designs/mecha_designs.dm Normal file
View File

@@ -0,0 +1,23 @@
/datum/design/board/savannah_ivanov_main
name = "\"Savannah-Ivanov\" Central Control module"
desc = "Allows for the construction of a \"Savannah-Ivanov\" Central Control module."
id = "savannah_ivanov_main"
build_path = /obj/item/circuitboard/mecha/savannah_ivanov/main
category = list("Exosuit Modules")
departmental_flags = DEPARTMENTAL_FLAG_SCIENCE
/datum/design/board/savannah_ivanov_peri
name = "\"Savannah-Ivanov\" Peripherals Control module"
desc = "Allows for the construction of a \"Savannah-Ivanov\" Peripheral Control module."
id = "savannah_ivanov_peri"
build_path = /obj/item/circuitboard/mecha/savannah_ivanov/peripherals
category = list("Exosuit Modules")
departmental_flags = DEPARTMENTAL_FLAG_SCIENCE
/datum/design/board/savannah_ivanov_targ
name = "\"Savannah-Ivanov\" Weapons & Targeting Control module"
desc = "Allows for the construction of a \"Savannah-Ivanov\" Weapons & Targeting Control module."
id = "savannah_ivanov_targ"
build_path = /obj/item/circuitboard/mecha/savannah_ivanov/targeting
category = list("Exosuit Modules")
departmental_flags = DEPARTMENTAL_FLAG_SCIENCE

117
modular_splurt/code/modules/research/designs/mechfabricator_designs.dm Normal file
View File

@@ -0,0 +1,117 @@
//Savannah-Ivanov
/datum/design/savannah_ivanov_chassis
name = "Exosuit Chassis (\"Savannah-Ivanov\")"
id = "savannah_ivanov_chassis"
build_type = MECHFAB
build_path = /obj/item/mecha_parts/chassis/savannah_ivanov
materials = list(/datum/material/iron=20000)
construction_time = 100
category = list("Savannah-Ivanov")
/datum/design/savannah_ivanov_torso
name = "Exosuit Torso (\"Savannah-Ivanov\")"
id = "savannah_ivanov_torso"
build_type = MECHFAB
build_path = /obj/item/mecha_parts/part/savannah_ivanov_torso
materials = list(/datum/material/iron=20000,/datum/material/glass = 7500)
construction_time = 200
category = list("Savannah-Ivanov")
/datum/design/savannah_ivanov_head
name = "Exosuit Head (\"Savannah-Ivanov\")"
id = "savannah_ivanov_head"
build_type = MECHFAB
build_path = /obj/item/mecha_parts/part/savannah_ivanov_head
materials = list(/datum/material/iron=6000,/datum/material/glass = 10000)
construction_time = 100
category = list("Savannah-Ivanov")
/datum/design/savannah_ivanov_left_arm
name = "Exosuit Left Arm (\"Savannah-Ivanov\")"
id = "savannah_ivanov_left_arm"
build_type = MECHFAB
build_path = /obj/item/mecha_parts/part/savannah_ivanov_left_arm
materials = list(/datum/material/iron=15000)
construction_time = 150
category = list("Savannah-Ivanov")
/datum/design/savannah_ivanov_right_arm
name = "Exosuit Right Arm (\"Savannah-Ivanov\")"
id = "savannah_ivanov_right_arm"
build_type = MECHFAB
build_path = /obj/item/mecha_parts/part/savannah_ivanov_right_arm
materials = list(/datum/material/iron=15000)
construction_time = 150
category = list("Savannah-Ivanov")
/datum/design/savannah_ivanov_chassis
name = "Exosuit Chassis (\"Savannah-Ivanov\")"
id = "savannah_ivanov_chassis"
build_type = MECHFAB
build_path = /obj/item/mecha_parts/chassis/savannah_ivanov
materials = list(/datum/material/iron=25000)
construction_time = 100
category = list("Savannah-Ivanov")
/datum/design/savannah_ivanov_torso
name = "Exosuit Torso (\"Savannah-Ivanov\")"
id = "savannah_ivanov_torso"
build_type = MECHFAB
build_path = /obj/item/mecha_parts/part/savannah_ivanov_torso
materials = list(/datum/material/iron=25000, /datum/material/glass = 10000,/datum/material/silver=10000)
construction_time = 300
category = list("Savannah-Ivanov")
/datum/design/savannah_ivanov_head
name = "Exosuit Head (\"Savannah-Ivanov\")"
id = "savannah_ivanov_head"
build_type = MECHFAB
build_path = /obj/item/mecha_parts/part/savannah_ivanov_head
materials = list(/datum/material/iron=10000,/datum/material/glass = 15000,/datum/material/silver=2000)
construction_time = 200
category = list("Savannah-Ivanov")
/datum/design/savannah_ivanov_left_arm
name = "Exosuit Left Arm (\"Savannah-Ivanov\")"
id = "savannah_ivanov_left_arm"
build_type = MECHFAB
build_path = /obj/item/mecha_parts/part/savannah_ivanov_left_arm
materials = list(/datum/material/iron=10000,/datum/material/silver=4000)
construction_time = 200
category = list("Savannah-Ivanov")
/datum/design/savannah_ivanov_right_arm
name = "Exosuit Right Arm (\"Savannah-Ivanov\")"
id = "savannah_ivanov_right_arm"
build_type = MECHFAB
build_path = /obj/item/mecha_parts/part/savannah_ivanov_right_arm
materials = list(/datum/material/iron=10000,/datum/material/silver=4000)
construction_time = 200
category = list("Savannah-Ivanov")
/datum/design/savannah_ivanov_left_leg
name = "Exosuit Left Leg (\"Savannah-Ivanov\")"
id = "savannah_ivanov_left_leg"
build_type = MECHFAB
build_path = /obj/item/mecha_parts/part/savannah_ivanov_left_leg
materials = list(/datum/material/iron=15000,/datum/material/silver=4000)
construction_time = 200
category = list("Savannah-Ivanov")
/datum/design/savannah_ivanov_right_leg
name = "Exosuit Right Leg (\"Savannah-Ivanov\")"
id = "savannah_ivanov_right_leg"
build_type = MECHFAB
build_path = /obj/item/mecha_parts/part/savannah_ivanov_right_leg
materials = list(/datum/material/iron=15000,/datum/material/silver=4000)
construction_time = 200
category = list("Savannah-Ivanov")
/datum/design/savannah_ivanov_armor
name = "Exosuit Armor (\"Savannah-Ivanov\")"
id = "savannah_ivanov_armor"
build_type = MECHFAB
build_path = /obj/item/mecha_parts/part/savannah_ivanov_armor
materials = list(/datum/material/iron=30000,/datum/material/uranium=25000,/datum/material/titanium=20000)
construction_time = 600
category = list("Savannah-Ivanov")

19
modular_splurt/code/modules/research/techweb/nodes/mecha_nodes.dm Normal file
View File

@@ -0,0 +1,19 @@
/datum/techweb_node/savannah_ivanov
id = "mecha_savannah_ivanov"
display_name = "EXOSUIT: Savannah-Ivanov"
description = "Savannah-Ivanov exosuit designs"
prereq_ids = list("adv_mecha", "weaponry", "exp_tools")
design_ids = list(
"savannah_ivanov_chassis",
"savannah_ivanov_torso",
"savannah_ivanov_head",
"savannah_ivanov_left_arm",
"savannah_ivanov_left_leg",
"savannah_ivanov_right_arm",
"savannah_ivanov_right_leg",
"savannah_ivanov_armor",
"savannah_ivanov_main",
"savannah_ivanov_peri",
"savannah_ivanov_targ",
)
research_costs = list(TECHWEB_POINT_TYPE_GENERIC = 5000)

6
code/modules/vehicles/mecha/combat/savannah_ivanov.dm → modular_splurt/code/modules/vehicles/mecha/combat/savannah_ivanov.dm
View File

@@ -15,7 +15,7 @@
/obj/vehicle/sealed/mecha/combat/savannah_ivanov
name = "\improper Savannah-Ivanov"
desc = "An insanely overbulked mecha that handily crushes single-pilot opponents. The price is that you need two pilots to use it."
icon = 'icons/mecha/coop_mech.dmi'
icon = 'modular_splurt/icons/mecha/coop_mech.dmi'
base_icon_state = "savannah_ivanov"
icon_state = "savannah_ivanov_0_0"
//does not include mmi compatibility
@@ -56,6 +56,7 @@
///Savannah Skyfall
/datum/action/vehicle/sealed/mecha/skyfall
name = "Savannah Skyfall"
icon_icon = 'modular_splurt/icons/mob/actions/actions_mecha.dmi'
button_icon_state = "mech_savannah"
///cooldown time between skyfall uses
var/skyfall_cooldown_time = 1 MINUTES
@@ -221,6 +222,7 @@
/datum/action/vehicle/sealed/mecha/ivanov_strike
name = "Ivanov Strike"
icon_icon = 'modular_splurt/icons/mob/actions/actions_mecha.dmi'
button_icon_state = "mech_ivanov"
///cooldown time between strike uses
var/strike_cooldown_time = 40 SECONDS
@@ -329,7 +331,7 @@
/obj/effect/skyfall_landingzone
name = "Landing Zone Indicator"
desc = "A holographic projection designating the landing zone of something. It's probably best to stand back."
icon = 'icons/mob/telegraphing/telegraph_96x96.dmi'
icon = 'modular_splurt/icons/mob/telegraphing/telegraph_96x96.dmi'
icon_state = "target_largebox"
layer = BELOW_MOB_LAYER
pixel_x = -32

6
modular_splurt/code/modules/vehicles/mecha/mech_fabricator.dm Normal file
View File

@@ -0,0 +1,6 @@
/obj/machinery/mecha_part_fabricator/Initialize(mapload)
var/list/extra_part_sets = list(
"Savannah-Ivanov"
)
LAZYADD(part_sets, extra_part_sets)
. = ..()

132
modular_splurt/code/modules/vehicles/mecha/mecha_construction_paths.dm Normal file
View File

@@ -0,0 +1,132 @@
//SAVANNAH-IVANOV
/datum/component/construction/unordered/mecha_chassis/savannah_ivanov
result = /datum/component/construction/mecha/savannah_ivanov
steps = list(
/obj/item/mecha_parts/part/savannah_ivanov_torso,
/obj/item/mecha_parts/part/savannah_ivanov_head,
/obj/item/mecha_parts/part/savannah_ivanov_left_arm,
/obj/item/mecha_parts/part/savannah_ivanov_right_arm,
/obj/item/mecha_parts/part/savannah_ivanov_left_leg,
/obj/item/mecha_parts/part/savannah_ivanov_right_leg
)
/datum/component/construction/mecha/savannah_ivanov
result = /obj/vehicle/sealed/mecha/combat/savannah_ivanov
base_icon = "savannah_ivanov"
//has_weapons_module = TRUE
circuit_control = /obj/item/circuitboard/mecha/savannah_ivanov/main
circuit_periph = /obj/item/circuitboard/mecha/savannah_ivanov/peripherals
circuit_weapon = /obj/item/circuitboard/mecha/savannah_ivanov/targeting
inner_plating = /obj/item/stack/sheet/plasteel
inner_plating_amount = 10
outer_plating = /obj/item/mecha_parts/part/savannah_ivanov_armor
outer_plating_amount = 1
/datum/component/construction/mecha/savannah_ivanov/custom_action(obj/item/I, mob/living/user, diff)
if(!..())
return FALSE
//TODO: better messages.
switch(index)
if(1)
user.visible_message("<span class='notice'>[user] connects [parent] hydraulic systems.</span>", "<span class='notice'>You connect [parent] hydraulic systems.</span>")
if(2)
if(diff==FORWARD)
user.visible_message("<span class='notice'>[user] activates [parent] hydraulic systems.</span>", "<span class='notice'>You activate [parent] hydraulic systems.</span>")
else
user.visible_message("<span class='notice'>[user] disconnects [parent] hydraulic systems.</span>", "<span class='notice'>You disconnect [parent] hydraulic systems.</span>")
if(3)
if(diff==FORWARD)
user.visible_message("<span class='notice'>[user] adds the wiring to [parent].</span>", "<span class='notice'>You add the wiring to [parent].</span>")
else
user.visible_message("<span class='notice'>[user] deactivates [parent] hydraulic systems.</span>", "<span class='notice'>You deactivate [parent] hydraulic systems.</span>")
if(4)
if(diff==FORWARD)
user.visible_message("<span class='notice'>[user] adjusts the wiring of [parent].</span>", "<span class='notice'>You adjust the wiring of [parent].</span>")
else
user.visible_message("<span class='notice'>[user] removes the wiring from [parent].</span>", "<span class='notice'>You remove the wiring from [parent].</span>")
if(5)
if(diff==FORWARD)
user.visible_message("<span class='notice'>[user] installs [I] into [parent].</span>", "<span class='notice'>You install [I] into [parent].</span>")
else
user.visible_message("<span class='notice'>[user] disconnects the wiring of [parent].</span>", "<span class='notice'>You disconnect the wiring of [parent].</span>")
if(6)
if(diff==FORWARD)
user.visible_message("<span class='notice'>[user] secures the mainboard.</span>", "<span class='notice'>You secure the mainboard.</span>")
else
user.visible_message("<span class='notice'>[user] removes the central control module from [parent].</span>", "<span class='notice'>You remove the central computer mainboard from [parent].</span>")
if(7)
if(diff==FORWARD)
user.visible_message("<span class='notice'>[user] installs [I] into [parent].</span>", "<span class='notice'>You install [I] into [parent].</span>")
else
user.visible_message("<span class='notice'>[user] unfastens the mainboard.</span>", "<span class='notice'>You unfasten the mainboard.</span>")
if(8)
if(diff==FORWARD)
user.visible_message("<span class='notice'>[user] secures the peripherals control module.</span>", "<span class='notice'>You secure the peripherals control module.</span>")
else
user.visible_message("<span class='notice'>[user] removes the peripherals control module from [parent].</span>", "<span class='notice'>You remove the peripherals control module from [parent].</span>")
if(9)
if(diff==FORWARD)
user.visible_message("<span class='notice'>[user] installs [I] into [parent].</span>", "<span class='notice'>You install [I] into [parent].</span>")
else
user.visible_message("<span class='notice'>[user] unfastens the peripherals control module.</span>", "<span class='notice'>You unfasten the peripherals control module.</span>")
if(10)
if(diff==FORWARD)
user.visible_message("<span class='notice'>[user] secures the scanner module.</span>", "<span class='notice'>You secure the scanner module.</span>")
else
user.visible_message("<span class='notice'>[user] removes the scanner module from [parent].</span>", "<span class='notice'>You remove the scanner module from [parent].</span>")
if(11)
if(diff==FORWARD)
user.visible_message("<span class='notice'>[user] installs [I] to [parent].</span>", "<span class='notice'>You install [I] to [parent].</span>")
else
user.visible_message("<span class='notice'>[user] unfastens the scanner module.</span>", "<span class='notice'>You unfasten the scanner module.</span>")
if(12)
if(diff==FORWARD)
user.visible_message("<span class='notice'>[user] secures the capacitor.</span>", "<span class='notice'>You secure the capacitor.</span>")
else
user.visible_message("<span class='notice'>[user] removes the capacitor from [parent].</span>", "<span class='notice'>You remove the capacitor from [parent].</span>")
if(13)
if(diff==FORWARD)
user.visible_message("<span class='notice'>[user] installs [I] into [parent].</span>", "<span class='notice'>You install [I] into [parent].</span>")
else
user.visible_message("<span class='notice'>[user] unfastens the capacitor.</span>", "<span class='notice'>You unfasten the capacitor.</span>")
if(14)
if(diff==FORWARD)
user.visible_message("<span class='notice'>[user] secures the power cell.</span>", "<span class='notice'>You secure the power cell.</span>")
else
user.visible_message("<span class='notice'>[user] pries the power cell from [parent].</span>", "<span class='notice'>You pry the power cell from [parent].</span>")
if(15)
if(diff==FORWARD)
user.visible_message("<span class='notice'>[user] installs the internal armor layer to [parent].</span>", "<span class='notice'>You install the internal armor layer to [parent].</span>")
else
user.visible_message("<span class='notice'>[user] unfastens the power cell.</span>", "<span class='notice'>You unfasten the power cell.</span>")
if(16)
if(diff==FORWARD)
user.visible_message("<span class='notice'>[user] secures the internal armor layer.</span>", "<span class='notice'>You secure the internal armor layer.</span>")
else
user.visible_message("<span class='notice'>[user] pries internal armor layer from [parent].</span>", "<span class='notice'>You pry internal armor layer from [parent].</span>")
if(17)
if(diff==FORWARD)
user.visible_message("<span class='notice'>[user] welds the internal armor layer to [parent].</span>", "<span class='notice'>You weld the internal armor layer to [parent].</span>")
else
user.visible_message("<span class='notice'>[user] unfastens the internal armor layer.</span>", "<span class='notice'>You unfasten the internal armor layer.</span>")
if(18)
if(diff==FORWARD)
user.visible_message("<span class='notice'>[user] installs the external armor layer to [parent].</span>", "<span class='notice'>You install the external reinforced armor layer to [parent].</span>")
else
user.visible_message("<span class='notice'>[user] cuts the internal armor layer from [parent].</span>", "<span class='notice'>You cut the internal armor layer from [parent].</span>")
if(19)
if(diff==FORWARD)
user.visible_message("<span class='notice'>[user] secures the external armor layer.</span>", "<span class='notice'>You secure the external reinforced armor layer.</span>")
else
user.visible_message("<span class='notice'>[user] pries the external armor layer from [parent].</span>", "<span class='notice'>You pry the external armor layer from [parent].</span>")
if(20)
if(diff==FORWARD)
user.visible_message("<span class='notice'>[user] welds the external armor layer to [parent].</span>", "<span class='notice'>You weld the external armor layer to [parent].</span>")
else
user.visible_message("<span class='notice'>[user] unfastens the external armor layer.</span>", "<span class='notice'>You unfasten the external armor layer.</span>")
return TRUE

65
modular_splurt/code/modules/vehicles/mecha/mecha_parts.dm Normal file
View File

@@ -0,0 +1,65 @@
////////// Phazon
// Savannah-Ivanov
/obj/item/mecha_parts/chassis/savannah_ivanov
icon = 'modular_splurt/icons/mecha/mech_construct.dmi'
name = "\improper Savannah-Ivanov chassis"
construct_type = /datum/component/construction/unordered/mecha_chassis/savannah_ivanov
/obj/item/mecha_parts/part/savannah_ivanov_torso
icon = 'modular_splurt/icons/mecha/mech_construct.dmi'
name="\improper Savannah-Ivanov torso"
desc="A Savannah-Ivanov torso part. It's missing a huge chunk of space..."
icon_state = "savannah_ivanov_harness"
/obj/item/mecha_parts/part/savannah_ivanov_head
icon = 'modular_splurt/icons/mecha/mech_construct.dmi'
name="\improper Savannah-Ivanov head"
desc="A Savannah-Ivanov head. It's sensors have been adjusted to support graceful landings."
icon_state = "savannah_ivanov_head"
/obj/item/mecha_parts/part/savannah_ivanov_left_arm
icon = 'modular_splurt/icons/mecha/mech_construct.dmi'
name="\improper Savannah-Ivanov left arm"
desc="A Savannah-Ivanov left arm. Hidden rocket fabrication included in the wrists."
icon_state = "savannah_ivanov_l_arm"
/obj/item/mecha_parts/part/savannah_ivanov_right_arm
icon = 'modular_splurt/icons/mecha/mech_construct.dmi'
name="\improper Savannah-Ivanov right arm"
desc="A Savannah-Ivanov left arm. Hidden rocket fabrication included in the wrists."
icon_state = "savannah_ivanov_r_arm"
/obj/item/mecha_parts/part/savannah_ivanov_left_leg
icon = 'modular_splurt/icons/mecha/mech_construct.dmi'
name="\improper Savannah-Ivanov left leg"
desc="A Savannah-Ivanov left leg. In production they were designed to carry more than two passengers, so the leaping functionality was added as to not waste potential."
icon_state = "savannah_ivanov_l_leg"
/obj/item/mecha_parts/part/savannah_ivanov_right_leg
icon = 'modular_splurt/icons/mecha/mech_construct.dmi'
name="\improper Savannah-Ivanov right leg"
desc="A Savannah-Ivanov left leg. In production they were designed to carry more than two passengers, so the leaping functionality was added as to not waste potential."
icon_state = "savannah_ivanov_r_leg"
/obj/item/mecha_parts/part/savannah_ivanov_armor
icon = 'modular_splurt/icons/mecha/mech_construct.dmi'
name="Savannah-Ivanov armor"
desc="Savannah-Ivanov armor plates. They are uniquely shaped and reinforced to deal with the stresses of two pilots, grandiose leaps, and missiles."
icon_state = "savannah_ivanov_armor"
///////// Circuitboards
/obj/item/circuitboard/mecha/savannah_ivanov/peripherals
name = "Savannah Peripherals Control module (Exosuit Board)"
icon_state = "mcontroller"
/obj/item/circuitboard/mecha/savannah_ivanov/targeting
name = "Ivanov Weapon Control and Targeting module (Exosuit Board)"
icon_state = "mcontroller"
/obj/item/circuitboard/mecha/savannah_ivanov/main
name = "Savannah-Ivanov Combination Control Lock module (Exosuit Board)"
icon_state = "mainboard"

11
modular_splurt/code/modules/vehicles/mecha/mecha_wreckage.dm Normal file
View File

@@ -0,0 +1,11 @@
/obj/structure/mecha_wreckage/savannah_ivanov
name = "\improper Savannah-Ivanov wreckage"
icon = 'modular_splurt/icons/mecha/coop_mech.dmi'
icon_state = "savannah_ivanov-broken"
parts = list(
/obj/item/mecha_parts/part/savannah_ivanov_torso,
/obj/item/mecha_parts/part/savannah_ivanov_head,
/obj/item/mecha_parts/part/savannah_ivanov_left_arm,
/obj/item/mecha_parts/part/savannah_ivanov_right_arm,
/obj/item/mecha_parts/part/savannah_ivanov_left_leg,
/obj/item/mecha_parts/part/savannah_ivanov_right_leg)

0
icons/hud/screen_full.dmi → modular_splurt/icons/hud/screen_full.dmi
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 2.9 KiB

After

Width:  |  Height:  |  Size: 2.9 KiB

0
icons/mecha/coop_mech.dmi → modular_splurt/icons/mecha/coop_mech.dmi
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 3.2 KiB

After

Width:  |  Height:  |  Size: 3.2 KiB

BIN
modular_splurt/icons/mecha/mech_construct.dmi Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.3 KiB

BIN
modular_splurt/icons/mob/actions/actions_mecha.dmi Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.4 KiB

0
icons/mob/telegraphing/telegraph.dmi → modular_splurt/icons/mob/telegraphing/telegraph.dmi
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.3 KiB

After

Width:  |  Height:  |  Size: 1.3 KiB

0
icons/mob/telegraphing/telegraph_96x96.dmi → modular_splurt/icons/mob/telegraphing/telegraph_96x96.dmi
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.1 KiB

After

Width:  |  Height:  |  Size: 1.1 KiB

0
icons/mob/telegraphing/telegraph_holographic.dmi → modular_splurt/icons/mob/telegraphing/telegraph_holographic.dmi
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.5 KiB

After

Width:  |  Height:  |  Size: 1.5 KiB

BIN
modular_splurt/icons/obj/toy.dmi
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 37 KiB

After

Width:  |  Height:  |  Size: 38 KiB

BIN
modular_splurt/icons/screen/fullscreen_15x15.dmi Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 2.9 KiB

16
tgstation.dme
View File

@@ -208,7 +208,6 @@
#include "code\__HELPERS\roundend.dm"
#include "code\__HELPERS\sanitize_values.dm"
#include "code\__HELPERS\shell.dm"
#include "code\__HELPERS\spawns.dm"
#include "code\__HELPERS\stat_tracking.dm"
#include "code\__HELPERS\text.dm"
#include "code\__HELPERS\text_vr.dm"
@@ -3750,7 +3749,6 @@
#include "code\modules\vehicles\mecha\combat\neovgre.dm"
#include "code\modules\vehicles\mecha\combat\phazon.dm"
#include "code\modules\vehicles\mecha\combat\reticence.dm"
#include "code\modules\vehicles\mecha\combat\savannah_ivanov.dm"
#include "code\modules\vehicles\mecha\equipment\mecha_equipment.dm"
#include "code\modules\vehicles\mecha\equipment\tools\medical_tools.dm"
#include "code\modules\vehicles\mecha\equipment\tools\mining_tools.dm"
@@ -4215,6 +4213,7 @@
#include "modular_splurt\code\__HELPERS\_cit_helpers.dm"
#include "modular_splurt\code\__HELPERS\icons.dm"
#include "modular_splurt\code\__HELPERS\matrices.dm"
#include "modular_splurt\code\__HELPERS\spawns.dm"
#include "modular_splurt\code\__HELPERS\text.dm"
#include "modular_splurt\code\__HELPERS\unsorted.dm"
#include "modular_splurt\code\_globalvars\tgui.dm"
@@ -4228,6 +4227,7 @@
#include "modular_splurt\code\_onclick\hud\qareenhud.dm"
#include "modular_splurt\code\_onclick\hud\robot.dm"
#include "modular_splurt\code\_onclick\hud\screen_objects.dm"
#include "modular_splurt\code\_rendering\fullscreen\fullscreen.dm"
#include "modular_splurt\code\controllers\configuration\entries\splurt_comms.dm"
#include "modular_splurt\code\controllers\configuration\entries\splurt_discord.dm"
#include "modular_splurt\code\controllers\configuration\entries\splurt_fetish_content.dm"
@@ -4309,6 +4309,7 @@
#include "modular_splurt\code\game\object\items\plaguedoc.dm"
#include "modular_splurt\code\game\object\items\plushes.dm"
#include "modular_splurt\code\game\object\items\RCD.dm"
#include "modular_splurt\code\game\object\items\toys.dm"
#include "modular_splurt\code\game\object\items\weaponry.dm"
#include "modular_splurt\code\game\object\items\circuitboards\computer_circuitboards.dm"
#include "modular_splurt\code\game\object\items\circuitboards\machine_circuitboards.dm"
@@ -4419,6 +4420,7 @@
#include "modular_splurt\code\modules\atmospherics\machinery\components\unary_devices\vent_pump.dm"
#include "modular_splurt\code\modules\atmospherics\machinery\components\unary_devices\vent_scrubber.dm"
#include "modular_splurt\code\modules\atmospherics\machinery\other\miner.dm"
#include "modular_splurt\code\modules\cargo\supplypod.dm"
#include "modular_splurt\code\modules\cargo\blackmarket\clothing.dm"
#include "modular_splurt\code\modules\cargo\blackmarket\misc.dm"
#include "modular_splurt\code\modules\cargo\blackmarket\weapons.dm"
@@ -4430,6 +4432,7 @@
#include "modular_splurt\code\modules\cargo\exports\sheets.dm"
#include "modular_splurt\code\modules\cargo\exports\sweatshop.dm"
#include "modular_splurt\code\modules\cargo\packs\armory.dm"
#include "modular_splurt\code\modules\cargo\packs\costumes_toys.dm"
#include "modular_splurt\code\modules\cargo\packs\emergency.dm"
#include "modular_splurt\code\modules\cargo\packs\engine.dm"
#include "modular_splurt\code\modules\cargo\packs\goodies.dm"
@@ -4620,12 +4623,16 @@
#include "modular_splurt\code\modules\reagents\reagent_containers\hypovial.dm"
#include "modular_splurt\code\modules\reagents\reagent_containers\pill.dm"
#include "modular_splurt\code\modules\reagents\reagent_containers\spray.dm"
#include "modular_splurt\code\modules\research\designs\autoylathe_designs.dm"
#include "modular_splurt\code\modules\research\designs\biogenerator_designs.dm"
#include "modular_splurt\code\modules\research\designs\limbgrower_designs.dm"
#include "modular_splurt\code\modules\research\designs\mecha_designs.dm"
#include "modular_splurt\code\modules\research\designs\mechfabricator_designs.dm"
#include "modular_splurt\code\modules\research\designs\medical_designs.dm"
#include "modular_splurt\code\modules\research\designs\power_designs.dm"
#include "modular_splurt\code\modules\research\designs\machine_designs\machine_designs_all_misc.dm"
#include "modular_splurt\code\modules\research\techweb\nodes\bluespace_nodes.dm"
#include "modular_splurt\code\modules\research\techweb\nodes\mecha_nodes.dm"
#include "modular_splurt\code\modules\research\techweb\nodes\medical_nodes.dm"
#include "modular_splurt\code\modules\research\techweb\nodes\misc_nodes.dm"
#include "modular_splurt\code\modules\research\techweb\nodes\robotic_nodes.dm"
@@ -4646,6 +4653,11 @@
#include "modular_splurt\code\modules\toys\cards.dm"
#include "modular_splurt\code\modules\uplink\uplink_items\uplink_reactor.dm"
#include "modular_splurt\code\modules\vehicles\mecha\_mecha.dm"
#include "modular_splurt\code\modules\vehicles\mecha\mech_fabricator.dm"
#include "modular_splurt\code\modules\vehicles\mecha\mecha_construction_paths.dm"
#include "modular_splurt\code\modules\vehicles\mecha\mecha_parts.dm"
#include "modular_splurt\code\modules\vehicles\mecha\mecha_wreckage.dm"
#include "modular_splurt\code\modules\vehicles\mecha\combat\savannah_ivanov.dm"
#include "modular_splurt\code\modules\vending\autodrobe.dm"
#include "modular_splurt\code\modules\vending\barkbox.dm"
#include "modular_splurt\code\modules\vending\clothesmate.dm"