cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2026-08-26 14:31:59 +01: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
code/modules/detectivework/microscope/dnascanner.dm
+4 -4
View File
@@ -7,7 +7,7 @@
anchored = 1
density = 1
var/obj/item/weapon/forensics/swab/bloodsamp = null
var/obj/item/forensics/swab/bloodsamp = null
var/closed = 0
var/scanning = 0
var/scanner_progress = 0
@@ -25,7 +25,7 @@
to_chat(user, "<span class='warning'>Open the cover before inserting the sample.</span>")
return
var/obj/item/weapon/forensics/swab/swab = W
var/obj/item/forensics/swab/swab = W
if(istype(swab) && swab.is_used())
user.unEquip(W)
src.bloodsamp = swab
@@ -102,10 +102,10 @@
visible_message("<span class='notice'>\icon[src] makes an insistent chime.</span>", range = 2)
update_icon()
if(bloodsamp)
var/obj/item/weapon/paper/P = new()
var/obj/item/paper/P = new()
var/pname = "[src] report #[++report_num]: [bloodsamp.name]"
var/info
P.stamped = list(/obj/item/weapon/stamp)
P.stamped = list(/obj/item/stamp)
P.overlays = list("paper_stamped")
//dna data itself
var/data = "No scan information available."
code/modules/detectivework/microscope/microscope.dm
+11 -11
View File
@@ -7,16 +7,16 @@
anchored = 1
density = 1
var/obj/item/weapon/sample = null
var/obj/item/sample = null
var/report_num = 0
/obj/machinery/microscope/attackby(obj/item/weapon/W as obj, mob/user as mob)
/obj/machinery/microscope/attackby(obj/item/W as obj, mob/user as mob)
if(sample)
to_chat(user, "<span class='warning'>There is already a slide in the microscope.</span>")
return
if(istype(W, /obj/item/weapon/forensics/slide) || istype(W, /obj/item/weapon/sample/print))
if(istype(W, /obj/item/forensics/slide) || istype(W, /obj/item/sample/print))
to_chat(user, "<span class='notice'>You insert \the [W] into the microscope.</span>")
user.unEquip(W)
W.forceMove(src)
@@ -36,17 +36,17 @@
return
to_chat(user, "<span class='notice'>Printing findings now...</span>")
var/obj/item/weapon/paper/report = new()
var/obj/item/paper/report = new()
var/pname
var/info
report.stamped = list(/obj/item/weapon/stamp)
report.stamped = list(/obj/item/stamp)
report.overlays = list("paper_stamped")
report_num++
if(istype(sample, /obj/item/weapon/forensics/slide))
var/obj/item/weapon/forensics/slide/slide = sample
if(istype(sample, /obj/item/forensics/slide))
var/obj/item/forensics/slide/slide = sample
if(slide.has_swab)
var/obj/item/weapon/forensics/swab/swab = slide.has_swab
var/obj/item/forensics/swab/swab = slide.has_swab
pname = "GSR report #[++report_num]: [swab.name]"
info = "<b>Scanned item:</b><br>[swab.name]<br><br>"
@@ -57,7 +57,7 @@
info += "No gunpowder residue found."
else if(slide.has_sample)
var/obj/item/weapon/sample/fibers/fibers = slide.has_sample
var/obj/item/sample/fibers/fibers = slide.has_sample
pname = "Fiber report #[++report_num]: [fibers.name]"
info = "<b>Scanned item:</b><br>[fibers.name]<br><br>"
if(fibers.evidence)
@@ -69,10 +69,10 @@
else
pname = "Empty slide report #[report_num]"
info = "Evidence suggests that there's nothing in this slide."
else if(istype(sample, /obj/item/weapon/sample/print))
else if(istype(sample, /obj/item/sample/print))
pname = "Fingerprint report #[report_num]: [sample.name]"
info = "<b>Fingerprint analysis report #[report_num]</b>: [sample.name]<br>"
var/obj/item/weapon/sample/print/card = sample
var/obj/item/sample/print/card = sample
if(card.evidence && card.evidence.len)
info += "Surface analysis has determined unique fingerprint strings:<br><br>"
for(var/prints in card.evidence)
code/modules/detectivework/microscope/slides.dm
+8 -8
View File
@@ -1,17 +1,17 @@
/obj/item/weapon/forensics/slide
/obj/item/forensics/slide
name = "microscope slide"
desc = "A pair of thin glass panes used in the examination of samples beneath a microscope."
icon_state = "slide"
var/obj/item/weapon/forensics/swab/has_swab
var/obj/item/weapon/sample/fibers/has_sample
var/obj/item/forensics/swab/has_swab
var/obj/item/sample/fibers/has_sample
/obj/item/weapon/forensics/slide/attackby(var/obj/item/weapon/W, var/mob/user)
/obj/item/forensics/slide/attackby(var/obj/item/W, var/mob/user)
if(has_swab || has_sample)
to_chat(user, "<span class='warning'>There is already a sample in the slide.</span>")
return
if(istype (W, /obj/item/weapon/forensics/swab))
if(istype (W, /obj/item/forensics/swab))
has_swab = W
else if(istype(W, /obj/item/weapon/sample/fibers))
else if(istype(W, /obj/item/sample/fibers))
has_sample = W
else
to_chat(user, "<span class='warning'>You don't think this will fit.</span>")
@@ -21,7 +21,7 @@
W.forceMove(src)
update_icon()
/obj/item/weapon/forensics/slide/attack_self(var/mob/user)
/obj/item/forensics/slide/attack_self(var/mob/user)
if(has_swab || has_sample)
to_chat(user, "<span class='notice'>You remove \the sample from \the [src].</span>")
if(has_swab)
@@ -33,7 +33,7 @@
update_icon()
return
/obj/item/weapon/forensics/slide/update_icon()
/obj/item/forensics/slide/update_icon()
if(!has_swab && !has_sample)
icon_state = "slide"
else if(has_swab)