cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-08-22 04:30:44 +01:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
Conflicts:
	code/game/gamemodes/changeling/powers/mutations.dm
This commit is contained in:
Steelpoint
2015-09-10 23:18:39 +08:00
parent 98aef2ee6a d216e60477
commit 5a5bcbbbd7
24 changed files with 102 additions and 81 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/datums/uplink_item.dm
+1 -1
View File
@@ -100,7 +100,7 @@ var/list/uplink_items = list()
category = "Conspicuous and Dangerous Weapons"
/datum/uplink_item/dangerous/pistol
name = "Syndicate Pistol"
name = "FK-69 Pistol"
desc = "A small, easily concealable handgun that uses 10mm auto rounds in 8-round magazines and is compatible with suppressors."
item = /obj/item/weapon/gun/projectile/automatic/pistol
cost = 9