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

Merge branch 'master' into 9/4/2015_master_to_dev

Browse Source 
Conflicts:
	code/game/jobs/job/security.dm
	code/modules/projectiles/guns/energy/nuclear.dm
	code/modules/projectiles/guns/projectile/automatic.dm
	maps/colony-1.dmm
	maps/colony-5.dmm
This commit is contained in:
Neerti
2015-09-04 08:26:03 -04:00
parent 66b2b07f03 73f13d8084
commit b93595c19f
22 changed files with 113 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
code/modules/projectiles/guns/energy/nuclear.dm
View File

@@ -20,6 +20,26 @@
self_recharge = 1
use_external_power = 1
/obj/item/weapon/gun/energy/gun
name = "fm-2t"
desc = "The FM-2t is a versatile energy based small arm, capable of switching between stun or kill with a three round burst option for both settings."
icon_state = "fm-2tstun100"
item_state = null //so the human update icon uses the icon_state instead.
fire_sound = 'sound/weapons/Taser.ogg'
max_shots = 12
projectile_type = /obj/item/projectile/beam/stun
origin_tech = list(TECH_COMBAT = 4, TECH_MAGNET = 2, TECH_ILLEGAL = 3)
modifystate = "fm-2tstun"
firemodes = list(
list(name="stun", projectile_type=/obj/item/projectile/beam/stun, modifystate="fm-2tstun", fire_sound='sound/weapons/Taser.ogg'),
list(name="stun 3-round bursts", burst=3, fire_delay=null, move_delay=4, burst_accuracy=list(0,-1,-1), dispersion=list(0.0, 0.6, 1.0), projectile_type=/obj/item/projectile/beam/stun, modifystate="fm-2tstun", fire_sound='sound/weapons/Taser.ogg'),
list(name="lethal", projectile_type=/obj/item/projectile/beam, modifystate="fm-2tkill", fire_sound='sound/weapons/Laser.ogg'),
list(name="lethal 3-round bursts", burst=3, fire_delay=null, move_delay=4, burst_accuracy=list(0,-1,-1), dispersion=list(0.0, 0.6, 1.0), projectile_type=/obj/item/projectile/beam, modifystate="fm-2tkill", fire_sound='sound/weapons/Laser.ogg'),
)
/obj/item/weapon/gun/energy/gun/nuclear
name = "advanced energy gun"
desc = "An energy gun with an experimental miniaturized reactor."
@@ -29,12 +49,12 @@
force = 8 //looks heavier than a pistol
self_recharge = 1
modifystate = null
firemodes = list(
list(name="stun", projectile_type=/obj/item/projectile/beam/stun, fire_sound='sound/weapons/Taser.ogg'),
list(name="lethal", projectile_type=/obj/item/projectile/beam, fire_sound='sound/weapons/Laser.ogg'),
)
var/lightfail = 0
//override for failcheck behaviour

7
code/modules/projectiles/guns/projectile/automatic.dm
View File

@@ -30,7 +30,7 @@
/obj/item/weapon/gun/projectile/automatic/c20r
name = "submachine gun"
desc = "The C-20r is a lightweight and rapid firing SMG, for when you REALLY need someone dead. Uses 10mm rounds. Has a 'Scarborough Arms - Per falcis, per pravitas' buttstamp."
desc = "The C-20r is a lightweight and rapid firing SMG, for when you REALLY need someone dead. Uses 12mm rounds. Has a 'Scarborough Arms - Per falcis, per pravitas' buttstamp."
icon_state = "c20r"
item_state = "c20r"
w_class = 3
@@ -230,7 +230,7 @@
name = "\improper AS-24 automatic shotgun"
desc = "A durable, rugged looking automatic weapon of a make popular on the frontier worlds. Uses 12 gauge shells. It is unmarked."
icon_state = "ashot"
item_state = "arifle"
item_state = null
w_class = 4
force = 10
caliber = "shotgun"
@@ -252,3 +252,6 @@
else
icon_state = "ashot"
return