From 8807f13305a9be307e8c060d756a3d2d927159f0 Mon Sep 17 00:00:00 2001 From: SamCroswell Date: Tue, 24 Feb 2015 14:25:28 -0500 Subject: [PATCH] ERT - Helmets Change, Cells Capacity Adjustment The pulse pistol now has 1600 max charge, the Carbine now has a max charge of 4000. ERT helmets no longer need to be fastened to their suits to be equipped, as this was causing bugs. --- code/game/objects/items/weapons/power_cells.dm | 4 ++-- code/game/response_team.dm | 2 +- code/modules/clothing/spacesuits/ert.dm | 1 + 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/code/game/objects/items/weapons/power_cells.dm b/code/game/objects/items/weapons/power_cells.dm index 54d6292fc48..7424f685ef8 100644 --- a/code/game/objects/items/weapons/power_cells.dm +++ b/code/game/objects/items/weapons/power_cells.dm @@ -122,11 +122,11 @@ /obj/item/weapon/stock_parts/cell/pulse/carbine name = "pulse carbine power cell" - maxcharge = 5000 + maxcharge = 4000 /obj/item/weapon/stock_parts/cell/pulse/pistol name = "pulse pistol power cell" - maxcharge = 2000 + maxcharge = 1600 /obj/item/weapon/stock_parts/cell/emproof name = "\improper EMP-proof cell" diff --git a/code/game/response_team.dm b/code/game/response_team.dm index 1e7a23623cf..4e4a488369f 100644 --- a/code/game/response_team.dm +++ b/code/game/response_team.dm @@ -64,7 +64,7 @@ var/can_call_ert if(!new_name)//Somebody changed his mind, place is available again. L.name = "Commando" return*/ - if(alert(usr, "Join the ERT?.", "Emergency Response Team", "Yes", "No") == "No") + if(alert(usr, "Join the ERT?", "Emergency Response Team", "Yes", "No") == "No") L.name = "Response Team" return diff --git a/code/modules/clothing/spacesuits/ert.dm b/code/modules/clothing/spacesuits/ert.dm index 0d39a13a7b1..947c4b0441c 100644 --- a/code/modules/clothing/spacesuits/ert.dm +++ b/code/modules/clothing/spacesuits/ert.dm @@ -5,6 +5,7 @@ item_state = "helm-command" armor = list(melee = 50, bullet = 50, laser = 30,energy = 15, bomb = 30, bio = 100, rad = 60) siemens_coefficient = 0.6 + rig_restrict_helmet = 0 // ERT helmets can be taken on and off at will. var/obj/machinery/camera/camera /obj/item/clothing/head/helmet/space/rig/ert/attack_self(mob/user)