shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

makes cyborg playable

Browse Source
This commit is contained in:
Metis
2024-11-15 22:18:47 -05:00
parent 52550eae18
commit 495a45841e
6 changed files with 56 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/__HELPERS/do_after.dm
+3 -1
View File
@@ -14,6 +14,7 @@
var/holding = user.get_active_held_item()
var/datum/progressbar/progbar
var/is_food_gripper = istype(user.get_active_held_item(), /obj/item/gripper/food) //GS13 EDIT
if (progress)
progbar = new(user, time, target)
@@ -34,7 +35,8 @@
|| (!(timed_action_flags & IGNORE_TARGET_IN_DOAFTERS) && !(target in user.do_afters)) \
|| (!(timed_action_flags & IGNORE_USER_LOC_CHANGE) && !drifting && user.loc != user_loc) \
|| (!(timed_action_flags & IGNORE_TARGET_LOC_CHANGE) && target.loc != target_loc) \
|| (!(timed_action_flags & IGNORE_HELD_ITEM) && user.get_active_held_item() != holding) \
//GS13 EDIT
|| (!(timed_action_flags & IGNORE_HELD_ITEM) && !is_food_gripper && user.get_active_held_item() != holding) \
|| (!(timed_action_flags & IGNORE_INCAPACITATED) && user.incapacitated()) \
|| (extra_checks && !extra_checks.Invoke()) \
)
code/modules/mob/living/silicon/robot/robot_modules.dm
+16
View File
@@ -281,6 +281,7 @@
/obj/item/t_scanner/adv_mining_scanner,
/obj/item/restraints/handcuffs/cable/zipties,
/obj/item/soap/nanotrasen,
/obj/item/gripper/food, //GS13 EDIT
/obj/item/borg/cyborghug)
emag_modules = list(/obj/item/melee/transforming/energy/sword/cyborg)
ratvar_modules = list(
@@ -317,6 +318,7 @@
/obj/item/organ_storage,
/obj/item/borg/lollipop,
/obj/item/sensor_device,
/obj/item/gripper/food, //GS13 EDIT
/obj/item/shockpaddles/cyborg)
emag_modules = list(/obj/item/reagent_containers/borghypo/hacked)
ratvar_modules = list(
@@ -421,6 +423,7 @@
/obj/item/storage/part_replacer/cyborg,
/obj/item/holosign_creator/combifan,
/obj/item/gripper,
/obj/item/gripper/food, //GS13 EDIT
/obj/item/lightreplacer/cyborg,
/obj/item/geiger_counter/cyborg,
/obj/item/assembly/signaler/cyborg,
@@ -527,6 +530,9 @@
/obj/item/melee/baton/loaded,
/obj/item/gun/energy/disabler/cyborg,
/obj/item/clothing/mask/gas/sechailer/cyborg,
/obj/item/gripper/food, //GS13 EDIT
/obj/item/reagent_containers/borghypo/feeding_tube, //GS13 EDIT
/obj/item/gun/energy/fatoray/weak/cyborg, //GS13 EDIT
/obj/item/pinpointer/crew)
emag_modules = list(/obj/item/gun/energy/laser/cyborg)
ratvar_modules = list(/obj/item/clockwork/slab/cyborg/security,
@@ -632,6 +638,9 @@
/obj/item/holosign_creator/cyborg,
/obj/item/borg/cyborghug/peacekeeper,
/obj/item/megaphone,
/obj/item/gripper/food, //GS13 EDIT
/obj/item/reagent_containers/borghypo/feeding_tube, //GS13 EDIT
/obj/item/gun/energy/fatoray/weak/cyborg, //GS13 EDIT
/obj/item/borg/projectile_dampen)
emag_modules = list(/obj/item/reagent_containers/borghypo/peace/hacked)
ratvar_modules = list(
@@ -724,6 +733,8 @@
/obj/item/razor, //killbait material
/obj/item/lipstick/purple,
/obj/item/reagent_containers/spray/waterflower/cyborg,
/obj/item/gripper/food, //GS13 EDIT
/obj/item/reagent_containers/borghypo/feeding_tube, //GS13 EDIT
/obj/item/borg/cyborghug/peacekeeper,
/obj/item/borg/lollipop/clown,
/obj/item/picket_sign/cyborg,
@@ -764,6 +775,9 @@
/obj/item/soap/nanotrasen,
/obj/item/storage/bag/trash/cyborg,
/obj/item/mop/cyborg,
/obj/item/gripper/food, //GS13 EDIT
/obj/item/reagent_containers/borghypo/feeding_tube, //GS13 EDIT
/obj/item/cookiesynth, //GS13 EDIT
/obj/item/lightreplacer/cyborg,
/obj/item/holosign_creator,
/obj/item/reagent_containers/spray/cyborg_drying)
@@ -905,6 +919,7 @@
/obj/item/stack/marker_beacon/cyborg,
/obj/item/dest_tagger,
/obj/item/stack/packageWrap/cyborg,
/obj/item/gripper/food, //GS13 EDIT
/obj/item/card/id/miningborg)
emag_modules = list(/obj/item/borg/stun)
ratvar_modules = list(
@@ -986,6 +1001,7 @@
/obj/item/gun/ballistic/revolver/grenadelauncher/cyborg,
/obj/item/card/emag,
/obj/item/crowbar/cyborg,
/obj/item/gripper/food, //GS13 EDIT
/obj/item/pinpointer/syndicate_cyborg)
ratvar_modules = list(
code/modules/research/techweb/nodes/robotics_nodes.dm
+1 -1
View File
@@ -20,7 +20,7 @@
starting_node = TRUE
display_name = "Cyborg Construction"
description = "Sapient robots with preloaded tool modules and programmable laws."
design_ids = list("robocontrol", "sflash", "borg_suit", "borg_head", "borg_chest", "borg_r_arm", "borg_l_arm", "borg_r_leg", "borg_l_leg", "borgupload",
design_ids = list("robocontrol", "sflash", "borg_suit", "borg_head", "borg_chest", "borg_r_arm", "borg_l_arm", "borg_r_leg", "borg_l_leg", "borgupload", "borg_upgrade_foodgrip", //GS13 EDIT
"cyborgrecharger", "borg_upgrade_restart", "borg_upgrade_rename")
/datum/techweb_node/adv_robotics