cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2026-08-29 07:59:01 +01: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
code/modules/shieldgen/emergency_shield.dm
+3 -3
View File
@@ -43,7 +43,7 @@
if(!height || air_group) return FALSE
else return ..()
/obj/machinery/shield/attackby(obj/item/weapon/W as obj, mob/user as mob)
/obj/machinery/shield/attackby(obj/item/W as obj, mob/user as mob)
if(!istype(W)) return
//Calculate damage
@@ -270,7 +270,7 @@
update_icon()
return 1
/obj/machinery/shieldgen/attackby(obj/item/weapon/W as obj, mob/user as mob)
/obj/machinery/shieldgen/attackby(obj/item/W as obj, mob/user as mob)
if(W.isscrewdriver())
playsound(src.loc, W.usesound, 100, 1)
if(is_open)
@@ -309,7 +309,7 @@
anchored = TRUE
else if(istype(W, /obj/item/weapon/card/id) || istype(W, /obj/item/device/pda))
else if(istype(W, /obj/item/card/id) || istype(W, /obj/item/device/pda))
if(src.allowed(user))
src.locked = !src.locked
to_chat(user, "The controls are now [src.locked ? "locked." : "unlocked."]")
code/modules/shieldgen/sheldwallgen.dm
+1 -1
View File
@@ -176,7 +176,7 @@
src.anchored = 0
return
if(istype(W, /obj/item/weapon/card/id)||istype(W, /obj/item/device/pda))
if(istype(W, /obj/item/card/id)||istype(W, /obj/item/device/pda))
if (src.allowed(user))
src.locked = !src.locked
to_chat(user, "Controls are now [src.locked ? "locked." : "unlocked."]")
code/modules/shieldgen/shield_capacitor.dm
+2 -2
View File
@@ -39,8 +39,8 @@
/obj/machinery/shield_capacitor/attackby(obj/item/W, mob/user)
if(istype(W, /obj/item/weapon/card/id))
var/obj/item/weapon/card/id/C = W
if(istype(W, /obj/item/card/id))
var/obj/item/card/id/C = W
if(access_captain in C.access || access_security in C.access || access_engine in C.access)
src.locked = !src.locked
to_chat(user, "Controls are now [src.locked ? "locked." : "unlocked."]")
code/modules/shieldgen/shield_gen.dm
+2 -2
View File
@@ -54,8 +54,8 @@
spark(src, 5, alldirs)
/obj/machinery/shield_gen/attackby(obj/item/W, mob/user)
if(istype(W, /obj/item/weapon/card/id))
var/obj/item/weapon/card/id/C = W
if(istype(W, /obj/item/card/id))
var/obj/item/card/id/C = W
if(access_captain in C.access || access_security in C.access || access_engine in C.access)
src.locked = !src.locked
to_chat(user, "Controls are now [src.locked ? "locked." : "unlocked."]")