This commit is contained in:
Kyep
2018-01-02 19:53:57 -08:00
parent ad4e753cc4
commit 3c8d8c0c00
13 changed files with 330 additions and 131 deletions
@@ -159,9 +159,31 @@ effective or pretty fucking useless.
return ..()
/obj/item/device/jammer/attack_self(mob/user)
to_chat(user,"<span class='notice'>You [active ? "deactivate" : "activate"] the [src].</span>")
toggle_active(user)
/obj/item/device/jammer/proc/toggle_active(mob/user)
if(user)
to_chat(user,"<span class='notice'>You [active ? "deactivate" : "activate"] the [src].</span>")
active = !active
if(active)
active_jammers |= src
else
active_jammers -= src
active_jammers -= src
/obj/structure/syndijammer
name = "syndicate wide-area radio jammer"
desc = "Device used to disrupt radio communications over a wide area"
icon = 'icons/obj/singularity.dmi'
icon_state = "beaconsynd1"
anchored = TRUE
var/obj/item/device/jammer/myjammer
/obj/structure/syndijammer/New()
myjammer = new /obj/item/device/jammer(src)
myjammer.range = 30
myjammer.toggle_active()
/obj/structure/syndijammer/Destroy()
if(myjammer)
qdel(myjammer)
+5
View File
@@ -27,3 +27,8 @@
name = "'Blue' secret documents"
desc = "\"Top Secret\" documents printed on special copy-protected paper. It details sensitive Syndicate operational intelligence. These documents are marked \"Blue\"."
icon_state = "docs_blue"
/obj/item/documents/syndicate/yellow
name = "'Yellow' secret documents"
desc = "\"Top Secret\" documents printed on special copy-protected paper. It details sensitive Syndicate operational intelligence. These documents are marked \"Yellow\"."
icon_state = "docs_yellow"
@@ -147,20 +147,23 @@
beakers += B2
// Assembly Variants
/obj/item/weapon/grenade/chem_grenade/explosion/remote
New()
..()
CreateDefaultTrigger(/obj/item/device/assembly/signaler)
/obj/item/weapon/grenade/chem_grenade/explosion/remote/New()
..()
CreateDefaultTrigger(/obj/item/device/assembly/signaler)
/obj/item/weapon/grenade/chem_grenade/explosion/prox/New()
..()
CreateDefaultTrigger(/obj/item/device/assembly/prox_sensor)
/obj/item/weapon/grenade/chem_grenade/explosion/mine/New()
..()
CreateDefaultTrigger(/obj/item/device/assembly/mousetrap)
/obj/item/weapon/grenade/chem_grenade/explosion/mine_armed/New()
..()
CreateDefaultTrigger(/obj/item/device/assembly/mousetrap/armed)
/obj/item/weapon/grenade/chem_grenade/explosion/prox
New()
..()
CreateDefaultTrigger(/obj/item/device/assembly/prox_sensor)
/obj/item/weapon/grenade/chem_grenade/explosion/mine
New()
..()
CreateDefaultTrigger(/obj/item/device/assembly/mousetrap)
// Basic EMP grenade
/obj/item/weapon/grenade/chem_grenade/emp
@@ -86,6 +86,11 @@
new /obj/item/device/multitool(src)
new /obj/item/clothing/gloves/combat(src)
/obj/item/weapon/storage/toolbox/syndicate/trapped/New()
..()
new /obj/item/weapon/grenade/chem_grenade/explosion/mine_armed(src)
/obj/item/weapon/storage/toolbox/drone
name = "mechanical toolbox"
icon_state = "blue"