cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-07-21 04:57:57 +01:00
Code Issues Packages Projects Releases Wiki Activity

aaa (#1972)

Browse Source
This commit is contained in:
Azarak
2020-11-30 20:41:56 +01:00
committed by GitHub
parent 6b1ed5496b
commit db2b08ad43
9 changed files with 57 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/items/devices/radio/encryptionkey.dm
+2 -1
View File
@@ -107,7 +107,8 @@
/obj/item/encryptionkey/heads/hop
name = "\proper the head of personnel's encryption key"
icon_state = "hop_cypherkey"
channels = list(RADIO_CHANNEL_SUPPLY = 1, RADIO_CHANNEL_SERVICE = 1, RADIO_CHANNEL_COMMAND = 1)
//channels = list(RADIO_CHANNEL_SUPPLY = 1, RADIO_CHANNEL_SERVICE = 1, RADIO_CHANNEL_COMMAND = 1) //ORIGINAL
channels = list(RADIO_CHANNEL_SERVICE = 1, RADIO_CHANNEL_COMMAND = 1) //SKYRAT EDIT CHANGE
/obj/item/encryptionkey/headset_cargo
name = "supply radio encryption key"
code/game/objects/structures/crates_lockers/closets/secure/cargo.dm
+2 -1
View File
@@ -10,7 +10,8 @@
new /obj/item/clothing/under/rank/cargo/qm(src)
new /obj/item/clothing/under/rank/cargo/qm/skirt(src)
new /obj/item/clothing/shoes/sneakers/brown(src)
new /obj/item/radio/headset/headset_cargo(src)
//new /obj/item/radio/headset/headset_cargo(src) //ORIGINAL
new /obj/item/clothing/under/rank/cargo/qm(src) //SKYRAT EDIT CHANGE
new /obj/item/clothing/suit/fire/firefighter(src)
new /obj/item/clothing/gloves/fingerless(src)
new /obj/item/megaphone/cargo(src)
code/modules/jobs/job_types/cargo_technician.dm
+4 -2
View File
@@ -1,10 +1,12 @@
/datum/job/cargo_tech
title = "Cargo Technician"
department_head = list("Head of Personnel")
//department_head = list("Head of Personnel") //ORIGINAL
department_head = list("Quartermaster") //SKYRAT EDIT CHANGE
faction = "Station"
total_positions = 3
spawn_positions = 2
supervisors = "the quartermaster and the head of personnel"
//supervisors = "the quartermaster and the head of personnel" //ORIGINAL
supervisors = "the quartermaster" //SKYRAT EDIT CHANGE
selection_color = "#dcba97"
outfit = /datum/outfit/job/cargo_tech
code/modules/jobs/job_types/head_of_personnel.dm
+20 -1
View File
@@ -2,7 +2,8 @@
title = "Head of Personnel"
auto_deadmin_role_flags = DEADMIN_POSITION_HEAD
department_head = list("Captain")
head_announce = list(RADIO_CHANNEL_SUPPLY, RADIO_CHANNEL_SERVICE)
//head_announce = list(RADIO_CHANNEL_SUPPLY, RADIO_CHANNEL_SERVICE) //ORIGINAL
head_announce = list(RADIO_CHANNEL_SERVICE) //SKYRAT EDIT CHANGE
faction = "Station"
total_positions = 1
spawn_positions = 1
@@ -16,6 +17,8 @@
outfit = /datum/outfit/job/hop
//SKYRAT EDIT CHANGE BEGIN
/*
access = list(ACCESS_SECURITY, ACCESS_SEC_DOORS, ACCESS_COURT, ACCESS_WEAPONS,
ACCESS_MEDICAL, ACCESS_PSYCHOLOGY, ACCESS_ENGINE, ACCESS_CHANGE_IDS, ACCESS_AI_UPLOAD, ACCESS_EVA, ACCESS_HEADS,
ACCESS_ALL_PERSONAL_LOCKERS, ACCESS_MAINT_TUNNELS, ACCESS_BAR, ACCESS_JANITOR, ACCESS_CONSTRUCTION, ACCESS_MORGUE,
@@ -30,6 +33,22 @@
ACCESS_MECH_MINING, ACCESS_MECH_ENGINE, ACCESS_MECH_SCIENCE, ACCESS_MECH_SECURITY, ACCESS_MECH_MEDICAL,
ACCESS_THEATRE, ACCESS_CHAPEL_OFFICE, ACCESS_LIBRARY, ACCESS_RESEARCH, ACCESS_MINING, ACCESS_VAULT, ACCESS_MINING_STATION,
ACCESS_HOP, ACCESS_RC_ANNOUNCE, ACCESS_KEYCARD_AUTH, ACCESS_GATEWAY, ACCESS_MINERAL_STOREROOM, ACCESS_AUX_BASE, ACCESS_TELEPORTER)
*/
access = list(ACCESS_SECURITY, ACCESS_SEC_DOORS, ACCESS_COURT, ACCESS_WEAPONS,
ACCESS_MEDICAL, ACCESS_PSYCHOLOGY, ACCESS_ENGINE, ACCESS_CHANGE_IDS, ACCESS_AI_UPLOAD, ACCESS_EVA, ACCESS_HEADS,
ACCESS_ALL_PERSONAL_LOCKERS, ACCESS_MAINT_TUNNELS, ACCESS_BAR, ACCESS_JANITOR, ACCESS_CONSTRUCTION, ACCESS_MORGUE,
ACCESS_CREMATORIUM, ACCESS_KITCHEN, ACCESS_HYDROPONICS, ACCESS_LAWYER,
ACCESS_THEATRE, ACCESS_CHAPEL_OFFICE, ACCESS_LIBRARY, ACCESS_RESEARCH, ACCESS_VAULT, ACCESS_MINING_STATION,
ACCESS_MECH_ENGINE, ACCESS_MECH_SCIENCE, ACCESS_MECH_SECURITY, ACCESS_MECH_MEDICAL,
ACCESS_HOP, ACCESS_RC_ANNOUNCE, ACCESS_KEYCARD_AUTH, ACCESS_GATEWAY, ACCESS_MINERAL_STOREROOM, ACCESS_AUX_BASE, ACCESS_TELEPORTER)
minimal_access = list(ACCESS_SECURITY, ACCESS_SEC_DOORS, ACCESS_COURT, ACCESS_WEAPONS,
ACCESS_MEDICAL, ACCESS_PSYCHOLOGY, ACCESS_ENGINE, ACCESS_CHANGE_IDS, ACCESS_AI_UPLOAD, ACCESS_EVA, ACCESS_HEADS,
ACCESS_ALL_PERSONAL_LOCKERS, ACCESS_MAINT_TUNNELS, ACCESS_BAR, ACCESS_JANITOR, ACCESS_CONSTRUCTION, ACCESS_MORGUE,
ACCESS_CREMATORIUM, ACCESS_KITCHEN, ACCESS_HYDROPONICS, ACCESS_LAWYER,
ACCESS_MECH_ENGINE, ACCESS_MECH_SCIENCE, ACCESS_MECH_SECURITY, ACCESS_MECH_MEDICAL,
ACCESS_THEATRE, ACCESS_CHAPEL_OFFICE, ACCESS_LIBRARY, ACCESS_RESEARCH, ACCESS_VAULT, ACCESS_MINING_STATION,
ACCESS_HOP, ACCESS_RC_ANNOUNCE, ACCESS_KEYCARD_AUTH, ACCESS_GATEWAY, ACCESS_MINERAL_STOREROOM, ACCESS_AUX_BASE, ACCESS_TELEPORTER)
//SKYRAT EDIT CHANGE END
paycheck = PAYCHECK_COMMAND
paycheck_department = ACCOUNT_SRV
bounty_types = CIV_JOB_RANDOM
code/modules/jobs/job_types/quartermaster.dm
+17 -5
View File
@@ -1,18 +1,27 @@
/datum/job/qm
title = "Quartermaster"
department_head = list("Head of Personnel")
//department_head = list("Head of Personnel") //ORIGINAL
department_head = list("Captain") //SKYRAT EDIT CHANGE
faction = "Station"
total_positions = 1
spawn_positions = 1
supervisors = "the head of personnel"
//supervisors = "the head of personnel" //ORIGINAL
supervisors = "the captain" //SKYRAT EDIT CHANGE
selection_color = "#d7b088"
exp_type_department = EXP_TYPE_SUPPLY // This is so the jobs menu can work properly
outfit = /datum/outfit/job/quartermaster
//SKYRAT EDIT CHANGE BEGIN
/*
access = list(ACCESS_MAINT_TUNNELS, ACCESS_MAILSORTING, ACCESS_CARGO, ACCESS_QM, ACCESS_MINING, ACCESS_MECH_MINING, ACCESS_MINING_STATION, ACCESS_MINERAL_STOREROOM, ACCESS_VAULT, ACCESS_AUX_BASE)
minimal_access = list(ACCESS_MAINT_TUNNELS, ACCESS_MAILSORTING, ACCESS_CARGO, ACCESS_QM, ACCESS_MINING, ACCESS_MECH_MINING, ACCESS_MINING_STATION, ACCESS_MINERAL_STOREROOM, ACCESS_VAULT, ACCESS_AUX_BASE)
paycheck = PAYCHECK_MEDIUM
*/
access = list(ACCESS_MAINT_TUNNELS, ACCESS_MAILSORTING, ACCESS_CARGO, ACCESS_QM, ACCESS_MINING, ACCESS_MECH_MINING, ACCESS_MINING_STATION, ACCESS_MINERAL_STOREROOM, ACCESS_VAULT, ACCESS_AUX_BASE, ACCESS_KEYCARD_AUTH, ACCESS_RC_ANNOUNCE, ACCESS_SEC_DOORS, ACCESS_HEADS)
minimal_access = list(ACCESS_MAINT_TUNNELS, ACCESS_MAILSORTING, ACCESS_CARGO, ACCESS_QM, ACCESS_MINING, ACCESS_MECH_MINING, ACCESS_MINING_STATION, ACCESS_MINERAL_STOREROOM, ACCESS_VAULT, ACCESS_AUX_BASE, ACCESS_KEYCARD_AUTH, ACCESS_RC_ANNOUNCE, ACCESS_SEC_DOORS, ACCESS_HEADS)
//SKYRAT EDIT CHANGE END
//paycheck = PAYCHECK_MEDIUM //ORIGINAL
paycheck = PAYCHECK_COMMAND //SKYRAT EDIT CHANGE
paycheck_department = ACCOUNT_CAR
display_order = JOB_DISPLAY_ORDER_QUARTERMASTER
@@ -23,12 +32,15 @@
jobtype = /datum/job/qm
belt = /obj/item/pda/quartermaster
ears = /obj/item/radio/headset/headset_cargo
//ears = /obj/item/radio/headset/headset_cargo //ORIGINAL
ears = /obj/item/radio/headset/heads/qm //SKYRAT EDIT CHANGE
id = /obj/item/card/id/silver //SKYRAT EDIT ADDITION
uniform = /obj/item/clothing/under/rank/cargo/qm
shoes = /obj/item/clothing/shoes/sneakers/brown
glasses = /obj/item/clothing/glasses/sunglasses
l_hand = /obj/item/clipboard
backpack_contents = list(/obj/item/modular_computer/tablet/preset/cargo=1)
//backpack_contents = list(/obj/item/modular_computer/tablet/preset/cargo=1) //ORIGINAL
backpack_contents = list(/obj/item/melee/classic_baton/telescopic=1, /obj/item/modular_computer/tablet/preset/advanced/command = 1) //SKYRAT EDIT CHANGE
chameleon_extras = /obj/item/stamp/qm
code/modules/jobs/jobs.dm
+1
View File
@@ -5,6 +5,7 @@ GLOBAL_LIST_INIT(command_positions, list(
"Head of Security",
"Chief Engineer",
"Research Director",
"Quartermaster", //SKYRAT EDIT ADDITION
"Chief Medical Officer"))
modular_skyrat/master_files/code/game/objects/items/devices/radio/encryption_key.dm
+4
View File
@@ -0,0 +1,4 @@
/obj/item/encryptionkey/heads/qm
name = "\proper the quartermaster's encryption key"
icon_state = "hop_cypherkey"
channels = list(RADIO_CHANNEL_SUPPLY = 1, RADIO_CHANNEL_COMMAND = 1)
modular_skyrat/master_files/code/game/objects/items/devices/radio/headset.dm
+5
View File
@@ -0,0 +1,5 @@
/obj/item/radio/headset/heads/qm
name = "\proper the quartermaster's headset"
desc = "The headset of the king (or queen) of paperwork."
icon_state = "com_headset"
keyslot = new /obj/item/encryptionkey/heads/qm
tgstation.dme
+2
View File
@@ -3279,6 +3279,8 @@
#include "modular_skyrat\master_files\code\datums\traits\good.dm"
#include "modular_skyrat\master_files\code\datums\traits\negative.dm"
#include "modular_skyrat\master_files\code\datums\traits\neutral.dm"
#include "modular_skyrat\master_files\code\game\objects\items\devices\radio\encryption_key.dm"
#include "modular_skyrat\master_files\code\game\objects\items\devices\radio\headset.dm"
#include "modular_skyrat\master_files\code\game\objects\structures\trash_pile.dm"
#include "modular_skyrat\master_files\code\modules\clothing\anthro_clothes.dm"
#include "modular_skyrat\master_files\code\modules\clothing\non_anthro_clothes.dm"