cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-07-20 11:34:19 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #8664 from RyanSmake/muhspessnamez

Browse Source 
We don't need 5 separate variables to know which station we are on, take two
This commit is contained in:
tigercat2000
2018-02-09 13:18:22 -08:00
committed by GitHub
parent 642a275c99 cdf25e8577
commit bd50420a50
7 changed files with 21 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/holiday/holiday.dm
+1 -3
View File
@@ -349,10 +349,8 @@
holiday_master.holidays = list()
holiday_master.holidays[H.name] = H
station_name = null
station_name()
//update our hub status
world.update_status()
message_admins("<span class='notice'>ADMIN: Event: [key_name_admin(src)] force-set Holiday to \"[H]\"</span>")
log_admin("[key_name(src)] force-set Holiday to \"[H]\"")
log_admin("[key_name(src)] force-set Holiday to \"[H]\"")
code/modules/shuttle/supply.dm
+1 -1
View File
@@ -297,7 +297,7 @@
var/obj/item/weapon/paper/reqform = new /obj/item/weapon/paper(_loc)
playsound(_loc, 'sound/goonstation/machines/printer_thermal.ogg', 50, 1)
reqform.name = "Requisition Form - [crates] '[object.name]' for [orderedby]"
reqform.info += "<h3>[station_name] Supply Requisition Form</h3><hr>"
reqform.info += "<h3>[station_name()] Supply Requisition Form</h3><hr>"
reqform.info += "INDEX: #[shuttle_master.ordernum]<br>"
reqform.info += "REQUESTED BY: [orderedby]<br>"
reqform.info += "RANK: [orderedbyRank]<br>"