cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-08-21 19:19:12 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #10819 from VOREStation/Icons/guns

Browse Source 
Swap some guns for Eris ones
This commit is contained in:
Aronai Sieyes
2021-07-03 17:13:44 -04:00
committed by GitHub
parent 6b72eece69 450ab17039
commit 47291e79d3
113 changed files with 29 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/projectiles/guns/energy/laser_vr.dm
+3 -4
View File
@@ -35,17 +35,16 @@
/obj/item/weapon/gun/energy/imperial
name = "imperial energy pistol"
desc = "An elegant weapon developed by the Imperium Auream. Their weaponsmiths have cleverly found a way to make a gun that is only about the size of an average energy pistol, yet with the fire power of a laser carbine."
icon = 'icons/obj/gun_vr.dmi'
icon_override = 'icons/obj/gun_vr.dmi'
icon_state = "ge_pistol"
item_state = "ge_pistol"
fire_sound = 'sound/weapons/mandalorian.ogg'
icon = 'icons/obj/gun_vr.dmi'
item_icons = list(slot_r_hand_str = 'icons/obj/gun_vr.dmi', slot_l_hand_str = 'icons/obj/gun_vr.dmi') // WORK YOU FUCKING CUNT PIECE OF SHIT BASTARD STUPID BITCH ITEM ICON AAAAHHHH
item_state_slots = list(slot_r_hand_str = "ge_pistol_r", slot_l_hand_str = "ge_pistol_l")
slot_flags = SLOT_BELT
w_class = ITEMSIZE_NORMAL
force = 10
origin_tech = list(TECH_COMBAT = 4, TECH_MAGNET = 2)
matter = list(DEFAULT_WALL_MATERIAL = 2000)
fire_sound = 'sound/weapons/mandalorian.ogg'
projectile_type = /obj/item/projectile/beam/imperial
// Removed because gun64_vr.dmi guns don't work.
code/modules/projectiles/guns/energy/stun.dm
+1
View File
@@ -35,6 +35,7 @@
desc = "A LAEP20 Aktzin. Designed and produced by Lawson Arms under the wing of Hephaestus, several TSCs have been trying to get a hold of the blueprints for half a decade."
description_fluff = "Lawson Arms is Hephaestus Industries’ main personal-energy-weapon branding, often sold alongside MarsTech projectile weapons to security and law enforcement agencies. \
The Aktzin's capsule-based stun ammunition is a closely guarded Hephaestus Industries patent, and the company has been particularly litigious towards any attempted imitators."
icon = 'icons/obj/guns/energy/stunrevolver.dmi'
icon_state = "stunrevolver"
item_state = "stunrevolver"
origin_tech = list(TECH_COMBAT = 3, TECH_MATERIAL = 3, TECH_POWER = 2)
code/modules/projectiles/guns/projectile/pistol_vr.dm
+3
View File
@@ -40,7 +40,9 @@
name = "\improper \"Giskard\" holdout pistol"
desc = "The FS HG .380 \"Giskard\" can even fit into the pocket! Uses .380 rounds."
icon = 'icons/obj/gun_vr.dmi'
icon_override = 'icons/obj/gun_vr.dmi'
icon_state = "giskardcivil"
item_state = "giskardcivil"
caliber = ".380"
magazine_type = /obj/item/ammo_magazine/m380
allowed_magazines = list(/obj/item/ammo_magazine/m380)
@@ -61,6 +63,7 @@
name = "\improper \"Olivaw\" holdout burst-pistol"
desc = "The FS HG .380 \"Olivaw\" is a more advanced version of the \"Giskard\". This one seems to have a two-round burst-fire mode. Uses .380 rounds."
icon_state = "olivawcivil"
item_state = "olivawcivil"
firemodes = list(
list(mode_name="semiauto", burst=1, fire_delay=1.2, move_delay=null, burst_accuracy=null, dispersion=null),
list(mode_name="2-round bursts", burst=2, fire_delay=0.2, move_delay=4, burst_accuracy=list(0,-15), dispersion=list(1.2, 1.8)),