From ff22f0e365d6f75261ee3a0c2ff2e5861be9577a Mon Sep 17 00:00:00 2001 From: Andrew Date: Sun, 27 Aug 2017 22:48:31 -0500 Subject: [PATCH 1/2] Removes Cyborg Module Restraint on Jetpack The jetpack upgrade can now be applied to any cyborg module. --- .../objects/items/robot/robot_upgrades.dm | 19 +++++----- .../mob/living/silicon/robot/robot_modules.dm | 1 - html/changelogs/Nalarac - Borg Jetpack.yml | 36 +++++++++++++++++++ 3 files changed, 47 insertions(+), 9 deletions(-) create mode 100644 html/changelogs/Nalarac - Borg Jetpack.yml diff --git a/code/game/objects/items/robot/robot_upgrades.dm b/code/game/objects/items/robot/robot_upgrades.dm index 4a7dc88597..64c517af86 100644 --- a/code/game/objects/items/robot/robot_upgrades.dm +++ b/code/game/objects/items/robot/robot_upgrades.dm @@ -135,7 +135,7 @@ /obj/item/borg/upgrade/jetpack name = "mining robot jetpack" - desc = "A carbon dioxide jetpack suitable for low-gravity mining operations." + desc = "A carbon dioxide jetpack suitable for low-gravity operations." icon_state = "cyborg_upgrade3" item_state = "cyborg_upgrade" require_module = 1 @@ -143,17 +143,20 @@ /obj/item/borg/upgrade/jetpack/action(var/mob/living/silicon/robot/R) if(..()) return 0 - if(!R.module || !(type in R.module.supported_upgrades)) - R << "Upgrade mounting error! No suitable hardpoint detected!" - usr << "There's no mounting point for the module!" - return 0 - else + var/obj/item/weapon/tank/jetpack/carbondioxide/T = locate() in R.module + if(!T) + T = locate() in R.module.contents + if(!T) + T = locate() in R.module.modules + if(!T) R.module.modules += new/obj/item/weapon/tank/jetpack/carbondioxide for(var/obj/item/weapon/tank/jetpack/carbondioxide in R.module.modules) R.internals = src - //R.icon_state="Miner+j" return 1 - + if(T) + R << "Upgrade mounting error! No suitable hardpoint detected!" + usr << "There's no mounting point for the module!" + return 0 /obj/item/borg/upgrade/syndicate/ name = "scrambled equipment module" diff --git a/code/modules/mob/living/silicon/robot/robot_modules.dm b/code/modules/mob/living/silicon/robot/robot_modules.dm index de9517fd0c..277ac9e862 100644 --- a/code/modules/mob/living/silicon/robot/robot_modules.dm +++ b/code/modules/mob/living/silicon/robot/robot_modules.dm @@ -671,7 +671,6 @@ var/global/list/robot_modules = list( "Treadhead" = "Miner", "Drone" = "drone-miner" ) - supported_upgrades = list(/obj/item/borg/upgrade/jetpack) /obj/item/weapon/robot_module/robot/miner/New() ..() diff --git a/html/changelogs/Nalarac - Borg Jetpack.yml b/html/changelogs/Nalarac - Borg Jetpack.yml new file mode 100644 index 0000000000..4c3bb4e0ae --- /dev/null +++ b/html/changelogs/Nalarac - Borg Jetpack.yml @@ -0,0 +1,36 @@ +################################ +# Example Changelog File +# +# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb. +# +# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.) +# When it is, any changes listed below will disappear. +# +# Valid Prefixes: +# bugfix +# wip (For works in progress) +# tweak +# soundadd +# sounddel +# rscadd (general adding of nice things) +# rscdel (general deleting of nice things) +# imageadd +# imagedel +# maptweak +# spellcheck (typo fixes) +# experiment +################################# + +# Your name. +author: Nalarac + +# Optional: Remove this file after generating master changelog. Useful for PR changelogs that won't get used again. +delete-after: True + +# Any changes you've made. See valid prefix list above. +# INDENT WITH TWO SPACES. NOT TABS. SPACES. +# SCREW THIS UP AND IT WON'T WORK. +# Also, all entries are changed into a single [] after a master changelog generation. Just remove the brackets when you add new entries. +# Please surround your changes in double quotes ("), as certain characters otherwise screws up compiling. The quotes will not show up in the changelog. +changes: + - tweak: "Removes the module restraint for the cyborg jetpack upgrade" From d6c4d76d4349a96ce7d9d5fdc0c58aed6a764326 Mon Sep 17 00:00:00 2001 From: Andrew Date: Wed, 30 Aug 2017 12:40:48 -0500 Subject: [PATCH 2/2] Converts dialog to use to_chat Figured I might as well change the rest of the file while I was add it --- .../game/objects/items/robot/robot_upgrades.dm | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/code/game/objects/items/robot/robot_upgrades.dm b/code/game/objects/items/robot/robot_upgrades.dm index 64c517af86..584d6dd105 100644 --- a/code/game/objects/items/robot/robot_upgrades.dm +++ b/code/game/objects/items/robot/robot_upgrades.dm @@ -12,7 +12,7 @@ /obj/item/borg/upgrade/proc/action(var/mob/living/silicon/robot/R) if(R.stat == DEAD) - usr << "The [src] will not function on a deceased robot." + to_chat(usr, "The [src] will not function on a deceased robot.") return 1 return 0 @@ -66,7 +66,7 @@ /obj/item/borg/upgrade/restart/action(var/mob/living/silicon/robot/R) if(R.health < 0) - usr << "You have to repair the robot before using this module!" + to_chat(usr, "You have to repair the robot before using this module!") return 0 if(!R.key) @@ -110,8 +110,8 @@ if(..()) return 0 if(!R.module || !(type in R.module.supported_upgrades)) - R << "Upgrade mounting error! No suitable hardpoint detected!" - usr << "There's no mounting point for the module!" + to_chat(R, "Upgrade mounting error! No suitable hardpoint detected!") + to_chat(usr, "There's no mounting point for the module!") return 0 var/obj/item/weapon/gun/energy/taser/mounted/cyborg/T = locate() in R.module @@ -120,12 +120,12 @@ if(!T) T = locate() in R.module.modules if(!T) - usr << "This robot has had its taser removed!" + to_chat(usr, "This robot has had its taser removed!") return 0 if(T.recharge_time <= 2) - R << "Maximum cooling achieved for this hardpoint!" - usr << "There's no room for another cooling unit!" + to_chat(R, "Maximum cooling achieved for this hardpoint!") + to_chat(usr, "There's no room for another cooling unit!") return 0 else @@ -154,8 +154,8 @@ R.internals = src return 1 if(T) - R << "Upgrade mounting error! No suitable hardpoint detected!" - usr << "There's no mounting point for the module!" + to_chat(R, "Upgrade mounting error! No suitable hardpoint detected!") + to_chat(usr, "There's no mounting point for the module!") return 0 /obj/item/borg/upgrade/syndicate/