cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2025-12-25 09:41:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

Removes All Weapons

Browse Source
This commit is contained in:
Fox McCloud
2018-04-15 16:25:56 -04:00
parent 8b576c4d42
commit 5c4aa9b3fd
1100 changed files with 17642 additions and 17666 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
code/modules/modular_computers/file_system/programs/command/card.dm
View File

@@ -48,9 +48,9 @@
if(user.can_admin_interact())
return 1
if(computer)
var/obj/item/weapon/computer_hardware/card_slot/card_slot = computer.all_components[MC_CARD]
var/obj/item/computer_hardware/card_slot/card_slot = computer.all_components[MC_CARD]
if(card_slot)
var/obj/item/weapon/card/id/auth_card = card_slot.stored_card2
var/obj/item/card/id/auth_card = card_slot.stored_card2
if(auth_card)
return check_access(auth_card)
return 0
@@ -62,9 +62,9 @@
/datum/computer_file/program/card_mod/proc/get_target_rank()
if(computer)
var/obj/item/weapon/computer_hardware/card_slot/card_slot = computer.all_components[MC_CARD]
var/obj/item/computer_hardware/card_slot/card_slot = computer.all_components[MC_CARD]
if(card_slot)
var/obj/item/weapon/card/id/id_card = card_slot.stored_card
var/obj/item/card/id/id_card = card_slot.stored_card
if(id_card && id_card.assignment)
return id_card.assignment
return "Unassigned"
@@ -137,10 +137,10 @@
return -1
/datum/computer_file/program/card_mod/proc/format_jobs(list/jobs)
var/obj/item/weapon/computer_hardware/card_slot/card_slot = computer.all_components[MC_CARD]
var/obj/item/computer_hardware/card_slot/card_slot = computer.all_components[MC_CARD]
if(!card_slot || !card_slot.stored_card)
return null
var/obj/item/weapon/card/id/id_card = card_slot.stored_card
var/obj/item/card/id/id_card = card_slot.stored_card
var/list/formatted = list()
for(var/job in jobs)
formatted.Add(list(list(
@@ -164,8 +164,8 @@
if(..())
return 1
var/obj/item/weapon/computer_hardware/card_slot/card_slot
var/obj/item/weapon/computer_hardware/printer/printer
var/obj/item/computer_hardware/card_slot/card_slot
var/obj/item/computer_hardware/printer/printer
if(computer)
card_slot = computer.all_components[MC_CARD]
printer = computer.all_components[MC_PRINT]
@@ -174,8 +174,8 @@
var/mob/user = usr
var/obj/item/weapon/card/id/modify = card_slot.stored_card
var/obj/item/weapon/card/id/scan = card_slot.stored_card2
var/obj/item/card/id/modify = card_slot.stored_card
var/obj/item/card/id/scan = card_slot.stored_card2
switch(href_list["action"])
if("PRG_modify")
@@ -185,7 +185,7 @@
card_slot.try_eject(1, user)
else
var/obj/item/I = usr.get_active_hand()
if(istype(I, /obj/item/weapon/card/id))
if(istype(I, /obj/item/card/id))
if(!usr.drop_item())
return
I.forceMove(computer)
@@ -196,7 +196,7 @@
card_slot.try_eject(2, user)
else
var/obj/item/I = usr.get_active_hand()
if(istype(I, /obj/item/weapon/card/id))
if(istype(I, /obj/item/card/id))
if(!usr.drop_item())
return
I.forceMove(computer)
@@ -375,11 +375,11 @@
/datum/computer_file/program/card_mod/ui_data(mob/user)
var/list/data = get_header_data()
var/obj/item/weapon/card/id/modify = null
var/obj/item/weapon/card/id/scan = null
var/obj/item/card/id/modify = null
var/obj/item/card/id/scan = null
var/obj/item/weapon/computer_hardware/card_slot/card_slot
var/obj/item/weapon/computer_hardware/printer/printer
var/obj/item/computer_hardware/card_slot/card_slot
var/obj/item/computer_hardware/printer/printer
if(computer)
card_slot = computer.all_components[MC_CARD]
printer = computer.all_components[MC_PRINT]

4
code/modules/modular_computers/file_system/programs/command/comms.dm
View File

@@ -187,7 +187,7 @@
if(access_captain in access)
authenticated = COMM_AUTHENTICATION_MAX
var/mob/living/carbon/human/H = usr
var/obj/item/weapon/card/id = H.get_idcard(TRUE)
var/obj/item/card/id = H.get_idcard(TRUE)
if(istype(id))
crew_announcement.announcer = GetNameAndAssignmentFromId(id)
@@ -222,7 +222,7 @@
var/mob/living/carbon/human/L = usr
var/obj/item/card = L.get_active_hand()
var/obj/item/weapon/card/id/I = (card && card.GetID()) || L.wear_id || L.wear_pda
var/obj/item/card/id/I = (card && card.GetID()) || L.wear_id || L.wear_pda
if(istype(I, /obj/item/device/pda))
var/obj/item/device/pda/pda = I
I = pda.id