cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2026-08-26 06:22:26 +01:00
Code Issues Packages Projects Releases Wiki Activity

Unfucks stuff

Browse Source
This commit is contained in:
alberyk
2021-09-24 01:18:25 -03:00
parent 8eb2192c0f
commit b41fdf76a8
6 changed files with 92 additions and 93 deletions
Download Patch File Download Diff File Expand all files Collapse all files
aurorastation.dme
+1 -2
View File
@@ -675,15 +675,14 @@
#include "code\game\jobs\faction\unaffiliated.dm"
#include "code\game\jobs\faction\zavodskoi.dm"
#include "code\game\jobs\faction\zeng_hu.dm"
#include "code\game\jobs\job\assistant.dm"
#include "code\game\jobs\job\captain.dm"
#include "code\game\jobs\job\civilian.dm"
#include "code\game\jobs\job\civilian_chaplain.dm"
#include "code\game\jobs\job\engineering.dm"
#include "code\game\jobs\job\job.dm"
#include "code\game\jobs\job\medical.dm"
#include "code\game\jobs\job\science.dm"
#include "code\game\jobs\job\security.dm"
#include "code\game\jobs\job\ship_crew.dm"
#include "code\game\jobs\job\silicon.dm"
#include "code\game\jobs\job\outsider\merchant.dm"
#include "code\game\jobs\job\outsider\representative.dm"
code/game/jobs/job/captain.dm
+2 -2
View File
@@ -83,7 +83,7 @@ var/datum/announcement/minor/captain_announcement = new(do_newscast = 1)
spawn_positions = 1
intro_prefix = "the"
supervisors = "the captain"
selection_color = "#90524b"
selection_color = "#1e59c9"
minimal_player_age = 10
economic_modifier = 10
ideal_character_age = 50
@@ -137,7 +137,7 @@ var/datum/announcement/minor/captain_announcement = new(do_newscast = 1)
spawn_positions = 3
intro_prefix = "the"
supervisors = "the executive officer and the captain"
selection_color = "#90524b"
selection_color = "#2b5bb5"
minimal_player_age = 10
economic_modifier = 10
ideal_character_age = 50
code/game/jobs/job/civilian.dm
+83 -29
View File
@@ -1,4 +1,39 @@
//Food
/datum/job/service_manager
title = "Service Manager"
flag = SERVICE_MANAGER
departments = list(DEPARTMENT_CIVILIAN = JOBROLE_SUPERVISOR)
department_flag = CIVILIAN
faction = "Station"
total_positions = 1
spawn_positions = 1
supervisors = "the executive officer"
selection_color = "#90524b"
economic_modifier = 5
minimum_character_age = 25
access = list(access_bar, access_janitor, access_construction, access_crematorium, access_kitchen, access_hydroponics,access_chapel_office, access_library, access_janitor, access_journalist)
access = list(access_bar, access_janitor, access_construction, access_crematorium, access_kitchen, access_hydroponics,access_chapel_office, access_library, access_janitor, access_journalist)
ideal_character_age = 40
outfit = /datum/outfit/job/service_manager
/datum/outfit/job/service_manager
name = "Service Manager"
jobtype = /datum/job/service_manager
uniform = /obj/item/clothing/under/rank/service_manager
tab_pda = /obj/item/modular_computer/handheld/pda/civilian
wristbound = /obj/item/modular_computer/handheld/wristbound/preset/pda/civilian
tablet = /obj/item/modular_computer/handheld/preset/civilian
headset = /obj/item/device/radio/headset/headset_service
bowman = /obj/item/device/radio/headset/headset_service/alt
double_headset = /obj/item/device/radio/headset/alt/double/service
wrist_radio = /obj/item/device/radio/headset/wrist/service
/datum/job/bartender
title = "Bartender"
flag = BARTENDER
@@ -262,42 +297,61 @@
l_hand = /obj/item/modular_computer/laptop/preset
gloves = /obj/item/modular_computer/handheld/wristbound/preset/advanced/civilian
/datum/job/service_manager
title = "Service Manager"
flag = SERVICE_MANAGER
departments = list(DEPARTMENT_CIVILIAN = JOBROLE_SUPERVISOR)
/datum/job/chaplain
title = "Chaplain"
flag = CHAPLAIN
departments = SIMPLEDEPT(DEPARTMENT_CIVILIAN)
department_flag = CIVILIAN
faction = "Station"
total_positions = 1
spawn_positions = 1
supervisors = "the executive officer"
supervisors = "the service manager"
selection_color = "#90524b"
economic_modifier = 5
access = list(access_morgue, access_chapel_office, access_crematorium, access_maint_tunnels)
minimal_access = list(access_morgue, access_chapel_office, access_crematorium)
alt_titles = list("Presbyter","Rabbi","Imam","Priest","Shaman","Counselor")
outfit = /datum/outfit/job/chaplain
minimum_character_age = 25
access = list(access_bar, access_janitor, access_construction, access_crematorium, access_kitchen, access_hydroponics,access_chapel_office, access_library, access_janitor, access_journalist)
access = list(access_bar, access_janitor, access_construction, access_crematorium, access_kitchen, access_hydroponics,access_chapel_office, access_library, access_janitor, access_journalist)
ideal_character_age = 40
outfit = /datum/outfit/job/service_manager
/datum/outfit/job/service_manager
name = "Service Manager"
jobtype = /datum/job/service_manager
uniform = /obj/item/clothing/under/rank/service_manager
tab_pda = /obj/item/modular_computer/handheld/pda/civilian
wristbound = /obj/item/modular_computer/handheld/wristbound/preset/pda/civilian
tablet = /obj/item/modular_computer/handheld/preset/civilian
/datum/outfit/job/chaplain
name = "Chaplain"
jobtype = /datum/job/chaplain
uniform = /obj/item/clothing/under/rank/chaplain
shoes = /obj/item/clothing/shoes/black
headset = /obj/item/device/radio/headset/headset_service
bowman = /obj/item/device/radio/headset/headset_service/alt
double_headset = /obj/item/device/radio/headset/alt/double/service
wrist_radio = /obj/item/device/radio/headset/wrist/service
tab_pda = /obj/item/modular_computer/handheld/pda/civilian/chaplain
wristbound = /obj/item/modular_computer/handheld/wristbound/preset/pda/civilian/chaplain
tablet = /obj/item/modular_computer/handheld/preset/civilian/chaplain
/datum/outfit/job/chaplain/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE)
. = ..()
if(visualsOnly)
return
var/obj/item/storage/bible/B = new /obj/item/storage/bible(get_turf(H)) //BS12 EDIT
var/obj/item/storage/S = locate() in H.contents
if(S && istype(S))
B.forceMove(S)
var/datum/religion/religion = SSrecords.religions[H.religion]
if (religion)
if(religion.name == "None" || religion.name == "Other")
B.verbs += /obj/item/storage/bible/proc/Set_Religion
return 1
B.icon_state = religion.book_sprite
B.name = religion.book_name
SSticker.Bible_icon_state = religion.book_sprite
SSticker.Bible_item_state = religion.book_sprite
SSticker.Bible_name = religion.book_name
return 1
//Operations
/datum/job/operations_manager
@@ -309,7 +363,7 @@
total_positions = 1
spawn_positions = 1
supervisors = "the captain"
selection_color = "#90524b"
selection_color = "#7B431C"
economic_modifier = 5
minimum_character_age = 30
@@ -352,7 +406,7 @@
total_positions = 3
spawn_positions = 3
supervisors = "the supply manager"
selection_color = "#90524b"
selection_color = "#967032"
minimum_character_age = 18
@@ -387,7 +441,7 @@
total_positions = 3
spawn_positions = 3
supervisors = "the supply manager"
selection_color = "#90524b"
selection_color = "#967032"
economic_modifier = 5
minimum_character_age = 18
@@ -433,7 +487,7 @@
total_positions = 2
spawn_positions = 2
supervisors = "operations manager"
selection_color = "#90524b"
selection_color = "#967032"
economic_modifier = 5
minimum_character_age = 25
code/game/jobs/job/civilian_chaplain.dm
-55
View File
@@ -1,55 +0,0 @@
//Due to how large this one is it gets its own file
/datum/job/chaplain
title = "Chaplain"
flag = CHAPLAIN
departments = SIMPLEDEPT(DEPARTMENT_CIVILIAN)
department_flag = CIVILIAN
faction = "Station"
total_positions = 1
spawn_positions = 1
supervisors = "the service manager"
selection_color = "#90524b"
access = list(access_morgue, access_chapel_office, access_crematorium, access_maint_tunnels)
minimal_access = list(access_morgue, access_chapel_office, access_crematorium)
alt_titles = list("Presbyter","Rabbi","Imam","Priest","Shaman","Counselor")
outfit = /datum/outfit/job/chaplain
/datum/outfit/job/chaplain
name = "Chaplain"
jobtype = /datum/job/chaplain
uniform = /obj/item/clothing/under/rank/chaplain
shoes = /obj/item/clothing/shoes/black
headset = /obj/item/device/radio/headset/headset_service
bowman = /obj/item/device/radio/headset/headset_service/alt
double_headset = /obj/item/device/radio/headset/alt/double/service
wrist_radio = /obj/item/device/radio/headset/wrist/service
tab_pda = /obj/item/modular_computer/handheld/pda/civilian/chaplain
wristbound = /obj/item/modular_computer/handheld/wristbound/preset/pda/civilian/chaplain
tablet = /obj/item/modular_computer/handheld/preset/civilian/chaplain
/datum/outfit/job/chaplain/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE)
. = ..()
if(visualsOnly)
return
var/obj/item/storage/bible/B = new /obj/item/storage/bible(get_turf(H)) //BS12 EDIT
var/obj/item/storage/S = locate() in H.contents
if(S && istype(S))
B.forceMove(S)
var/datum/religion/religion = SSrecords.religions[H.religion]
if (religion)
if(religion.name == "None" || religion.name == "Other")
B.verbs += /obj/item/storage/bible/proc/Set_Religion
return 1
B.icon_state = religion.book_sprite
B.name = religion.book_name
SSticker.Bible_icon_state = religion.book_sprite
SSticker.Bible_item_state = religion.book_sprite
SSticker.Bible_name = religion.book_name
return 1
code/game/jobs/job/assistant.dm → code/game/jobs/job/ship_crew.dm
+5 -4
View File
@@ -8,7 +8,7 @@
spawn_positions = -1
intro_prefix = "an"
supervisors = "absolutely everyone"
selection_color = "#90524b"
selection_color = "#949494"
economic_modifier = 1
access = list() //See /datum/job/assistant/get_access()
minimal_access = list() //See /datum/job/assistant/get_access()
@@ -28,7 +28,7 @@
shoes = /obj/item/clothing/shoes/black
/datum/job/visitor
title = "Visitor"
title = "Crew Member"
flag = VISITOR
departments = SIMPLEDEPT(DEPARTMENT_CIVILIAN)
department_flag = CIVILIAN
@@ -36,15 +36,16 @@
total_positions = -1
spawn_positions = -1
supervisors = "any authority figure"
selection_color = "#90524b"
selection_color = "#949494"
economic_modifier = 1
access = list()
minimal_access = list()
outfit = /datum/outfit/job/visitor
alt_titles = list("Passenger")
/datum/outfit/job/visitor
name = "Visitor"
jobtype = /datum/job/visitor
uniform = /obj/item/clothing/under/color/black
shoes = /obj/item/clothing/shoes/black
shoes = /obj/item/clothing/shoes/black
code/game/jobs/jobs.dm
+1 -1
View File
@@ -112,7 +112,7 @@ var/list/civilian_positions = list(
"Corporate Reporter",
"Chaplain",
"Assistant",
"Visitor"
"Crew Member"
)