mirror of
https://github.com/CHOMPStation2/CHOMPStation2.git
synced 2025-12-10 02:09:41 +00:00
Merge pull request #10240 from Heroman3003/contamination-b-gun
Removes access loss on ID contamination/digestion.
This commit is contained in:
committed by
Chompstation Bot
parent
f516265384
commit
746eb865ed
@@ -200,7 +200,6 @@
|
|||||||
modify.access -= access_type
|
modify.access -= access_type
|
||||||
if(!access_allowed)
|
if(!access_allowed)
|
||||||
modify.access += access_type
|
modify.access += access_type
|
||||||
modify.lost_access = list() //VOREStation addition: reset the lost access upon any modifications
|
|
||||||
. = TRUE
|
. = TRUE
|
||||||
|
|
||||||
if("assign")
|
if("assign")
|
||||||
@@ -225,7 +224,6 @@
|
|||||||
modify.access = access
|
modify.access = access
|
||||||
modify.assignment = t1
|
modify.assignment = t1
|
||||||
modify.rank = t1
|
modify.rank = t1
|
||||||
modify.lost_access = list() //VOREStation addition: reset the lost access upon any modifications
|
|
||||||
|
|
||||||
callHook("reassign_employee", list(modify))
|
callHook("reassign_employee", list(modify))
|
||||||
. = TRUE
|
. = TRUE
|
||||||
@@ -283,7 +281,6 @@
|
|||||||
if(is_authenticated())
|
if(is_authenticated())
|
||||||
modify.assignment = "Dismissed" //VOREStation Edit: setting adjustment
|
modify.assignment = "Dismissed" //VOREStation Edit: setting adjustment
|
||||||
modify.access = list()
|
modify.access = list()
|
||||||
modify.lost_access = list() //VOREStation addition: reset the lost access upon any modifications
|
|
||||||
|
|
||||||
callHook("terminate_employee", list(modify))
|
callHook("terminate_employee", list(modify))
|
||||||
|
|
||||||
|
|||||||
@@ -17,6 +17,7 @@
|
|||||||
var/obj/item/weapon/card/id/inserted
|
var/obj/item/weapon/card/id/inserted
|
||||||
|
|
||||||
/obj/machinery/computer/id_restorer/attackby(obj/I, mob/user)
|
/obj/machinery/computer/id_restorer/attackby(obj/I, mob/user)
|
||||||
|
/*
|
||||||
if(istype(I, /obj/item/weapon/card/id) && !(istype(I,/obj/item/weapon/card/id/guest)))
|
if(istype(I, /obj/item/weapon/card/id) && !(istype(I,/obj/item/weapon/card/id/guest)))
|
||||||
if(!inserted && user.unEquip(I))
|
if(!inserted && user.unEquip(I))
|
||||||
I.forceMove(src)
|
I.forceMove(src)
|
||||||
@@ -24,12 +25,14 @@
|
|||||||
else if(inserted)
|
else if(inserted)
|
||||||
to_chat(user, "<span class='warning'>There is already ID card inside.</span>")
|
to_chat(user, "<span class='warning'>There is already ID card inside.</span>")
|
||||||
return
|
return
|
||||||
|
*/
|
||||||
..()
|
..()
|
||||||
|
|
||||||
/obj/machinery/computer/id_restorer/attack_hand(mob/user)
|
/obj/machinery/computer/id_restorer/attack_hand(mob/user)
|
||||||
if(..()) return
|
if(..()) return
|
||||||
if(stat & (NOPOWER|BROKEN)) return
|
if(stat & (NOPOWER|BROKEN)) return
|
||||||
|
|
||||||
|
/*
|
||||||
if(!inserted) // No point in giving you an option what to do if there's no ID to do things with.
|
if(!inserted) // No point in giving you an option what to do if there's no ID to do things with.
|
||||||
to_chat(user, "<span class='notice'>No ID is inserted.</span>")
|
to_chat(user, "<span class='notice'>No ID is inserted.</span>")
|
||||||
return
|
return
|
||||||
@@ -78,6 +81,7 @@
|
|||||||
return
|
return
|
||||||
if("Cancel")
|
if("Cancel")
|
||||||
return
|
return
|
||||||
|
*/
|
||||||
|
|
||||||
|
|
||||||
//Frame
|
//Frame
|
||||||
|
|||||||
@@ -96,7 +96,7 @@ var/list/gurgled_overlays = list(
|
|||||||
// Special handling of gurgle_contaminate
|
// Special handling of gurgle_contaminate
|
||||||
//////////////
|
//////////////
|
||||||
/obj/item/weapon/card/id/gurgle_contaminate(var/atom/movable/item_storage = null)
|
/obj/item/weapon/card/id/gurgle_contaminate(var/atom/movable/item_storage = null)
|
||||||
digest_act(item_storage) //Digesting these anyway
|
digest_act(item_storage) //Contamination and digestion does same thing to these
|
||||||
return TRUE
|
return TRUE
|
||||||
|
|
||||||
/obj/item/device/pda/gurgle_contaminate(var/atom/movable/item_storage = null)
|
/obj/item/device/pda/gurgle_contaminate(var/atom/movable/item_storage = null)
|
||||||
|
|||||||
@@ -55,8 +55,6 @@
|
|||||||
/////////////
|
/////////////
|
||||||
/obj/item/weapon/hand_tele/digest_act(var/atom/movable/item_storage = null)
|
/obj/item/weapon/hand_tele/digest_act(var/atom/movable/item_storage = null)
|
||||||
return FALSE
|
return FALSE
|
||||||
/obj/item/weapon/card/id/gold/captain/spare/digest_act(var/atom/movable/item_storage = null)
|
|
||||||
return FALSE
|
|
||||||
/obj/item/device/aicard/digest_act(var/atom/movable/item_storage = null)
|
/obj/item/device/aicard/digest_act(var/atom/movable/item_storage = null)
|
||||||
return FALSE
|
return FALSE
|
||||||
/obj/item/device/paicard/digest_act(var/atom/movable/item_storage = null)
|
/obj/item/device/paicard/digest_act(var/atom/movable/item_storage = null)
|
||||||
@@ -78,20 +76,14 @@
|
|||||||
// Some special treatment
|
// Some special treatment
|
||||||
/////////////
|
/////////////
|
||||||
|
|
||||||
/obj/item/weapon/card/id
|
|
||||||
var/lost_access = list()
|
|
||||||
|
|
||||||
/obj/item/weapon/card/id/digest_act(atom/movable/item_storage = null)
|
/obj/item/weapon/card/id/digest_act(atom/movable/item_storage = null)
|
||||||
desc = "A partially digested card that has seen better days. The damage appears to be only cosmetic, but the access codes need to be reprogrammed at the HoP office or ID restoration terminal."
|
desc = "A partially digested card that has seen better days. The damage appears to be only cosmetic."
|
||||||
if(!sprite_stack || !istype(sprite_stack) || !(sprite_stack.len))
|
if(!sprite_stack || !istype(sprite_stack) || !(sprite_stack.len))
|
||||||
icon = 'icons/obj/card_vr.dmi'
|
icon = 'icons/obj/card_vr.dmi'
|
||||||
icon_state = "[initial(icon_state)]_digested"
|
icon_state = "[initial(icon_state)]_digested"
|
||||||
else
|
else
|
||||||
sprite_stack += "digested"
|
sprite_stack += "digested"
|
||||||
update_icon()
|
update_icon()
|
||||||
if(!(LAZYLEN(lost_access)) && LAZYLEN(access))
|
|
||||||
lost_access = access //Do not forget what access we lose
|
|
||||||
access = list() // Then lose it
|
|
||||||
return FALSE
|
return FALSE
|
||||||
|
|
||||||
/obj/item/weapon/reagent_containers/food/digest_act(atom/movable/item_storage = null)
|
/obj/item/weapon/reagent_containers/food/digest_act(atom/movable/item_storage = null)
|
||||||
|
|||||||
Reference in New Issue
Block a user