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

12
code/modules/integrated_electronics/core/assemblies.dm
View File

@@ -11,9 +11,9 @@
var/max_complexity = IC_COMPLEXITY_BASE
var/opened = 0
var/can_anchor = FALSE // If true, wrenching it will anchor it.
var/obj/item/weapon/cell/device/battery // Internal cell which most circuits need to work.
var/obj/item/cell/device/battery // Internal cell which most circuits need to work.
var/detail_color = COLOR_ASSEMBLY_BLACK
var/obj/item/weapon/card/id/access_card
var/obj/item/card/id/access_card
/obj/item/device/electronic_assembly/implant
name = "electronic implant"
@@ -22,14 +22,14 @@
w_class = ITEMSIZE_TINY
max_components = IC_COMPONENTS_BASE / 2
max_complexity = IC_COMPLEXITY_BASE / 2
var/obj/item/weapon/implant/integrated_circuit/implant = null
var/obj/item/implant/integrated_circuit/implant = null
/obj/item/device/electronic_assembly/Initialize(mapload, printed = FALSE)
. = ..()
if (!printed)
battery = new(src)
START_PROCESSING(SSelectronics, src)
access_card = new /obj/item/weapon/card/id(src)
access_card = new /obj/item/card/id(src)
/obj/item/device/electronic_assembly/Destroy()
QDEL_NULL(battery)
@@ -270,7 +270,7 @@
to_chat(user, "<span class='warning'>\The [src] isn't open, so you can't fiddle with the internal components. \
Try using a crowbar.</span>")
else if(istype(I, /obj/item/weapon/cell/device))
else if(istype(I, /obj/item/cell/device))
if(!opened)
to_chat(user, "<span class='warning'>\The [src] isn't open, so you can't put anything inside. Try using a crowbar.</span>")
for(var/obj/item/integrated_circuit/input/S in contents)
@@ -283,7 +283,7 @@
S.attackby_react(I,user,user.a_intent)
return FALSE
var/obj/item/weapon/cell/device/cell = I
var/obj/item/cell/device/cell = I
user.drop_from_inventory(cell,src)
battery = cell
playsound(get_turf(src), 'sound/items/Deconstruct.ogg', 50, 1)

10
code/modules/integrated_electronics/core/printer.dm
View File

@@ -39,7 +39,7 @@
interact(user)
return TRUE
if(istype(O,/obj/item/weapon/disk/integrated_circuit/upgrade/advanced))
if(istype(O,/obj/item/disk/integrated_circuit/upgrade/advanced))
if(upgraded)
to_chat(user, "<span class='warning'>\The [src] already has this upgrade. </span>")
return TRUE
@@ -48,7 +48,7 @@
interact(user)
return TRUE
if(istype(O,/obj/item/weapon/disk/integrated_circuit/upgrade/clone))
if(istype(O,/obj/item/disk/integrated_circuit/upgrade/clone))
if(can_clone)
to_chat(user, "<span class='warning'>\The [src] already has this upgrade. </span>")
return TRUE
@@ -151,7 +151,7 @@
return FALSE
// FUKKEN UPGRADE DISKS
/obj/item/weapon/disk/integrated_circuit/upgrade
/obj/item/disk/integrated_circuit/upgrade
name = "integrated circuit printer upgrade disk"
desc = "Install this into your integrated circuit printer to enhance it."
icon = 'icons/obj/assemblies/electronic_tools.dmi'
@@ -160,12 +160,12 @@
w_class = ITEMSIZE_SMALL
origin_tech = list(TECH_ENGINEERING = 3, TECH_DATA = 4)
/obj/item/weapon/disk/integrated_circuit/upgrade/advanced
/obj/item/disk/integrated_circuit/upgrade/advanced
name = "integrated circuit printer upgrade disk - advanced designs"
desc = "Install this into your integrated circuit printer to enhance it. This one adds new, advanced designs to the printer."
// To be implemented later.
/obj/item/weapon/disk/integrated_circuit/upgrade/clone
/obj/item/disk/integrated_circuit/upgrade/clone
name = "integrated circuit printer upgrade disk - circuit cloner"
desc = "Install this into your integrated circuit printer to enhance it. This one allows the printer to duplicate assemblies."
icon_state = "upgrade_disk_clone"

122
code/modules/integrated_electronics/core/tools.dm
View File

@@ -280,7 +280,7 @@
detail_color = color_list[color_choice]
update_icon()
/obj/item/weapon/storage/bag/circuits
/obj/item/storage/bag/circuits
name = "circuit kit"
desc = "This kit is essential for any circuitry projects."
icon = 'icons/obj/assemblies/electronic_tools.dmi'
@@ -289,50 +289,50 @@
display_contents_with_number = 0
can_hold = list(
/obj/item/integrated_circuit,
/obj/item/weapon/storage/bag/circuits/mini,
/obj/item/storage/bag/circuits/mini,
/obj/item/device/electronic_assembly,
/obj/item/device/integrated_electronics,
/obj/item/weapon/crowbar,
/obj/item/weapon/screwdriver,
/obj/item/crowbar,
/obj/item/screwdriver,
/obj/item/device/multitool
)
/obj/item/weapon/storage/bag/circuits/basic/fill()
new /obj/item/weapon/storage/bag/circuits/mini/arithmetic(src)
new /obj/item/weapon/storage/bag/circuits/mini/trig(src)
new /obj/item/weapon/storage/bag/circuits/mini/input(src)
new /obj/item/weapon/storage/bag/circuits/mini/output(src)
new /obj/item/weapon/storage/bag/circuits/mini/memory(src)
new /obj/item/weapon/storage/bag/circuits/mini/logic(src)
new /obj/item/weapon/storage/bag/circuits/mini/time(src)
new /obj/item/weapon/storage/bag/circuits/mini/reagents(src)
new /obj/item/weapon/storage/bag/circuits/mini/transfer(src)
new /obj/item/weapon/storage/bag/circuits/mini/converter(src)
new /obj/item/weapon/storage/bag/circuits/mini/power(src)
/obj/item/storage/bag/circuits/basic/fill()
new /obj/item/storage/bag/circuits/mini/arithmetic(src)
new /obj/item/storage/bag/circuits/mini/trig(src)
new /obj/item/storage/bag/circuits/mini/input(src)
new /obj/item/storage/bag/circuits/mini/output(src)
new /obj/item/storage/bag/circuits/mini/memory(src)
new /obj/item/storage/bag/circuits/mini/logic(src)
new /obj/item/storage/bag/circuits/mini/time(src)
new /obj/item/storage/bag/circuits/mini/reagents(src)
new /obj/item/storage/bag/circuits/mini/transfer(src)
new /obj/item/storage/bag/circuits/mini/converter(src)
new /obj/item/storage/bag/circuits/mini/power(src)
new /obj/item/device/electronic_assembly(src)
new /obj/item/device/assembly/electronic_assembly(src)
new /obj/item/device/assembly/electronic_assembly(src)
new /obj/item/device/multitool(src)
new /obj/item/weapon/screwdriver(src)
new /obj/item/weapon/crowbar(src)
new /obj/item/screwdriver(src)
new /obj/item/crowbar(src)
make_exact_fit()
/obj/item/weapon/storage/bag/circuits/all/fill()
/obj/item/storage/bag/circuits/all/fill()
..()
new /obj/item/weapon/storage/bag/circuits/mini/arithmetic/all(src)
new /obj/item/weapon/storage/bag/circuits/mini/trig/all(src)
new /obj/item/weapon/storage/bag/circuits/mini/input/all(src)
new /obj/item/weapon/storage/bag/circuits/mini/output/all(src)
new /obj/item/weapon/storage/bag/circuits/mini/memory/all(src)
new /obj/item/weapon/storage/bag/circuits/mini/logic/all(src)
new /obj/item/weapon/storage/bag/circuits/mini/smart/all(src)
new /obj/item/weapon/storage/bag/circuits/mini/manipulation/all(src)
new /obj/item/weapon/storage/bag/circuits/mini/time/all(src)
new /obj/item/weapon/storage/bag/circuits/mini/reagents/all(src)
new /obj/item/weapon/storage/bag/circuits/mini/transfer/all(src)
new /obj/item/weapon/storage/bag/circuits/mini/converter/all(src)
new /obj/item/weapon/storage/bag/circuits/mini/power/all(src)
new /obj/item/storage/bag/circuits/mini/arithmetic/all(src)
new /obj/item/storage/bag/circuits/mini/trig/all(src)
new /obj/item/storage/bag/circuits/mini/input/all(src)
new /obj/item/storage/bag/circuits/mini/output/all(src)
new /obj/item/storage/bag/circuits/mini/memory/all(src)
new /obj/item/storage/bag/circuits/mini/logic/all(src)
new /obj/item/storage/bag/circuits/mini/smart/all(src)
new /obj/item/storage/bag/circuits/mini/manipulation/all(src)
new /obj/item/storage/bag/circuits/mini/time/all(src)
new /obj/item/storage/bag/circuits/mini/reagents/all(src)
new /obj/item/storage/bag/circuits/mini/transfer/all(src)
new /obj/item/storage/bag/circuits/mini/converter/all(src)
new /obj/item/storage/bag/circuits/mini/power/all(src)
new /obj/item/device/electronic_assembly(src)
new /obj/item/device/electronic_assembly/medium(src)
@@ -340,10 +340,10 @@
new /obj/item/device/electronic_assembly/drone(src)
new /obj/item/device/integrated_electronics/wirer(src)
new /obj/item/device/integrated_electronics/debugger(src)
new /obj/item/weapon/crowbar(src)
new /obj/item/crowbar(src)
make_exact_fit()
/obj/item/weapon/storage/bag/circuits/mini
/obj/item/storage/bag/circuits/mini
name = "circuit box"
desc = "Used to partition categories of circuits, for a neater workspace."
w_class = 2
@@ -352,7 +352,7 @@
var/spawn_flags_to_use = IC_SPAWN_DEFAULT
var/list/spawn_types = list()
/obj/item/weapon/storage/bag/circuits/mini/fill()
/obj/item/storage/bag/circuits/mini/fill()
spawn_types = typecacheof(spawn_types)
for (var/thing in typecache_filter_list(SSelectronics.all_integrated_circuits, spawn_types))
var/obj/item/integrated_circuit/IC = thing
@@ -362,7 +362,7 @@
make_exact_fit()
/obj/item/weapon/storage/bag/circuits/mini/arithmetic
/obj/item/storage/bag/circuits/mini/arithmetic
name = "arithmetic circuit box"
desc = "Warning: Contains math."
icon_state = "box_arithmetic"
@@ -370,10 +370,10 @@
/obj/item/integrated_circuit/arithmetic
)
/obj/item/weapon/storage/bag/circuits/mini/arithmetic/all // Don't believe this will ever be needed.
/obj/item/storage/bag/circuits/mini/arithmetic/all // Don't believe this will ever be needed.
spawn_flags_to_use = IC_SPAWN_DEFAULT|IC_SPAWN_RESEARCH
/obj/item/weapon/storage/bag/circuits/mini/trig
/obj/item/storage/bag/circuits/mini/trig
name = "trig circuit box"
desc = "Danger: Contains more math."
icon_state = "box_trig"
@@ -381,10 +381,10 @@
/obj/item/integrated_circuit/trig
)
/obj/item/weapon/storage/bag/circuits/mini/trig/all // Ditto
/obj/item/storage/bag/circuits/mini/trig/all // Ditto
spawn_flags_to_use = IC_SPAWN_DEFAULT|IC_SPAWN_RESEARCH
/obj/item/weapon/storage/bag/circuits/mini/input
/obj/item/storage/bag/circuits/mini/input
name = "input circuit box"
desc = "Tell these circuits everything you know."
icon_state = "box_input"
@@ -392,10 +392,10 @@
/obj/item/integrated_circuit/input
)
/obj/item/weapon/storage/bag/circuits/mini/input/all
/obj/item/storage/bag/circuits/mini/input/all
spawn_flags_to_use = IC_SPAWN_DEFAULT|IC_SPAWN_RESEARCH
/obj/item/weapon/storage/bag/circuits/mini/output
/obj/item/storage/bag/circuits/mini/output
name = "output circuit box"
desc = "Circuits to interface with the world beyond itself."
icon_state = "box_output"
@@ -403,10 +403,10 @@
/obj/item/integrated_circuit/output
)
/obj/item/weapon/storage/bag/circuits/mini/output/all
/obj/item/storage/bag/circuits/mini/output/all
spawn_flags_to_use = IC_SPAWN_DEFAULT|IC_SPAWN_RESEARCH
/obj/item/weapon/storage/bag/circuits/mini/memory
/obj/item/storage/bag/circuits/mini/memory
name = "memory circuit box"
desc = "Machines can be quite forgetful without these."
icon_state = "box_memory"
@@ -414,10 +414,10 @@
/obj/item/integrated_circuit/memory
)
/obj/item/weapon/storage/bag/circuits/mini/memory/all
/obj/item/storage/bag/circuits/mini/memory/all
spawn_flags_to_use = IC_SPAWN_DEFAULT|IC_SPAWN_RESEARCH
/obj/item/weapon/storage/bag/circuits/mini/logic
/obj/item/storage/bag/circuits/mini/logic
name = "logic circuit box"
desc = "May or may not be Turing complete."
icon_state = "box_logic"
@@ -425,10 +425,10 @@
/obj/item/integrated_circuit/logic
)
/obj/item/weapon/storage/bag/circuits/mini/logic/all
/obj/item/storage/bag/circuits/mini/logic/all
spawn_flags_to_use = IC_SPAWN_DEFAULT|IC_SPAWN_RESEARCH
/obj/item/weapon/storage/bag/circuits/mini/time
/obj/item/storage/bag/circuits/mini/time
name = "time circuit box"
desc = "No time machine parts, sadly."
icon_state = "box_time"
@@ -436,10 +436,10 @@
/obj/item/integrated_circuit/time
)
/obj/item/weapon/storage/bag/circuits/mini/time/all
/obj/item/storage/bag/circuits/mini/time/all
spawn_flags_to_use = IC_SPAWN_DEFAULT|IC_SPAWN_RESEARCH
/obj/item/weapon/storage/bag/circuits/mini/reagents
/obj/item/storage/bag/circuits/mini/reagents
name = "reagent circuit box"
desc = "Unlike most electronics, these circuits are supposed to come in contact with liquids."
icon_state = "box_reagents"
@@ -447,10 +447,10 @@
/obj/item/integrated_circuit/reagent
)
/obj/item/weapon/storage/bag/circuits/mini/reagents/all
/obj/item/storage/bag/circuits/mini/reagents/all
spawn_flags_to_use = IC_SPAWN_DEFAULT|IC_SPAWN_RESEARCH
/obj/item/weapon/storage/bag/circuits/mini/transfer
/obj/item/storage/bag/circuits/mini/transfer
name = "transfer circuit box"
desc = "Useful for moving data representing something arbitrary to another arbitrary virtual place."
icon_state = "box_transfer"
@@ -458,10 +458,10 @@
/obj/item/integrated_circuit/transfer
)
/obj/item/weapon/storage/bag/circuits/mini/transfer/all
/obj/item/storage/bag/circuits/mini/transfer/all
spawn_flags_to_use = IC_SPAWN_DEFAULT|IC_SPAWN_RESEARCH
/obj/item/weapon/storage/bag/circuits/mini/converter
/obj/item/storage/bag/circuits/mini/converter
name = "converter circuit box"
desc = "Transform one piece of data to another type of data with these."
icon_state = "box_converter"
@@ -469,10 +469,10 @@
/obj/item/integrated_circuit/converter
)
/obj/item/weapon/storage/bag/circuits/mini/converter/all
/obj/item/storage/bag/circuits/mini/converter/all
spawn_flags_to_use = IC_SPAWN_DEFAULT|IC_SPAWN_RESEARCH
/obj/item/weapon/storage/bag/circuits/mini/smart
/obj/item/storage/bag/circuits/mini/smart
name = "smart box"
desc = "Sentience not included."
icon_state = "box_ai"
@@ -480,10 +480,10 @@
/obj/item/integrated_circuit/smart
)
/obj/item/weapon/storage/bag/circuits/mini/smart/all
/obj/item/storage/bag/circuits/mini/smart/all
spawn_flags_to_use = IC_SPAWN_DEFAULT|IC_SPAWN_RESEARCH
/obj/item/weapon/storage/bag/circuits/mini/manipulation
/obj/item/storage/bag/circuits/mini/manipulation
name = "manipulation box"
desc = "Make your machines actually useful with these."
icon_state = "box_manipulation"
@@ -491,10 +491,10 @@
/obj/item/integrated_circuit/manipulation
)
/obj/item/weapon/storage/bag/circuits/mini/manipulation/all
/obj/item/storage/bag/circuits/mini/manipulation/all
spawn_flags_to_use = IC_SPAWN_DEFAULT|IC_SPAWN_RESEARCH
/obj/item/weapon/storage/bag/circuits/mini/power
/obj/item/storage/bag/circuits/mini/power
name = "power circuit box"
desc = "Electronics generally require electricity."
icon_state = "box_power"
@@ -503,5 +503,5 @@
/obj/item/integrated_circuit/power
)
/obj/item/weapon/storage/bag/circuits/mini/power/all
/obj/item/storage/bag/circuits/mini/power/all
spawn_flags_to_use = IC_SPAWN_DEFAULT|IC_SPAWN_RESEARCH