mirror of
https://github.com/Aurorastation/Aurora.3.git
synced 2026-08-23 21:12:24 +01:00
Removes Weapons (#7415)
* 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
@@ -68,14 +68,14 @@
|
||||
/**
|
||||
* Employee reassignment hook.
|
||||
* Called in card.dm when someone's card is reassigned at the HoP's desk.
|
||||
* Parameters: var/obj/item/weapon/card/id
|
||||
* Parameters: var/obj/item/card/id
|
||||
*/
|
||||
/hook/reassign_employee
|
||||
|
||||
/**
|
||||
* Employee suspension hook.
|
||||
* Called in card.dm when someone's card is suspended at the HoP's desk.
|
||||
* Parameters: var/obj/item/weapon/card/id
|
||||
* Parameters: var/obj/item/card/id
|
||||
*/
|
||||
/hook/suspend_employee
|
||||
|
||||
|
||||
@@ -59,7 +59,7 @@
|
||||
/datum/controller/subsystem/arrivals/proc/forbidden_atoms_check(atom/A)
|
||||
if(istype(A,/mob/living))
|
||||
return 1
|
||||
if(istype(A,/obj/item/weapon/disk/nuclear))
|
||||
if(istype(A,/obj/item/disk/nuclear))
|
||||
return 1
|
||||
if(istype(A,/obj/machinery/nuclearbomb))
|
||||
return 1
|
||||
|
||||
@@ -557,7 +557,7 @@ var/datum/controller/subsystem/cargo/SScargo
|
||||
/datum/controller/subsystem/cargo/proc/forbidden_atoms_check(atom/A)
|
||||
if(istype(A,/mob/living))
|
||||
return 1
|
||||
if(istype(A,/obj/item/weapon/disk/nuclear))
|
||||
if(istype(A,/obj/item/disk/nuclear))
|
||||
return 1
|
||||
if(istype(A,/obj/machinery/nuclearbomb))
|
||||
return 1
|
||||
@@ -683,7 +683,7 @@ var/datum/controller/subsystem/cargo/SScargo
|
||||
log_debug("SScargo: Bad variable name [var_name] for item name: [coi.ci.name] id: [coi.ci.id] - [e]")
|
||||
|
||||
//Spawn the Paper Inside
|
||||
var/obj/item/weapon/paper/P = new(A)
|
||||
var/obj/item/paper/P = new(A)
|
||||
P.set_content_unsafe("[co.order_id] - [co.ordered_by]", co.get_report_delivery_order())
|
||||
|
||||
//Shuttle is loaded now - Charge cargo for it
|
||||
|
||||
@@ -194,9 +194,9 @@ var/datum/controller/subsystem/docs/SSdocs
|
||||
var/tags = list() // for use by mappers, typically
|
||||
|
||||
/obj/random/document/item_to_spawn()
|
||||
return /obj/item/weapon/paper
|
||||
return /obj/item/paper
|
||||
|
||||
/obj/random/document/post_spawn(var/obj/item/weapon/paper/spawned)
|
||||
/obj/random/document/post_spawn(var/obj/item/paper/spawned)
|
||||
if(!istype(spawned))
|
||||
return
|
||||
var/list/total_tags = tags | list(SSDOCS_MEDIUM_PAPER)
|
||||
@@ -211,13 +211,13 @@ var/datum/controller/subsystem/docs/SSdocs
|
||||
return null
|
||||
|
||||
log_ss("docs","Document [doc.name] successfully spawned!")
|
||||
var/obj/item/weapon/paper/P = spawned
|
||||
var/obj/item/paper/P = spawned
|
||||
P.set_content(doc.title, doc.content)
|
||||
|
||||
/obj/random/document/junk/post_spawn(var/obj/item/spawned)
|
||||
..()
|
||||
if(istype(spawned, /obj/item/weapon/paper) && prob(80)) // 1 in 5 junk-spawned documents will be perfectly readable
|
||||
var/obj/item/weapon/paper/P = spawned
|
||||
if(istype(spawned, /obj/item/paper) && prob(80)) // 1 in 5 junk-spawned documents will be perfectly readable
|
||||
var/obj/item/paper/P = spawned
|
||||
P.info = stars(P.info, 85) // 85% readable, preserves tags
|
||||
P.icon_state = "scrap"
|
||||
|
||||
|
||||
@@ -124,7 +124,7 @@ var/datum/controller/subsystem/economy/SSeconomy
|
||||
//create a sealed package containing the account details
|
||||
var/obj/item/smallDelivery/P = new /obj/item/smallDelivery(source_db.loc)
|
||||
|
||||
var/obj/item/weapon/paper/R = new /obj/item/weapon/paper(P)
|
||||
var/obj/item/paper/R = new /obj/item/paper(P)
|
||||
P.wrapped = R
|
||||
var/pname = "Account information: [M.owner_name]"
|
||||
var/info = "<b>Account details (confidential)</b><br><hr><br>"
|
||||
@@ -143,7 +143,7 @@ var/datum/controller/subsystem/economy/SSeconomy
|
||||
stampoverlay.icon_state = "paper_stamp-cent"
|
||||
if(!R.stamped)
|
||||
R.stamped = new
|
||||
R.stamped += /obj/item/weapon/stamp
|
||||
R.stamped += /obj/item/stamp
|
||||
R.add_overlay(stampoverlay)
|
||||
R.stamps += "<HR><i>This paper has been stamped by the Accounts Database.</i>"
|
||||
|
||||
|
||||
@@ -154,7 +154,7 @@
|
||||
var/report_text = selected_ruin.get_contact_report()
|
||||
for(var/obj/effect/landmark/C in landmarks_list)
|
||||
if(C.name == "Space Ruin Paper")
|
||||
var/obj/item/weapon/paper/P = new /obj/item/weapon/paper(get_turf(C))
|
||||
var/obj/item/paper/P = new /obj/item/paper(get_turf(C))
|
||||
P.name = "Icarus reading report"
|
||||
P.info = report_text
|
||||
P.update_icon()
|
||||
@@ -808,7 +808,7 @@
|
||||
Debug("EIS/([H]): Entry.")
|
||||
if (LAZYLEN(items))
|
||||
Debug("EIS/([H]): [items.len] items.")
|
||||
var/obj/item/weapon/storage/B = locate() in H
|
||||
var/obj/item/storage/B = locate() in H
|
||||
if (B)
|
||||
for (var/thing in items)
|
||||
to_chat(H, "<span class='notice'>Placing \the [thing] in your [B.name]!</span>")
|
||||
|
||||
@@ -67,7 +67,7 @@
|
||||
network_channels[channel_name] = newChannel
|
||||
return newChannel
|
||||
|
||||
/datum/controller/subsystem/news/proc/SubmitArticle(var/msg, var/author, var/datum/feed_channel/channel, var/obj/item/weapon/photo/photo, var/adminMessage = 0, var/message_type = "", var/time_stamp)
|
||||
/datum/controller/subsystem/news/proc/SubmitArticle(var/msg, var/author, var/datum/feed_channel/channel, var/obj/item/photo/photo, var/adminMessage = 0, var/message_type = "", var/time_stamp)
|
||||
if(!channel)
|
||||
log_debug("SSnews: Attempted to submit a article from [author] without a proper channel",SEVERITY_ERROR)
|
||||
return
|
||||
|
||||
@@ -74,7 +74,7 @@
|
||||
new /obj/item/device/electronic_assembly/wallmount/light,
|
||||
new /obj/item/device/electronic_assembly/wallmount,
|
||||
new /obj/item/device/electronic_assembly/wallmount/heavy,
|
||||
new /obj/item/weapon/implant/integrated_circuit,
|
||||
new /obj/item/implant/integrated_circuit,
|
||||
new /obj/item/clothing/under/circuitry,
|
||||
new /obj/item/clothing/gloves/circuitry,
|
||||
new /obj/item/clothing/glasses/circuitry,
|
||||
|
||||
@@ -53,57 +53,57 @@ var/datum/controller/subsystem/traumas/SStraumas
|
||||
|
||||
"security" = typecacheof(list(/obj/item/clothing/under/rank/security, /obj/item/clothing/under/rank/warden, /obj/item/clothing/head/beret/sec,
|
||||
/obj/item/clothing/under/rank/head_of_security, /obj/item/clothing/under/det, /obj/item/clothing/glasses/hud/security,
|
||||
/obj/item/weapon/melee/baton, /obj/item/weapon/gun/energy/taser, /obj/item/weapon/handcuffs, /obj/item/clothing/glasses/sunglasses/sechud,
|
||||
/obj/item/melee/baton, /obj/item/gun/energy/taser, /obj/item/handcuffs, /obj/item/clothing/glasses/sunglasses/sechud,
|
||||
/obj/machinery/door/airlock/security, /obj/item/clothing/under/rank/cadet, /obj/structure/sign/directions/security,
|
||||
/obj/item/clothing/head/bio_hood/security, /obj/item/clothing/head/bomb_hood/security, /obj/item/clothing/head/helmet/space/void/security,
|
||||
/obj/item/clothing/head/soft/sec, /obj/item/clothing/suit/armor/vest/security, /obj/item/clothing/suit/bio_suit/security,
|
||||
/obj/item/clothing/suit/bomb_suit/security, /obj/item/clothing/suit/security/navyofficer, /obj/item/clothing/suit/space/void/security,
|
||||
/obj/item/clothing/suit/storage/hooded/wintercoat/security, /obj/item/device/magnetic_lock/security,/obj/item/toy/figure/secofficer,
|
||||
/obj/item/weapon/gun/bang/sec, /obj/item/weapon/gun/projectile/sec, /obj/item/weapon/book/manual/wiki/security_space_law)),
|
||||
/obj/item/gun/bang/sec, /obj/item/gun/projectile/sec, /obj/item/book/manual/wiki/security_space_law)),
|
||||
|
||||
"clowns" = typecacheof(list(/obj/item/clothing/under/rank/clown, /obj/item/clothing/shoes/clown_shoes,
|
||||
/obj/item/clothing/mask/gas/clown_hat, /obj/item/weapon/bananapeel,
|
||||
/obj/item/weapon/bikehorn, /obj/item/device/pda/clown)),
|
||||
/obj/item/clothing/mask/gas/clown_hat, /obj/item/bananapeel,
|
||||
/obj/item/bikehorn, /obj/item/device/pda/clown)),
|
||||
|
||||
"cats" = typecacheof(list(/obj/item/clothing/head/tajaran, /obj/item/clothing/suit/storage/tajaran,
|
||||
/obj/item/clothing/suit/storage/toggle/labcoat/tajaran, /obj/item/clothing/suit/storage/tajaran,
|
||||
/obj/item/stack/material/animalhide/cat, /obj/item/weapon/holder/cat, /obj/item/toy/plushie/kitten)),
|
||||
/obj/item/stack/material/animalhide/cat, /obj/item/holder/cat, /obj/item/toy/plushie/kitten)),
|
||||
|
||||
"lizards" = typecacheof(list(/obj/item/toy/plushie/lizard,/obj/item/weapon/material/hatchet/unathiknife,/obj/item/weapon/rig/unathi,
|
||||
"lizards" = typecacheof(list(/obj/item/toy/plushie/lizard,/obj/item/material/hatchet/unathiknife,/obj/item/rig/unathi,
|
||||
/obj/item/clothing/suit/unathi/robe, /obj/structure/sign/flag/hegemony, /obj/item/stack/material/animalhide/lizard,
|
||||
/obj/item/toy/plushie/lizard)),
|
||||
|
||||
"skrell" = typecacheof(list(/obj/structure/sign/flag/jargon, /obj/item/clothing/ears/skrell, /obj/item/clothing/suit/space/void/skrell,
|
||||
/obj/item/clothing/head/helmet/space/void/skrell, /obj/item/organ/brain/skrell, /obj/item/organ/eyes/skrell,
|
||||
/obj/item/organ/heart/skrell, /obj/item/organ/kidneys/skrell, /obj/item/organ/liver/skrell, /obj/item/organ/lungs/skrell,
|
||||
/obj/item/weapon/reagent_containers/food/snacks/skrellsnacks)),
|
||||
/obj/item/reagent_containers/food/snacks/skrellsnacks)),
|
||||
|
||||
"robots" = typecacheof(list(/obj/item/device/electronic_assembly/drone, /obj/item/weapon/holder/drone, /obj/item/device/mmi/digital,
|
||||
"robots" = typecacheof(list(/obj/item/device/electronic_assembly/drone, /obj/item/holder/drone, /obj/item/device/mmi/digital,
|
||||
/obj/item/organ/ipc_tag, /obj/machinery/computer/borgupload, /obj/item/clothing/suit/cyborg_suit,
|
||||
/obj/machinery/cryopod/robot, /obj/machinery/robotic_fabricator, /obj/effect/decal/cleanable/blood/gibs/robot, /obj/effect/decal/remains/robot,
|
||||
/obj/item/robot_parts, /obj/item/organ/cell, /obj/item/organ/data, /obj/item/toy/figure/borg)),
|
||||
|
||||
"nanotrasen" = typecacheof(list(/obj/item/toy/nanotrasenballoon, /obj/item/weapon/soap/nanotrasen, /obj/structure/sign/flag/nanotrasen,
|
||||
/obj/item/clothing/suit/storage/toggle/leather_jacket/nanotrasen, /obj/item/clothing/suit/storage/toggle/brown_jacket/nanotrasen, /obj/item/weapon/storage/toolbox/lunchbox/nt,
|
||||
"nanotrasen" = typecacheof(list(/obj/item/toy/nanotrasenballoon, /obj/item/soap/nanotrasen, /obj/structure/sign/flag/nanotrasen,
|
||||
/obj/item/clothing/suit/storage/toggle/leather_jacket/nanotrasen, /obj/item/clothing/suit/storage/toggle/brown_jacket/nanotrasen, /obj/item/storage/toolbox/lunchbox/nt,
|
||||
/obj/structure/banner, /obj/structure/bed/chair/office/bridge, /obj/item/clothing/head/collectable/captain,
|
||||
/obj/item/clothing/head/helmet/space/void/captain, /obj/item/clothing/suit/space/void/captain, /obj/item/clothing/suit/storage/hooded/wintercoat/captain,
|
||||
/obj/item/clothing/under/captainformal, /obj/item/clothing/under/rank/captain, /obj/item/toy/figure/captain, /obj/item/weapon/card/id/captains_spare,
|
||||
/obj/item/weapon/gun/energy/captain, /obj/item/weapon/stamp/captain, /obj/item/weapon/storage/backpack/captain, /obj/item/clothing/suit/armor/vest/security)),
|
||||
/obj/item/clothing/under/captainformal, /obj/item/clothing/under/rank/captain, /obj/item/toy/figure/captain, /obj/item/card/id/captains_spare,
|
||||
/obj/item/gun/energy/captain, /obj/item/stamp/captain, /obj/item/storage/backpack/captain, /obj/item/clothing/suit/armor/vest/security)),
|
||||
|
||||
"filth" = typecacheof(list(/obj/effect/decal/cleanable,/obj/effect/decal/remains,/obj/item/trash, /obj/machinery/portable_atmospherics/hydroponics)),
|
||||
|
||||
"paranormals" = typecacheof(list(/obj/item/weapon/book/tome,/obj/item/weapon/nullrod,/obj/structure/constructshell,
|
||||
"paranormals" = typecacheof(list(/obj/item/book/tome,/obj/item/nullrod,/obj/structure/constructshell,
|
||||
/obj/structure/cult, /obj/structure/girder/cult, /obj/structure/grille/cult, /obj/effect/forcefield/cult,
|
||||
/obj/effect/gateway, /obj/item/clothing/head/culthood, /obj/item/clothing/head/helmet/space/cult, /obj/item/clothing/shoes/cult,
|
||||
/obj/item/clothing/suit/cultrobes, /obj/item/clothing/suit/space/cult, /obj/item/toy/cultsword, /obj/item/weapon/melee/cultblade,
|
||||
/obj/item/weapon/storage/backpack/cultpack, /obj/item/weapon/storage/bible, /obj/effect/rune, /obj/item/weapon/spirit_board)),
|
||||
/obj/item/clothing/suit/cultrobes, /obj/item/clothing/suit/space/cult, /obj/item/toy/cultsword, /obj/item/melee/cultblade,
|
||||
/obj/item/storage/backpack/cultpack, /obj/item/storage/bible, /obj/effect/rune, /obj/item/spirit_board)),
|
||||
|
||||
"doctors" = typecacheof(list(/obj/item/weapon/gun/launcher/syringe, /obj/item/weapon/reagent_containers/syringe, /obj/item/clothing/suit/storage/toggle/labcoat,
|
||||
/obj/item/toy/figure/md, /obj/item/weapon/bedsheet/medical, /obj/item/weapon/rig/medical, /obj/item/weapon/storage/backpack/duffel/med,
|
||||
/obj/item/weapon/storage/backpack/medic, /obj/item/weapon/storage/backpack/messenger/med, /obj/item/weapon/storage/belt/medical,
|
||||
"doctors" = typecacheof(list(/obj/item/gun/launcher/syringe, /obj/item/reagent_containers/syringe, /obj/item/clothing/suit/storage/toggle/labcoat,
|
||||
/obj/item/toy/figure/md, /obj/item/bedsheet/medical, /obj/item/rig/medical, /obj/item/storage/backpack/duffel/med,
|
||||
/obj/item/storage/backpack/medic, /obj/item/storage/backpack/messenger/med, /obj/item/storage/belt/medical,
|
||||
/obj/machinery/vending/medical, /obj/mecha/medical/odysseus, /obj/structure/closet/crate/medical, /obj/structure/closet/medical_wall,
|
||||
/obj/structure/sign/greencross, /obj/item/clothing/accessory/armband/med, /obj/item/clothing/head/helmet/space/void/medical, /obj/item/clothing/mask/breath/medical,
|
||||
/obj/item/clothing/under/rank/medical, /obj/item/weapon/scalpel, /obj/machinery/clonepod, /obj/item/weapon/storage/firstaid, /obj/machinery/optable,
|
||||
/obj/item/clothing/under/rank/medical, /obj/item/scalpel, /obj/machinery/clonepod, /obj/item/storage/firstaid, /obj/machinery/optable,
|
||||
/obj/item/clothing/accessory/armband/science, /obj/item/clothing/under/rank/scientist, /obj/machinery/door/airlock/science, /obj/machinery/door/airlock/medical))
|
||||
|
||||
)
|
||||
|
||||
Reference in New Issue
Block a user