Skip to content

Commit

Permalink
stuff
Browse files Browse the repository at this point in the history
ffuts
  • Loading branch information
Domic2 committed Jul 29, 2020
1 parent 02134f5 commit 226cbc8
Show file tree
Hide file tree
Showing 9 changed files with 143 additions and 46 deletions.
3 changes: 2 additions & 1 deletion maps/perseverance/Perseverance_1.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -731,6 +731,7 @@
"oc" = (/obj/structure/closet/firecloset,/turf/simulated/floor/plating,/area/ship/perseverance/midship/cryos)
"od" = (/obj/effect/floor_decal/corner/brown{icon_state = "corner_white"; dir = 10},/obj/structure/table/rack,/obj/item/stack/material/steel/fifty,/obj/item/stack/material/titanium/fifty,/turf/simulated/floor/tiled,/area/ship/perseverance/cargobay/aft)
"oe" = (/obj/machinery/atmospherics/unary/outlet_injector{dir = 8; icon_state = "on"; use_power = 1},/turf/simulated/floor/plating,/area/space)
"of" = (/obj/structure/ladder/up,/turf/simulated/floor/plating,/area/ship/perseverance/midship/storage)

(1,1,1) = {"
aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
Expand Down Expand Up @@ -828,7 +829,7 @@ aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabTbTbxbxbTbTbTbTbTbTbTbTabjkjqjrjrjqjqjqjqjkjqjrjrjqjkjsjCjsjrjsjkjqjrjrjqjkjqjqjqjqjrjrjqjkabbTitbTbTbTbTbTbTbxbxbTbTaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaTaaaaaaaaaTaaaaaaaabTbTabgOjqjrjrjrjrjrjrgrjrjrjrjqjkjFjCjrjrjFjkjqjGjHjHhdjHjHjHjHjHjHjKhnhVhVgcoeaaaaaaaTaaaaaaaaaTaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaTaaaaaaaaaTaaaaaaaabTbTabjkjqjrjrjrjrjrjrgrjrjrjrjqjkjNjCjOjPjNjkjqjQjrjrgrjrjrjrjrjrjrjqjkabbTitabaaaaaaaTaaaaaaaaaTaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaTaaaaaaaaaTaaaaaaaabTbTabjkjqjqjqjrjqjqjqjkjqjrjrjqjkjRjCjOjSjTjkjqjQjrjqjkjqjqjqjqjrjrjqjkabbTbTaaaaaaaaaTaaaaaaaaaTaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaTaaaaaaaaaTaaaaaaaabTbTabjkjqjqjqjrjqofjqjkjqjrjrjqjkjRjCjOjSjTjkjqjQjrjqjkjqofjqjqjrjrjqjkabbTbTaaaaaaaaaTaaaaaaaaaTaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaTaaaaaaaaaTaaaaaaaabTbTabafafafafhyafafafafjqjrjrjrjrjrjCjrjUjHjHjHjVjrjqakakakakakhAhCakakabbTbTaaaaaaaaaTaaaaaaaaaTaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaTaaaaaaaaaTaaaaaaaabTbTabafaPfHfJfJfThifTafjqjrjrjrjrjrjCjrjrjrjrjrjrjrjrhCbhbhbhbhbhbhiuakabbTbTaaaaaaaaaTaaaaaaaaaTaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaTaaaaaaaaaTaaaaaaaabTbTabafafafhXhjfJfJfJafjqjrjrnPjkjYjCjkjrkdjknQjrjrjrhEbhbhbhbhbhbhiuakabbTbTaaaaaaaaaTaaaaaaaaaTaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
Expand Down
69 changes: 52 additions & 17 deletions maps/perseverance/Perseverance_2.dmm

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion maps/perseverance/XIV_define.dm
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@
salary_modifier = 0.4


//Images 2-4 are from starsector, image 1 I have no idea, couldn't really find who made it :I
//Images 2-4 are from starsector, image 1 I have no idea, couldn't really find who made it, but it's def. Alien: Isolation themed
lobby_screens = list('maps/perseverance/lobby/Menu1.png', 'maps/perseverance/lobby/Menu2.jpg', 'maps/perseverance/lobby/Menu3.jpg', 'maps/perseverance/lobby/Menu4.jpg')
lobby_tracks = list(
/music_track/torch,
Expand Down
6 changes: 3 additions & 3 deletions maps/perseverance/code/XIV_clothes.dm
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

/obj/item/clothing/under/XIV/xion
name = "xion jumpsuit"
desc = "A relatively cheap utility jumpsuit produced by Xion Industries."
desc = "A relatively protecive utility jumpsuit produced by Xion Industries."
icon_state = "xion"
item_state = "xion"
worn_state = "xionsuit_s"
Expand All @@ -15,7 +15,7 @@

/obj/item/clothing/under/XIV/xionplus
name = "xion padded suit"
desc = "A special suit given to higher-ranking xion employees."
desc = "A special suit used by higher-ranking xion employees."
icon = 'maps/perseverance/icons/clothes/XIVunder.dmi'
icon_state = "manage"
item_state = "manage"
Expand All @@ -29,4 +29,4 @@
)

/obj/item/clothing/under/rank/medical/XIV
name = "field medic's jumpsuit"
name = "field physicians jumpsuit"
Binary file added maps/perseverance/icons/bsdrive.dmi
Binary file not shown.
20 changes: 13 additions & 7 deletions maps/perseverance/jobs/XIV_IDs.dm
Original file line number Diff line number Diff line change
@@ -1,38 +1,44 @@
/obj/item/weapon/card/id/XIV/manager
name = "identification card"
desc = "An identification card issued to the Expedition leader."
desc = "An identification card issued to the expedition leader."
job_access_type = /datum/job/manager
item_state = "silver_id"
extra_details = list("goldstripe")
color = "#ccecff"

/obj/item/weapon/card/id/XIV/amanager
name = "identification card"
desc = "An identification card issued to contracted Assistant Managers."
desc = "An identification card issued to contracted navigation officers."
job_access_type = /datum/job/amanager
detail_color = COLOR_COMMAND_BLUE

/obj/item/weapon/card/id/XIV/senior_engineer
name = "identification card"
desc = "An identification card issued to contracted system engineers."
job_access_type = /datum/job/senior_engineer
detail_color = COLOR_SUN

/obj/item/weapon/card/id/XIV/engineer
name = "identification card"
desc = "An identification card issued to contracted mechanics."
desc = "An identification card issued to contracted ship technicians."
job_access_type = /datum/job/engineer
detail_color = COLOR_SUN
detail_color = COLOR_BROWN

/obj/item/weapon/card/id/XIV/doctor
name = "identification card"
desc = "An identification card issued to contracted doctors."
desc = "An identification card issued to contracted field physicians."
job_access_type = /datum/job/doctor
detail_color = COLOR_PALE_BLUE_GRAY

/obj/item/weapon/card/id/XIV/fabtec
name = "identification card"
desc = "An identification card issued to contracted fabrication technicians."
desc = "An identification card issued to contracted scientists."
job_access_type = /datum/job/science
detail_color = COLOR_RESEARCH
color = COLOR_WHITE

/obj/item/weapon/card/id/XIV/assistant
name = "identification card"
desc = "An identification card issued to contracted miners."
desc = "An identification card issued to contracted crewmen."
job_access_type = /datum/job/assistant
detail_color = COLOR_BROWN
78 changes: 62 additions & 16 deletions maps/perseverance/jobs/XIV_jobjobs.dm
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@
captain_announcement.Announce("All hands, [alt_title || title] [person.real_name] on deck!", new_sound = announce_sound)
..()

//assistant manager
//nav officer
/datum/job/amanager
title = "Navigations Officer"
department = "Command"
Expand Down Expand Up @@ -78,7 +78,7 @@

//doctor
/datum/job/doctor
title = "Field Medic"
title = "Field Physician"
department = "Medical"
department_flag = MED
total_positions = 4
Expand Down Expand Up @@ -109,12 +109,12 @@

software_on_spawn = list(/datum/computer_file/program/suit_sensors,
/datum/computer_file/program/camera_monitor)
skill_points = 20
skill_points = 22

/datum/job/doctor/get_description_blurb()
return "You are the Field Medic, specialized in keeping your fellow cremembers operational. You are subordinate to the Operations Manager and are expected to follow them."
return "You are the Field Physician, specialized in keeping your fellow cremembers operational. You are subordinate to the Operations Manager and are expected to follow them."

//fab tech
//scientist
/datum/job/science
title = "Scientist"
department = "Research"
Expand All @@ -124,7 +124,7 @@
supervisors = "the Expedition Leader and Navigation Officers"
selection_color = "#633d63"
economic_power = 3
skill_points = 18
skill_points = 22
ideal_character_age = 20
alt_titles = list()

Expand All @@ -142,15 +142,62 @@
access = list(access_XIV, access_research)

/datum/job/science/get_description_blurb()
return "You are the Scientist, hired primarily to assist the rest of the crew in more scientific matters. You are subordinate to the Operations manager and are expected to follow them."
return "You are the Scientist, hired primarily to perform various onboard and offsite research and surveying operations. You are subordinate to the Operations manager and are expected to follow them."

/datum/job/senior_engineer
title = "Systems Engineer"
department = "Engineering"
department_flag = ENG
total_positions = 4
spawn_positions = 4
hud_icon = "hudengineer"
supervisors = "the Expedition Leader and Navigation Officers"
selection_color = COLOR_DARK_BROWN
economic_power = 2
alt_titles = list()
minimal_player_age = 0
ideal_character_age = 24
outfit_type = /decl/hierarchy/outfit/job/isolation/senior_engineer
allowed_branches = list(
/datum/mil_branch/civilian
)
allowed_ranks = list(
/datum/mil_rank/civ/contractor
)
min_skill = list( SKILL_COMPUTER = SKILL_BASIC,
SKILL_EVA = SKILL_BASIC,
SKILL_CONSTRUCTION = SKILL_BASIC,
SKILL_ELECTRICAL = SKILL_ADEPT,
SKILL_ATMOS = SKILL_BASIC,
SKILL_ENGINES = SKILL_ADEPT)

max_skill = list( SKILL_CONSTRUCTION = SKILL_MAX,
SKILL_ELECTRICAL = SKILL_MAX,
SKILL_ATMOS = SKILL_MAX,
SKILL_ENGINES = SKILL_MAX)
skill_points = 18

access = list(access_XIV, access_engine_equip, access_tcomsat, access_network, access_engine, access_atmospherics)

software_on_spawn = list(/datum/computer_file/program/power_monitor,
/datum/computer_file/program/supermatter_monitor,
/datum/computer_file/program/alarm_monitor,
/datum/computer_file/program/atmos_control,
/datum/computer_file/program/rcon_console,
/datum/computer_file/program/camera_monitor,
/datum/computer_file/program/shields_monitor,
/datum/computer_file/program/ntnetmonitor)

/datum/job/engineer/get_description_blurb()
return "You are the Systems Engineer, your job is to keep the ship and various prototype systems from exploding. You are subordinate to the Operations Manager and are expected to follow them."

//Engineer
//Techie
/datum/job/engineer
title = "Engineering Technician"
title = "Ship Technician"
department = "Engineering"
department_flag = ENG
total_positions = 6
spawn_positions = 6
total_positions = 4
spawn_positions = 4
hud_icon = "hudengineer"
supervisors = "the Expedition Leader and Navigation Officers"
selection_color = COLOR_DARK_BROWN
Expand Down Expand Up @@ -178,19 +225,18 @@
SKILL_ENGINES = SKILL_MAX)
skill_points = 18

access = list(access_XIV, access_engine_equip, access_tcomsat, access_network, access_engine, access_atmospherics)
access = list(access_XIV, access_engine_equip, access_engine, access_atmospherics)

software_on_spawn = list(/datum/computer_file/program/power_monitor,
/datum/computer_file/program/supermatter_monitor,
/datum/computer_file/program/alarm_monitor,
/datum/computer_file/program/atmos_control,
/datum/computer_file/program/rcon_console,
/datum/computer_file/program/camera_monitor,
/datum/computer_file/program/shields_monitor,
/datum/computer_file/program/ntnetmonitor)
/datum/computer_file/program/shields_monitor)

/datum/job/engineer/get_description_blurb()
return "You are the Engineeirng Techinican, your job is to keep the ship operational. You are subordinate to the Operations Manager and are expected to follow them."
return "You are the Ship Techinican, your job is to keep the ship operational, and clean. You are subordinate to the Operations Manager and are expected to follow them."

//crewman
/datum/job/assistant
Expand All @@ -213,7 +259,7 @@
access = list(access_XIV)
minimal_access = list()

skill_points = 15
skill_points = 18

/datum/job/assistant/get_description_blurb()
return "You are the Crewman, your job is to aid other emplyees in whatever way you can. You are subordinate to the Operations Manager and are expected to follow them."
Expand Down
2 changes: 1 addition & 1 deletion maps/perseverance/jobs/XIV_jobs.dm
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
/datum/species/human/mule = list()
)

allowed_jobs = list(/datum/job/manager, /datum/job/amanager, /datum/job/engineer, /datum/job/doctor, /datum/job/science, /datum/job/ai
allowed_jobs = list(/datum/job/manager, /datum/job/amanager,/datum/job/senior_engineer, /datum/job/engineer, /datum/job/doctor, /datum/job/science, /datum/job/ai
) //this actually also sets in what order the jobs show on the occupation screen, neat

access_modify_region = list(
Expand Down
9 changes: 9 additions & 0 deletions maps/perseverance/jobs/XIV_outfits.dm
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,15 @@
shoes = /obj/item/clothing/shoes/dutyboots
id_type = /obj/item/weapon/card/id/XIV/amanager

//senior engineer
/decl/hierarchy/outfit/job/isolation/senior_engineer
name = OUTFIT_JOB_NAME("Systems Engineer")
uniform = /obj/item/clothing/under/XIV/xion
shoes = /obj/item/clothing/shoes/workboots
id_type = /obj/item/weapon/card/id/XIV/senior_engineer
gloves = /obj/item/clothing/gloves/thick/duty
belt = /obj/item/weapon/storage/belt/utility/full/XIV

//engineer
/decl/hierarchy/outfit/job/isolation/techie
name = OUTFIT_JOB_NAME("Engineering Technician")
Expand Down

0 comments on commit 226cbc8

Please sign in to comment.