cyberpresidentvanellope/Polaris
1
0
Fork 0
mirror of https://github.com/PolarisSS13/Polaris.git synced 2025-12-21 07:32:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

Adds a smaller device cell for use in non-weapon devices

Browse Source
This commit is contained in:
Anewbe
2016-10-08 15:34:18 -05:00
parent 426659c1d2
commit 771d8b9e4b
9 changed files with 35 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
code/game/objects/items/weapons/power_cells.dm
View File

@@ -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

7
code/game/objects/items/weapons/storage/belt.dm
View File

@@ -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,

2
code/game/objects/items/weapons/stunbaton.dm
View File

@@ -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

6
code/game/objects/structures/crates_lockers/closets/secure/security.dm
View File

@@ -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