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

fixes the merging failure

Browse Source 
hopefully that's it
This commit is contained in:
VistaPOWA
2014-01-05 03:32:10 +01:00
parent 443d6e2d9e
commit fd34cea8ef
5 changed files with 40 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/datums/uplink_item.dm
+7 -1
View File
@@ -380,9 +380,15 @@ var/list/uplink_items = list()
/datum/uplink_item/device_tools/syndicate_bomb
name = "Syndicate Bomb"
desc = "The Syndicate Bomb has an adjustable timer with a minimum setting of 30 seconds. Ordering the bomb sends you a small beacon, which will teleport the explosive to your location when you activate it. \
You can wrench the bomb down to prevent removal. The crew may defuse the bomb."
You can wrench the bomb down to prevent removal. The crew may attempt to defuse the bomb."
item = /obj/item/device/sbeacondrop/bomb
cost = 5
/datum/uplink_item/device_tools/syndicate_detonator
name = "Syndicate Detonator"
desc = "The Syndicate Detonator is a companion device to the Syndicate Bomb. Simply press the included button and an encrypted radio frequency will instruct all live syndicate bombs to detonate. \
Useful for when speed matters or you wish to synchronize multiple bomb blasts. Be sure to stand clear of the blast radius before using the detonator."
item = /obj/item/device/syndicatedetonator
cost = 1
/datum/uplink_item/device_tools/teleporter
name = "Teleporter Circuit Board"