Skip to content

Commit

Permalink
commit message (tgstation#46)
Browse files Browse the repository at this point in the history
  • Loading branch information
Forgotten312 authored and Truncated21 committed Jul 21, 2016
1 parent 34075b0 commit 7dd6593
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 3 deletions.
6 changes: 3 additions & 3 deletions code/game/machinery/porta_turret_fix/portable_turret.dm
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@
var/controllock = 0 //if the turret responds to control panels

var/installation = /obj/item/weapon/gun/energy/gun/turret //the type of weapon installed
var/fire_mode = 1
var/gun_charge = 0 //the charge of the gun inserted
var/projectile = null //holder for bullettype
var/eprojectile = null //holder for the shot when emagged
Expand Down Expand Up @@ -89,9 +90,8 @@

/obj/machinery/porta_turret_fixed/proc/setup()

var/obj/item/weapon/gun/energy/E= new installation //All energy-based weapons are applicable
var/obj/item/ammo_casing/shottype = E.ammo_type[1]

var/obj/item/weapon/gun/energy/E = new installation //All energy-based weapons are applicable
var/obj/item/ammo_casing/shottype=E.ammo_type[fire_mode]
projectile = shottype.projectile_type
eprojectile = projectile
shot_sound = shottype.fire_sound
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@
var/finish_name = "turret" //the name applied to the product turret
var/installation = null //the gun type installed
var/gun_charge = 0 //the gun charge of the gun type installed
var/gun_fire_mode = 1

/obj/machinery/porta_turret_construct/New()
..()
Expand Down Expand Up @@ -91,6 +92,7 @@
var/obj/item/weapon/gun/energy/E = I
if(!user.drop_item())
return
gun_fire_mode=E.select
installation = I.type
gun_charge = E.power_supply.charge //the gun's charge is stored in gun_charge
user << "<span class='notice'>You add [I] to the turret.</span>"
Expand Down Expand Up @@ -159,6 +161,7 @@
turret.name = finish_name
turret.installation = installation
turret.gun_charge = gun_charge
turret.fire_mode = gun_fire_mode
turret.setup()

qdel(src)
Expand Down

0 comments on commit 7dd6593

Please sign in to comment.