[Species] InterPersonal Conflict #97

Pspritechologist · 2023-04-20T05:10:49Z

Description

Adds IPCs!
Everyone's favourite Positronic species finally available to be played in Space Station 14!

TODO

Ready to merge?

Changelog

🆑

add: Added IPC to the game as a new species! Your favourite robot people are finally around to suffer like the rest of us. Be sure to stop by Engineering for a charge!

github-actions · 2023-04-20T05:11:41Z

RSI Diff Bot; head commit 73acebc merging into 3d86d8f
This PR makes changes to 1 or more RSIs. Here is a summary of all changes:

Resources/Textures/SimpleStation14/Interface/Alerts/charge.rsi

State	Old	New	Status
charge-empty			Added
charge0			Added
charge1			Added
charge2			Added
charge3			Added
charge4			Added

Resources/Textures/SimpleStation14/Mobs/Customization/ipc_antenna.rsi

State	Old	New	Status
ipc_antenna_antlers			Added
ipc_antenna_crowned			Added
ipc_antenna_cyberhead			Added
ipc_antenna_droneeyes			Added
ipc_antenna_light			Added
ipc_antenna_lightb			Added
ipc_antenna_sidelights			Added
ipc_antenna_tesla			Added
ipc_antenna_towers			Added
ipc_antenna_tv			Added

Resources/Textures/SimpleStation14/Mobs/Customization/ipc_screens.rsi

State	Old	New	Status
ipc_screen_blank			Added
ipc_screen_blue			Added
ipc_screen_breakout			Added
ipc_screen_bsod			Added
ipc_screen_console			Added
ipc_screen_ecgwave			Added
ipc_screen_eight			Added
ipc_screen_exclaim			Added
ipc_screen_eyes			Added
ipc_screen_eyesangry			Added
ipc_screen_eyestall			Added
ipc_screen_frown			Added
ipc_screen_glider			Added
ipc_screen_goggles			Added
ipc_screen_heart			Added
ipc_screen_l			Added
ipc_screen_loading			Added
ipc_screen_monoeye			Added
ipc_screen_nature			Added
ipc_screen_orange			Added
ipc_screen_pink			Added
ipc_screen_question			Added
ipc_screen_rainbowdiag			Added
ipc_screen_rainbowhoriz			Added
ipc_screen_redtext			Added
ipc_screen_rgb			Added
ipc_screen_ring			Added
ipc_screen_scroll			Added
ipc_screen_shower			Added
ipc_screen_sinewave			Added
ipc_screen_smile			Added
ipc_screen_squarewave			Added
ipc_screen_stars			Added
ipc_screen_static			Added
ipc_screen_tetris			Added
ipc_screen_textdrop			Added
ipc_screen_tv			Added
ipc_screen_windowsxp			Added
ipc_screen_yellow			Added

Resources/Textures/SimpleStation14/Mobs/Species/IPC/organs.rsi

State	Old	New	Status
brain-inhand-left			Added
brain-inhand-right			Added
brain			Added
ears			Added
eyeball-l			Added
eyeball-r			Added
heart-off			Added
heart-on			Added
microcell			Added
tongue			Added

Resources/Textures/SimpleStation14/Mobs/Species/IPC/parts.rsi

State	Old	New	Status
full			Added
head_f			Added
head_m			Added
l_arm			Added
l_foot			Added
l_hand			Added
l_leg			Added
r_arm			Added
r_foot			Added
r_hand			Added
r_leg			Added
torso_f			Added
torso_m			Added

Resources/Textures/SimpleStation14/Structures/Machines/borgcharger.rsi

State	Old	New	Status
base			Added
borgcharger_1			Added
borgcharger_2			Added
borgcharger_active_unlit			Added
borgcharger_closed_unlit			Added
borgcharger_open_unlit			Added
borgcharger_panel			Added
borgcharger_unlit			Added
closed			Added
icon			Added
open			Added

Resources/Textures/SimpleStation14/Structures/Machines/charging_pad.rsi

State	Old	New	Status
beam			Added
idle			Added
offline			Added

Edit: diff updated after 73acebc

DEATHB4DEFEAT

cringnt

Content.Server/SimpleStation14/Silicon/Charge/Systems/SiliconChargeDeathSystem.cs

Content.Shared/SimpleStation14/Silicon/Systems/SharedSiliconSystem.cs

Resources/Prototypes/SimpleStation14/Body/Organs/ipc.yml

Resources/Prototypes/SimpleStation14/Body/Parts/ipc.yml

Resources/Prototypes/SimpleStation14/Entities/Mobs/Player/silicon_base.yml

…telist system for "hardlight

…g :P

…ologram is deleted upon spawning and crashes as no hologram component is found?

…benefit. There's a grace period upon leaving a projector of one 24th of a second before you get returned.

…he protos, make a temp new tag Light, deleted unused files, renamed HoloData to HoloMind, and made HoloData struct to hold info on the Holo like type and whether it's hardlight. Needs implementing in YAML.

…an interact with light things, and non-Holograms can't.

… work on hologram data in the component (no structs ;-;), and refined the variations of Holograms.

…ariables designed to allow for a wide variety of silicons in the future, such as Drones, Borgs, and IPCs. Charging system is simple right now, but with lots of foundation to improve. Currently takes into account ambient temperature for power drain with added risk of fire, and updates movement speed in line with charge state. Alert for battery level also added. Temp mod doesn't work just yet due to borg not having a temperature component??

…lot off human at the moment. Charger and crit systems still to come.

…d the dumbass temperature alert thing (>:(), overheating fire still acting strange?

…harger. Chargers heat up mobs, or even contained air as they push power through to them. IPCs as a race yet further to finishing. Added antenna and screen markings for them.

… hues looked awful on them anyway)

…ity and charge them together, and working towards a visualizer. Have previously managed to get it to work, although it doesn't in this commit, as I'm still trying to get it to be unlit.

Content.Shared/Humanoid/SkinColor.cs

…into IPCs

DEATHB4DEFEAT

Need random names
Age max change
Remove marking points (there are no markings enabled)
alerts-charge-desc
Robot typing indicator
Broken charging pad
No guidebook entry
Needs eye protection
Remove ability to be psionic

Content.Server/SimpleStation14/Power/Components/RandomBatteryChargeComponent.cs

Content.Server/SimpleStation14/Power/Systems/SiliconEmitSoundOnDrainedSystem.cs

Content.Server/SimpleStation14/Silicon/Charge/Components/BatteryDrinkerSourceComponent.cs

Content.Server/SimpleStation14/Silicon/Charge/Systems/SiliconChargeSystem.cs

Content.Server/SimpleStation14/Silicon/Charge/Systems/SiliconChargerSystem.cs

Content.Shared/SimpleStation14/Silicon/Components/SiliconChargerComponent.cs

Resources/Locale/en-US/revenant/revenant.ftl

…kstation into IPCs

…into IPCs

DEATHB4DEFEAT

github-actions bot added Changes: C# Changes any cs files Changes: Sprite Changes any png or json in an rsi Changes: YML Changes any yml files labels Apr 20, 2023

DEATHB4DEFEAT added this to the Unique Species milestone Apr 20, 2023

DEATHB4DEFEAT changed the title ~~Interpersonal Conflict~~ [Species] InterPersonal Conflict Apr 20, 2023

DEATHB4DEFEAT requested changes Apr 21, 2023

View reviewed changes

Pspritechologist force-pushed the IPC branch from 1472687 to bf1436b Compare April 26, 2023 03:34

Pspritechologist added 22 commits May 13, 2023 04:02

Added a new mob typed named Hologram, set up a clone of the Drone whi…

0cf1ff5

…telist system for "hardlight

adds early scutters, and the basis of a charging system.

f26cbf1

Working on it

9bcb278

Lots more work towards holograms, probably too long without committin…

3da44f1

…g :P

Committing more

e80ccbc

More work on Holograms. Moved most things over to events, bug where h…

3e53704

…ologram is deleted upon spawning and crashes as no hologram component is found?

Fixed holocorgi ID

a08512d

Fuckin working again. Stuff is networked now, though not to any real …

6431633

…benefit. There's a grace period upon leaving a projector of one 24th of a second before you get returned.

Prepared for projected, lightbee, and hardlight holos by separating t…

80b458e

…he protos, make a temp new tag Light, deleted unused files, renamed HoloData to HoloMind, and made HoloData struct to hold info on the Holo like type and whether it's hardlight. Needs implementing in YAML.

Removed some unneeded things, cleaned some files, made it Holograms c…

1f90d22

…an interact with light things, and non-Holograms can't.

Added damage sets for Holograms, kinda fixed rotation on spawn, begun…

c274806

… work on hologram data in the component (no structs ;-;), and refined the variations of Holograms.

Functioning IPC species! Still needs to be fine tuned, as it takes a …

e1924e7

…lot off human at the moment. Charger and crit systems still to come.

Far more work on IPCs as a race, some sprites for future use, unfucke…

dedbb69

…d the dumbass temperature alert thing (>:(), overheating fire still acting strange?

Added silicon chargers in the form of a charging pad and industrial c…

81ca98f

…harger. Chargers heat up mobs, or even contained air as they push power through to them. IPCs as a race yet further to finishing. Added antenna and screen markings for them.

Finally found the positronic brain sprites. Temp usage for now.

1fa8672

Fix posi brain sprite

99e5e84

Fixed charger burn damage

05825b5

Gutted Holograms from the branch to break up the PRs.

0bed393

Fixed the dumbass colours on IPCs and set Dionas to use None (because…

62a7194

… hues looked awful on them anyway)

Working on IPCs falling asleep when de powered. Sleep sucks

312d097

Chargers are awesome now! Recursive check to find all items on an ent…

7879042

…ity and charge them together, and working towards a visualizer. Have previously managed to get it to work, although it doesn't in this commit, as I'm still trying to get it to be unlit.

Pspritechologist commented Jun 25, 2023

View reviewed changes

Content.Shared/Humanoid/SkinColor.cs Show resolved Hide resolved

Pspritechologist added 4 commits June 25, 2023 06:44

Add Parkstation tags to skin colours file.

1a19f87

Merge branch 'master' of https://github.com/Park-Station/Parkstation …

fdbff21

…into IPCs

Removed unintended changes.

fdaff09

Adjust tv sprite

1702ba8

DEATHB4DEFEAT requested changes Jul 15, 2023

View reviewed changes

Pspritechologist added 2 commits July 23, 2023 00:51

Merge branch 'upstream-sync-2' of https://github.com/Park-Station/Par…

4f33428

…kstation into IPCs

Minor fixes post-merge

be28f08

github-actions bot added Changes: Map Changes any yml file in the Maps directories Changes: UI Changes any XAML files and removed Changes: YML Changes any yml files Changes: Sprite Changes any png or json in an rsi labels Jul 23, 2023

Merge branch 'master' of https://github.com/Simple-Station/Parkstation …

a8a8b97

…into IPCs

github-actions bot added Changes: Sprite Changes any png or json in an rsi Changes: YML Changes any yml files and removed Changes: Map Changes any yml file in the Maps directories Changes: UI Changes any XAML files labels Jul 24, 2023

Pspritechologist added 7 commits July 24, 2023 19:00

Review fixes

d2e503b

Batteries should now blow up again

624c2b9

Addressed remaining review issues.

989d315

Missing FTL fix?

93df8ce

Removed unneeded sleep change, added timer for coming back to life

b897bd2

IPCs have names now

8449285

Removed vscode file

73acebc

DEATHB4DEFEAT approved these changes Jul 27, 2023

View reviewed changes

Pspritechologist merged commit 81ba344 into master Jul 27, 2023
4 of 13 checks passed

Pspritechologist deleted the IPC branch July 27, 2023 04:10

SimpleStation14 added a commit that referenced this pull request Jul 27, 2023

Automatic Changelog Update (#97)

596264e

DEATHB4DEFEAT mentioned this pull request Feb 14, 2024

IPC / Machine People Species space-wizards/space-station-14#25203

Closed

7 tasks

Day-OS mentioned this pull request Jun 28, 2024

Complete IPC overhaul SS14-Classic/deep-station-14#31

Merged

1 task

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[Species] InterPersonal Conflict #97

[Species] InterPersonal Conflict #97

Pspritechologist commented Apr 20, 2023 •

edited

Loading

github-actions bot commented Apr 20, 2023 •

edited

Loading

DEATHB4DEFEAT left a comment

DEATHB4DEFEAT left a comment •

edited

Loading

DEATHB4DEFEAT left a comment

[Species] InterPersonal Conflict #97

[Species] InterPersonal Conflict #97

Conversation

Pspritechologist commented Apr 20, 2023 • edited Loading

Description

TODO

Changelog

github-actions bot commented Apr 20, 2023 • edited Loading

DEATHB4DEFEAT left a comment

Choose a reason for hiding this comment

DEATHB4DEFEAT left a comment • edited Loading

Choose a reason for hiding this comment

DEATHB4DEFEAT left a comment

Choose a reason for hiding this comment

Pspritechologist commented Apr 20, 2023 •

edited

Loading

github-actions bot commented Apr 20, 2023 •

edited

Loading

DEATHB4DEFEAT left a comment •

edited

Loading