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

Silicon Updates - AI Cores - Holograms - Borgs - On My! #65

Open
wants to merge 105 commits into
base: master
Choose a base branch
from

Conversation

Ossa88
Copy link
Collaborator

@Ossa88 Ossa88 commented Nov 19, 2024

About The Pull Request

  • Make this description better.... So many changes/picture edits... George_Takei_Oh_My.mp3
  • New AI Core Sprites - unable to modularize
  • Remove Bad Cyborg Sprites - coded out
  • Add New Cyborg Sprites - modularized
  • Modularize robot_modules.dm
  • Sub Modularize Module Types (xxxx_borg.dm)
  • Modularize robot_upgrades.dm
  • Update clown_borg.dm
  • Update default_borg.dm
  • Update engi_borg.dm
  • Update jani_borg.dm
  • Update med_borg.dm
  • Update miner_borg.dm
  • Update peace_borg.dm
  • Add sci_borg.dm
  • Update sec_borg.dm
  • Update serv_borg.dm
  • Update synd_borg.dm
  • Add ninja_borg.dm
  • Cyborg Omnitools - Engi, Medical, Botany
  • Load new modules into Mechfabricator.
  • Load new modules into techweb.
  • Create new techweb entries.
  • create custom modules for pentest

All were taken under the following license:
image
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:

Girl - MonkeStation
Boy - MonkeStation
Yesman - MonkeStation
Boxfort - MonkeStation
Hotdog - MonkeStation
Terminal - MonkeStation
Cheese - Paradise Station
Void Donut - Paradise Station
Bee - Paradise Station
Fox - Paradise Station
Tiger - Paradise Station
Vox - Paradise Station
Liz - Paradise Station
DarkMatter - Paradise Station
Nadburn - Paradise Station
Rainbow Slime - Paradise Station
Borb - Paradise Station
Catamari - Paradise Station
RandomGod - MonkeStation
Fische - Pentest Orginal by secc.

Code_BgrwloTB6r

New AI Hologram Sprites:

Angel - Paradise Station
Borb - Paradise Station
Biggest Fan - Paradise Station
Cat Cloud - Paradise Station
Donut - Paradise Station
Frost Pheonix - Paradise Station

Code_dLnyqH780i


Remove Bad Cyborg Sprites & Add New Cyborg Sprites

Removes all of the Servbot Borg Sprites from the radial menu.
Z112D9Iwsk
Removes the Disney Wall-E Borg Sprites from the radial menu.
image
Removes the Fallout Borg Sprites from the radial menu.
image

Adds Vex's NuMeka Borg skins.
image
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.
Before: image
After: image


Updates the Cyborg Module Sprites to TG's

To be enabled at the end.
image


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:

The purpose of the modularized code is primarily to prevent updates being pushed by shiptest from causing
conflict errors in the future. Shiptest loves to use single letter variables and non descriptive defines
which make reading the code more difficult, and lead to various problems.

Along with this, the code contained here is being refactored to be much more in line with TG Station,
which will allow us to pull from TG Station, or various forks, for new updates and features without having to
recode everything from scratch.

Unfortunately, due to how many parts of the code are outdated, this is not a 1:1 copy of TG code. Eventually
it would be best to update the system to be more in line, yet that would cause a much larger refactor of code
across much more than the robot files.

- Ossa

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

dreamseeker_ysIcWFBvI0

New Stock Tools:

Removed Stock Tools:

New Upgrade Modules:

Engineering Model

image
image

New Stock Tools:

dreammaker_wO49pQvehO
3x Engineering Omni Tools

Removed Stock Tools:

Crowbar
Screwdriver
Wrench
Wirecutters
Multitool

New Upgrade Modules:

Medical Model

image
image

New Stock Tools:

7h686ycBm0
2x Medical Omni Tools

Removed Stock Tools:

Scalpel
Retractor
Hemostat
Saw
Drill
Cautery

New Upgrade Modules:

Miner Model

image
image

New Stock Tools:

Removed Stock Tools:

New Upgrade Modules:

Janitor Model

image
image

New Stock Tools:

Removed Stock Tools:

New Upgrade Modules:

Advanced Mop
Experimental Broom
High Capacity Light Replacer
Plunger

Service Borg

dreamseeker_I59WEpU8dZ
dreamseeker_tSAU0cLyMy

New Stock Tools:

Chisel (to match TG)
Rag (to match TG)
Money Bag(to match TG)
dreammaker_ANYhEvIV58
Botany Omnitool
Plant Bag
Plant Scanner

Removed Stock Tools:

New Upgrade Modules:
dreamseeker_vVA9xG1o3L

Rolling Table (Deployable Table)
https://cdn.discordapp.com/attachments/1308337313977204789/1309461992922284062/dreamseeker_g7dqOXZ6a3.gif?ex=6741ab03&is=67405983&hm=65479eec73b4bdfb62bd21f2fcdbc69b120b40357195997d1f213159e0858ce2&

Silicon Knife: (Cuts Meat and Bread)

Force set to 0

Service Apparatus: (Picks up stuff)

Food
Paper
Seeds
Fish
Reagent_Containers/Condiments
Reagent_Containers/Food (Hopefully a catch all for other food types needs testing

Condiment Synthesizer: (Makes Condiments)

BBQ Sauce
Black Pepper
Capsaicin
Coco Powder
Corn Oil
Corn Startch
Egg Yolk
Flour
Ketchup
Mayonnaise
Rice
Salt
Sugar
Soy Sauce
Vanilla

Second Glass Apparatus

Security Model

image
image

New Stock Tools:

Removed Stock Tools:

New Upgrade Modules:

Peacekeeper Model

image

New Stock Tools:

Removed Stock Tools:

New Upgrade Modules:


Science Borg

Science Borg Module

Only one sprite is enabled at this time.

dreamseeker_NRUNqQuHBE

Stock Tools:

Flash
Binoculars
Beaker
Dropper
Syringe
Welding Tool
1x Engi Omnitool
1x Medical Omnitool
Gas Analyzer
Geiger Counter
Signaler
Fire Extinguisher
Pen
Cyborg Clipboard and Paper Synthesizer
Survey Scanner
Science Apparatus - Can pick up:

Paper
Research Notes
Slime Extracts
Relics
Anomaly Cores
Mech Parts
Mech Boards
Cable Coil

Upgrade Modules:

Elite Survey Scanner


Ninja Borg

Ninja Cyborg Module. Allows the transformation into a Ninja. Current Not Printable. Admin only.
image

Stock Tools:

Weebstick
Cyborg Stun Baton
Cyborg Energy Laser
Cyborg Flash
Handcuffs
Cyborg Sec Hailer Mask
Fire Extinguisher

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:

Seperated our changes from Shiptest.
Commented out the orginal robot_modules.dm
@Ossa88 Ossa88 changed the title New AI Cores Silicon Updates - AI Cores - Holograms - Borgs - On My! Nov 20, 2024
@Ossa88
Copy link
Collaborator Author

Ossa88 commented Nov 20, 2024

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"
Copy link
Collaborator Author

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.

@Ossa88 Ossa88 added the Test Merge Required This requires Test Merging label Nov 21, 2024
@Ossa88
Copy link
Collaborator Author

Ossa88 commented Nov 22, 2024

WTF broke

@Ossa88
Copy link
Collaborator Author

Ossa88 commented Nov 22, 2024

Notes to self:

[x] Create Botany Omni Tool
[x] Make Botany Tools stock?

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.
Copy link
Contributor

This pull request has conflicts, please resolve those before we can evaluate the pull request.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant