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.

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

Closed. #1363

Closed
Closed

Closed. #1363

Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
4 changes: 2 additions & 2 deletions Resources/Locale/en-US/job/job-description.ftl
Original file line number Diff line number Diff line change
Expand Up @@ -36,10 +36,10 @@ job-description-musician = Entertain the crew with your unique musical talent, a
job-description-passenger = Enjoy your stay aboard the station with no obligations!
job-description-psychologist = Provide emotional support to traumatized crew.
job-description-qm = Manage the supplies of the station & the logistics department, keep the salvage specialists working, make sure all orders are fulfilled, and keep the money flowing.
job-description-rd = Manage the epistemics department, unlocking technologies, acquiring & researching artifacts, and performing experiments.
job-description-rd = Manage the science department, unlocking technologies, acquiring & researching artifacts, and performing experiments.
job-description-research-assistant = Learn the basics of how to research various artifacts, anomalies and robotics.
job-description-reporter = Entertain & inform the crew with your vibrant journalism through wireless cameras, the radio and the news.
job-description-roboticist = Build a makeshift workshop in epistemics closet and create your own cyborg army.
job-description-roboticist = Build a makeshift workshop in science closet and create your own cyborg army.
job-description-salvagespec = Use the salvage magnet to draw in detatched scraps & asteroids to loot and enrich the station, build a salvage ship and then travel to new planets, while fighting off any space fauna along the way.
job-description-scientist = Research alien artifacts, unlock new technologies, build newer and better machines around the station, and make everything run more efficiently.
job-description-security = Catch criminals and enemies of the station, enforce the law, and ensure that the station does not fall into disarray.
Expand Down
14 changes: 7 additions & 7 deletions Resources/Locale/en-US/job/job-names.ftl
Original file line number Diff line number Diff line change
Expand Up @@ -3,15 +3,15 @@ job-name-security = Security Officer
job-name-cadet = Security Cadet
job-name-hos = Head of Security
job-name-detective = Detective
job-name-brigmedic = Corpsman
job-name-brigmedic = Brigmedic
job-name-borg = Cyborg
job-name-senior-researcher = Mystic
job-name-senior-researcher = Senior Researcher
job-name-senior-engineer = Senior Engineer
job-name-senior-physician = Senior Physician
job-name-scientist = Acolyte
job-name-research-assistant = Noviciate
job-name-rd = Mystagogue
job-name-roboticist = Golemancer
job-name-scientist = Scientist
job-name-research-assistant = Research Assistant
job-name-rd = Research Director
job-name-roboticist = Roboticist
job-name-psychologist = Psychologist
job-name-intern = Medical Intern
job-name-doctor = Medical Doctor
Expand All @@ -38,7 +38,7 @@ job-name-botanist = Botanist
job-name-bartender = Bartender
job-name-passenger = Passenger
job-name-salvagespec = Salvage specialist
job-name-qm = Logistics Officer
job-name-qm = Quartermaster
job-name-cargotech = Cargo Technician
job-name-chef = Chef
job-name-clown = Clown
Expand Down
16 changes: 8 additions & 8 deletions Resources/Prototypes/Entities/Clothing/Ears/headsets.yml
Original file line number Diff line number Diff line change
Expand Up @@ -38,8 +38,8 @@
- type: entity
parent: ClothingHeadset
id: ClothingHeadsetCargo
name: logistics headset # DeltaV - Logistics Department replacing Cargo
description: A headset used by supply employees.
name: cargo headset # Ronstation - Cargo Department replacing Logistics
description: A headset used by cargo employees.
components:
- type: ContainerFill
containers:
Expand All @@ -65,8 +65,8 @@
- type: entity
parent: ClothingHeadsetCargo
id: ClothingHeadsetQM
name: logistics officer's headset # DeltaV - Logistics Department replacing Cargo
description: A headset used by the logistics officer. # DeltaV - Logistics Department replacing Cargo
name: quartermaster's headset # Ronstation - Cargo Department replacing Logistics
description: A headset used by the quartermaster. # Ronstation - Cargo Department replacing Logistics
components:
- type: ContainerFill
containers:
Expand Down Expand Up @@ -167,8 +167,8 @@
- type: entity
parent: ClothingHeadset
id: ClothingHeadsetScience
name: epistemics headset # DeltaV - Epistemics Department replacing Science
description: A sciency headset. Like usual. # DeltaV - Epistemics Department replacing Science
name: science headset # Ronstation - Science Department replacing Epistemics
description: A sciency headset. Like usual. # Ronstation - Science Department replacing Epistemics
components:
- type: ContainerFill
containers:
Expand Down Expand Up @@ -215,7 +215,7 @@
- type: entity
parent: ClothingHeadsetScience
id: ClothingHeadsetRD
name: mysta headset # DeltaV - Epistemics Department replacing Science
name: research director headset # Ronstation - Science Department replacing Epistemics
description: Lamarr used to love chewing on this...
components:
- type: ContainerFill
Expand Down Expand Up @@ -244,7 +244,7 @@
- type: entity
parent: ClothingHeadset
id: ClothingHeadsetBrigmedic
name: corpsman headset # DeltaV - rename brigmedic to corpsman
name: brigmedic headset # Ronstation - rename corpsman to brigmedic
description: A headset that helps to hear the death cries.
components:
- type: ContainerFill
Expand Down
4 changes: 2 additions & 2 deletions Resources/Prototypes/Entities/Clothing/Ears/headsets_alt.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
- type: entity
parent: ClothingHeadsetAlt
id: ClothingHeadsetAltCargo
name: logistics officer's over-ear headset # DeltaV - Logistics Department replacing Cargo
name: quartermaster's over-ear headset # Ronstation - Cargo Department replacing Logistics
components:
- type: ContainerFill
containers:
Expand Down Expand Up @@ -118,7 +118,7 @@
- type: entity
parent: ClothingHeadsetAlt
id: ClothingHeadsetAltScience
name: mystagogue's over-ear headset # DeltaV - Epistemics Department replacing Science
name: research director's over-ear headset # Ronstation - Science Department replacing Epistemics
components:
- type: ContainerFill
containers:
Expand Down
8 changes: 4 additions & 4 deletions Resources/Prototypes/Entities/Clothing/Head/hats.yml
Original file line number Diff line number Diff line change
Expand Up @@ -104,9 +104,9 @@
- type: entity
parent: ClothingHeadBase
id: ClothingHeadHatBeretQM
# DeltaV - Logistics Department - Replace Quartermaster with Logistics Officer
name: logistics officer's beret
description: A beret with the logistics department's insignia emblazoned on it. For logistics officers that are more inclined towards style.
# Ronstation - Cargo Department - Replace Logistics Officer with Quartermaster
name: quartermaster's beret
description: A beret with the cargo department's insignia emblazoned on it. For quartermasters that are more inclined towards style.
# End of modified code
components:
- type: Sprite
Expand Down Expand Up @@ -1170,4 +1170,4 @@
- type: Sprite
sprite: Clothing/Head/Hats/flatcap_orion.rsi
- type: Clothing
sprite: Clothing/Head/Hats/flatcap_orion.rsi
sprite: Clothing/Head/Hats/flatcap_orion.rsi
Original file line number Diff line number Diff line change
Expand Up @@ -248,7 +248,7 @@
- type: entity
parent: ClothingOuterStorageBase
id: ClothingOuterCoatRnd
name: epistemics lab coat # DeltaV - Epistemics Department replacing Science
name: science lab coat # Ronstation - Science Department replacing Epistemics
description: A suit that protects against minor chemical spills. Has a purple stripe on the shoulder.
components:
- type: Sprite
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -266,7 +266,7 @@
- type: entity
parent: ClothingOuterHardsuitBase
id: ClothingOuterHardsuitBrigmedic
name: corpsman hardsuit # DeltaV - rename brigmedic to corpsman
name: brigmedic hardsuit # Ronstation - rename corpsman to brigmedic
description: Special hardsuit of the guardian angel of the brig. It is the medical version of the security hardsuit. # I will fix the rest of this entry later when I resprite sec suits
components:
- type: Sprite
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@
- type: entity
parent: ClothingOuterWinterCoatToggleable
id: ClothingOuterWinterCargo
name: logistics winter coat # DeltaV - Logistics Department replacing Cargo
name: cargo winter coat # Ronstation - Cargo Department replacing Logistics
components:
- type: Sprite
sprite: Clothing/OuterClothing/WinterCoats/coatcargo.rsi
Expand Down Expand Up @@ -360,7 +360,7 @@
- type: entity
parent: ClothingOuterWinterCoatToggleable
id: ClothingOuterWinterQM
name: logistics officer's winter coat # DeltaV - Logistics Department replacing Cargo
name: Quartermaster's winter coat # Ronstation - Cargo Department replacing Logistics
components:
- type: Sprite
sprite: Clothing/OuterClothing/WinterCoats/coatqm.rsi
Expand Down Expand Up @@ -405,7 +405,7 @@
- type: entity
parent: ClothingOuterWinterCoatToggleable
id: ClothingOuterWinterSci
name: epistemics winter coat # DeltaV - Epistemics Department replacing Science
name: science winter coat # Ronstation - Science Department replacing Epistemics
components:
- type: Sprite
sprite: Clothing/OuterClothing/WinterCoats/coatsci.rsi
Expand Down
14 changes: 7 additions & 7 deletions Resources/Prototypes/Entities/Clothing/Uniforms/jumpskirts.yml
Original file line number Diff line number Diff line change
Expand Up @@ -280,13 +280,13 @@
- type: entity
parent: ClothingUniformSkirtBase
id: ClothingUniformJumpskirtBrigmedic
name: corpsman jumpskirt # DeltaV - renamed brigmedic to corpsman
name: brigmedic jumpskirt # Ronstation - renamed corpsman to brigmedic
description: This uniform is issued to qualified personnel who have been trained. No one cares that the training took half a day.
components:
- type: Sprite
sprite: DeltaV/Clothing/Uniforms/Jumpskirt/brigmedic.rsi # DeltaV - resprite
sprite: Clothing/Uniforms/Jumpskirt/brigmedic.rsi # Ronstation - resprite
- type: Clothing
sprite: DeltaV/Clothing/Uniforms/Jumpskirt/brigmedic.rsi # DeltaV - resprite
sprite: Clothing/Uniforms/Jumpskirt/brigmedic.rsi # Ronstation - resprite

- type: entity
parent: ClothingUniformBase
Expand Down Expand Up @@ -331,7 +331,7 @@
- type: entity
parent: ClothingUniformSkirtBase
id: ClothingUniformJumpskirtQM
name: logistics officer's jumpskirt # DeltaV - Logistics Department replacing Cargo
name: quartermaster's jumpskirt # Ronstation - Cargo Department replacing Logistics
description: 'What can brown do for you?'
components:
- type: Sprite
Expand All @@ -342,7 +342,7 @@
- type: entity
parent: ClothingUniformSkirtBase
id: ClothingUniformJumpskirtQMTurtleneck
name: logistics officer's turtleneck # DeltaV - Logistics Department replacing Cargo
name: quartermaster's turtleneck # Ronstation - Cargo Department replacing Logistics
description: A sharp turtleneck made for the hardy work environment of supply.
components:
- type: Sprite
Expand All @@ -353,8 +353,8 @@
- type: entity
parent: ClothingUniformSkirtBase
id: ClothingUniformJumpskirtResearchDirector
name: mystagogue's turtleneck # DeltaV - Epistemics Department replacing Science
description: It's a turtleneck worn by those with the know-how to achieve the position of Mystagogue. Its fabric provides minor protection from biological contaminants. # DeltaV - Epistemics Department replacing Science
name: research director's turtleneck # Ronstation - Science Department replacing Epistemics
description: It's a turtleneck worn by those with the know-how to achieve the position of Research Director. Its fabric provides minor protection from biological contaminants. # Ronstation - Science Department replacing Epistemics
components:
- type: Sprite
sprite: Clothing/Uniforms/Jumpskirt/rnd.rsi
Expand Down
16 changes: 8 additions & 8 deletions Resources/Prototypes/Entities/Clothing/Uniforms/jumpsuits.yml
Original file line number Diff line number Diff line change
Expand Up @@ -614,13 +614,13 @@
- type: entity
parent: ClothingUniformBase
id: ClothingUniformJumpsuitBrigmedic
name: corpsman jumpsuit # DeltaV - rename brigmedic to corpsman
name: brigmedic jumpsuit # Ronstation - rename corpsman to brigmedic
description: This uniform is issued to qualified personnel who have been trained. No one cares that the training took half a day.
components:
- type: Sprite
sprite: DeltaV/Clothing/Uniforms/Jumpsuit/brigmedic.rsi # DeltaV - resprite
sprite: Clothing/Uniforms/Jumpsuit/brigmedic.rsi # Ronstation - resprite
- type: Clothing
sprite: DeltaV/Clothing/Uniforms/Jumpsuit/brigmedic.rsi # DeltaV - resprite
sprite: Clothing/Uniforms/Jumpsuit/brigmedic.rsi # Ronstation - resprite

- type: entity
parent: ClothingUniformBase
Expand Down Expand Up @@ -686,9 +686,9 @@
- type: entity
parent: ClothingUniformBase
id: ClothingUniformJumpsuitQMFormal
# DeltaV - Logistics Department - Replace Quartermaster with Logistics Officer
name: logistics officer's formal suit
description: Inspired by the logistics officers of military's past, the perfect outfit for supplying a formal occasion.
# Ronstation - Cargo Department - Replace Logistics Officer with Quartermaster
name: Quartermaster's formal suit
description: The perfect outfit for supplying a formal occasion.
# End of modified code
components:
- type: Sprite
Expand All @@ -699,8 +699,8 @@
- type: entity
parent: ClothingUniformBase
id: ClothingUniformJumpsuitResearchDirector
name: mystagogue's turtleneck # DeltaV - Epistemics Department replacing Science
description: It's a turtleneck worn by those with the know-how to achieve the position of Mystagogue. Its fabric provides minor protection from biological contaminants. # DeltaV - Epistemics Department replacing Science
name: research director's turtleneck # Ronstation - Science Department replacing Epistemics
description: It's a turtleneck worn by those with the know-how to achieve the position of Research Director. Its fabric provides minor protection from biological contaminants. # Ronstation - Science Department replacing Epistemics
components:
- type: Sprite
sprite: Clothing/Uniforms/Jumpsuit/rnd.rsi
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -137,6 +137,9 @@
- board
- type: PlacementReplacement
key: walls
- type: IconSmooth
key: walls
mode: NoSprite
- type: PaintableAirlock
group: Standard
department: Civilian
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,9 @@
behaviors:
- !type:DoActsBehavior
acts: ["Destruction"]
- type: IconSmooth
key: walls
mode: NoSprite
- type: Occluder
- type: BlockWeather
- type: InteractionVerbs
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
components:
- type: InteractionOutline
- type: Sprite
sprite: Structures/Doors/Windoors/windoor.rsi
sprite: _Ronstation/Structures/Doors/Windoors/windoor.rsi
layers:
- state: assembly
- type: Physics
Expand Down Expand Up @@ -56,7 +56,7 @@
parent: WindoorAssembly
components:
- type: Sprite
sprite: Structures/Doors/Windoors/windoor.rsi
sprite: _Ronstation/Structures/Doors/Windoors/windoor.rsi
layers:
- state: secure_underlay
- state: assembly
Expand Down Expand Up @@ -112,7 +112,7 @@
parent: WindoorAssembly
components:
- type: Sprite
sprite: Structures/Doors/Windoors/plasma.rsi
sprite: _Ronstation/Structures/Doors/Windoors/plasma.rsi
layers:
- state: assembly
- type: Destructible
Expand Down Expand Up @@ -142,7 +142,7 @@
parent: WindoorAssembly
components:
- type: Sprite
sprite: Structures/Doors/Windoors/plasma.rsi
sprite: _Ronstation/Structures/Doors/Windoors/plasma.rsi
layers:
- state: secure_underlay
- state: assembly
Expand Down Expand Up @@ -174,7 +174,7 @@
parent: WindoorAssembly
components:
- type: Sprite
sprite: Structures/Doors/Windoors/uranium.rsi
sprite: _Ronstation/Structures/Doors/Windoors/uranium.rsi
layers:
- state: assembly
- type: Destructible
Expand Down Expand Up @@ -204,7 +204,7 @@
parent: WindoorAssembly
components:
- type: Sprite
sprite: Structures/Doors/Windoors/uranium.rsi
sprite: _Ronstation/Structures/Doors/Windoors/uranium.rsi
layers:
- state: secure_underlay
- state: assembly
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
layer:
- GlassAirlockLayer
- type: Sprite
sprite: Structures/Doors/Windoors/windoor.rsi
sprite: _Ronstation/Structures/Doors/Windoors/windoor.rsi
layers:
- state: closed
map: ["enum.DoorVisualLayers.Base"]
Expand Down Expand Up @@ -156,7 +156,7 @@
abstract: true
components:
- type: Sprite
sprite: Structures/Doors/Windoors/windoor.rsi
sprite: _Ronstation/Structures/Doors/Windoors/windoor.rsi
layers:
- state: secure_underlay
- state: closed
Expand Down Expand Up @@ -210,7 +210,7 @@
abstract: true
components:
- type: Sprite
sprite: Structures/Doors/Windoors/plasma.rsi
sprite: _Ronstation/Structures/Doors/Windoors/plasma.rsi
layers:
- state: closed
map: [ "enum.DoorVisualLayers.Base" ]
Expand Down Expand Up @@ -264,7 +264,7 @@
abstract: true
components:
- type: Sprite
sprite: Structures/Doors/Windoors/plasma.rsi
sprite: _Ronstation/Structures/Doors/Windoors/plasma.rsi
layers:
- state: secure_underlay
- state: closed
Expand Down Expand Up @@ -320,7 +320,7 @@
abstract: true
components:
- type: Sprite
sprite: Structures/Doors/Windoors/uranium.rsi
sprite: _Ronstation/Structures/Doors/Windoors/uranium.rsi
layers:
- state: closed
map: [ "enum.DoorVisualLayers.Base" ]
Expand Down Expand Up @@ -374,7 +374,7 @@
abstract: true
components:
- type: Sprite
sprite: Structures/Doors/Windoors/uranium.rsi
sprite: _Ronstation/Structures/Doors/Windoors/uranium.rsi
layers:
- state: secure_underlay
- state: closed
Expand Down
Loading
Loading