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

16
code/modules/world_api/commands/cciaa.dm
View File

@@ -78,8 +78,8 @@
return TRUE
var/output = list()
if (istype(faxes[fax_id], /obj/item/weapon/paper))
var/obj/item/weapon/paper/a = faxes[fax_id]
if (istype(faxes[fax_id], /obj/item/paper))
var/obj/item/paper/a = faxes[fax_id]
output["title"] = a.name ? a.name : "Untitled Fax"
var/content = replacetext(a.info, "<br>", "\n")
@@ -90,13 +90,13 @@
response = "Fax (Paper) with id [fax_id] retrieved"
data = output
return TRUE
else if (istype(faxes[fax_id], /obj/item/weapon/photo))
else if (istype(faxes[fax_id], /obj/item/photo))
statuscode = 501
response = "Fax is a Photo - Unable to send"
data = null
return TRUE
else if (istype(faxes[fax_id], /obj/item/weapon/paper_bundle))
var/obj/item/weapon/paper_bundle/b = faxes[fax_id]
else if (istype(faxes[fax_id], /obj/item/paper_bundle))
var/obj/item/paper_bundle/b = faxes[fax_id]
output["title"] = b.name ? b.name : "Untitled Paper Bundle"
if (!b.pages || !b.pages.len)
@@ -106,7 +106,7 @@
return TRUE
var/i = 0
for (var/obj/item/weapon/paper/c in b.pages)
for (var/obj/item/paper/c in b.pages)
i++
var/content = replacetext(c.info, "<br>", "\n")
content = strip_html_properly(content, 0)
@@ -235,7 +235,7 @@
/datum/topic_command/send_fax/proc/send_fax(var/obj/machinery/photocopier/faxmachine/F, title, body, senderkey)
// Create the reply message
var/obj/item/weapon/paper/P = new /obj/item/weapon/paper( null ) //hopefully the null loc won't cause trouble for us
var/obj/item/paper/P = new /obj/item/paper( null ) //hopefully the null loc won't cause trouble for us
P.name = "[current_map.boss_name] - [title]"
P.info = body
P.update_icon()
@@ -245,7 +245,7 @@
stampoverlay.icon_state = "paper_stamp-cent"
if(!P.stamped)
P.stamped = new
P.stamped += /obj/item/weapon/stamp
P.stamped += /obj/item/stamp
P.add_overlay(stampoverlay)
P.stamps += "<HR><i>This paper has been stamped by the Central Command Quantum Relay.</i>"