cyberpresidentvanellope/CHOMPstation
1
0
Fork 0
mirror of https://github.com/CHOMPstation/CHOMPstation.git synced 2026-08-27 22:16:23 +01:00
Code Issues Packages Projects Releases Wiki Activity

Adds Collapsible AM rifle. Createes new uplink entry (#3644)

Browse Source 
* Adds Collapsible AM rifle, and adds case with parts and 5 shots to Uplink. Separates it and intended merc version, both costing default telecrystal amount. Does NOT make them antagonist type specific.

* Addresses review.

* Makes rifle case traitor/merc specific. Enables ability to have specific uplink items be available only for specific antags.
This commit is contained in:
LorenLuke
2017-07-28 16:06:20 -05:00
committed by Anewbe
parent ff557493bd
commit 31e90bfeed
9 changed files with 213 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/items/devices/uplink_random_lists.dm
+1 -1
View File
@@ -57,7 +57,7 @@ var/datum/uplink_random_selection/all_uplink_selection = new/datum/uplink_random
items += new/datum/uplink_random_item(/datum/uplink_item/item/ammo/mc9mm)
items += new/datum/uplink_random_item(/datum/uplink_item/item/visible_weapons/revolver)
items += new/datum/uplink_random_item(/datum/uplink_item/item/ammo/a357)
items += new/datum/uplink_random_item(/datum/uplink_item/item/visible_weapons/heavysniper, 15, 0)
items += new/datum/uplink_random_item(/datum/uplink_item/item/visible_weapons/heavysnipermerc, 15, 0)
items += new/datum/uplink_random_item(/datum/uplink_item/item/ammo/sniperammo, 15, 0)
items += new/datum/uplink_random_item(/datum/uplink_item/item/grenades/emp, 50)
items += new/datum/uplink_random_item(/datum/uplink_item/item/visible_weapons/crossbow, 33)
code/game/objects/items/weapons/storage/secure.dm
+2
View File
@@ -149,7 +149,9 @@
force = 8.0
throw_speed = 1
throw_range = 4
max_w_class = ITEMSIZE_NORMAL
w_class = ITEMSIZE_LARGE
max_storage_space = ITEMSIZE_COST_NORMAL * 4
attack_hand(mob/user as mob)
if ((src.loc == user) && (src.locked == 1))
code/game/objects/items/weapons/storage/uplink_kits.dm
+14 -1
View File
@@ -281,4 +281,17 @@
/obj/item/weapon/storage/box/syndie_kit/demolitions_super_heavy/New()
..()
new /obj/item/weapon/syndie/c4explosive/heavy/super_heavy(src)
new /obj/item/weapon/screwdriver(src)
new /obj/item/weapon/screwdriver(src)
/obj/item/weapon/storage/secure/briefcase/rifle
name = "secure briefcase"
/obj/item/weapon/storage/secure/briefcase/rifle/New()
..()
new /obj/item/sniper_rifle_part/barrel(src)
new /obj/item/sniper_rifle_part/stock(src)
new /obj/item/sniper_rifle_part/trigger_group(src)
for(var/i = 1 to 4)
new /obj/item/ammo_casing/a145(src)