cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-10 18:22:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into upstream-merge-11426

Browse Source
This commit is contained in:
Nadyr
2021-08-25 22:49:43 -04:00
committed by GitHub
parent af8d866e1b bbc75a8c28
commit 2797027a41
120 changed files with 1880 additions and 1392 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
code/modules/projectiles/guns/energy/laser.dm
View File

@@ -139,6 +139,7 @@
force = 5
slot_flags = SLOT_BELT
w_class = ITEMSIZE_NORMAL
unacidable = TRUE
projectile_type = /obj/item/projectile/beam
origin_tech = null
fire_delay = 10 //Old pistol

18
code/modules/projectiles/guns/energy/stun.dm
View File

@@ -30,18 +30,6 @@
charge_cost = 800
recharge_time = 0.5 SECONDS
/obj/item/weapon/gun/energy/stunrevolver
name = "stun revolver"
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)
projectile_type = /obj/item/projectile/energy/electrode/strong
charge_cost = 300
/obj/item/weapon/gun/energy/crossbow
name = "mini energy-crossbow"
desc = "A weapon favored by many mercenary stealth specialists."
@@ -81,9 +69,6 @@
origin_tech = list(TECH_COMBAT = 2, TECH_MATERIAL = 2, TECH_POWER = 3)
fire_delay = 20
charge_cost = 600
<<<<<<< HEAD
projectile_type = /obj/item/projectile/energy/plasmastun
=======
projectile_type = /obj/item/projectile/energy/plasmastun
//Stun Revolvers
@@ -125,5 +110,4 @@
icon_state = "snubstunrevolver"
item_state = "stunrevolver"
w_class = ITEMSIZE_SMALL //small pistol is small
origin_tech = list(TECH_COMBAT = 3, TECH_MATERIAL = 3, TECH_POWER = 2)
>>>>>>> b0ac3188ae (Merge pull request #11426 from GhostActual/stun-revolvers)
origin_tech = list(TECH_COMBAT = 3, TECH_MATERIAL = 3, TECH_POWER = 2)