Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Minutemanning #2455

Closed
wants to merge 3 commits into from
Closed

Minutemanning #2455

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
eb79e1f
adds bespoke minuteman faction and moves all minuteman outfits over t…
Erikafox Nov 6, 2023
24dde98
cleans a little
Erikafox Nov 6, 2023
dcfc70f
Merge branch 'master' into minutemanning
Erikafox Nov 15, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion _maps/configs/independent_nemo.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
"slots": 1
},
"Mech Pilot": {
"outfit": "/datum/outfit/job/roboticist/technician",
"outfit": "/datum/outfit/job/roboticist",
"slots": 1
},
"Ship Engineer": {
Expand Down
2 changes: 1 addition & 1 deletion _maps/configs/independent_rigger.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@
"slots": 2
},
"Mech Technician": {
"outfit": "/datum/outfit/job/roboticist/technician",
"outfit": "/datum/outfit/job/roboticist",
"slots": 1
},
"Security Detail": {
Expand Down
14 changes: 7 additions & 7 deletions _maps/configs/minutemen_asclepius.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,32 +17,32 @@
"limit": 1,
"job_slots": {
"Captain": {
"outfit": "/datum/outfit/job/captain/minutemen",
"outfit": "/datum/outfit/job/minuteman/captain",
"officer": true,
"slots": 1
},
"Mechanic": {
"outfit": "/datum/outfit/job/engineer/minutemen",
"outfit": "/datum/outfit/job/minuteman/engineer",
"slots": 1
},
"Minuteman": {
"outfit": "/datum/outfit/job/security/minutemen",
"outfit": "/datum/outfit/job/minuteman/security",
"slots": 1
},
"Cadet": {
"outfit": "/datum/outfit/job/assistant/minutemen",
"outfit": "/datum/outfit/job/minuteman/assistant",
"slots": 3
},
"Field Medic": {
"outfit": "/datum/outfit/job/doctor/minutemen",
"outfit": "/datum/outfit/job/minuteman/doctor",
"slots": 3
},
"Paramedic":{
"outfit": "/datum/outfit/job/paramedic/minutemen",
"outfit": "/datum/outfit/job/minuteman/paramedic",
"slots": 2
},
"Chemist":{
"outfit": "/datum/outfit/job/chemist/minutemen",
"outfit": "/datum/outfit/job/minuteman/chemist",
"slots": 1
}
},
Expand Down
12 changes: 6 additions & 6 deletions _maps/configs/minutemen_cepheus.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,28 +15,28 @@
"limit": 1,
"job_slots": {
"Captain": {
"outfit": "/datum/outfit/job/captain/minutemen",
"outfit": "/datum/outfit/job/minuteman/captain",
"officer": true,
"slots": 1
},
"Mechanic": {
"outfit": "/datum/outfit/job/engineer/minutemen",
"outfit": "/datum/outfit/job/minuteman/engineer",
"slots": 1
},
"Minuteman": {
"outfit": "/datum/outfit/job/security/minutemen",
"outfit": "/datum/outfit/job/minuteman/security",
"slots": 2
},
"Mech Pilot" :{
"outfit": "/datum/outfit/job/security/minutemen/mechpilot",
"outfit": "/datum/outfit/job/minuteman/security/mech_pilot",
"slots": 2
},
"Roboticist": {
"outfit": "/datum/outfit/job/roboticist/technician/minutemen",
"outfit": "/datum/outfit/job/minuteman/roboticist",
"slots": 1
},
"Cadet": {
"outfit": "/datum/outfit/job/assistant/minutemen",
"outfit": "/datum/outfit/job/minuteman/assistant",
"slots": 3
}
},
Expand Down
8 changes: 4 additions & 4 deletions _maps/configs/minutemen_corvus.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,20 +16,20 @@
"limit": 2,
"job_slots": {
"Captain": {
"outfit": "/datum/outfit/job/captain/minutemen",
"outfit": "/datum/outfit/job/minuteman/captain",
"officer": true,
"slots": 1
},
"Mechanic": {
"outfit": "/datum/outfit/job/engineer/minutemen",
"outfit": "/datum/outfit/job/minuteman/engineer",
"slots": 1
},
"Minuteman": {
"outfit": "/datum/outfit/job/security/minutemen",
"outfit": "/datum/outfit/job/minuteman/security",
"slots": 2
},
"Cadet": {
"outfit": "/datum/outfit/job/assistant/minutemen",
"outfit": "/datum/outfit/job/minuteman/assistant",
"slots": 2
}
},
Expand Down
24 changes: 14 additions & 10 deletions _maps/configs/minutemen_vela.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,11 @@
"$schema": "https://raw.githubusercontent.com/shiptest-ss13/Shiptest/master/_maps/ship_config_schema.json",
"map_name": "Vela-class Industrial Cruiser",
"prefix": "CMGSV",
"namelists": ["GENERAL", "MYTHOLOGICAL", "BEASTS"],
"namelists": [
"GENERAL",
"MYTHOLOGICAL",
"BEASTS"
],
"description": "The Vela-Class is the designation for a series of semi-modular industrial cruisers created by the Colonial Minutemen in the early 440s. While the original design was created almost exclusively for extracting minerals from asteroid belts, modern examples tend to take on a multi-mission role, with the most common configuration being a mech hanger, and research pod. The ship itself often sees long deployments that encourage modification, leading to Velas taking on a personality as their crews leave their mark.",
"tags": [
"Robotics",
Expand All @@ -15,41 +19,41 @@
"limit": 1,
"job_slots": {
"Captain": {
"outfit": "/datum/outfit/job/captain/minutemen",
"outfit": "/datum/outfit/job/minuteman/captain",
"officer": true,
"slots": 1
},
"Foreman": {
"outfit": "/datum/outfit/job/ce/minutemen",
"outfit": "/datum/outfit/job/minuteman/ce",
"officer": true,
"slots": 1
},
"Bridge Officer": {
"outfit": "/datum/outfit/job/head_of_personnel/minutemen",
"outfit": "/datum/outfit/job/minuteman/head_of_personnel",
"slots": 1
},
"Mech Pilot": {
"outfit": "/datum/outfit/job/miner/hazard/minutemen",
"outfit": "/datum/outfit/job/minuteman/miner",
"slots": 4
},
"Mech Technician": {
"outfit": "/datum/outfit/job/roboticist/technician/minutemen",
"outfit": "/datum/outfit/job/minuteman/roboticist",
"slots": 2
},
"Engineer": {
"outfit": "/datum/outfit/job/engineer/minutemen",
"outfit": "/datum/outfit/job/minuteman/engineer",
"slots": 2
},
"Minuteman": {
"outfit": "/datum/outfit/job/security/minutemen",
"outfit": "/datum/outfit/job/minuteman/security",
"slots": 2
},
"Scientist": {
"outfit": "/datum/outfit/job/scientist/minutemen",
"outfit": "/datum/outfit/job/minuteman/scientist",
"slots": 2
},
"Cadet": {
"outfit": "/datum/outfit/job/assistant/minutemen",
"outfit": "/datum/outfit/job/minuteman/assistant",
"slots": 1
}
},
Expand Down
4 changes: 2 additions & 2 deletions code/game/objects/items/storage/backpack.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -132,7 +132,7 @@
item_state = "securitypack"

/obj/item/storage/backpack/security/cmm
name = "cmm backpack"
name = "CMM backpack"
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
name = "CMM backpack"
name = "\improper CMM backpack"

desc = "It's a very blue backpack."
icon_state = "cmmpack"

Expand Down Expand Up @@ -286,7 +286,7 @@
item_state = "satchel-sec"

/obj/item/storage/backpack/satchel/sec/cmm
name = "cmm satchel"
name = "CMM satchel"
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
name = "CMM satchel"
name = "\improper CMM satchel"

desc = "A robust satchel for anti-piracy related needs."
icon_state = "satchel-cmm"

Expand Down
Loading