diff --git a/code/game/objects/items/robot/robot_upgrades.dm b/code/game/objects/items/robot/robot_upgrades.dm index 80f2ad9797f..edc2232185b 100644 --- a/code/game/objects/items/robot/robot_upgrades.dm +++ b/code/game/objects/items/robot/robot_upgrades.dm @@ -589,7 +589,8 @@ R.SetLockdown(0) R.set_anchored(FALSE) R.notransform = FALSE - R.resize = 2 + //R.resize = 2 //ORIGINAL + R.resize = 1.25 //SKYRAT EDIT CHANGE - CYBORG R.hasExpanded = TRUE R.update_transform() @@ -598,7 +599,8 @@ if (.) if (R.hasExpanded) R.hasExpanded = FALSE - R.resize = 0.5 + //R.resize = 0.5 //ORIGINAL + R.resize = 0.8 //SKYRAT EDIT CHANGE - CYBORG R.update_transform() /obj/item/borg/upgrade/rped diff --git a/code/modules/research/designs/mechfabricator_designs.dm b/code/modules/research/designs/mechfabricator_designs.dm index 0cb5dc796bf..23c09f18efa 100644 --- a/code/modules/research/designs/mechfabricator_designs.dm +++ b/code/modules/research/designs/mechfabricator_designs.dm @@ -764,7 +764,8 @@ id = "borg_upgrade_expand" build_type = MECHFAB build_path = /obj/item/borg/upgrade/expand - materials = list(/datum/material/iron = 200000, /datum/material/titanium = 5000) + //materials = list(/datum/material/iron = 200000, /datum/material/titanium = 5000) //ORIGINAL + materials = list(/datum/material/iron = 20000, /datum/material/titanium = 5000) //SKYRAT EDIT CHANGE - CYBORG construction_time = 120 category = list("Cyborg Upgrade Modules") diff --git a/code/modules/research/techweb/all_nodes.dm b/code/modules/research/techweb/all_nodes.dm index 6d831fecc0a..05320588062 100644 --- a/code/modules/research/techweb/all_nodes.dm +++ b/code/modules/research/techweb/all_nodes.dm @@ -288,7 +288,8 @@ display_name = "Cyborg Upgrades: Utility" description = "Utility upgrades for cyborgs." prereq_ids = list("adv_robotics") - design_ids = list("borg_upgrade_thrusters", "borg_upgrade_selfrepair", "borg_upgrade_expand", "borg_upgrade_disablercooler", "borg_upgrade_trashofholding", "borg_upgrade_advancedmop", "borg_upgrade_broomer", "borg_upgrade_prt") + //design_ids = list("borg_upgrade_thrusters", "borg_upgrade_selfrepair", "borg_upgrade_expand", "borg_upgrade_disablercooler", "borg_upgrade_trashofholding", "borg_upgrade_advancedmop", "borg_upgrade_broomer", "borg_upgrade_prt") //ORIGINAL + design_ids = list("borg_upgrade_thrusters", "borg_upgrade_selfrepair", "borg_upgrade_expand", "borg_upgrade_shrink", "borg_upgrade_disablercooler", "borg_upgrade_trashofholding", "borg_upgrade_advancedmop", "borg_upgrade_broomer", "borg_upgrade_prt") //SKYRAT EDIT CHANGE - CYBORG research_costs = list(TECHWEB_POINT_TYPE_GENERIC = 2000) /datum/techweb_node/cyborg_upg_engiminer diff --git a/modular_skyrat/modules/cyborg/code/mechafabricator_designs.dm b/modular_skyrat/modules/cyborg/code/mechafabricator_designs.dm new file mode 100644 index 00000000000..45d50ea281b --- /dev/null +++ b/modular_skyrat/modules/cyborg/code/mechafabricator_designs.dm @@ -0,0 +1,8 @@ +/datum/design/borg_upgrade_shrink + name = "Cyborg Upgrade (Shrink)" + id = "borg_upgrade_shrink" + build_type = MECHFAB + build_path = /obj/item/borg/upgrade/shrink + materials = list(/datum/material/iron=20000, /datum/material/glass=5000) + construction_time = 120 + category = list("Cyborg Upgrade Modules") diff --git a/modular_skyrat/modules/cyborg/code/robot_upgrades.dm b/modular_skyrat/modules/cyborg/code/robot_upgrades.dm new file mode 100644 index 00000000000..3f4f32d0191 --- /dev/null +++ b/modular_skyrat/modules/cyborg/code/robot_upgrades.dm @@ -0,0 +1,42 @@ +/mob/living/silicon/robot + var/hasShrunk = FALSE + +/obj/item/borg/upgrade/shrink + name = "borg shrinker" + desc = "A cyborg resizer, it makes a cyborg small." + icon_state = "cyborg_upgrade3" + +/obj/item/borg/upgrade/shrink/action(mob/living/silicon/robot/R, user = usr) + . = ..() + if(.) + + if(R.hasShrunk) + to_chat(usr, "This unit already has a shrink module installed!") + return FALSE + + R.notransform = TRUE + var/prev_lockcharge = R.lockcharge + R.SetLockdown(1) + R.set_anchored(TRUE) + var/datum/effect_system/smoke_spread/smoke = new + smoke.set_up(1, R.loc) + smoke.start() + sleep(2) + for(var/i in 1 to 4) + playsound(R, pick('sound/items/drill_use.ogg', 'sound/items/jaws_cut.ogg', 'sound/items/jaws_pry.ogg', 'sound/items/welder.ogg', 'sound/items/ratchet.ogg'), 80, TRUE, -1) + sleep(12) + if(!prev_lockcharge) + R.SetLockdown(0) + R.set_anchored(FALSE) + R.notransform = FALSE + R.resize = 0.75 + R.hasExpanded = TRUE + R.update_transform() + +/obj/item/borg/upgrade/shrink/deactivate(mob/living/silicon/robot/R, user = usr) + . = ..() + if (.) + if (R.hasShrunk) + R.hasShrunk = FALSE + R.resize = (4/3) + R.update_transform() diff --git a/modular_skyrat/modules/cyborg/readme.md b/modular_skyrat/modules/cyborg/readme.md new file mode 100644 index 00000000000..906150e2294 --- /dev/null +++ b/modular_skyrat/modules/cyborg/readme.md @@ -0,0 +1,27 @@ +## Title: Cyborg + +MODULE ID: CYBORG + +### Description: + +Most new content relating to cyborgs goes here. Borg skins are in Altborgs currently + +### TG Proc Changes: + +- N/A + +### Defines: + +- /code/modules/research/techweb/all_nodes.dm > /datum/techweb_node/cyborg_upg_util + +### Master file additions + +- N/A + +### Included files that are not contained in this module: + +- N/A + +### Credits: + +Azarak - porting diff --git a/tgstation.dme b/tgstation.dme index 83c7a4032f3..f74b2f6049a 100644 --- a/tgstation.dme +++ b/tgstation.dme @@ -3333,6 +3333,10 @@ #include "modular_skyrat\modules\altborgs\code\modules\mob\living\silicon\robot\robot.dm" #include "modular_skyrat\modules\altborgs\code\modules\mob\living\silicon\robot\robot_modules.dm" #include "modular_skyrat\modules\altborgs\code\modules\mob\living\silicon\robot\update_icons.dm" +#include "modular_skyrat\modules\ambitions\code\ambition.dm" +#include "modular_skyrat\modules\ambitions\code\ambition_templates.dm" +#include "modular_skyrat\modules\ambitions\code\antag_datums.dm" +#include "modular_skyrat\modules\ambitions\code\mind.dm" #include "modular_skyrat\modules\antagonists\code\gamemodes.dm" #include "modular_skyrat\modules\antagonists\code\modules\uplink\uplink_items.dm" #include "modular_skyrat\modules\autotransfer\code\autotransfer.dm" @@ -3543,6 +3547,8 @@ #include "modular_skyrat\modules\customization\modules\surgery\organs\tails.dm" #include "modular_skyrat\modules\customization\modules\surgery\organs\vox.dm" #include "modular_skyrat\modules\customization\modules\surgery\organs\wings.dm" +#include "modular_skyrat\modules\cyborg\code\mechafabricator_designs.dm" +#include "modular_skyrat\modules\cyborg\code\robot_upgrades.dm" #include "modular_skyrat\modules\emotes\code\dna_screams.dm" #include "modular_skyrat\modules\emotes\code\emotes.dm" #include "modular_skyrat\modules\emotes\code\silicon_emotes.dm" @@ -3613,8 +3619,4 @@ #include "modular_skyrat\modules\verbs\code\modules\client\verbs\looc.dm" #include "modular_skyrat\modules\verbs\code\modules\mob\say.dm" #include "modular_skyrat\modules\verbs\code\modules\mob\subtle.dm" -#include "modular_skyrat\modules\ambitions\code\ambition.dm" -#include "modular_skyrat\modules\ambitions\code\ambition_templates.dm" -#include "modular_skyrat\modules\ambitions\code\antag_datums.dm" -#include "modular_skyrat\modules\ambitions\code\mind.dm" // END_INCLUDE