cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-09 16:12:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #13883 from Heroman3003/assorted-fix

Browse Source 
Allows ID to be inserted into fax machine by clicking it + 2 minor fixes
This commit is contained in:
Casey
2022-10-09 23:08:05 -04:00
committed by CHOMPStation2
parent 0972599a01
commit 897c1135fa
5 changed files with 14 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
code/modules/mob/living/simple_mob/subtypes/occult/unknown.dm
View File

@@ -260,7 +260,7 @@
vision_range = 10 vision_range = 10
closest_distance = 4 closest_distance = 4
/datum/ai_holder/simple_mob/ranged/bossmob_glitch/pre_special_attack(atom/A) /datum/ai_holder/simple_mob/ranged/aggressive/bossmob_glitch/pre_special_attack(atom/A)
var/mob/living/simple_mob/glitch_boss/GB var/mob/living/simple_mob/glitch_boss/GB
if(istype(holder, /mob/living/simple_mob/glitch_boss)) if(istype(holder, /mob/living/simple_mob/glitch_boss))
GB = holder GB = holder

2
code/modules/nifsoft/software/15_misc.dm
View File

@@ -188,7 +188,7 @@
/datum/nifsoft/malware/activate() /datum/nifsoft/malware/activate()
if((. = ..())) if((. = ..()))
to_chat(nif.human,"<span class='danger'>Runtime error in 15_misc.dm, line 189.</span>") to_chat(nif.human,"<span class='danger'>Runtime error in 15_misc.dm, line 191.</span>")
/datum/nifsoft/malware/install() /datum/nifsoft/malware/install()
if((. = ..())) if((. = ..()))

11
code/modules/paperwork/faxmachine.dm
View File

@@ -114,7 +114,7 @@ var/list/adminfaxes = list() //cache for faxes that have been sent to admins
if(!authenticated) if(!authenticated)
return return
switch(action) switch(action)
if("send") if("send")
if(copyitem) if(copyitem)
@@ -136,7 +136,11 @@ var/list/adminfaxes = list() //cache for faxes that have been sent to admins
return TRUE return TRUE
/obj/machinery/photocopier/faxmachine/attackby(obj/item/O as obj, mob/user as mob) /obj/machinery/photocopier/faxmachine/attackby(obj/item/O as obj, mob/user as mob)
if(O.is_multitool() && panel_open) if(istype(O, /obj/item/weapon/card/id) && !scan)
user.drop_from_inventory(O)
O.forceMove(src)
scan = O
else if(O.is_multitool() && panel_open)
var/input = sanitize(tgui_input_text(usr, "What Department ID would you like to give this fax machine?", "Multitool-Fax Machine Interface", department)) var/input = sanitize(tgui_input_text(usr, "What Department ID would you like to give this fax machine?", "Multitool-Fax Machine Interface", department))
if(!input) if(!input)
to_chat(usr, "No input found. Please hang up and try your call again.") to_chat(usr, "No input found. Please hang up and try your call again.")
@@ -257,7 +261,7 @@ var/list/adminfaxes = list() //cache for faxes that have been sent to admins
var/faxid = export_fax(sent) var/faxid = export_fax(sent)
message_chat_admins(sender, faxname, sent, faxid, font_colour) message_chat_admins(sender, faxname, sent, faxid, font_colour)
// VoreStation Edit End // VoreStation Edit End
// Webhooks don't parse the HTML on the paper, so we gotta strip them out so it's still readable. // Webhooks don't parse the HTML on the paper, so we gotta strip them out so it's still readable.
var/summary = make_summary(sent) var/summary = make_summary(sent)
summary = paper_html_to_plaintext(summary) summary = paper_html_to_plaintext(summary)
@@ -277,4 +281,3 @@ var/list/adminfaxes = list() //cache for faxes that have been sent to admins
"body" = summary "body" = summary
) )
) )

2
code/modules/paperwork/paper.dm
View File

@@ -164,7 +164,7 @@
. += "<span class='notice'>You have to go closer if you want to read it.</span>" . += "<span class='notice'>You have to go closer if you want to read it.</span>"
/obj/item/weapon/paper/proc/show_content(var/mob/user, var/forceshow=0) /obj/item/weapon/paper/proc/show_content(var/mob/user, var/forceshow=0)
if(!(istype(user, /mob/living/carbon/human) || istype(user, /mob/observer/dead) || istype(user, /mob/living/silicon) || user.universal_understand) && !forceshow) if(!(forceshow || (istype(user, /mob/living/carbon/human) || istype(user, /mob/observer/dead) || istype(user, /mob/living/silicon) || (istype(user) && user.universal_understand))))
user << browse("<HTML><HEAD><TITLE>[name]</TITLE></HEAD><BODY>[stars(info)][stamps]</BODY></HTML>", "window=[name]") user << browse("<HTML><HEAD><TITLE>[name]</TITLE></HEAD><BODY>[stars(info)][stamps]</BODY></HTML>", "window=[name]")
onclose(user, "[name]") onclose(user, "[name]")
else else

4
code/modules/research/designs/precursor.dm
View File

@@ -87,3 +87,7 @@
req_tech = list(TECH_MATERIAL = 7, TECH_BLUESPACE = 5, TECH_MAGNET = 6, TECH_PHORON = 3, TECH_ARCANE = 1, TECH_PRECURSOR = 2) req_tech = list(TECH_MATERIAL = 7, TECH_BLUESPACE = 5, TECH_MAGNET = 6, TECH_PHORON = 3, TECH_ARCANE = 1, TECH_PRECURSOR = 2)
build_path = /obj/random/janusmodule build_path = /obj/random/janusmodule
sort_string = "ZBBAA" sort_string = "ZBBAA"
/datum/design/item/precursor/janusmodule/Fabricate(var/newloc, var/fabricator)
var/type_to_spawn = pick(subtypesof(/obj/item/weapon/circuitboard/mecha/imperion))
return new type_to_spawn(newloc)