From 771d8b9e4b3721bde40aee4beb53262448dbea8f Mon Sep 17 00:00:00 2001 From: Anewbe Date: Sat, 8 Oct 2016 15:34:18 -0500 Subject: [PATCH 1/3] Adds a smaller device cell for use in non-weapon devices --- code/datums/uplink/ammunition.dm | 2 +- code/game/objects/items/weapons/power_cells.dm | 7 ++++++- code/game/objects/items/weapons/storage/belt.dm | 7 +++++-- code/game/objects/items/weapons/stunbaton.dm | 2 +- .../crates_lockers/closets/secure/security.dm | 6 +++--- code/modules/projectiles/guns/energy.dm | 7 +++++-- code/modules/projectiles/guns/energy/laser.dm | 6 ++++-- code/modules/research/designs.dm | 10 +++++++++- code/modules/xenobio2/tools/slime_handling_tools.dm | 1 + 9 files changed, 35 insertions(+), 13 deletions(-) diff --git a/code/datums/uplink/ammunition.dm b/code/datums/uplink/ammunition.dm index 6a98430aeaf..33ecddf7da9 100644 --- a/code/datums/uplink/ammunition.dm +++ b/code/datums/uplink/ammunition.dm @@ -98,4 +98,4 @@ /datum/uplink_item/item/ammo/cell name = "weapon cell" - path = /obj/item/weapon/cell/device \ No newline at end of file + path = /obj/item/weapon/cell/device/weapon \ No newline at end of file diff --git a/code/game/objects/items/weapons/power_cells.dm b/code/game/objects/items/weapons/power_cells.dm index 4ff88fd4a1c..9ecd9bbcc82 100644 --- a/code/game/objects/items/weapons/power_cells.dm +++ b/code/game/objects/items/weapons/power_cells.dm @@ -30,9 +30,14 @@ force = 0 throw_speed = 5 throw_range = 7 - maxcharge = 2400 + maxcharge = 480 matter = list("metal" = 350, "glass" = 50) +/obj/item/weapon/cell/device/weapon + name = "weapon power cell" + desc = "A small power cell designed to power handheld weaponry." + maxcharge = 2400 + /obj/item/weapon/cell/crap name = "\improper rechargable AA battery" desc = "You can't top the plasma top." //TOTALLY TRADEMARK INFRINGEMENT diff --git a/code/game/objects/items/weapons/storage/belt.dm b/code/game/objects/items/weapons/storage/belt.dm index c68b0faf7d2..de640be27f4 100644 --- a/code/game/objects/items/weapons/storage/belt.dm +++ b/code/game/objects/items/weapons/storage/belt.dm @@ -40,6 +40,7 @@ /obj/item/weapon/wrench, /obj/item/device/multitool, /obj/item/device/flashlight, + /obj/item/weapon/cell/device, /obj/item/stack/cable_coil, /obj/item/device/t_scanner, /obj/item/device/analyzer, @@ -54,7 +55,6 @@ /obj/item/weapon/material/hatchet, /obj/item/device/analyzer/plant_analyzer, /obj/item/weapon/extinguisher/mini, - /obj/item/device/flashlight/maglight, /obj/item/weapon/tape_roll, /obj/item/device/integrated_electronics/wirer, ) @@ -97,7 +97,6 @@ /obj/item/device/pda, /obj/item/taperoll, /obj/item/device/megaphone, - /obj/item/device/flashlight/pen, /obj/item/clothing/mask/surgical, /obj/item/clothing/head/surgery, /obj/item/clothing/gloves, @@ -105,6 +104,7 @@ /obj/item/clothing/glasses, /obj/item/weapon/crowbar, /obj/item/device/flashlight, + /obj/item/weapon/cell/device, /obj/item/weapon/extinguisher/mini ) @@ -156,6 +156,7 @@ /obj/item/device/taperecorder, /obj/item/clothing/glasses, /obj/item/device/flashlight, + /obj/item/weapon/cell/device, /obj/item/weapon/reagent_containers/spray/luminol, /obj/item/weapon/sample, /obj/item/weapon/forensics/sample_kit/powder, @@ -236,6 +237,7 @@ can_hold = list( /obj/item/clothing/glasses, /obj/item/device/flashlight, + /obj/item/weapon/cell/device, /obj/item/weapon/grenade, /obj/item/device/pda, /obj/item/device/radio/headset, @@ -263,6 +265,7 @@ /obj/item/device/gps, /obj/item/device/measuring_tape, /obj/item/device/flashlight, + /obj/item/weapon/cell/device, /obj/item/weapon/pickaxe, /obj/item/device/depth_scanner, /obj/item/device/camera, diff --git a/code/game/objects/items/weapons/stunbaton.dm b/code/game/objects/items/weapons/stunbaton.dm index 80d24df2a24..a5b03264d64 100644 --- a/code/game/objects/items/weapons/stunbaton.dm +++ b/code/game/objects/items/weapons/stunbaton.dm @@ -30,7 +30,7 @@ /obj/item/weapon/melee/baton/loaded/New() //this one starts with a cell pre-installed. ..() - bcell = new/obj/item/weapon/cell/device(src) + bcell = new/obj/item/weapon/cell/device/weapon(src) update_icon() return diff --git a/code/game/objects/structures/crates_lockers/closets/secure/security.dm b/code/game/objects/structures/crates_lockers/closets/secure/security.dm index a7f526a2e37..064f58f83e2 100644 --- a/code/game/objects/structures/crates_lockers/closets/secure/security.dm +++ b/code/game/objects/structures/crates_lockers/closets/secure/security.dm @@ -121,7 +121,7 @@ new /obj/item/device/flash(src) new /obj/item/weapon/melee/baton/loaded(src) new /obj/item/weapon/gun/energy/gun(src) - new /obj/item/weapon/cell/device(src) + new /obj/item/weapon/cell/device/weapon(src) new /obj/item/clothing/accessory/holster/waist(src) new /obj/item/weapon/melee/telebaton(src) new /obj/item/clothing/head/beret/sec/corporate/hos(src) @@ -167,7 +167,7 @@ new /obj/item/weapon/reagent_containers/spray/pepper(src) new /obj/item/weapon/melee/baton/loaded(src) new /obj/item/weapon/gun/energy/gun(src) - new /obj/item/weapon/cell/device(src) + new /obj/item/weapon/cell/device/weapon(src) new /obj/item/weapon/storage/box/holobadge(src) new /obj/item/clothing/head/beret/sec/corporate/warden(src) new /obj/item/clothing/suit/storage/hooded/wintercoat/security(src) @@ -214,7 +214,7 @@ new /obj/item/clothing/under/rank/security/corp(src) new /obj/item/ammo_magazine/c45m/rubber(src) new /obj/item/weapon/gun/energy/taser(src) - new /obj/item/weapon/cell/device(src) + new /obj/item/weapon/cell/device/weapon(src) new /obj/item/clothing/suit/storage/hooded/wintercoat/security(src) new /obj/item/device/flashlight/maglight(src) return diff --git a/code/modules/projectiles/guns/energy.dm b/code/modules/projectiles/guns/energy.dm index 77720e5dae3..5636b68b947 100644 --- a/code/modules/projectiles/guns/energy.dm +++ b/code/modules/projectiles/guns/energy.dm @@ -34,7 +34,10 @@ /obj/item/weapon/gun/energy/New() ..() - power_supply = new /obj/item/weapon/cell/device(src) + if(cell_type) + power_supply = new cell_type(src) + else + power_supply = new /obj/item/weapon/cell/device/weapon(src) if(self_recharge) processing_objects.Add(src) update_icon() @@ -168,7 +171,7 @@ /obj/item/weapon/gun/energy/proc/start_recharge() if(power_supply == null) - power_supply = new /obj/item/weapon/cell/device(src) + power_supply = new /obj/item/weapon/cell/device/weapon(src) self_recharge = 1 processing_objects.Add(src) update_icon() \ No newline at end of file diff --git a/code/modules/projectiles/guns/energy/laser.dm b/code/modules/projectiles/guns/energy/laser.dm index 47206bc3e82..6fd294f9284 100644 --- a/code/modules/projectiles/guns/energy/laser.dm +++ b/code/modules/projectiles/guns/energy/laser.dm @@ -29,9 +29,11 @@ desc = "A modified version of the HI G40E, this one fires less concentrated energy bolts designed for target practice." projectile_type = /obj/item/projectile/beam/practice + cell_type = /obj/item/weapon/cell/device + firemodes = list( - list(mode_name="normal", projectile_type=/obj/item/projectile/beam/practice, charge_cost = 240), - list(mode_name="suppressive", projectile_type=/obj/item/projectile/beam/practice, charge_cost = 60), + list(mode_name="normal", projectile_type=/obj/item/projectile/beam/practice, charge_cost = 48), + list(mode_name="suppressive", projectile_type=/obj/item/projectile/beam/practice, charge_cost = 12), ) obj/item/weapon/gun/energy/retro diff --git a/code/modules/research/designs.dm b/code/modules/research/designs.dm index 346aecacabd..6503f6e63c3 100644 --- a/code/modules/research/designs.dm +++ b/code/modules/research/designs.dm @@ -267,7 +267,15 @@ other types of metals and chemistry for reagents). materials = list(DEFAULT_WALL_MATERIAL = 350, "glass" = 25) build_path = /obj/item/weapon/cell/device category = "Misc" - sort_string = "DAAAE" + sort_string = "DAABA" + +/datum/design/item/powercell/weapon + name = "weapon" + build_type = PROTOLATHE + id = "weapon" + materials = list(DEFAULT_WALL_MATERIAL = 700, "glass" = 50) + category = "Misc" + sort_string = "DAABB" /datum/design/item/hud materials = list(DEFAULT_WALL_MATERIAL = 50, "glass" = 50) diff --git a/code/modules/xenobio2/tools/slime_handling_tools.dm b/code/modules/xenobio2/tools/slime_handling_tools.dm index 27136cd872e..e06fa3a86b2 100644 --- a/code/modules/xenobio2/tools/slime_handling_tools.dm +++ b/code/modules/xenobio2/tools/slime_handling_tools.dm @@ -18,6 +18,7 @@ origin_tech = list(TECH_COMBAT = 2, TECH_BIO = 4) agonyforce = 10 //It's not supposed to be great at stunning human beings. var/stasisforce = 60 //How much stasis it does to slimes, and 1/3rd to non-slimes. + hitcost = 48 //Less zap for less cost /obj/item/weapon/melee/baton/slime/attack(mob/M, mob/user) if(istype(M, /mob/living/simple_animal/xeno)) From 860bff98166e27a4a891dd5a47e2a80181070d0d Mon Sep 17 00:00:00 2001 From: Anewbe Date: Sat, 8 Oct 2016 15:50:08 -0500 Subject: [PATCH 2/3] Changelog --- html/changelogs/Anewbe - Cells Again.yml | 38 ++++++++++++++++++++++++ 1 file changed, 38 insertions(+) create mode 100644 html/changelogs/Anewbe - Cells Again.yml diff --git a/html/changelogs/Anewbe - Cells Again.yml b/html/changelogs/Anewbe - Cells Again.yml new file mode 100644 index 00000000000..52eed59ef70 --- /dev/null +++ b/html/changelogs/Anewbe - Cells Again.yml @@ -0,0 +1,38 @@ +################################ +# 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: Anewbe + +# 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: "The base device cell has been shrunk, for use in non-weapon devices." + - rscadd: "Adds another class of device cell, for use in weapons." + - rscadd: "Belts can now hold device cells." \ No newline at end of file From fb4a84d869929b558f2c10743ce1b9b94bbcf19b Mon Sep 17 00:00:00 2001 From: Anewbe Date: Sat, 8 Oct 2016 15:50:23 -0500 Subject: [PATCH 3/3] Map change --- maps/polaris-2.dmm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/maps/polaris-2.dmm b/maps/polaris-2.dmm index 03416019c84..68b2e77b017 100644 --- a/maps/polaris-2.dmm +++ b/maps/polaris-2.dmm @@ -1325,7 +1325,7 @@ "azy" = (/obj/structure/table/rack,/obj/item/device/binoculars,/obj/item/device/binoculars,/obj/item/device/binoculars,/obj/item/device/binoculars,/obj/item/device/binoculars,/obj/item/device/binoculars,/turf/unsimulated/floor{icon_state = "dark"},/area/syndicate_mothership) "azz" = (/obj/structure/table/rack,/obj/item/device/flashlight/flare,/obj/item/device/flashlight/flare,/obj/item/device/flashlight/flare,/obj/item/device/flashlight/flare,/obj/item/device/flashlight/flare,/obj/item/device/flashlight/flare,/obj/item/device/flashlight/flare,/obj/item/device/flashlight/flare,/obj/item/device/flashlight/flare,/obj/item/device/flashlight/flare,/obj/item/device/flashlight/flare,/obj/item/device/flashlight/flare,/turf/unsimulated/floor{icon_state = "dark"},/area/syndicate_mothership) "azA" = (/obj/structure/table/rack,/obj/item/device/radio,/obj/item/device/radio,/obj/item/device/radio,/obj/item/device/radio,/obj/item/device/radio,/obj/item/device/radio,/turf/unsimulated/floor{icon_state = "dark"},/area/syndicate_mothership) -"azB" = (/obj/structure/table/reinforced,/obj/item/weapon/cell/device,/obj/item/weapon/cell/device,/obj/item/weapon/cell/device,/obj/item/weapon/cell/device,/obj/item/weapon/cell/device,/obj/item/weapon/cell/device,/turf/unsimulated/floor{icon_state = "dark"},/area/centcom/specops) +"azB" = (/obj/structure/table/reinforced,/obj/item/weapon/cell/device/weapon,/obj/item/weapon/cell/device/weapon,/obj/item/weapon/cell/device/weapon,/obj/item/weapon/cell/device/weapon,/obj/item/weapon/cell/device/weapon,/obj/item/weapon/cell/device/weapon,/turf/unsimulated/floor{icon_state = "dark"},/area/centcom/specops) "azC" = (/obj/structure/table/rack,/obj/item/weapon/tank/emergency_oxygen/double,/obj/item/weapon/tank/emergency_oxygen/double,/obj/item/weapon/tank/emergency_oxygen/double,/obj/item/weapon/tank/emergency_oxygen/double,/obj/item/weapon/tank/emergency_oxygen/double,/obj/item/weapon/tank/emergency_oxygen/double,/turf/unsimulated/floor{icon_state = "dark"},/area/syndicate_mothership) "azD" = (/obj/structure/shuttle/engine/propulsion{tag = "icon-propulsion_r (WEST)"; icon_state = "propulsion_r"; dir = 8},/turf/space,/area/shuttle/administration/centcom) "azE" = (/turf/unsimulated/floor{icon_state = "plating"; name = "plating"},/turf/simulated/shuttle/wall{dir = 4; icon_state = "diagonalWall3"},/area/shuttle/administration/centcom) @@ -2746,7 +2746,7 @@ "baP" = (/obj/machinery/teleport/station,/turf/unsimulated/floor{icon_state = "dark"},/area/wizard_station) "baQ" = (/obj/machinery/teleport/hub,/turf/unsimulated/floor{icon_state = "dark"},/area/wizard_station) "baR" = (/obj/structure/table/woodentable,/obj/item/clothing/shoes/workboots,/obj/item/clothing/under/technomancer,/obj/item/clothing/head/technomancer,/obj/item/weapon/storage/box/syndie_kit/chameleon,/obj/item/weapon/storage/box/syndie_kit/chameleon,/turf/unsimulated/floor{icon_state = "dark"},/area/wizard_station) -"baS" = (/obj/structure/table/rack,/obj/item/weapon/gun/energy/gun,/obj/item/weapon/gun/energy/gun,/obj/item/weapon/gun/energy/gun,/obj/machinery/recharger/wallcharger{pixel_x = 5; pixel_y = -32},/obj/item/weapon/cell/device,/obj/item/weapon/cell/device,/obj/item/weapon/cell/device,/turf/unsimulated/floor{icon_state = "dark"},/area/syndicate_mothership) +"baS" = (/obj/structure/table/rack,/obj/item/weapon/gun/energy/gun,/obj/item/weapon/gun/energy/gun,/obj/item/weapon/gun/energy/gun,/obj/machinery/recharger/wallcharger{pixel_x = 5; pixel_y = -32},/obj/item/weapon/cell/device/weapon,/obj/item/weapon/cell/device/weapon,/obj/item/weapon/cell/device/weapon,/turf/unsimulated/floor{icon_state = "dark"},/area/syndicate_mothership) (1,1,1) = {" aaaaabaacaadaaeaafaagaahaaaaaiaajaakaalaamaanaaoaagaafaajaacaadaahaakaaeaamaaiaaoaalaahaajaapaaqaaraasaataauaavaawaaxaayaaaaabaacaadaaeaafaagaahaaaaaiaajaakaalaamaanaaoaagaafaajaacaadaahaakaazaaAaaBaaCaaDaaEaaFaaGaaHaaIaaJaaKaaLaaMaaNaaOaaAaaBaaCaaDaaEaaFaaGaaHaaIaaJaazaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaQaaQaaQaaQaaQaaQaaQaaQaaQaaQaaQaaQaaQaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaPaaRaaSaaSaaSaaSaaSaaSaaSaaSaaSaaSaaRaaSaaSaaSaaSaaSaaSaaSaaSaaSaaSaaRaaSaaSaaSaaSaaSaaSaaSaaSaaSaaSaaRaaSaaSaaSaaSaaSaaSaaSaaSaaSaaSaaRaaSaaSaaSaaSaaSaaSaaSaaSaaSaaSaaRaaSaaSaaSaaSaaSaaSaaSaaSaaSaaSaaRaaSaaSaaSaaSaaSaaSaaSaaSaaSaaSaaR