From c364cbf7a9c88cefafce1192c90a9d8d7364fc9e Mon Sep 17 00:00:00 2001 From: Emisse <99158783+Emisse@users.noreply.github.com> Date: Sun, 8 May 2022 23:17:39 -0600 Subject: [PATCH] Very Important PR That Adds 2 Fountain Pens (#8019) * Add files via upload * Update paper.yml * Update meta.json * Update pda.yml * Update pda.yml --- .../Entities/Objects/Devices/pda.yml | 6 ++++-- .../Entities/Objects/Misc/paper.yml | 20 ++++++++++++++++++ .../Objects/Misc/bureaucracy.rsi/meta.json | 6 ++++++ .../Objects/Misc/bureaucracy.rsi/pen_cap.png | Bin 0 -> 343 bytes .../Objects/Misc/bureaucracy.rsi/pen_hop.png | Bin 0 -> 264 bytes 5 files changed, 30 insertions(+), 2 deletions(-) create mode 100644 Resources/Textures/Objects/Misc/bureaucracy.rsi/pen_cap.png create mode 100644 Resources/Textures/Objects/Misc/bureaucracy.rsi/pen_hop.png diff --git a/Resources/Prototypes/Entities/Objects/Devices/pda.yml b/Resources/Prototypes/Entities/Objects/Devices/pda.yml index 777aa6e138..3f140c5bbe 100644 --- a/Resources/Prototypes/Entities/Objects/Devices/pda.yml +++ b/Resources/Prototypes/Entities/Objects/Devices/pda.yml @@ -361,6 +361,8 @@ components: - type: PDA id: CaptainIDCard + penSlot: + startingItem: PenCap - type: Appearance visuals: - type: PDAVisualizer @@ -368,7 +370,6 @@ - type: Icon state: pda-captain - - type: entity parent: BasePDA id: HoPPDA @@ -377,6 +378,8 @@ components: - type: PDA id: HoPIDCard + penSlot: + startingItem: PenHop - type: Appearance visuals: - type: PDAVisualizer @@ -384,7 +387,6 @@ - type: Icon state: pda-hop - - type: entity parent: BasePDA id: CEPDA diff --git a/Resources/Prototypes/Entities/Objects/Misc/paper.yml b/Resources/Prototypes/Entities/Objects/Misc/paper.yml index ca2ff71027..ac588ce999 100644 --- a/Resources/Prototypes/Entities/Objects/Misc/paper.yml +++ b/Resources/Prototypes/Entities/Objects/Misc/paper.yml @@ -108,6 +108,26 @@ HeldPrefix: overpriced_pen size: 2 +- type: entity + name: captain's fountain pen + parent: Pen + id: PenCap + description: 'A luxurious fountain pen for the captain of the station.' + components: + - type: Sprite + sprite: Objects/Misc/bureaucracy.rsi + state: pen_cap + +- type: entity + name: hop's fountain pen + parent: Pen + id: PenHop + description: 'A luxurious fountain pen for the hop of the station.' + components: + - type: Sprite + sprite: Objects/Misc/bureaucracy.rsi + state: pen_hop + - type: entity id: BoxFolderBase parent: BoxBase diff --git a/Resources/Textures/Objects/Misc/bureaucracy.rsi/meta.json b/Resources/Textures/Objects/Misc/bureaucracy.rsi/meta.json index 8ec8d3b1dd..c028ff6968 100644 --- a/Resources/Textures/Objects/Misc/bureaucracy.rsi/meta.json +++ b/Resources/Textures/Objects/Misc/bureaucracy.rsi/meta.json @@ -204,6 +204,12 @@ { "name": "pen" }, + { + "name": "pen_cap" + }, + { + "name": "pen_hop" + }, { "name": "overpriced_pen" }, diff --git a/Resources/Textures/Objects/Misc/bureaucracy.rsi/pen_cap.png b/Resources/Textures/Objects/Misc/bureaucracy.rsi/pen_cap.png new file mode 100644 index 0000000000000000000000000000000000000000..a1685e050efb082f2dc43828984285e66d610fe9 GIT binary patch literal 343 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz&H|6fVg?4jBOuH;Rhv(mfq{|J z)5S5QV$R#E8@Ub{2ryjWE-4f#yc)QqLxF?q-8;R1j(^z;IUc=PSN~u^_QF2dl5owt zTUO8RemwI^SXb~Rm)$BC%wnt7m!CY^)YQ%>(Evd*2jmj}?0IwIKch{>bdjmNYSr&+J?4EGR{LpOQh1WJW ztceMmwKYhs<+_8|!T)n~rs)WaJ}vTi+aw~m{O&jVrvZ*0-y7c-txzg5RqE?dpV`WJ zHEo`M=8G0irge4?D)}#NZ29^x*n+z%s&G=7+#XweG|pFr*kfUHx3vIVCg!03(lv%>V!Z literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Misc/bureaucracy.rsi/pen_hop.png b/Resources/Textures/Objects/Misc/bureaucracy.rsi/pen_hop.png new file mode 100644 index 0000000000000000000000000000000000000000..da0a9c694c00f5073755a97797d219491474485b GIT binary patch literal 264 zcmV+j0r&oiP)Px#!bwCyR9J=W)ISQsFcin}Z^c;z$s%+v(z&N_%L$x%h=QxDHz^t2by9FE(#^R& z#B-Fh^5pqJH6VS