From 182dcd93b56314a751e739acc91b808c64ffad3e Mon Sep 17 00:00:00 2001 From: Fox-McCloud Date: Fri, 24 Mar 2017 16:57:25 -0400 Subject: [PATCH] autolathe receivers --- code/game/objects/items/devices/radio/radio.dm | 2 +- code/modules/assembly/signaler.dm | 2 +- code/modules/projectiles/guns/projectile/saw.dm | 2 +- code/modules/research/designs/autolathe_designs.dm | 8 ++++++++ code/modules/research/designs/weapon_designs.dm | 10 ---------- 5 files changed, 11 insertions(+), 13 deletions(-) diff --git a/code/game/objects/items/devices/radio/radio.dm b/code/game/objects/items/devices/radio/radio.dm index 8703926c13c..429ef47970a 100644 --- a/code/game/objects/items/devices/radio/radio.dm +++ b/code/game/objects/items/devices/radio/radio.dm @@ -315,7 +315,7 @@ var/global/list/default_medbay_channels = list( actually transmit large mass. Headsets are the only radio devices capable of sending subspace transmissions to the Communications Satellite. - A headset sends a signal to a subspace listener/reciever elsewhere in space, + A headset sends a signal to a subspace listener/receiver elsewhere in space, the signal gets processed and logged, and an audible transmission gets sent to each individual headset. */ diff --git a/code/modules/assembly/signaler.dm b/code/modules/assembly/signaler.dm index 0ce52543909..9a76869d339 100644 --- a/code/modules/assembly/signaler.dm +++ b/code/modules/assembly/signaler.dm @@ -61,7 +61,7 @@ if(!flag1) dat += {" Send Signal
- Reciever is [receiving?"on":"off"]
+ Receiver is [receiving?"on":"off"]
"} dat += {" Frequency/Code for signaler:
diff --git a/code/modules/projectiles/guns/projectile/saw.dm b/code/modules/projectiles/guns/projectile/saw.dm index 72e4bacebab..cfe8ffbb0a5 100644 --- a/code/modules/projectiles/guns/projectile/saw.dm +++ b/code/modules/projectiles/guns/projectile/saw.dm @@ -1,6 +1,6 @@ /obj/item/weapon/gun/projectile/automatic/l6_saw name = "\improper L6 SAW" - desc = "A heavily modified 5.56 light machine gun, designated 'L6 SAW'. Has 'Aussec Armoury - 2531' engraved on the reciever below the designation." + desc = "A heavily modified 5.56 light machine gun, designated 'L6 SAW'. Has 'Aussec Armoury - 2531' engraved on the receiver below the designation." icon_state = "l6closed100" item_state = "l6closedmag" w_class = 5 diff --git a/code/modules/research/designs/autolathe_designs.dm b/code/modules/research/designs/autolathe_designs.dm index 7431e44737c..280fea0b66c 100644 --- a/code/modules/research/designs/autolathe_designs.dm +++ b/code/modules/research/designs/autolathe_designs.dm @@ -632,6 +632,14 @@ build_path = /obj/item/weapon/restraints/handcuffs category = list("hacked", "Security") +/datum/design/receiver + name = "Modular Receiver" + id = "receiver" + build_type = AUTOLATHE + materials = list(MAT_METAL = 15000) + build_path = /obj/item/weaponcrafting/receiver + category = list("hacked", "Security") + /datum/design/shotgun_slug name = "Shotgun Slug" id = "shotgun_slug" diff --git a/code/modules/research/designs/weapon_designs.dm b/code/modules/research/designs/weapon_designs.dm index 0ad25eb32ed..e282e42fa3f 100644 --- a/code/modules/research/designs/weapon_designs.dm +++ b/code/modules/research/designs/weapon_designs.dm @@ -104,16 +104,6 @@ locked = 1 category = list("Weapons") -/datum/design/receiver - name = "Modular Receiver" - desc = "A prototype modular receiver and trigger assembly for a variety of firearms." - id = "receiver" - req_tech = list("combat" = 5, "materials" = 4) - build_type = PROTOLATHE - materials = list(MAT_METAL = 6500, MAT_SILVER = 500) - build_path = /obj/item/weaponcrafting/receiver - category = list("Weapons") - /datum/design/plasmapistol name = "Plasma Pistol" desc = "A specialized firearm designed to fire lethal bolts of toxins."