cyberpresidentvanellope/Polaris
1
0
Fork 0
mirror of https://github.com/PolarisSS13/Polaris.git synced 2026-01-03 05:52:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Ninja Powersink Fix

Browse Source 
Fixes ninja powersinks not working, and likely some other bugs involving rig gloves, like handcuffing.
This commit is contained in:
Neerti
2016-07-10 00:03:21 -04:00
parent 108a8743f5
commit 19936ce06c
4 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
code/modules/clothing/spacesuits/rig/rig.dm
View File

@@ -45,7 +45,7 @@
var/obj/item/clothing/shoes/boots = null // Deployable boots, if any.
var/obj/item/clothing/suit/space/rig/chest // Deployable chestpiece, if any.
var/obj/item/clothing/head/helmet/space/rig/helmet = null // Deployable helmet, if any.
var/obj/item/clothing/gloves/rig/gloves = null // Deployable gauntlets, if any.
var/obj/item/clothing/gloves/gauntlets/rig/gloves = null // Deployable gauntlets, if any.
var/obj/item/weapon/cell/cell // Power supply, if any.
var/obj/item/rig_module/selected_module = null // Primary system (used with middle-click)
var/obj/item/rig_module/vision/visor // Kinda shitty to have a var for a module, but saves time.

2
code/modules/clothing/spacesuits/rig/rig_pieces.dm
View File

@@ -82,7 +82,7 @@
/obj/item/clothing/head/helmet/space/rig/proc/prevent_track()
return 0
/obj/item/clothing/gloves/rig/Touch(var/atom/A, var/proximity)
/obj/item/clothing/gloves/gauntlets/rig/Touch(var/atom/A, var/proximity)
if(!A || !proximity)
return 0

4
code/modules/mob/living/bot/secbot.dm
View File

@@ -130,7 +130,7 @@
if(ishuman(target) && declare_arrests)
var/area/location = get_area(src)
broadcast_security_hud_message("[src] is [arrest_type ? "detaining" : "arresting"] a level [check_threat(target)] suspect <b>[target]</b> in <b>[location]</b>.", src)
// say("Engaging patrol mode.")
/mob/living/bot/secbot/UnarmedAttack(var/mob/M, var/proximity)
@@ -145,7 +145,7 @@
var/cuff = 1
if(istype(C, /mob/living/carbon/human))
var/mob/living/carbon/human/H = C
if(istype(H.back, /obj/item/weapon/rig) && istype(H.gloves,/obj/item/clothing/gloves/rig))
if(istype(H.back, /obj/item/weapon/rig) && istype(H.gloves,/obj/item/clothing/gloves/gauntlets/rig))
cuff = 0
if(!C.lying || C.handcuffed || arrest_type)
cuff = 0

2
code/modules/mob/living/carbon/resist.dm
View File

@@ -50,7 +50,7 @@
displaytime = breakouttime / 600 //Minutes
var/mob/living/carbon/human/H = src
if(istype(H) && H.gloves && istype(H.gloves,/obj/item/clothing/gloves/rig))
if(istype(H) && H.gloves && istype(H.gloves,/obj/item/clothing/gloves/gauntlets/rig))
breakouttime /= 2
displaytime /= 2