cyberpresidentvanellope/CHOMPstation
1
0
Fork 0
mirror of https://github.com/CHOMPstation/CHOMPstation.git synced 2026-08-26 21:46:51 +01:00
Code Issues Packages Projects Releases Wiki Activity

Polaris sync

Browse Source
This commit is contained in:
killer653
2017-12-21 04:01:07 -05:00
parent 99d641e5bc b7c67cba68
commit 3a2093ef40
514 changed files with 13847 additions and 5596 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/paperwork/adminpaper.dm
+1 -1
View File
@@ -58,7 +58,7 @@
text = "<hr><font size= \"1\">"
text += "This transmission is intended only for the addressee and may contain confidential information. Any unauthorized disclosure is strictly prohibited. <br><br>"
text += "If this transmission is recieved in error, please notify both the sender and the office of [using_map.boss_name] Internal Affairs immediately so that corrective action may be taken."
text += "If this transmission is received in error, please notify both the sender and the office of [using_map.boss_name] Internal Affairs immediately so that corrective action may be taken."
text += "Failure to comply is a breach of regulation and may be prosecuted to the fullest extent of the law, where applicable."
text += "</font>"
code/modules/paperwork/faxmachine.dm
+4 -4
View File
@@ -80,7 +80,7 @@ var/list/adminfaxes = list() //cache for faxes that have been sent to admins
if(copyitem)
copyitem.loc = usr.loc
usr.put_in_hands(copyitem)
usr << "<span class='notice'>You take \the [copyitem] out of \the [src].</span>"
to_chat(usr, "<span class='notice'>You take \the [copyitem] out of \the [src].</span>")
copyitem = null
if(href_list["scan"])
@@ -124,7 +124,7 @@ var/list/adminfaxes = list() //cache for faxes that have been sent to admins
var/success = 0
for(var/obj/machinery/photocopier/faxmachine/F in allfaxes)
if( F.department == destination )
success = F.recievefax(copyitem)
success = F.receivefax(copyitem)
if (success)
visible_message("[src] beeps, \"Message transmitted successfully.\"")
@@ -132,7 +132,7 @@ var/list/adminfaxes = list() //cache for faxes that have been sent to admins
else
visible_message("[src] beeps, \"Error transmitting message.\"")
/obj/machinery/photocopier/faxmachine/proc/recievefax(var/obj/item/incoming)
/obj/machinery/photocopier/faxmachine/proc/receivefax(var/obj/item/incoming)
if(stat & (BROKEN|NOPOWER))
return 0
@@ -164,7 +164,7 @@ var/list/adminfaxes = list() //cache for faxes that have been sent to admins
use_power(200)
//recieved copies should not use toner since it's being used by admins only.
//received copies should not use toner since it's being used by admins only.
var/obj/item/rcvdcopy
if (istype(copyitem, /obj/item/weapon/paper))
rcvdcopy = copy(copyitem, 0)
code/modules/paperwork/paper.dm
+18
View File
@@ -35,6 +35,24 @@
var/const/signfont = "Times New Roman"
var/const/crayonfont = "Comic Sans MS"
/obj/item/weapon/paper/alien
name = "alien tablet"
desc = "It looks highly advanced"
icon = 'icons/obj/abductor.dmi'
icon_state = "alienpaper"
/obj/item/weapon/paper/alien/update_icon()
if(info)
icon_state = "alienpaper_words"
else
icon_state = "alienpaper"
/obj/item/weapon/paper/alien/burnpaper()
return
/obj/item/weapon/paper/alien/AltClick() // No airplanes for me.
return
//lipstick wiping is in code/game/objects/items/weapons/cosmetics.dm!
/obj/item/weapon/paper/New()