-
-
Notifications
You must be signed in to change notification settings - Fork 21
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
Silicon Updates - AI Cores - Holograms - Borgs - On My! #65
base: master
Are you sure you want to change the base?
Conversation
Seperated our changes from Shiptest. Commented out the orginal robot_modules.dm
Some parts of this are still in work... The NuMeka sprites are significantly more advanced than ship tests.... So currently I am unsure if their custom open cover sprites are working (odds are no) along with the fact that these have custom wrecks... another thing that is untested at the moment. A odd bug was noted that I believe is shiptest wide... All Borgs have their lights on by default, regardless of their flashlight status... meaning their _l varient is always active... need someone to assist in determining a fix. |
/obj/item/borg/upgrade/condiment_synthesizer | ||
name = "Service Cyborg Condiment Synthesiser" | ||
desc = "An upgrade to the service model cyborg, allowing it to produce solid condiments." | ||
icon_state = "cyborg_upgrade3" |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
FYI this is just a temp place holder until the _robot_upgrades.dm is finished... Will be swapped with the other icon state at that time.
WTF broke |
Notes to self: [x] Create Botany Omni Tool |
Because the sprites have gender speific open panel sprites and splitting them is the easist way for the game to grab the correct version.
robots/code/... icons moved from modularbase into robots. Debug_items updated with proc information for omnitool... Seems it was partically copied from TG but never finished.
Removed the service botany upgrade... its stock in the frontier.
This pull request has conflicts, please resolve those before we can evaluate the pull request. |
About The Pull Request
All were taken under the following license:
![image](https://private-user-images.githubusercontent.com/8151625/387540144-427e3874-a510-47f3-ba55-9188b87d6a6a.png?jwt=eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJpc3MiOiJnaXRodWIuY29tIiwiYXVkIjoicmF3LmdpdGh1YnVzZXJjb250ZW50LmNvbSIsImtleSI6ImtleTUiLCJleHAiOjE3Mzk2ODgzMTEsIm5iZiI6MTczOTY4ODAxMSwicGF0aCI6Ii84MTUxNjI1LzM4NzU0MDE0NC00MjdlMzg3NC1hNTEwLTQ3ZjMtYmE1NS05MTg4Yjg3ZDZhNmEucG5nP1gtQW16LUFsZ29yaXRobT1BV1M0LUhNQUMtU0hBMjU2JlgtQW16LUNyZWRlbnRpYWw9QUtJQVZDT0RZTFNBNTNQUUs0WkElMkYyMDI1MDIxNiUyRnVzLWVhc3QtMSUyRnMzJTJGYXdzNF9yZXF1ZXN0JlgtQW16LURhdGU9MjAyNTAyMTZUMDY0MDExWiZYLUFtei1FeHBpcmVzPTMwMCZYLUFtei1TaWduYXR1cmU9ZjA5NmQ2NjZmZDEwNTVmYTEyYmUwNTI2YjM5YWUwYmQ5ZmI2ZGM1ZWJhYzc4YTY4YWM2NDFiYjc0NzRjYTdhYSZYLUFtei1TaWduZWRIZWFkZXJzPWhvc3QifQ.u8SOmvn2r_Tc4KlnPXuZiE4jWMSVuv_FHlCsI5omvkQ)
All non-code assets, including icons and sound files, are licensed under the Creative Commons 3.0 BY-SA license, unless otherwise specified within the folder or file.
AI Stuff
New AI Core Sprites:
New AI Hologram Sprites:
Remove Bad Cyborg Sprites & Add New Cyborg Sprites
Removes all of the Servbot Borg Sprites from the radial menu.
![Z112D9Iwsk](https://private-user-images.githubusercontent.com/8151625/389182866-4bd87eee-2242-4840-ab83-a35e248655f0.png?jwt=eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJpc3MiOiJnaXRodWIuY29tIiwiYXVkIjoicmF3LmdpdGh1YnVzZXJjb250ZW50LmNvbSIsImtleSI6ImtleTUiLCJleHAiOjE3Mzk2ODgzMTEsIm5iZiI6MTczOTY4ODAxMSwicGF0aCI6Ii84MTUxNjI1LzM4OTE4Mjg2Ni00YmQ4N2VlZS0yMjQyLTQ4NDAtYWI4My1hMzVlMjQ4NjU1ZjAucG5nP1gtQW16LUFsZ29yaXRobT1BV1M0LUhNQUMtU0hBMjU2JlgtQW16LUNyZWRlbnRpYWw9QUtJQVZDT0RZTFNBNTNQUUs0WkElMkYyMDI1MDIxNiUyRnVzLWVhc3QtMSUyRnMzJTJGYXdzNF9yZXF1ZXN0JlgtQW16LURhdGU9MjAyNTAyMTZUMDY0MDExWiZYLUFtei1FeHBpcmVzPTMwMCZYLUFtei1TaWduYXR1cmU9MjJmNjA3NmQzNjBjMmY1N2IwNzkxNDY2M2FmMTM5Mjk0YmUxNGUwNDQ3YzRhZGE5ZWJhODIwMWFhNDIyN2UwZCZYLUFtei1TaWduZWRIZWFkZXJzPWhvc3QifQ.wpRHoKCI-FCtHMytb4ajbSd6IU9yDRHd1Dbq_f37VK0)
![image](https://private-user-images.githubusercontent.com/8151625/389182885-f0bcd5ac-95f2-45e9-b26d-1d9a482f9a65.png?jwt=eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJpc3MiOiJnaXRodWIuY29tIiwiYXVkIjoicmF3LmdpdGh1YnVzZXJjb250ZW50LmNvbSIsImtleSI6ImtleTUiLCJleHAiOjE3Mzk2ODgzMTEsIm5iZiI6MTczOTY4ODAxMSwicGF0aCI6Ii84MTUxNjI1LzM4OTE4Mjg4NS1mMGJjZDVhYy05NWYyLTQ1ZTktYjI2ZC0xZDlhNDgyZjlhNjUucG5nP1gtQW16LUFsZ29yaXRobT1BV1M0LUhNQUMtU0hBMjU2JlgtQW16LUNyZWRlbnRpYWw9QUtJQVZDT0RZTFNBNTNQUUs0WkElMkYyMDI1MDIxNiUyRnVzLWVhc3QtMSUyRnMzJTJGYXdzNF9yZXF1ZXN0JlgtQW16LURhdGU9MjAyNTAyMTZUMDY0MDExWiZYLUFtei1FeHBpcmVzPTMwMCZYLUFtei1TaWduYXR1cmU9YTE0M2Y0ZjBhOTU2YTVjNWE2Nzg1ZmZhY2ZlMTdiMDRjNGFjZDY1ZDQxZmEzZTMxYzA2YzQ2MDExYjVhMzNmYSZYLUFtei1TaWduZWRIZWFkZXJzPWhvc3QifQ.O5dMgsjd_5RqH-CZtotPhBdsBZrWD08WtmOhQ-0G4XM)
![image](https://private-user-images.githubusercontent.com/8151625/389182915-bb81726d-9e18-4b24-af22-546df197587c.png?jwt=eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJpc3MiOiJnaXRodWIuY29tIiwiYXVkIjoicmF3LmdpdGh1YnVzZXJjb250ZW50LmNvbSIsImtleSI6ImtleTUiLCJleHAiOjE3Mzk2ODgzMTEsIm5iZiI6MTczOTY4ODAxMSwicGF0aCI6Ii84MTUxNjI1LzM4OTE4MjkxNS1iYjgxNzI2ZC05ZTE4LTRiMjQtYWYyMi01NDZkZjE5NzU4N2MucG5nP1gtQW16LUFsZ29yaXRobT1BV1M0LUhNQUMtU0hBMjU2JlgtQW16LUNyZWRlbnRpYWw9QUtJQVZDT0RZTFNBNTNQUUs0WkElMkYyMDI1MDIxNiUyRnVzLWVhc3QtMSUyRnMzJTJGYXdzNF9yZXF1ZXN0JlgtQW16LURhdGU9MjAyNTAyMTZUMDY0MDExWiZYLUFtei1FeHBpcmVzPTMwMCZYLUFtei1TaWduYXR1cmU9YzdhY2U2MTFkMDM1MDkwZjY3N2ZkNTI0NWYzOGYyODMwYWZiZTU3MDZjY2NmYWU5N2RmODJiODI5YjRhYmVmZiZYLUFtei1TaWduZWRIZWFkZXJzPWhvc3QifQ.CL486HUwjZijw-xcSLr-pdUkWsp4jEPU5dyoilRQC9c)
Removes the Disney Wall-E Borg Sprites from the radial menu.
Removes the Fallout Borg Sprites from the radial menu.
Adds Vex's NuMeka Borg skins.
![image](https://private-user-images.githubusercontent.com/8151625/389183009-2482857c-7241-49da-b9b5-87b7a8b14939.png?jwt=eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJpc3MiOiJnaXRodWIuY29tIiwiYXVkIjoicmF3LmdpdGh1YnVzZXJjb250ZW50LmNvbSIsImtleSI6ImtleTUiLCJleHAiOjE3Mzk2ODgzMTEsIm5iZiI6MTczOTY4ODAxMSwicGF0aCI6Ii84MTUxNjI1LzM4OTE4MzAwOS0yNDgyODU3Yy03MjQxLTQ5ZGEtYjliNS04N2I3YThiMTQ5MzkucG5nP1gtQW16LUFsZ29yaXRobT1BV1M0LUhNQUMtU0hBMjU2JlgtQW16LUNyZWRlbnRpYWw9QUtJQVZDT0RZTFNBNTNQUUs0WkElMkYyMDI1MDIxNiUyRnVzLWVhc3QtMSUyRnMzJTJGYXdzNF9yZXF1ZXN0JlgtQW16LURhdGU9MjAyNTAyMTZUMDY0MDExWiZYLUFtei1FeHBpcmVzPTMwMCZYLUFtei1TaWduYXR1cmU9YzAxZTI0YjBkZDhjM2Y0ZDc5NzdlZGVhYzNhZDY1MWE2ZDQ0OTFmMGQ4YWFhZmQ0ZjAzM2U3MjlkZjU3NGFjZSZYLUFtei1TaWduZWRIZWFkZXJzPWhvc3QifQ.kU-P3IJgHAALWZpStbmw98XPta7hao5OT2l0yENi_80)
Enabled already existing Peacekeeper Borg Sprites
Fixes Shiptest Error where the "Qualified Doctor" did not properly show up on the Medical Borg Module Selector due to a typo.![image](https://private-user-images.githubusercontent.com/8151625/388103627-e11d2eb2-3c31-4b28-8c00-78ca1b9deaee.png?jwt=eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJpc3MiOiJnaXRodWIuY29tIiwiYXVkIjoicmF3LmdpdGh1YnVzZXJjb250ZW50LmNvbSIsImtleSI6ImtleTUiLCJleHAiOjE3Mzk2ODgzMTEsIm5iZiI6MTczOTY4ODAxMSwicGF0aCI6Ii84MTUxNjI1LzM4ODEwMzYyNy1lMTFkMmViMi0zYzMxLTRiMjgtOGMwMC03OGNhMWI5ZGVhZWUucG5nP1gtQW16LUFsZ29yaXRobT1BV1M0LUhNQUMtU0hBMjU2JlgtQW16LUNyZWRlbnRpYWw9QUtJQVZDT0RZTFNBNTNQUUs0WkElMkYyMDI1MDIxNiUyRnVzLWVhc3QtMSUyRnMzJTJGYXdzNF9yZXF1ZXN0JlgtQW16LURhdGU9MjAyNTAyMTZUMDY0MDExWiZYLUFtei1FeHBpcmVzPTMwMCZYLUFtei1TaWduYXR1cmU9OWMyY2Y4NzRiZDNjNmFiZTY2ODBmNjVmNDZiMDQzODEzMzY2YjQ0OWRmNzllZjE2MDNmM2U5MzY4NWU0NmEzMCZYLUFtei1TaWduZWRIZWFkZXJzPWhvc3QifQ.CuwQPb3zxRvYMHGdvYkx4w52QJj0SUdtekKX5_5rti4)
![image](https://private-user-images.githubusercontent.com/8151625/388105619-7b814c5c-36e9-454c-91da-b8861ea3e4c2.png?jwt=eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJpc3MiOiJnaXRodWIuY29tIiwiYXVkIjoicmF3LmdpdGh1YnVzZXJjb250ZW50LmNvbSIsImtleSI6ImtleTUiLCJleHAiOjE3Mzk2ODgzMTEsIm5iZiI6MTczOTY4ODAxMSwicGF0aCI6Ii84MTUxNjI1LzM4ODEwNTYxOS03YjgxNGM1Yy0zNmU5LTQ1NGMtOTFkYS1iODg2MWVhM2U0YzIucG5nP1gtQW16LUFsZ29yaXRobT1BV1M0LUhNQUMtU0hBMjU2JlgtQW16LUNyZWRlbnRpYWw9QUtJQVZDT0RZTFNBNTNQUUs0WkElMkYyMDI1MDIxNiUyRnVzLWVhc3QtMSUyRnMzJTJGYXdzNF9yZXF1ZXN0JlgtQW16LURhdGU9MjAyNTAyMTZUMDY0MDExWiZYLUFtei1FeHBpcmVzPTMwMCZYLUFtei1TaWduYXR1cmU9NmQ4YzA4MmU5OWM0ZDRlYjEyMGI3Y2I1ZWYxYmRhZDQzYzBkY2Y5YWY2ZGFlYjE2Nzc0NjhkOTA3ZDlkYjhlZiZYLUFtei1TaWduZWRIZWFkZXJzPWhvc3QifQ.gS5OpzT_hIX0xP1IbF_f6tkKARkbcdFETdHmoUCKzGo)
Before:
After:
Updates the Cyborg Module Sprites to TG's
To be enabled at the end.
![image](https://private-user-images.githubusercontent.com/8151625/388514261-8eea083f-a032-4e85-8252-0bf1b6254465.png?jwt=eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJpc3MiOiJnaXRodWIuY29tIiwiYXVkIjoicmF3LmdpdGh1YnVzZXJjb250ZW50LmNvbSIsImtleSI6ImtleTUiLCJleHAiOjE3Mzk2ODgzMTEsIm5iZiI6MTczOTY4ODAxMSwicGF0aCI6Ii84MTUxNjI1LzM4ODUxNDI2MS04ZWVhMDgzZi1hMDMyLTRlODUtODI1Mi0wYmYxYjYyNTQ0NjUucG5nP1gtQW16LUFsZ29yaXRobT1BV1M0LUhNQUMtU0hBMjU2JlgtQW16LUNyZWRlbnRpYWw9QUtJQVZDT0RZTFNBNTNQUUs0WkElMkYyMDI1MDIxNiUyRnVzLWVhc3QtMSUyRnMzJTJGYXdzNF9yZXF1ZXN0JlgtQW16LURhdGU9MjAyNTAyMTZUMDY0MDExWiZYLUFtei1FeHBpcmVzPTMwMCZYLUFtei1TaWduYXR1cmU9NDk1Y2FiNDZjZjFjZDk1YmVkNjc1NDc2YzY4NGUyYzk5Y2RkNzdkZmZlMGVlMTZlOTY2MjNhYWRjNTVkM2MyZiZYLUFtei1TaWduZWRIZWFkZXJzPWhvc3QifQ.NAQSl8SNg6m4RCJydjzP_zZcTP-JHfIyQCSe4ziqwBI)
Modularize robot_modules.dm
robot_modules.dm is the primary file for cyborg. It controls the list of what cyborgs are available, their toolsets, and what sprite they are allowed to use.
Purpose of modularization:
Creates:
_robot_modules.dm
clown_borg.dm
default_borg.dm
engi_borg.dm
jani_borg.dm
med_borg.dm
miner_borg.dm
peace_borg.dm
sec_borg.dm
serv_borg.dm
synd_borg.dm
All files have been created and are currently functional.
Modularize robot_upgrades.dm
robot_upgrades.dm is the primary file for cyborg addon upgrades. It controls the list of various modular upgrades that can be added to a cyborg. Such as ion thrusters, self repair, expanded hypospray.
Creates:
_robot_upgrades.dm
File has been created, and is currently functional
All current modules have been moved into the sub types.
Standard Model
New Stock Tools:
Removed Stock Tools:
New Upgrade Modules:
Engineering Model
New Stock Tools:
Removed Stock Tools:
New Upgrade Modules:
Medical Model
New Stock Tools:
Removed Stock Tools:
New Upgrade Modules:
Miner Model
New Stock Tools:
Removed Stock Tools:
New Upgrade Modules:
Janitor Model
New Stock Tools:
Removed Stock Tools:
New Upgrade Modules:
Service Borg
New Stock Tools:
Removed Stock Tools:
New Upgrade Modules:
![dreamseeker_vVA9xG1o3L](https://private-user-images.githubusercontent.com/8151625/388928569-2aa674ab-c2c5-43b7-a2ab-c23e251775e4.png?jwt=eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJpc3MiOiJnaXRodWIuY29tIiwiYXVkIjoicmF3LmdpdGh1YnVzZXJjb250ZW50LmNvbSIsImtleSI6ImtleTUiLCJleHAiOjE3Mzk2ODgzMTEsIm5iZiI6MTczOTY4ODAxMSwicGF0aCI6Ii84MTUxNjI1LzM4ODkyODU2OS0yYWE2NzRhYi1jMmM1LTQzYjctYTJhYi1jMjNlMjUxNzc1ZTQucG5nP1gtQW16LUFsZ29yaXRobT1BV1M0LUhNQUMtU0hBMjU2JlgtQW16LUNyZWRlbnRpYWw9QUtJQVZDT0RZTFNBNTNQUUs0WkElMkYyMDI1MDIxNiUyRnVzLWVhc3QtMSUyRnMzJTJGYXdzNF9yZXF1ZXN0JlgtQW16LURhdGU9MjAyNTAyMTZUMDY0MDExWiZYLUFtei1FeHBpcmVzPTMwMCZYLUFtei1TaWduYXR1cmU9ZjU4ZmI2ODI3OGY3OTRjM2JlN2UwYWEzZjk0OWUzMjg1MzlmN2UwNzJjZDQxMDJmMjU4ZDI3Y2Q5ZjdiMDczZiZYLUFtei1TaWduZWRIZWFkZXJzPWhvc3QifQ.0h6ajpmBVre8F0m33qc04D0IsufAP0nH_2R-tvOb07Y)
Security Model
New Stock Tools:
Removed Stock Tools:
New Upgrade Modules:
Peacekeeper Model
New Stock Tools:
Removed Stock Tools:
New Upgrade Modules:
Science Borg
Science Borg Module
Only one sprite is enabled at this time.
Stock Tools:
Upgrade Modules:
Ninja Borg
Ninja Cyborg Module. Allows the transformation into a Ninja. Current Not Printable. Admin only.
![image](https://private-user-images.githubusercontent.com/8151625/388100820-28db4881-4447-4f76-8901-c6f94d4398e4.png?jwt=eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJpc3MiOiJnaXRodWIuY29tIiwiYXVkIjoicmF3LmdpdGh1YnVzZXJjb250ZW50LmNvbSIsImtleSI6ImtleTUiLCJleHAiOjE3Mzk2ODgzMTEsIm5iZiI6MTczOTY4ODAxMSwicGF0aCI6Ii84MTUxNjI1LzM4ODEwMDgyMC0yOGRiNDg4MS00NDQ3LTRmNzYtODkwMS1jNmY5NGQ0Mzk4ZTQucG5nP1gtQW16LUFsZ29yaXRobT1BV1M0LUhNQUMtU0hBMjU2JlgtQW16LUNyZWRlbnRpYWw9QUtJQVZDT0RZTFNBNTNQUUs0WkElMkYyMDI1MDIxNiUyRnVzLWVhc3QtMSUyRnMzJTJGYXdzNF9yZXF1ZXN0JlgtQW16LURhdGU9MjAyNTAyMTZUMDY0MDExWiZYLUFtei1FeHBpcmVzPTMwMCZYLUFtei1TaWduYXR1cmU9NzRlMTgxYmQzODUxNjg0MGMzNDdkMTU1YzJjYmU0Y2FiMjcwMGYyZGM4YWVhMmU3ZmNkYWIyZTM1NjhkOGJmOSZYLUFtei1TaWduZWRIZWFkZXJzPWhvc3QifQ.Mvf22CoZfzQYFVXBbMxA3-cD3Y5UD0f66DpYMl6JrfI)
Stock Tools:
Why It's Good For The Game
More variety for AI core sprites.
More variety for Borg Sprites.
More Tools
More Modules
Clear code
Ninja.
Changelog
🆑
add: New AI Core Sprites
add: New AI Hologram Sprites
add: NuMeka Borg Sprites
del: Servbot Borg Sprites
del: Wall-E, Wall-A, EVE, Fallout Borg Sprites.
add: Medical Omnitools
add: Engineering Omnitools
add: Service Cyborg Botany Tools
add: Service Cyborg Condiment Synthesizer
add: Service Cyborg Silicon Knife
add: Service Cyborg Service Apparatus
add: Science Cyborg
add: Science Cyborg Scanner Upgrade
add: Ninja Cyborg
/:cl: