cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-08-22 20:48:56 +01:00
Code Issues Packages Projects Releases Wiki Activity

Removes checks for seclite/hydrid taser + suppressor/gun to be in hands for combining them.

Browse Source
This commit is contained in:
kingofkosmos
2015-11-18 06:24:23 +02:00
parent a121b9308c
commit 50b55e54e8
2 changed files with 1 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/projectiles/gun.dm
-6
View File
@@ -260,9 +260,6 @@
var/obj/item/device/flashlight/seclite/S = A
if(can_flashlight)
if(!F)
if(user.l_hand != src && user.r_hand != src)
user << "<span class='warning'>You'll need [src] in your hands to do that!</span>"
return
if(!user.unEquip(A))
return
user << "<span class='notice'>You click [S] into place on [src].</span>"
@@ -276,9 +273,6 @@
if(istype(A, /obj/item/weapon/screwdriver))
if(F)
if(user.l_hand != src && user.r_hand != src)
user << "<span class='warning'>You'll need [src] in your hands to do that!</span>"
return
for(var/obj/item/device/flashlight/seclite/S in src)
user << "<span class='notice'>You unscrew the seclite from [src].</span>"
F = null
code/modules/projectiles/guns/projectile.dm
+1 -4
View File
@@ -65,9 +65,6 @@
var/obj/item/weapon/suppressor/S = A
if(can_suppress)
if(!suppressed)
if(user.l_hand != src && user.r_hand != src)
user << "<span class='notice'>You'll need [src] in your hands to do that.</span>"
return
if(!user.unEquip(A))
return
user << "<span class='notice'>You screw [S] onto [src].</span>"
@@ -157,4 +154,4 @@
icon_state = "suppressor"
w_class = 2
var/oldsound = null
var/initial_w_class = null
var/initial_w_class = null