Removes Weapons (#7415)

* Adds icon and hitsound where needed.

* Moves alt_attack to /obj/item and deletes weapons.dm

* Replaced /obj/item/weapon with /obj/item

* Fixes merge issues.

* Fix merge issues.
This commit is contained in:
Werner
2019-11-16 18:36:13 +01:00
committed by GitHub
parent 128ca2235b
commit af16a489a6
1123 changed files with 27193 additions and 27175 deletions
@@ -39,7 +39,7 @@ var/global/datum/ntnet/ntnet_global = new()
add_log("NTNet logging system activated.")
// Simplified logging: Adds a log. log_string is mandatory parameter, source is optional.
/datum/ntnet/proc/add_log(var/log_string, var/obj/item/weapon/computer_hardware/network_card/source = null)
/datum/ntnet/proc/add_log(var/log_string, var/obj/item/computer_hardware/network_card/source = null)
var/log_text = "[worldtime2text()] - "
if(source)
log_text += "[source.get_network_tag()] - "
@@ -21,7 +21,7 @@
component_types = list(
/obj/item/stack/cable_coil{amount = 15},
/obj/item/weapon/circuitboard/ntnet_relay
/obj/item/circuitboard/ntnet_relay
)
// TODO: Implement more logic here. For now it's only a placeholder.
@@ -127,7 +127,7 @@
D.error = "Connection to quantum relay severed"
return ..()
/obj/machinery/ntnet_relay/attackby(var/obj/item/weapon/W as obj, var/mob/user as mob)
/obj/machinery/ntnet_relay/attackby(var/obj/item/W as obj, var/mob/user as mob)
if(W.isscrewdriver())
playsound(src.loc, W.usesound, 50, 1)
panel_open = !panel_open