cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2025-12-26 10:02:28 +00: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

2
code/modules/modular_computers/file_system/programs/civilian/cargo_control.dm
View File

@@ -30,7 +30,7 @@
data["status_message"] = status_message
//Pass the ID Data
var/obj/item/weapon/card/id/user_id_card = user.GetIdCard()
var/obj/item/card/id/user_id_card = user.GetIdCard()
last_user_name = GetNameAndAssignmentFromId(user_id_card)
data["username"] = last_user_name

6
code/modules/modular_computers/file_system/programs/civilian/cargo_delivery.dm
View File

@@ -29,7 +29,7 @@
mod_mode = 0 //We can't pay for orders when there is no card reader and no network card
if(program && program.computer && program.computer.card_slot)
var/obj/item/weapon/card/id/id_card = program.computer.card_slot.stored_card
var/obj/item/card/id/id_card = program.computer.card_slot.stored_card
data["has_id"] = !!id_card
data["id_account_number"] = id_card ? id_card.associated_account_number : null
//data["id_rank"] = id_card && id_card.assignment ? id_card.assignment : "Unassigned"
@@ -76,7 +76,7 @@
return 1
if(program && program.computer && program.computer.card_slot && program.computer.network_card)
var/obj/item/weapon/card/id/id_card = program.computer.card_slot.stored_card
var/obj/item/card/id/id_card = program.computer.card_slot.stored_card
if(!id_card || !id_card.registered_name)
status_message = "Card Error: Invalid ID Card in Card Reader"
return 1
@@ -117,7 +117,7 @@
var/mob/user = usr
if(!istype(user))
return
var/obj/item/weapon/card/id/I = user.GetIdCard()
var/obj/item/card/id/I = user.GetIdCard()
if(!istype(I) || !I.registered_name || !(access_cargo in I.access) || issilicon(user))
to_chat(user, "Authentication error: Unable to locate ID with appropriate access to allow this operation.")
return

2
code/modules/modular_computers/file_system/programs/civilian/cargo_order.dm
View File

@@ -28,7 +28,7 @@
var/list/data = host.initial_data()
//Pass the ID Data
var/obj/item/weapon/card/id/user_id_card = user.GetIdCard()
var/obj/item/card/id/user_id_card = user.GetIdCard()
if(!user_id_card)
last_user_name = "Unknown"
else

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

@@ -38,7 +38,7 @@
data["centcom_access"] = is_centcom
if(program && program.computer && program.computer.card_slot)
var/obj/item/weapon/card/id/id_card = program.computer.card_slot.stored_card
var/obj/item/card/id/id_card = program.computer.card_slot.stored_card
data["has_id"] = !!id_card
data["id_account_number"] = id_card ? id_card.associated_account_number : null
data["id_rank"] = id_card && id_card.assignment ? id_card.assignment : "Unassigned"
@@ -58,7 +58,7 @@
data["regions"] = get_accesses()
if(program.computer.card_slot.stored_card)
var/obj/item/weapon/card/id/id_card = program.computer.card_slot.stored_card
var/obj/item/card/id/id_card = program.computer.card_slot.stored_card
if(is_centcom)
var/list/all_centcom_access = list()
for(var/access in get_all_centcom_access())
@@ -91,7 +91,7 @@
ui.open()
/datum/nano_module/program/card_mod/proc/format_jobs(list/jobs)
var/obj/item/weapon/card/id/id_card = program.computer.card_slot.stored_card
var/obj/item/card/id/id_card = program.computer.card_slot.stored_card
var/list/formatted = list()
for(var/job in jobs)
formatted.Add(list(list(
@@ -110,8 +110,8 @@
return 1
var/mob/user = usr
var/obj/item/weapon/card/id/user_id_card = user.GetIdCard()
var/obj/item/weapon/card/id/id_card = computer.card_slot.stored_card
var/obj/item/card/id/user_id_card = user.GetIdCard()
var/obj/item/card/id/id_card = computer.card_slot.stored_card
var/datum/nano_module/program/card_mod/module = NM
switch(href_list["action"])
if("switchm")
@@ -235,8 +235,8 @@
SSnanoui.update_uis(NM)
return 1
/datum/computer_file/program/card_mod/proc/remove_nt_access(var/obj/item/weapon/card/id/id_card)
/datum/computer_file/program/card_mod/proc/remove_nt_access(var/obj/item/card/id/id_card)
id_card.access -= get_access_ids(ACCESS_TYPE_STATION|ACCESS_TYPE_CENTCOM)
/datum/computer_file/program/card_mod/proc/apply_access(var/obj/item/weapon/card/id/id_card, var/list/accesses)
/datum/computer_file/program/card_mod/proc/apply_access(var/obj/item/card/id/id_card, var/list/accesses)
id_card.access |= accesses

2
code/modules/modular_computers/file_system/programs/command/comm.dm
View File

@@ -136,7 +136,7 @@
if("announce")
if(is_autenthicated(user) && !issilicon(usr) && ntn_comm)
if(user)
var/obj/item/weapon/card/id/id_card = user.GetIdCard()
var/obj/item/card/id/id_card = user.GetIdCard()
crew_announcement.announcer = GetNameAndAssignmentFromId(id_card)
else
crew_announcement.announcer = "Unknown"

2
code/modules/modular_computers/file_system/programs/generic/news_browser.dm
View File

@@ -72,7 +72,7 @@
var/savename = sanitize(input(usr, "Enter file name or leave blank to cancel:", "Save article", loaded_article.filename))
if(!savename)
return 1
var/obj/item/weapon/computer_hardware/hard_drive/HDD = computer.hard_drive
var/obj/item/computer_hardware/hard_drive/HDD = computer.hard_drive
if(!HDD)
return 1
var/datum/computer_file/data/news_article/N = loaded_article.clone()

4
code/modules/modular_computers/file_system/programs/generic/ntsl2_interpreter.dm
View File

@@ -30,7 +30,7 @@
if(href_list["PRG_execfile"])
. = 1
var/obj/item/weapon/computer_hardware/hard_drive/HDD = computer.hard_drive
var/obj/item/computer_hardware/hard_drive/HDD = computer.hard_drive
var/datum/computer_file/data/F = HDD.find_file_by_name(href_list["PRG_execfile"])
if(istype(F))
var/oldtext = html_decode(F.stored_data)
@@ -72,7 +72,7 @@
else
return
var/obj/item/weapon/computer_hardware/hard_drive/HDD
var/obj/item/computer_hardware/hard_drive/HDD
if(!PRG.computer || !PRG.computer.hard_drive)
data["error"] = "I/O ERROR: Unable to access hard drive."

2
code/modules/modular_computers/file_system/programs/research/ai_restorer.dm
View File

@@ -73,7 +73,7 @@
A.switch_from_dead_to_living_mob_list()
A.add_ai_verbs()
A.updateicon()
var/obj/item/weapon/aicard/AC = A.loc
var/obj/item/aicard/AC = A.loc
if(AC)
AC.update_icon()
// Finished restoring

2
code/modules/modular_computers/file_system/programs/security/digitalwarrant.dm
View File

@@ -62,7 +62,7 @@
var/mob/user = usr
if(!istype(user))
return
var/obj/item/weapon/card/id/I = user.GetIdCard()
var/obj/item/card/id/I = user.GetIdCard()
if(!istype(I) || !I.registered_name || !(access_armory in I.access) || issilicon(user))
to_chat(user, "Authentication error: Unable to locate ID with appropriate access to allow this operation.")
return

2
code/modules/modular_computers/file_system/programs/system/configurator.dm
View File

@@ -49,7 +49,7 @@
VUEUI_SET_CHECK(data["battery"]["percent"], round(computer.battery_module.battery.percent()), ., data)
LAZYINITLIST(data["hardware"])
for(var/obj/item/weapon/computer_hardware/H in hardware)
for(var/obj/item/computer_hardware/H in hardware)
LAZYINITLIST(data["hardware"][H.name])
for(var/v in list("name", "desc", "enabled", "critical", "power_usage"))
VUEUI_SET_CHECK(data["hardware"][H.name][v], H.vars[v], ., data)

32
code/modules/modular_computers/file_system/programs/system/file_browser.dm
View File

@@ -19,7 +19,7 @@
if(href_list["PRG_openfile"])
. = 1
var/obj/item/weapon/computer_hardware/hard_drive/HDD = computer.hard_drive
var/obj/item/computer_hardware/hard_drive/HDD = computer.hard_drive
var/datum/computer_file/F = HDD.find_file_by_name(href_list["PRG_openfile"])
if (!F)
return
@@ -32,7 +32,7 @@
var/newname = sanitize(input(usr, "Enter file name or leave blank to cancel:", "File rename"))
if(!newname)
return 1
var/obj/item/weapon/computer_hardware/hard_drive/HDD = computer.hard_drive
var/obj/item/computer_hardware/hard_drive/HDD = computer.hard_drive
if(!HDD)
return 1
var/datum/computer_file/data/F = new/datum/computer_file/data()
@@ -41,7 +41,7 @@
HDD.store_file(F)
if(href_list["PRG_deletefile"])
. = 1
var/obj/item/weapon/computer_hardware/hard_drive/HDD = computer.hard_drive
var/obj/item/computer_hardware/hard_drive/HDD = computer.hard_drive
if(!HDD)
return 1
var/datum/computer_file/file = HDD.find_file_by_name(href_list["PRG_deletefile"])
@@ -50,7 +50,7 @@
HDD.remove_file(file)
if(href_list["PRG_usbdeletefile"])
. = 1
var/obj/item/weapon/computer_hardware/hard_drive/RHDD = computer.portable_drive
var/obj/item/computer_hardware/hard_drive/RHDD = computer.portable_drive
if(!RHDD)
return 1
var/datum/computer_file/file = RHDD.find_file_by_name(href_list["PRG_usbdeletefile"])
@@ -63,7 +63,7 @@
error = null
if(href_list["PRG_clone"])
. = 1
var/obj/item/weapon/computer_hardware/hard_drive/HDD = computer.hard_drive
var/obj/item/computer_hardware/hard_drive/HDD = computer.hard_drive
if(!HDD)
return 1
var/datum/computer_file/F = HDD.find_file_by_name(href_list["PRG_clone"])
@@ -73,7 +73,7 @@
HDD.store_file(C)
if(href_list["PRG_rename"])
. = 1
var/obj/item/weapon/computer_hardware/hard_drive/HDD = computer.hard_drive
var/obj/item/computer_hardware/hard_drive/HDD = computer.hard_drive
if(!HDD)
return 1
var/datum/computer_file/file = HDD.find_file_by_name(href_list["PRG_rename"])
@@ -86,7 +86,7 @@
. = 1
if(!open_file)
return 1
var/obj/item/weapon/computer_hardware/hard_drive/HDD = computer.hard_drive
var/obj/item/computer_hardware/hard_drive/HDD = computer.hard_drive
if(!HDD)
return 1
var/datum/computer_file/data/F = HDD.find_file_by_name(open_file)
@@ -117,7 +117,7 @@
. = 1
if(!open_file)
return 1
var/obj/item/weapon/computer_hardware/hard_drive/HDD = computer.hard_drive
var/obj/item/computer_hardware/hard_drive/HDD = computer.hard_drive
if(!HDD)
return 1
var/datum/computer_file/data/F = HDD.find_file_by_name(open_file)
@@ -131,8 +131,8 @@
return 1
if(href_list["PRG_copytousb"])
. = 1
var/obj/item/weapon/computer_hardware/hard_drive/HDD = computer.hard_drive
var/obj/item/weapon/computer_hardware/hard_drive/portable/RHDD = computer.portable_drive
var/obj/item/computer_hardware/hard_drive/HDD = computer.hard_drive
var/obj/item/computer_hardware/hard_drive/portable/RHDD = computer.portable_drive
if(!HDD || !RHDD || computer.enrolled != 2)
return 1
var/datum/computer_file/F = HDD.find_file_by_name(href_list["PRG_copytousb"])
@@ -142,8 +142,8 @@
RHDD.store_file(C)
if(href_list["PRG_copyfromusb"])
. = 1
var/obj/item/weapon/computer_hardware/hard_drive/HDD = computer.hard_drive
var/obj/item/weapon/computer_hardware/hard_drive/portable/RHDD = computer.portable_drive
var/obj/item/computer_hardware/hard_drive/HDD = computer.hard_drive
var/obj/item/computer_hardware/hard_drive/portable/RHDD = computer.portable_drive
if(!HDD || !RHDD || computer.enrolled != 2)
return 1
var/datum/computer_file/F = RHDD.find_file_by_name(href_list["PRG_copyfromusb"])
@@ -153,7 +153,7 @@
HDD.store_file(C)
if(href_list["PRG_encrypt"])
. = 1
var/obj/item/weapon/computer_hardware/hard_drive/HDD = computer.hard_drive
var/obj/item/computer_hardware/hard_drive/HDD = computer.hard_drive
if (!HDD)
return
var/datum/computer_file/F = HDD.find_file_by_name(href_list["PRG_encrypt"])
@@ -164,7 +164,7 @@
F.password = sanitize(input(usr, "Enter an encryption key:", "Encrypt File"))
if(href_list["PRG_decrypt"])
. = 1
var/obj/item/weapon/computer_hardware/hard_drive/HDD = computer.hard_drive
var/obj/item/computer_hardware/hard_drive/HDD = computer.hard_drive
if (!HDD)
return
var/datum/computer_file/F = HDD.find_file_by_name(href_list["PRG_encrypt"])
@@ -186,8 +186,8 @@
//var/list/data = list("_PC" = program.get_header_data())
PRG = program
var/obj/item/weapon/computer_hardware/hard_drive/HDD
var/obj/item/weapon/computer_hardware/hard_drive/portable/RHDD
var/obj/item/computer_hardware/hard_drive/HDD
var/obj/item/computer_hardware/hard_drive/portable/RHDD
if(PRG.error)
data["error"] = PRG.error
if(PRG.open_file)