shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Icon_override, Plasma weapon tweaks & gunlocker. AK-47 Summoning (#2759)

Browse Source 
* In hands of plasma weapons/tweaks

* Icon override states for all clothes

* a few compile issues ~

* Adds a new badmin button and plasma rifle case

* better cleanup of the sound effect

* Oh, these should've been deleted already.
This commit is contained in:
Poojawa
2017-09-16 04:29:22 -05:00
committed by GitHub
parent 54d28cadb0
commit 0eb8cf0235
30 changed files with 239 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/projectiles/ammunition/plasma.dm
+1 -1
View File
@@ -6,7 +6,7 @@
/obj/item/ammo_casing/energy/plasmagun/rifle
projectile_type = /obj/item/projectile/energy/plasmabolt/rifle
e_cost = 150
e_cost = 100
/obj/item/ammo_casing/energy/plasmagun/light
projectile_type = /obj/item/projectile/energy/plasmabolt/light
code/modules/projectiles/guns/energy/megabuster.dm
+2
View File
@@ -8,7 +8,9 @@
clumsy_check = 0
needs_permit = 0
selfcharge = 1
cell_type = "/obj/item/stock_parts/cell/pulse"
icon = 'icons/obj/guns/VGguns.dmi'
/obj/item/gun/energy/megabuster/proto
name = "Proto-buster"
icon_state = "protobuster"
code/modules/projectiles/guns/energy/plasma.dm
+9
View File
@@ -4,8 +4,11 @@
icon_state = "xray"
w_class = WEIGHT_CLASS_NORMAL
ammo_type = list(/obj/item/ammo_casing/energy/plasmagun)
cell_type = "/obj/item/stock_parts/cell/pulse/carbine"
ammo_x_offset = 2
shaded_charge = 1
lefthand_file = 'icons/mob/citadel/guns_lefthand.dmi'
righthand_file = 'icons/mob/citadel/guns_righthand.dmi'
/obj/item/gun/energy/plasma/rifle
@@ -47,8 +50,11 @@
icon_state = "xcomlasergun"
item_state = null
icon = 'icons/obj/guns/VGguns.dmi'
cell_type = "/obj/item/stock_parts/cell/pulse/carbine"
ammo_type = list(/obj/item/ammo_casing/energy/lasergun)
ammo_x_offset = 4
lefthand_file = 'icons/mob/citadel/guns_lefthand.dmi'
righthand_file = 'icons/mob/citadel/guns_righthand.dmi'
/obj/item/gun/energy/laser/LaserAK
name = "Laser AK470"
@@ -56,5 +62,8 @@
icon_state = "LaserAK"
item_state = null
icon = 'icons/obj/guns/VGguns.dmi'
cell_type = "/obj/item/stock_parts/cell/pulse/carbine"
ammo_type = list(/obj/item/ammo_casing/energy/laser)
ammo_x_offset = 4
lefthand_file = 'icons/mob/citadel/guns_lefthand.dmi'
righthand_file = 'icons/mob/citadel/guns_righthand.dmi'
code/modules/projectiles/projectile/megabuster.dm
+4
View File
@@ -7,9 +7,13 @@
hitsound = 'sound/weapons/sear.ogg'
hitsound_wall = 'sound/weapons/effects/searwall.ogg'
icon = 'icons/obj/VGprojectile.dmi'
lefthand_file = 'icons/mob/citadel/guns_lefthand.dmi'
righthand_file = 'icons/mob/citadel/guns_righthand.dmi'
/obj/item/projectile/energy/megabuster
name = "buster pellet"
icon_state = "megabuster"
nodamage = 1
icon = 'icons/obj/VGprojectile.dmi'
lefthand_file = 'icons/mob/citadel/guns_lefthand.dmi'
righthand_file = 'icons/mob/citadel/guns_righthand.dmi'
code/modules/projectiles/projectile/plasma.dm
+11 -6
View File
@@ -2,7 +2,6 @@ obj/item/projectile/energy/plasmabolt
icon = 'icons/obj/VGProjectile.dmi'
name = "plasma bolt"
icon_state = "plasma"
knockdown = 0
flag = "energy"
damage_type = BURN
hitsound = 'sound/weapons/sear.ogg'
@@ -10,21 +9,27 @@ obj/item/projectile/energy/plasmabolt
light_range = 3
light_color = LIGHT_COLOR_GREEN
/obj/item/projectile/energy/plasmabolt/on_hit(atom/target, blocked = FALSE)
. = ..()
if(isturf(target) || istype(target, /obj/structure/))
target.ex_act(EXPLODE_LIGHT)
/obj/item/projectile/energy/plasmabolt/light
damage = 35
damage = 30
icon_state = "plasma2"
irradiate = 20
knockdown = 60
irradiate = 10
stamina = 20
/obj/item/projectile/energy/plasmabolt/rifle
damage = 50
icon_state = "plasma3"
irradiate = 35
knockdown = 120
stamina = 120
/obj/item/projectile/energy/plasmabolt/MP40k
damage = 35
eyeblur = 4
irradiate = 25
knockdown = 100
stamina = 100
icon_state = "plasma3"