cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2026-01-03 05:52:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixes colourless mail and small mail bag (#7051)

Browse Source
This commit is contained in:
Guti
2023-09-27 08:00:07 +02:00
committed by GitHub
parent fa034b8839
commit bac07861fc
2 changed files with 13 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
code/controllers/subsystems/mail_ch.dm
View File

@@ -6,7 +6,7 @@ SUBSYSTEM_DEF(mail)
flags = SS_NO_TICK_CHECK
var/mail_waiting = 0 // Pending mail
var/mail_per_process = 2 // Mail to be generated
var/mail_per_process = 0.75 // Mail to be generated
/datum/controller/subsystem/mail/fire()
mail_waiting += mail_per_process

22
code/game/objects/items/mail_ch.dm
View File

@@ -57,14 +57,14 @@
RegisterSignal(src, COMSIG_MOVABLE_DISPOSING, .proc/disposal_handling)
if(isnull(department_colors))
department_colors = list(
DEPARTMENT_COMMAND = COLOR_CYAN_BLUE,
DEPARTMENT_CIVILIAN = COLOR_WHITE,
DEPARTMENT_ENGINEERING = COLOR_PALE_ORANGE,
DEPARTMENT_RESEARCH = COLOR_PALE_PURPLE_GRAY,
DEPARTMENT_MEDICAL = COLOR_PALE_BLUE_GRAY,
DEPARTMENT_PLANET = COLOR_PALE_GREEN_GRAY,
DEPARTMENT_CARGO = COLOR_BEIGE,
DEPARTMENT_SECURITY = COLOR_PALE_RED_GRAY,
COLOR_CYAN_BLUE = DEPARTMENT_COMMAND,
COLOR_GREEN_GRAY = DEPARTMENT_CIVILIAN,
COLOR_PALE_ORANGE = DEPARTMENT_ENGINEERING,
COLOR_PALE_PURPLE_GRAY = DEPARTMENT_RESEARCH,
COLOR_PALE_BLUE_GRAY = DEPARTMENT_MEDICAL,
COLOR_PALE_GREEN_GRAY = DEPARTMENT_PLANET,
COLOR_BEIGE = DEPARTMENT_CARGO,
COLOR_PALE_RED_GRAY = DEPARTMENT_SECURITY,
)
// Icons
@@ -155,7 +155,7 @@
goodies += job_goodies
for(var/iterator in 1 to goodie_count)
var/target_good = pick(goodies)
var/target_good = pickweight(goodies)
if(ispath(target_good, /datum/reagent))
var/obj/item/weapon/reagent_containers/target_container = new /obj/item/weapon/reagent_containers/glass/bottle(src)
target_container.reagents.add_reagent(target_good, target_container.volume)
@@ -256,7 +256,9 @@
icon_state = "mailbag"
slot_flags = SLOT_BELT | SLOT_POCKET
w_class = ITEMSIZE_NORMAL
storage_slots = 20
storage_slots = 21
max_storage_space = 50
allow_quick_gather = 1
allow_quick_empty = 1
max_w_class = ITEMSIZE_NORMAL
can_hold = list(