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

Zoo.dmm added, Vault updated, various bugfixes (#634)

Browse Source 
* :(

* Ports https://github.com/PolarisSS13/Polaris/pull/2571 early.

Need this for a map I wanna do.

* need sleep

* Emergency meds added

Resolves https://github.com/VOREStation/VOREStation/issues/600

* Fixes Fax Machine showing Sif Government

* Updates Tajaran lore to match Polaris.

* Sleeping for tonight

* Fixes #623

* Added more to the map

* Fox sprites from Paradise added

* Vore bee added

* Technical stuff no one cares about.

* Another update

* Reverts Pull #508

https://github.com/VOREStation/VOREStation/pull/508 messed up digesting
dead mobs and mice.

* Sergaling are now Saru.

* Saru

* Zoo map update, near completion

* Zoo map finished, plus Station Vault updated

* Revert "Ports https://github.com/PolarisSS13/Polaris/pull/2571 early."

This reverts commit 59e2bb211759604a95319ce6b1c74219a4b60800.

* Buzz off, Travis.

* Removed microwaves entirely so Travis stops bitching

* Travis stop being dumb

* Fix the zoo map once and for all..?

* Removes backup files.
This commit is contained in:
Spades
2016-10-09 18:55:17 -04:00
committed by GitHub
parent 2e5f80175c
commit 05869b0d9b
42 changed files with 3696 additions and 95 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/paperwork/faxmachine.dm
+3 -3
View File
@@ -1,5 +1,5 @@
var/list/obj/machinery/photocopier/faxmachine/allfaxes = list()
var/list/admin_departments = list("[boss_name]", "Sif Governmental Authority", "Supply")
var/list/admin_departments = list("[boss_name]", "Virgo Prime Governmental Authority", "Supply") // Vorestation edit
var/list/alldepartments = list()
var/list/adminfaxes = list() //cache for faxes that have been sent to admins
@@ -182,8 +182,8 @@ var/list/adminfaxes = list() //cache for faxes that have been sent to admins
//message badmins that a fax has arrived
if (destination == boss_name)
message_admins(sender, "[uppertext(boss_short)] FAX", rcvdcopy, "CentComFaxReply", "#006100")
else if ("Sif Governmental Authority")
message_admins(sender, "SIF GOVERNMENT FAX", rcvdcopy, "CentComFaxReply", "#1F66A0")
else if ("Virgo Prime Governmental Authority") // Vorestation edit
message_admins(sender, "VIRGO GOVERNMENT FAX", rcvdcopy, "CentComFaxReply", "#1F66A0") // Vorestation edit
else if ("Supply")
message_admins(sender, "[uppertext(boss_short)] SUPPLY FAX", rcvdcopy, "CentComFaxReply", "#5F4519")
else