cyberpresidentvanellope/Yogstation
1
0
Fork 0
mirror of https://github.com/yogstation13/Yogstation.git synced 2025-02-26 09:04:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/tgstation/-tg-station into jamesbondiguess

Browse Source 
Conflicts:
	code/modules/projectiles/guns/projectile/automatic.dm
This commit is contained in:
paprka
2015-01-23 16:55:52 -08:00
parent c41e707ee4 c7f67b949a
commit 3430cfaf44
219 changed files with 2891 additions and 3344 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
code/modules/projectiles/ammunition/energy.dm
View File

@@ -39,22 +39,22 @@
fire_sound = 'sound/weapons/pulse.ogg'
/obj/item/ammo_casing/energy/laser/pulse/carbine
e_cost = 1000
e_cost = 50
/obj/item/ammo_casing/energy/laser/carbine
e_cost = 1000
e_cost = 50
/obj/item/ammo_casing/energy/electrode/carbine
e_cost = 1000
e_cost = 50
/obj/item/ammo_casing/energy/laser/pulse/pistol
e_cost = 2000
e_cost = 100
/obj/item/ammo_casing/energy/laser/pistol
e_cost = 1000
e_cost = 50
/obj/item/ammo_casing/energy/electrode/pistol
e_cost = 1000
e_cost = 50
/obj/item/ammo_casing/energy/laser/bluetag
projectile_type = /obj/item/projectile/lasertag/bluetag
@@ -152,4 +152,4 @@
/obj/item/ammo_casing/energy/bolt/large
projectile_type = /obj/item/projectile/energy/bolt/large
select_name = "heavy bolt"
select_name = "heavy bolt"

5
code/modules/projectiles/gun.dm
View File

@@ -31,6 +31,9 @@
var/burst_size = 1
var/fire_delay = 0
lefthand_file = 'icons/mob/inhands/guns_lefthand.dmi'
righthand_file = 'icons/mob/inhands/guns_righthand.dmi'
var/obj/item/device/firing_pin/pin = /obj/item/device/firing_pin //standard firing pin for most guns
var/obj/item/device/flashlight/F = null
@@ -46,7 +49,7 @@
/obj/item/weapon/gun/examine(mob/user)
..()
if(pin)
user << "It has a [pin] installed."
user << "It has [pin] installed."
else
user << "It doesn't have a firing pin installed, and won't fire."

8
code/modules/projectiles/guns/energy/pulse.dm
View File

@@ -21,6 +21,10 @@
icon_state = "pulse_carbine"
item_state = "pulse"
ammo_type = list(/obj/item/ammo_casing/energy/laser/pulse/carbine, /obj/item/ammo_casing/energy/electrode/carbine, /obj/item/ammo_casing/energy/laser/carbine)
cell_type = "/obj/item/weapon/stock_parts/cell"
/obj/item/weapon/gun/energy/pulse_rifle/pulse_carbine/loyalpin
pin = /obj/item/device/firing_pin/implant/loyalty
/obj/item/weapon/gun/energy/pulse_rifle/pulse_pistol
name = "pulse pistol"
@@ -29,6 +33,10 @@
icon_state = "pulse_pistol"
item_state = "pulse"
ammo_type = list(/obj/item/ammo_casing/energy/laser/pulse/pistol, /obj/item/ammo_casing/energy/electrode/pistol, /obj/item/ammo_casing/energy/laser/pistol)
cell_type = "/obj/item/weapon/stock_parts/cell"
/obj/item/weapon/gun/energy/pulse_rifle/pulse_pistol/loyalpin
pin = /obj/item/device/firing_pin/implant/loyalty
/obj/item/weapon/gun/energy/pulse_rifle/destroyer
name = "pulse destroyer"

6
code/modules/projectiles/guns/energy/special.dm
View File

@@ -26,7 +26,7 @@
name = "floral somatoray"
desc = "A tool that discharges controlled radiation which induces mutation in plant cells."
icon_state = "flora"
item_state = "obj/item/gun.dmi"
item_state = "gun"
ammo_type = list(/obj/item/ammo_casing/energy/flora/yield, /obj/item/ammo_casing/energy/flora/mut)
origin_tech = "materials=2;biotech=3;powerstorage=3"
modifystate = 1
@@ -95,6 +95,8 @@
icon = 'icons/obj/bureaucracy.dmi'
icon_state = "pen"
item_state = "pen"
lefthand_file = 'icons/mob/inhands/items_lefthand.dmi'
righthand_file = 'icons/mob/inhands/items_righthand.dmi'
w_class = 1
@@ -110,7 +112,7 @@
icon_state = "kineticgun"
item_state = "kineticgun"
ammo_type = list(/obj/item/ammo_casing/energy/kinetic)
cell_type = "/obj/item/weapon/stock_parts/cell/crap"
cell_type = "/obj/item/weapon/stock_parts/cell/emproof"
var/overheat = 0
var/recent_reload = 1

4
code/modules/projectiles/guns/magic.dm
View File

@@ -17,6 +17,10 @@
origin_tech = null
clumsy_check = 0
trigger_guard = 0
pin = /obj/item/device/firing_pin/magic
lefthand_file = 'icons/mob/inhands/items_lefthand.dmi' //not really a gun and some toys use these inhands
righthand_file = 'icons/mob/inhands/items_righthand.dmi'
/obj/item/weapon/gun/magic/afterattack(atom/target as mob, mob/living/user as mob, flag)
newshot()

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

@@ -1,17 +1,20 @@
/obj/item/weapon/gun/projectile/automatic
name = "prototype SMG"
desc = "A prototype three-round burst 9mm submachine gun, designated 'SABR'. Has a threaded barrel for suppressors."
icon_state = "saber"
w_class = 3
origin_tech = "combat=4;materials=2"
mag_type = /obj/item/ammo_box/magazine/smgm9mm
w_class = 3
var/alarmed = 0
var/select = 1
can_suppress = 1
burst_size = 3
fire_delay = 2
var/select = 1
action_button_name = "Toggle Firemode"
/obj/item/weapon/gun/projectile/automatic/proto
name = "prototype SMG"
desc = "A prototype three-round burst 9mm submachine gun, designated 'SABR'. Has a threaded barrel for suppressors."
icon_state = "saber"
mag_type = /obj/item/ammo_box/magazine/smgm9mm
pin = null
/obj/item/weapon/gun/projectile/automatic/update_icon()
..()
overlays.Cut()
@@ -237,4 +240,4 @@
fire_sound = 'sound/weapons/Gunshot_smg.ogg'
can_suppress = 0
burst_size = 4
fire_delay = 1
fire_delay = 1

3
code/modules/projectiles/pins.dm
View File

@@ -37,6 +37,9 @@
return 1
return 0
/obj/item/device/firing_pin/magic
name = "magic crystal shard"
desc = "A small enchanted shard which allows magical weapons to fire."
/obj/item/device/firing_pin/implant
name = "implant-keyed firing pin"

2
code/modules/projectiles/projectile/bullets.dm
View File

@@ -134,7 +134,7 @@
..()
reagents.add_reagent("aluminium", 15)
reagents.add_reagent("foaming_agent", 5)
reagents.add_reagent("pacid", 5)
reagents.add_reagent("facid", 5)
//This one is for future syringe guns update
/obj/item/projectile/bullet/dart/syringe