From 5c2b3eceb8b8fda38a3436a8379abb4ea3c037b5 Mon Sep 17 00:00:00 2001 From: aada Date: Sun, 5 Jan 2025 01:37:03 -0600 Subject: [PATCH 1/4] migrate --- .../Specific/Robotics/borg_modules.yml | 37 ------------------ .../Specific/Robotics/Borg/borg_modules.yml | 38 ++++++++++++++++++- Resources/Prototypes/borg_types.yml | 3 +- 3 files changed, 39 insertions(+), 39 deletions(-) diff --git a/Resources/Prototypes/Entities/Objects/Specific/Robotics/borg_modules.yml b/Resources/Prototypes/Entities/Objects/Specific/Robotics/borg_modules.yml index 7fabb92bf1bc02..c9f12a1583b1cf 100644 --- a/Resources/Prototypes/Entities/Objects/Specific/Robotics/borg_modules.yml +++ b/Resources/Prototypes/Entities/Objects/Specific/Robotics/borg_modules.yml @@ -462,25 +462,6 @@ icon: { sprite: Interface/Actions/actions_borg.rsi, state: anomaly-module } # service modules -- type: entity - id: BorgModuleBartender - parent: [ BaseBorgModuleService, BaseProviderBorgModule ] - name: bartender cyborg module - components: - - type: Sprite - layers: - - state: service - - state: icon-beer - - type: ItemBorgModule - items: - - Lighter - - DrinkShaker - - BarSpoon - - BorgIceBucket - - Pitcher - - BorgDropper - -# depreciated. included in case of merge errors - type: entity id: BorgModuleService parent: [ BaseBorgModuleService, BaseProviderBorgModule ] @@ -570,24 +551,6 @@ - type: BorgModuleIcon icon: { sprite: Interface/Actions/actions_borg.rsi, state: clowning-module } -- type: entity - id: BorgModulePaper - parent: [ BaseBorgModuleService, BaseProviderBorgModule ] - name: bureaucracy cyborg module - components: - - type: Sprite - layers: - - state: service - - state: icon-pen - - type: ItemBorgModule - items: - - Pen - - BooksBag - - HandLabeler - - RubberStampApproved - - RubberStampDenied - - RubberStampBorg - #syndicate modules - type: entity id: BorgModuleSyndicateWeapon diff --git a/Resources/Prototypes/_Impstation/Entities/Objects/Specific/Robotics/Borg/borg_modules.yml b/Resources/Prototypes/_Impstation/Entities/Objects/Specific/Robotics/Borg/borg_modules.yml index 8b1e8c23af6367..b708b9518cfc16 100644 --- a/Resources/Prototypes/_Impstation/Entities/Objects/Specific/Robotics/Borg/borg_modules.yml +++ b/Resources/Prototypes/_Impstation/Entities/Objects/Specific/Robotics/Borg/borg_modules.yml @@ -37,7 +37,7 @@ - type: Tag tags: - BorgModuleTckTck - + - type: entity id: BorgModuleTckTckGun parent: [ BaseBorgModule, BaseProviderBorgModule, DecapoidEmpireContraband ] @@ -73,3 +73,39 @@ - Pen - type: BorgModuleIcon icon: { sprite: Interface/Actions/actions_borg.rsi, state: service-module } + +- type: entity + id: BorgModulePaper + parent: [ BaseBorgModuleService, BaseProviderBorgModule ] + name: bureaucracy cyborg module + components: + - type: Sprite + layers: + - state: service + - state: icon-pen + - type: ItemBorgModule + items: + - Pen + - BooksBag + - HandLabeler + - RubberStampApproved + - RubberStampDenied + - RubberStampBorg + +- type: entity + id: BorgModuleBartender + parent: [ BaseBorgModuleService, BaseProviderBorgModule ] + name: bartender cyborg module + components: + - type: Sprite + layers: + - state: service + - state: icon-beer + - type: ItemBorgModule + items: + - Lighter + - DrinkShaker + - BarSpoon + - BorgIceBucket + - Pitcher + - BorgDropper diff --git a/Resources/Prototypes/borg_types.yml b/Resources/Prototypes/borg_types.yml index 251b916a432ddb..7e2909959eebab 100644 --- a/Resources/Prototypes/borg_types.yml +++ b/Resources/Prototypes/borg_types.yml @@ -202,7 +202,8 @@ defaultModules: - BorgModuleMusique - - BorgModuleService + - BorgModuleBartender # imp + - BorgModulePaper # imp - BorgModuleClowning radioChannels: From db4e35ca75cbaacd0feee89d0f463b1c8ebd547b Mon Sep 17 00:00:00 2001 From: aada Date: Sun, 5 Jan 2025 01:53:10 -0600 Subject: [PATCH 2/4] parity with upstream files --- .../Entities/Structures/Machines/lathe.yml | 2 -- .../Prototypes/Recipes/Lathes/robotics.yml | 20 ------------------- .../Specific/Robotics/Borg/borg_modules.yml | 4 ++++ 3 files changed, 4 insertions(+), 22 deletions(-) diff --git a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml index 8a19c481f32f30..f03542496b33a2 100644 --- a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml +++ b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml @@ -594,8 +594,6 @@ - BorgModuleFireExtinguisher - BorgModuleRadiationDetection - BorgModuleTool - - BorgModuleBartender - - BorgModulePaper - BorgModuleArtistic #imp special - CyborgEndoskeleton - LeftArmBorg diff --git a/Resources/Prototypes/Recipes/Lathes/robotics.yml b/Resources/Prototypes/Recipes/Lathes/robotics.yml index bedc0f0b1994b1..a4413e01ebee11 100644 --- a/Resources/Prototypes/Recipes/Lathes/robotics.yml +++ b/Resources/Prototypes/Recipes/Lathes/robotics.yml @@ -186,16 +186,6 @@ # Service Modules -- type: latheRecipe - parent: BaseBorgModuleRecipe - id: BorgModuleBartender - result: BorgModuleBartender - -- type: latheRecipe - parent: BaseBorgModuleRecipe - id: BorgModuleMusique - result: BorgModuleMusique - - type: latheRecipe parent: BaseBorgModuleRecipe id: BorgModuleGardening @@ -205,13 +195,3 @@ parent: BaseBorgModuleRecipe id: BorgModuleHarvesting result: BorgModuleHarvesting - -- type: latheRecipe - parent: BaseBorgModuleRecipe - id: BorgModuleClowning - result: BorgModuleClowning - -- type: latheRecipe - parent: BaseBorgModuleRecipe - id: BorgModulePaper - result: BorgModulePaper diff --git a/Resources/Prototypes/_Impstation/Entities/Objects/Specific/Robotics/Borg/borg_modules.yml b/Resources/Prototypes/_Impstation/Entities/Objects/Specific/Robotics/Borg/borg_modules.yml index b708b9518cfc16..ff3281714794d0 100644 --- a/Resources/Prototypes/_Impstation/Entities/Objects/Specific/Robotics/Borg/borg_modules.yml +++ b/Resources/Prototypes/_Impstation/Entities/Objects/Specific/Robotics/Borg/borg_modules.yml @@ -91,6 +91,8 @@ - RubberStampApproved - RubberStampDenied - RubberStampBorg + - type: BorgModuleIcon + icon: { sprite: Interface/Actions/actions_borg.rsi, state: service-module } - type: entity id: BorgModuleBartender @@ -109,3 +111,5 @@ - BorgIceBucket - Pitcher - BorgDropper + - type: BorgModuleIcon + icon: { sprite: Interface/Actions/actions_borg.rsi, state: service-module } From 5af7d449b6310e15753e0fa63f6410327fb8eea8 Mon Sep 17 00:00:00 2001 From: aada Date: Sun, 5 Jan 2025 17:58:17 -0600 Subject: [PATCH 3/4] new .rsi --- .../Specific/Robotics/Borg/borg_modules.yml | 6 +++--- .../actions_borg.rsi/artistic-module.png | Bin 0 -> 525 bytes .../actions_borg.rsi/bartender-module.png | Bin 0 -> 760 bytes .../actions_borg.rsi/bureaucracy-module.png | Bin 0 -> 541 bytes .../Actions/actions_borg.rsi/meta.json | 20 ++++++++++++++++++ 5 files changed, 23 insertions(+), 3 deletions(-) create mode 100644 Resources/Textures/_Impstation/Interface/Actions/actions_borg.rsi/artistic-module.png create mode 100644 Resources/Textures/_Impstation/Interface/Actions/actions_borg.rsi/bartender-module.png create mode 100644 Resources/Textures/_Impstation/Interface/Actions/actions_borg.rsi/bureaucracy-module.png create mode 100644 Resources/Textures/_Impstation/Interface/Actions/actions_borg.rsi/meta.json diff --git a/Resources/Prototypes/_Impstation/Entities/Objects/Specific/Robotics/Borg/borg_modules.yml b/Resources/Prototypes/_Impstation/Entities/Objects/Specific/Robotics/Borg/borg_modules.yml index ff3281714794d0..8a3d1c1b20c7ad 100644 --- a/Resources/Prototypes/_Impstation/Entities/Objects/Specific/Robotics/Borg/borg_modules.yml +++ b/Resources/Prototypes/_Impstation/Entities/Objects/Specific/Robotics/Borg/borg_modules.yml @@ -72,7 +72,7 @@ - SprayPainter - Pen - type: BorgModuleIcon - icon: { sprite: Interface/Actions/actions_borg.rsi, state: service-module } + icon: { sprite: _Impstation/Interface/Actions/actions_borg.rsi, state: artistic-module } - type: entity id: BorgModulePaper @@ -92,7 +92,7 @@ - RubberStampDenied - RubberStampBorg - type: BorgModuleIcon - icon: { sprite: Interface/Actions/actions_borg.rsi, state: service-module } + icon: { sprite: _Impstation/Interface/Actions/actions_borg.rsi, state: bureaucracy-module } - type: entity id: BorgModuleBartender @@ -112,4 +112,4 @@ - Pitcher - BorgDropper - type: BorgModuleIcon - icon: { sprite: Interface/Actions/actions_borg.rsi, state: service-module } + icon: { sprite: _Impstation/Interface/Actions/actions_borg.rsi, state: bartender-module } diff --git a/Resources/Textures/_Impstation/Interface/Actions/actions_borg.rsi/artistic-module.png b/Resources/Textures/_Impstation/Interface/Actions/actions_borg.rsi/artistic-module.png new file mode 100644 index 0000000000000000000000000000000000000000..8107147d4cfe2af6fcae3bc4379d025fafe4937d GIT binary patch literal 525 zcmV+o0`mQdP)Dz233fEaXCSw$=s^9>+Bmu7Qc_wRsh+lYv70Jd#+-CsQ&FbsomIP4pMVHkgV-$@5j zsg!5oQmN$h^X!0SS)Kt}J+9?IBogrq(CTrw9C-e)(cyq;nw|l!av4r5y7nH5D_N6KS4w&7K?}o>2%uZ(aV93JfO9P z#3beHCjb`14~YL>_x$$m+T7Rh^BAR6_dEbVt-^RA%gp>PNS%YHhy3{9eGgn!Jx{^c z-PepSS%e62vK1xyX2>7KfB74h-+}pgn7Y+u@9i@(>qq`TTngaI120x!XWi;vY) zmJ^fLQ}mLEavK%iw-)-GnEFmct9~V=`%HM51Lq%zK=s@21aJ$kX7}|6);8`|0TO%Z P00000NkvXXu0mjfxu)+U literal 0 HcmV?d00001 diff --git a/Resources/Textures/_Impstation/Interface/Actions/actions_borg.rsi/bartender-module.png b/Resources/Textures/_Impstation/Interface/Actions/actions_borg.rsi/bartender-module.png new file mode 100644 index 0000000000000000000000000000000000000000..e63a2a660103c188db3f7e184d190bf185e583d5 GIT binary patch literal 760 zcmV6I56}LfIOlyM4Kr|u5WSWrj=Ro2?&xVAP96fkZVnSjf3F;6MuDfVFc=IA> zO}u~{7Pwg^H4a0-}E^XiT?fZM5e&5#?{&k)B^FUSA zU&m2Y(=@xTy;Cl(XGLw*WA7 z!x5JhiQGmGNs+9aS_l}r!C2QlPXmT-U>c^2z-q$U-sGWY-hT2V5DW(oOcH{E{}rn2xS_rTP7Ov_eDQ&c z#s%c4OsP<^&q<2J%f;6;Uv7f@cYg*dfg#mxfUE3E*$?RBr12dWwY zF(YCY4R(wjyZeX|p;Rcbt#4x*CSoQ?Ubj}mt~qP|FZTK);vNHG!9}2~G65kh5F!Lv z!~nWiT5F?Gbr$F*X3?|>lt({c6EJntzFyQtgmVFQ^Si!gh9?2}N`#LKX-Mw{)7G1i zEoklxJFf3J-NU=4CG@rY(R>e-yNh%+dghzDNk^^&>Ab{}^q%C8By2$H+Ry66J>)Xb zcebyl#QCjx*o4&3-Z(j`w_$Q4No+mFa?7$K9$SwA*m1udSIT7|H6)TE4LD~&${rAh q?6^_~5l~h2*nUjP`s=@D|MeTgTpaPCAHN>}0000~uVC+e(29#2+i5mt0c&x>0fW}eR^rnH6db|dDbWh+; z1oEGAeG9%{+Vf8cLqI$dOw=Ykqp?a zs;z1`0(xPD2U?QF%p8tcqO#H$9D&ZtbJ{d#%`;}xGbG-99~=Sa=LnYZ183tK&z~;v zwOn$??07biflvf$A7OGeLB$m86nB|T&$uK$)IYJ7dE2*e=sj>y1ij#38K*7@fW^@{ z%7XjM>nF12_SyukKV20KYb&LM1BOMlmmO1 fboAGsX7{=ThhpMfcC4L500000NkvXXu0mjfYwrI; literal 0 HcmV?d00001 diff --git a/Resources/Textures/_Impstation/Interface/Actions/actions_borg.rsi/meta.json b/Resources/Textures/_Impstation/Interface/Actions/actions_borg.rsi/meta.json new file mode 100644 index 00000000000000..07329e437007fb --- /dev/null +++ b/Resources/Textures/_Impstation/Interface/Actions/actions_borg.rsi/meta.json @@ -0,0 +1,20 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "artistic bartender and bureaucracy by iaada(github)", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "artistic-module" + }, + { + "name": "bartender-module" + }, + { + "name": "bureaucracy-module" + } + ] +} From 2b4a11ede7ce757f4e2a886c1bb4b78cdf6ebf60 Mon Sep 17 00:00:00 2001 From: aada Date: Sun, 5 Jan 2025 18:09:15 -0600 Subject: [PATCH 4/4] +1 --- Resources/Prototypes/borg_types.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Prototypes/borg_types.yml b/Resources/Prototypes/borg_types.yml index 7e2909959eebab..c8edd924d3b717 100644 --- a/Resources/Prototypes/borg_types.yml +++ b/Resources/Prototypes/borg_types.yml @@ -194,7 +194,7 @@ dummyPrototype: BorgChassisService # Functional - extraModuleCount: 3 + extraModuleCount: 4 moduleWhitelist: tags: - BorgModuleGeneric