From 6f2f0af06c875ab748eb84f502e96eaf737c03f0 Mon Sep 17 00:00:00 2001 From: mishka Date: Wed, 15 Jan 2025 11:19:08 -0800 Subject: [PATCH] addressed review issues. --- .../Entities/Objects/Devices/pda.yml | 32 +++--- .../Prototypes/Entities/Objects/Misc/pen.yml | 91 ++-------------- .../_DV/Entities/Objects/Devices/pda.yml | 4 +- .../_DV/Entities/Objects/Misc/pen.yml | 103 ++++++++++++++++++ .../Textures/Objects/Misc/pens.rsi/meta.json | 33 +----- .../_DV/Objects/Misc/pens.rsi/meta.json | 41 +++++++ .../Objects/Misc/pens.rsi/pen_cap2.png | Bin .../Objects/Misc/pens.rsi/pen_ce.png | Bin .../Objects/Misc/pens.rsi/pen_cj.png | Bin .../Objects/Misc/pens.rsi/pen_cmo.png | Bin .../Objects/Misc/pens.rsi/pen_hop2.png | Bin .../Objects/Misc/pens.rsi/pen_hos.png | Bin .../Objects/Misc/pens.rsi/pen_lo.png | Bin .../Objects/Misc/pens.rsi/pen_mystagogue.png | Bin .../Objects/Misc/pens.rsi/pen_psych2.png | Bin .../Objects/Misc/pens.rsi/pen_warden.png | Bin 16 files changed, 174 insertions(+), 130 deletions(-) create mode 100644 Resources/Prototypes/_DV/Entities/Objects/Misc/pen.yml create mode 100644 Resources/Textures/_DV/Objects/Misc/pens.rsi/meta.json rename Resources/Textures/{ => _DV}/Objects/Misc/pens.rsi/pen_cap2.png (100%) rename Resources/Textures/{ => _DV}/Objects/Misc/pens.rsi/pen_ce.png (100%) rename Resources/Textures/{ => _DV}/Objects/Misc/pens.rsi/pen_cj.png (100%) rename Resources/Textures/{ => _DV}/Objects/Misc/pens.rsi/pen_cmo.png (100%) rename Resources/Textures/{ => _DV}/Objects/Misc/pens.rsi/pen_hop2.png (100%) rename Resources/Textures/{ => _DV}/Objects/Misc/pens.rsi/pen_hos.png (100%) rename Resources/Textures/{ => _DV}/Objects/Misc/pens.rsi/pen_lo.png (100%) rename Resources/Textures/{ => _DV}/Objects/Misc/pens.rsi/pen_mystagogue.png (100%) rename Resources/Textures/{ => _DV}/Objects/Misc/pens.rsi/pen_psych2.png (100%) rename Resources/Textures/{ => _DV}/Objects/Misc/pens.rsi/pen_warden.png (100%) diff --git a/Resources/Prototypes/Entities/Objects/Devices/pda.yml b/Resources/Prototypes/Entities/Objects/Devices/pda.yml index 4e2b4fd2561..d288bca2aec 100644 --- a/Resources/Prototypes/Entities/Objects/Devices/pda.yml +++ b/Resources/Prototypes/Entities/Objects/Devices/pda.yml @@ -389,7 +389,7 @@ - type: Pda id: QuartermasterIDCard state: pda-qm - #new delta v content + # Begin DeltaV changes penSlot: startingItem: PenLO priority: -1 @@ -552,7 +552,9 @@ id: CaptainIDCard state: pda-captain penSlot: - startingItem: PenCap + # Begin DeltaV changes + startingItem: PenCapNew + # End DeltaV changes priority: -1 whitelist: tags: @@ -572,7 +574,9 @@ id: HoPIDCard state: pda-hop penSlot: - startingItem: PenHop + # Begin DeltaV changes + startingItem: PenHopNew + # End DeltaV changes priority: -1 whitelist: tags: @@ -592,14 +596,14 @@ - type: Pda id: CEIDCard state: pda-ce - #new delta v content + # Begin DeltaV changes penSlot: startingItem: PenCE priority: -1 whitelist: tags: - Write - #end delta v content + # End DeltaV changes - type: PdaBorderColor borderColor: "#949137" accentHColor: "#447987" @@ -630,14 +634,14 @@ - type: Pda id: CMOIDCard state: pda-cmo - #new delta v content + # Begin DeltaV changes penSlot: startingItem: PenCMO priority: -1 whitelist: tags: - Write - #end delta v content + # End DeltaV changes - type: PdaBorderColor borderColor: "#d7d7d0" accentHColor: "#447987" @@ -702,7 +706,7 @@ - type: Icon state: pda-chemistry -- type: entity +- type: entity parent: BasePDA id: RnDPDA name: mystagogue PDA # DeltaV - Epistemics Department replacing Science @@ -711,14 +715,14 @@ - type: Pda id: RDIDCard state: pda-rd - #new delta v content + # Begin DeltaV changes penSlot: startingItem: PenMystagogue priority: -1 whitelist: tags: - Write - #end delta v content + # End DeltaV changes - type: PdaBorderColor borderColor: "#d7d7d0" accentHColor: "#447987" @@ -764,14 +768,14 @@ - type: Pda id: HoSIDCard state: pda-hos - #new delta v content + # Begin DeltaV changes penSlot: startingItem: PenHos priority: -1 whitelist: tags: - Write - #end delta v content + # End DeltaV changes - type: PdaBorderColor borderColor: "#A32D26" accentHColor: "#447987" @@ -796,14 +800,14 @@ - type: Pda id: WardenIDCard state: pda-warden - #new delta v content + # Begin DeltaV changes penSlot: startingItem: PenWarden priority: -1 whitelist: tags: - Write - #end delta v content + # Begin DeltaV changes - type: PdaBorderColor borderColor: "#A32D26" accentVColor: "#949137" diff --git a/Resources/Prototypes/Entities/Objects/Misc/pen.yml b/Resources/Prototypes/Entities/Objects/Misc/pen.yml index d0b46f74c62..2845da439e6 100644 --- a/Resources/Prototypes/Entities/Objects/Misc/pen.yml +++ b/Resources/Prototypes/Entities/Objects/Misc/pen.yml @@ -42,6 +42,13 @@ damage: types: Piercing: 3 + - type: Tending # Shitmed + speed: 0.55 + - type: SurgeryTool # Shitmed + startSound: + path: /Audio/_Shitmed/Medical/Surgery/retractor1.ogg + endSound: + path: /Audio/_Shitmed/Medical/Surgery/hemostat1.ogg #TODO: I want the luxury pen to write a cool font like Merriweather in the future. @@ -109,91 +116,13 @@ description: A luxurious fountain pen for the captain of the station. components: - type: Sprite - state: pen_cap2 - -#new delta v pens -- type: entity - name: chief medical officer's pen - parent: PenEmbeddable - id: PenCMO - description: A fancy ballpoint pen belonging to the chief medical officer. Used for writing "do no harm" on things. - components: - - type: Sprite - state: pen_cmo - -- type: entity - name: psychologist's pen - parent: PenEmbeddable - id: PenPsych - description: A cheap ballpoint pen belonging to the Psychologist. Understands you better than anyone. - components: - - type: Sprite - state: pen_psych2 - -- type: entity - name: mystagogue's pen - parent: PenEmbeddable - id: PenMystagogue - description: An anomalous pen that may or may not have 0.001% chance of exploding when clicked. - components: - - type: Sprite - state: pen_mystagogue - -- type: entity - name: head of security's pen - parent: PenEmbeddable - id: PenHos - description: A robust pen, your strongest tools for keeping the peace. - components: - - type: Sprite - state: pen_hos - -- type: entity - name: warden's pen - parent: PenEmbeddable - id: PenWarden - description: An orderly pen that is chewed at the top from long hours in the office. - components: - - type: Sprite - state: pen_warden - -- type: entity - name: chief engineer's pen - parent: PenEmbeddable - id: PenCE - description: Once belonging to an egghead, it now belongs to you. Solves practical problems. - components: - - type: Sprite - state: pen_ce - - -- type: entity - name: logistics officer's pen - parent: PenEmbeddable - id: PenLO - description: An efficient pen. Vital for writing strongly worded letters to Epistemics. - components: - - type: Sprite - state: pen_lo - + state: pen_cap - type: entity name: hop's fountain pen parent: PenEmbeddable id: PenHop - description: This pen looks oddly familiar... - components: - - type: Sprite - state: pen_hop2 - - -- type: entity - name: chief justice's pen - parent: PenEmbeddable - id: PenCJ - description: A lawful pen adorned with a gold fountain tip. + description: A luxurious fountain pen for the hop of the station. components: - type: Sprite - state: pen_cj - - # end new delta v pens. hop pen and captain pens are changed from upstream. \ No newline at end of file + state: pen_hop \ No newline at end of file diff --git a/Resources/Prototypes/_DV/Entities/Objects/Devices/pda.yml b/Resources/Prototypes/_DV/Entities/Objects/Devices/pda.yml index 5d22ee48f84..c069c8077aa 100644 --- a/Resources/Prototypes/_DV/Entities/Objects/Devices/pda.yml +++ b/Resources/Prototypes/_DV/Entities/Objects/Devices/pda.yml @@ -66,7 +66,7 @@ id: ChiefJusticePDA name: chief justice PDA description: Whosoever bears this PDA is the law. - components: + components: - type: Sprite sprite: _DV/Objects/Devices/pda.rsi layers: @@ -82,14 +82,12 @@ - type: Pda id: ChiefJusticeIDCard state: pda-chiefjustice - #new cj pen penSlot: startingItem: PenCJ priority: -1 whitelist: tags: - Write - #end cj pen - type: PdaBorderColor borderColor: "#470823" - type: Icon diff --git a/Resources/Prototypes/_DV/Entities/Objects/Misc/pen.yml b/Resources/Prototypes/_DV/Entities/Objects/Misc/pen.yml new file mode 100644 index 00000000000..de2d56386ce --- /dev/null +++ b/Resources/Prototypes/_DV/Entities/Objects/Misc/pen.yml @@ -0,0 +1,103 @@ + +- type: entity + parent: PenEmbeddable + id: PenCMO + name: chief medical officer's pen + description: A fancy ballpoint pen belonging to the chief medical officer. Comes with enhanced surgical grip! + components: + - type: Sprite + sprite: _DV/Objects/Misc/pens.rsi + state: pen_cmo + +- type: entity + parent: PenEmbeddable + id: PenPsych + name: psychologist's pen + description: A cheap ballpoint pen belonging to the Psychologist. Understands you better than anyone. + components: + - type: Sprite + sprite: _DV/Objects/Misc/pens.rsi + state: pen_psych2 + +- type: entity + parent: PenEmbeddable + id: PenMystagogue + name: mystagogue's pen + description: An anomalous pen that may or may not have 0.001% chance of exploding when clicked. + components: + - type: Sprite + sprite: _DV/Objects/Misc/pens.rsi + state: pen_mystagogue + +- type: entity + parent: PenEmbeddable + id: PenHos + name: head of security's pen + description: A robust pen, your strongest tool for keeping the peace. + components: + - type: Sprite + sprite: _DV/Objects/Misc/pens.rsi + state: pen_hos + +- type: entity + parent: PenEmbeddable + id: PenWarden + name: warden's pen + description: An orderly pen that is chewed at the top from long hours in the office. + components: + - type: Sprite + sprite: _DV/Objects/Misc/pens.rsi + state: pen_warden + +- type: entity + parent: PenEmbeddable + id: PenCE + name: chief engineer's pen + description: Once belonging to an egghead, it now belongs to you. Solves practical problems. + components: + - type: Sprite + sprite: _DV/Objects/Misc/pens.rsi + state: pen_ce + + +- type: entity + parent: PenEmbeddable + id: PenLO + name: logistics officer's pen + description: An efficient pen. Vital for writing strongly worded letters to Epistemics. + components: + - type: Sprite + sprite: _DV/Objects/Misc/pens.rsi + state: pen_lo + + +- type: entity + parent: PenEmbeddable + id: PenCJ + name: chief justice's pen + description: A lawful pen adorned with a gold fountain tip. + components: + - type: Sprite + sprite: _DV/Objects/Misc/pens.rsi + state: pen_cj + +- type: entity + parent: PenEmbeddable + id: PenCapNew + name: captain's fountain pen + description: A luxurious fountain pen for the captain of the station. + components: + - type: Sprite + sprite: _DV/Objects/Misc/pens.rsi + state: pen_cap2 + +- type: entity + parent: PenEmbeddable + id: PenHopNew + name: head of personnel's pen + description: Looks oddly familiar... + components: + - type: Sprite + sprite: _DV/Objects/Misc/pens.rsi + state: pen_hop2 + \ No newline at end of file diff --git a/Resources/Textures/Objects/Misc/pens.rsi/meta.json b/Resources/Textures/Objects/Misc/pens.rsi/meta.json index f6d618011e8..8b649632570 100644 --- a/Resources/Textures/Objects/Misc/pens.rsi/meta.json +++ b/Resources/Textures/Objects/Misc/pens.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/commit/e1142f20f5e4661cb6845cfcf2dd69f864d67432. pen_centcom is a resprited version of pen_cap by PuroSlavKing (Github). Luxury pen is drawn by Ubaser. pen_cap2, pen_hos2, lo, mysta, ce, hos, cj, warden and psych pens sprited by kushbreth.", + "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/commit/e1142f20f5e4661cb6845cfcf2dd69f864d67432. pen_centcom is a resprited version of pen_cap by PuroSlavKing (Github). Luxury pen is drawn by Ubaser.", "size": { "x": 32, "y": 32 @@ -10,34 +10,6 @@ { "name": "pen" }, - - { - "name": "pen_cap2" - }, - { - "name": "pen_hos" - }, - { - "name": "pen_cmo" - }, - { - "name": "pen_psych2" - }, - { - "name": "pen_ce" - }, - { - "name": "pen_hop2" - }, - { - "name": "pen_lo" - }, - { - "name": "pen_warden" - }, - { - "name": "pen_mystagogue" - }, { "name": "pen_cap" }, @@ -52,9 +24,6 @@ }, { "name": "luxury_pen" - }, - { - "name": "pen_cj" }, { "name": "pen_blue" diff --git a/Resources/Textures/_DV/Objects/Misc/pens.rsi/meta.json b/Resources/Textures/_DV/Objects/Misc/pens.rsi/meta.json new file mode 100644 index 00000000000..744a5fc4d5e --- /dev/null +++ b/Resources/Textures/_DV/Objects/Misc/pens.rsi/meta.json @@ -0,0 +1,41 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "New pen sprites by Kushbreth.", + "size": { + "x": 32, + "y": 32 + }, + "states": [ +{ + "name": "pen_cap2" + }, + { + "name": "pen_hos" + }, + { + "name": "pen_cmo" + }, + { + "name": "pen_psych2" + }, + { + "name": "pen_ce" + }, + { + "name": "pen_hop2" + }, + { + "name": "pen_lo" + }, + { + "name": "pen_warden" + }, + { + "name": "pen_mystagogue" + }, + { + "name": "pen_cj" + } + ] +} \ No newline at end of file diff --git a/Resources/Textures/Objects/Misc/pens.rsi/pen_cap2.png b/Resources/Textures/_DV/Objects/Misc/pens.rsi/pen_cap2.png similarity index 100% rename from Resources/Textures/Objects/Misc/pens.rsi/pen_cap2.png rename to Resources/Textures/_DV/Objects/Misc/pens.rsi/pen_cap2.png diff --git a/Resources/Textures/Objects/Misc/pens.rsi/pen_ce.png b/Resources/Textures/_DV/Objects/Misc/pens.rsi/pen_ce.png similarity index 100% rename from Resources/Textures/Objects/Misc/pens.rsi/pen_ce.png rename to Resources/Textures/_DV/Objects/Misc/pens.rsi/pen_ce.png diff --git a/Resources/Textures/Objects/Misc/pens.rsi/pen_cj.png b/Resources/Textures/_DV/Objects/Misc/pens.rsi/pen_cj.png similarity index 100% rename from Resources/Textures/Objects/Misc/pens.rsi/pen_cj.png rename to Resources/Textures/_DV/Objects/Misc/pens.rsi/pen_cj.png diff --git a/Resources/Textures/Objects/Misc/pens.rsi/pen_cmo.png b/Resources/Textures/_DV/Objects/Misc/pens.rsi/pen_cmo.png similarity index 100% rename from Resources/Textures/Objects/Misc/pens.rsi/pen_cmo.png rename to Resources/Textures/_DV/Objects/Misc/pens.rsi/pen_cmo.png diff --git a/Resources/Textures/Objects/Misc/pens.rsi/pen_hop2.png b/Resources/Textures/_DV/Objects/Misc/pens.rsi/pen_hop2.png similarity index 100% rename from Resources/Textures/Objects/Misc/pens.rsi/pen_hop2.png rename to Resources/Textures/_DV/Objects/Misc/pens.rsi/pen_hop2.png diff --git a/Resources/Textures/Objects/Misc/pens.rsi/pen_hos.png b/Resources/Textures/_DV/Objects/Misc/pens.rsi/pen_hos.png similarity index 100% rename from Resources/Textures/Objects/Misc/pens.rsi/pen_hos.png rename to Resources/Textures/_DV/Objects/Misc/pens.rsi/pen_hos.png diff --git a/Resources/Textures/Objects/Misc/pens.rsi/pen_lo.png b/Resources/Textures/_DV/Objects/Misc/pens.rsi/pen_lo.png similarity index 100% rename from Resources/Textures/Objects/Misc/pens.rsi/pen_lo.png rename to Resources/Textures/_DV/Objects/Misc/pens.rsi/pen_lo.png diff --git a/Resources/Textures/Objects/Misc/pens.rsi/pen_mystagogue.png b/Resources/Textures/_DV/Objects/Misc/pens.rsi/pen_mystagogue.png similarity index 100% rename from Resources/Textures/Objects/Misc/pens.rsi/pen_mystagogue.png rename to Resources/Textures/_DV/Objects/Misc/pens.rsi/pen_mystagogue.png diff --git a/Resources/Textures/Objects/Misc/pens.rsi/pen_psych2.png b/Resources/Textures/_DV/Objects/Misc/pens.rsi/pen_psych2.png similarity index 100% rename from Resources/Textures/Objects/Misc/pens.rsi/pen_psych2.png rename to Resources/Textures/_DV/Objects/Misc/pens.rsi/pen_psych2.png diff --git a/Resources/Textures/Objects/Misc/pens.rsi/pen_warden.png b/Resources/Textures/_DV/Objects/Misc/pens.rsi/pen_warden.png similarity index 100% rename from Resources/Textures/Objects/Misc/pens.rsi/pen_warden.png rename to Resources/Textures/_DV/Objects/Misc/pens.rsi/pen_warden.png