cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2025-12-22 08:01:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

Removes Weapons (#7415)

Browse Source 
* 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
Download Patch File Download Diff File Expand all files Collapse all files

12
code/modules/lock/lock_construct.dm
View File

@@ -1,4 +1,4 @@
/obj/item/weapon/material/lock_construct
/obj/item/material/lock_construct
name = "lock"
desc = "A crude but useful lock and bolt."
icon = 'icons/obj/storage.dmi'
@@ -6,15 +6,15 @@
w_class = 1
var/lock_data
/obj/item/weapon/material/lock_construct/New()
/obj/item/material/lock_construct/New()
..()
force = 0
throwforce = 0
lock_data = generateRandomString(round(material.integrity/50))
/obj/item/weapon/material/lock_construct/attackby(var/obj/item/I, var/mob/user)
if(istype(I,/obj/item/weapon/key))
var/obj/item/weapon/key/K = I
/obj/item/material/lock_construct/attackby(var/obj/item/I, var/mob/user)
if(istype(I,/obj/item/key))
var/obj/item/key/K = I
if(!K.key_data)
to_chat(user, "<span class='notice'>You fashion \the [I] to unlock \the [src]</span>")
K.key_data = lock_data
@@ -23,7 +23,7 @@
return
..()
/obj/item/weapon/material/lock_construct/proc/create_lock(var/atom/target, var/mob/user)
/obj/item/material/lock_construct/proc/create_lock(var/atom/target, var/mob/user)
. = new /datum/lock(target,lock_data)
user.drop_from_inventory(src,user)
user.visible_message("<span class='notice'>\The [user] attaches \the [src] to \the [target].</span>")