From 359514e239352f6e84a16122afd9512b5a9c6769 Mon Sep 17 00:00:00 2001 From: Steelpoint Date: Tue, 27 Jan 2015 17:24:13 +0800 Subject: [PATCH 1/7] SecBorgDisabler --- .../mob/living/silicon/robot/robot_modules.dm | 2 +- .../projectiles/guns/energy/special.dm | 30 +++++++++++++++++++ 2 files changed, 31 insertions(+), 1 deletion(-) diff --git a/code/modules/mob/living/silicon/robot/robot_modules.dm b/code/modules/mob/living/silicon/robot/robot_modules.dm index 5a9961d9ea0..9bb9e39ac2d 100644 --- a/code/modules/mob/living/silicon/robot/robot_modules.dm +++ b/code/modules/mob/living/silicon/robot/robot_modules.dm @@ -162,7 +162,7 @@ modules += new /obj/item/device/flashlight/seclite(src) modules += new /obj/item/weapon/restraints/handcuffs/cable/zipties/cyborg(src) modules += new /obj/item/weapon/melee/baton/loaded(src) - modules += new /obj/item/weapon/gun/energy/gun/advtaser/cyborg(src) + modules += new /obj/item/weapon/gun/energy/disabler/cyborg(src) modules += new /obj/item/clothing/mask/gas/sechailer/cyborg(src) emag = new /obj/item/weapon/gun/energy/laser/cyborg(src) fix_modules() diff --git a/code/modules/projectiles/guns/energy/special.dm b/code/modules/projectiles/guns/energy/special.dm index d19ef1f4e32..d68cfa3ffe2 100644 --- a/code/modules/projectiles/guns/energy/special.dm +++ b/code/modules/projectiles/guns/energy/special.dm @@ -158,11 +158,41 @@ /obj/item/weapon/gun/energy/disabler name = "disabler" + desc = "An integrated hybrid taser that draws directly from a cyborg's power cell. The weapon contains a limiter to prevent the cyborg's power cell from overheating." + var/charge_tick = 0 + var/recharge_time = 10 + +/obj/item/weapon/gun/energy/disabler/cyborg + name = "cyborg disabler" desc = "A self-defense weapon that exhausts organic targets, weakening them until they collapse." icon_state = "disabler" item_state = null ammo_type = list(/obj/item/ammo_casing/energy/disabler) +/obj/item/weapon/gun/energy/disabler/cyborg/New() + ..() + SSobj.processing.Add(src) + + +/obj/item/weapon/gun/energy/disabler/cyborg/Destroy() + SSobj.processing.Remove(src) + ..() + +/obj/item/weapon/gun/energy/disabler/cyborg/process() //Every [recharge_time] ticks, recharge a shot for the cyborg + charge_tick++ + if(charge_tick < recharge_time) return 0 + charge_tick = 0 + + if(!power_supply) return 0 //sanity + if(isrobot(src.loc)) + var/mob/living/silicon/robot/R = src.loc + if(R && R.cell) + var/obj/item/ammo_casing/energy/shot = ammo_type[select] //Necessary to find cost of shot + if(R.cell.use(shot.e_cost)) //Take power from the borg... + power_supply.give(shot.e_cost) //... to recharge the shot + + update_icon() + return 1 /obj/item/weapon/gun/energy/wormhole_projector name = "bluespace wormhole projector" From 8b78853c682adb4c2b31c0855c3f90d5a1e2049a Mon Sep 17 00:00:00 2001 From: Steelpoint Date: Tue, 27 Jan 2015 17:43:13 +0800 Subject: [PATCH 2/7] Tweaking --- code/modules/projectiles/guns/energy/special.dm | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/code/modules/projectiles/guns/energy/special.dm b/code/modules/projectiles/guns/energy/special.dm index d68cfa3ffe2..d44a814a185 100644 --- a/code/modules/projectiles/guns/energy/special.dm +++ b/code/modules/projectiles/guns/energy/special.dm @@ -158,16 +158,16 @@ /obj/item/weapon/gun/energy/disabler name = "disabler" - desc = "An integrated hybrid taser that draws directly from a cyborg's power cell. The weapon contains a limiter to prevent the cyborg's power cell from overheating." - var/charge_tick = 0 - var/recharge_time = 10 + desc = "A self-defense weapon that exhausts organic targets, weakening them until they collapse." + item_state = null + ammo_type = list(/obj/item/ammo_casing/energy/disabler) /obj/item/weapon/gun/energy/disabler/cyborg name = "cyborg disabler" - desc = "A self-defense weapon that exhausts organic targets, weakening them until they collapse." + desc = "An integrated hybrid taser that draws directly from a cyborg's power cell. The weapon contains a limiter to prevent the cyborg's power cell from overheating." icon_state = "disabler" - item_state = null - ammo_type = list(/obj/item/ammo_casing/energy/disabler) + var/charge_tick = 0 + var/recharge_time = 2.5 /obj/item/weapon/gun/energy/disabler/cyborg/New() ..() From f279e0754b30efb8c25a38d230132502c23ba225 Mon Sep 17 00:00:00 2001 From: Steelpoint Date: Tue, 27 Jan 2015 17:47:25 +0800 Subject: [PATCH 3/7] MisplacedLine --- code/modules/projectiles/guns/energy/special.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/projectiles/guns/energy/special.dm b/code/modules/projectiles/guns/energy/special.dm index d44a814a185..2b272e5c751 100644 --- a/code/modules/projectiles/guns/energy/special.dm +++ b/code/modules/projectiles/guns/energy/special.dm @@ -159,13 +159,13 @@ /obj/item/weapon/gun/energy/disabler name = "disabler" desc = "A self-defense weapon that exhausts organic targets, weakening them until they collapse." + icon_state = "disabler" item_state = null ammo_type = list(/obj/item/ammo_casing/energy/disabler) /obj/item/weapon/gun/energy/disabler/cyborg name = "cyborg disabler" desc = "An integrated hybrid taser that draws directly from a cyborg's power cell. The weapon contains a limiter to prevent the cyborg's power cell from overheating." - icon_state = "disabler" var/charge_tick = 0 var/recharge_time = 2.5 From 4262a1c89c2ca7011f8ea0b761e8777a080b0eaa Mon Sep 17 00:00:00 2001 From: Steelpoint Date: Tue, 27 Jan 2015 20:37:00 +0800 Subject: [PATCH 4/7] WrongDescription --- code/modules/projectiles/guns/energy/special.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/projectiles/guns/energy/special.dm b/code/modules/projectiles/guns/energy/special.dm index 2b272e5c751..0cf46acaa26 100644 --- a/code/modules/projectiles/guns/energy/special.dm +++ b/code/modules/projectiles/guns/energy/special.dm @@ -165,7 +165,7 @@ /obj/item/weapon/gun/energy/disabler/cyborg name = "cyborg disabler" - desc = "An integrated hybrid taser that draws directly from a cyborg's power cell. The weapon contains a limiter to prevent the cyborg's power cell from overheating." + desc = "An integrated disabler that draws from a cyborg's power cell. This weapon contains a limiter to prevent the cyborg's power cell from overheating." var/charge_tick = 0 var/recharge_time = 2.5 From 6b17d4e8f8a2cc3a32cbaac7693844b9bd25ebd4 Mon Sep 17 00:00:00 2001 From: Steelpoint Date: Tue, 27 Jan 2015 23:45:49 +0800 Subject: [PATCH 5/7] UpdatedCoolingModule --- code/game/objects/items/robot/robot_upgrades.dm | 14 +++++++------- .../research/designs/mechfabricator_designs.dm | 8 ++++---- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/code/game/objects/items/robot/robot_upgrades.dm b/code/game/objects/items/robot/robot_upgrades.dm index ae6c4f08a9a..691f79272af 100644 --- a/code/game/objects/items/robot/robot_upgrades.dm +++ b/code/game/objects/items/robot/robot_upgrades.dm @@ -1,4 +1,4 @@ -// robot_upgrades.dm + // robot_upgrades.dm // Contains various borg upgrades. /obj/item/borg/upgrade @@ -98,14 +98,14 @@ return 1 -/obj/item/borg/upgrade/tasercooler - name = "cyborg rapid taser cooling module" - desc = "Used to cool a mounted taser, increasing the potential current in it and thus its recharge rate." +/obj/item/borg/upgrade/disablercooler + name = "cyborg rapid disabler cooling module" + desc = "Used to cool a mounted disabler, increasing the potential current in it and thus its recharge rate." icon_state = "cyborg_upgrade3" require_module = 1 -/obj/item/borg/upgrade/tasercooler/action(var/mob/living/silicon/robot/R) +/obj/item/borg/upgrade/disablercooler/action(var/mob/living/silicon/robot/R) if(..()) return 0 if(!istype(R.module, /obj/item/weapon/robot_module/security)) @@ -113,13 +113,13 @@ usr << "There's no mounting point for the module!" return 0 - var/obj/item/weapon/gun/energy/gun/advtaser/cyborg/T = locate() in R.module + var/obj/item/weapon/gun/energy/disabler/cyborg/T = locate() in R.module if(!T) T = locate() in R.module.contents if(!T) T = locate() in R.module.modules if(!T) - usr << "This cyborg has had its taser removed!" + usr << "This cyborg has had its disabler removed!" return 0 if(T.recharge_time <= 2) diff --git a/code/modules/research/designs/mechfabricator_designs.dm b/code/modules/research/designs/mechfabricator_designs.dm index 158b666f29d..a983d2fb1d8 100644 --- a/code/modules/research/designs/mechfabricator_designs.dm +++ b/code/modules/research/designs/mechfabricator_designs.dm @@ -634,11 +634,11 @@ construction_time = 120 category = list("Cyborg Upgrade Modules") -/datum/design/borg_upgrade_tasercooler - name = "Cyborg Upgrade Module (Rapid Taser Cooling Module)" - id = "borg_upgrade_tasercooler" +/datum/design/borg_upgrade_disablercooler + name = "Cyborg Upgrade Module (Rapid Disabler Cooling Module)" + id = "borg_upgrade_disablercooler" build_type = MECHFAB - build_path = /obj/item/borg/upgrade/tasercooler + build_path = /obj/item/borg/upgrade/disablercooler materials = list("$metal"=80000 , "$glass"=6000 , "$gold"= 2000, "$diamond" = 500) construction_time = 120 category = list("Cyborg Upgrade Modules") From 24cc29bf6e78053cae4e35ee85d258b3f277960b Mon Sep 17 00:00:00 2001 From: Steelpoint Date: Thu, 5 Feb 2015 14:08:17 +0800 Subject: [PATCH 6/7] Changelog --- .../Steelpoint-SecBorgDisabler-7390.yml | 36 +++++++++++++++++++ 1 file changed, 36 insertions(+) create mode 100644 html/changelogs/Steelpoint-SecBorgDisabler-7390.yml diff --git a/html/changelogs/Steelpoint-SecBorgDisabler-7390.yml b/html/changelogs/Steelpoint-SecBorgDisabler-7390.yml new file mode 100644 index 00000000000..453895d2edb --- /dev/null +++ b/html/changelogs/Steelpoint-SecBorgDisabler-7390.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 +# rscdel (general adding of nice things) +# rscadd (general deleting of nice things) +# imageadd +# imagedel +# spellcheck (typo fixes) +# experiment +# tgs (TG-ported fixes?) +################################# + +# Your name. +author: Steelpoint + +# 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, this gets changed to [] after reading. Just remove the brackets when you add new shit. +# Please surround your changes in single (') or double quotes ("). It works without them, but if you use certain characters it screws up compiling. The quotes will not show up in the changelog. +changes: + - rscadd: "Security Cyborgs Advance Taser have been replaced with a Disabler. From 92f5bc2dc8c6c21ca8272ee1c377be0fcf562fd2 Mon Sep 17 00:00:00 2001 From: Steelpoint Date: Fri, 6 Feb 2015 13:21:23 +0800 Subject: [PATCH 7/7] MergeConflict --- code/modules/research/designs/mechfabricator_designs.dm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/code/modules/research/designs/mechfabricator_designs.dm b/code/modules/research/designs/mechfabricator_designs.dm index e6f476df192..e8e53971da7 100644 --- a/code/modules/research/designs/mechfabricator_designs.dm +++ b/code/modules/research/designs/mechfabricator_designs.dm @@ -635,11 +635,11 @@ construction_time = 120 category = list("Cyborg Upgrade Modules") -/datum/design/borg_upgrade_tasercooler - name = "Cyborg Upgrade Module (Rapid Taser Cooling Module)" - id = "borg_upgrade_tasercooler" +/datum/design/borg_upgrade_disablercooler + name = "Cyborg Upgrade Module (Rapid Disabler Cooling Module)" + id = "borg_upgrade_disablercooler" build_type = MECHFAB - build_path = /obj/item/borg/upgrade/tasercooler + build_path = /obj/item/borg/upgrade/disablercooler req_tech = list("combat" = 5, "power" = 4) materials = list("$metal"=80000 , "$glass"=6000 , "$gold"= 2000, "$diamond" = 500) construction_time = 120