diff --git a/Resources/Audio/Announcers/_LostParadise/alerts/blue.ogg b/Resources/Audio/Announcers/_LostParadise/alerts/blue.ogg new file mode 100644 index 0000000000..57bf6c9aab Binary files /dev/null and b/Resources/Audio/Announcers/_LostParadise/alerts/blue.ogg differ diff --git a/Resources/Audio/Announcers/_LostParadise/alerts/delta.ogg b/Resources/Audio/Announcers/_LostParadise/alerts/delta.ogg new file mode 100644 index 0000000000..81c72e54d6 Binary files /dev/null and b/Resources/Audio/Announcers/_LostParadise/alerts/delta.ogg differ diff --git a/Resources/Audio/Announcers/_LostParadise/alerts/epsilon.ogg b/Resources/Audio/Announcers/_LostParadise/alerts/epsilon.ogg new file mode 100644 index 0000000000..b4f52e3086 Binary files /dev/null and b/Resources/Audio/Announcers/_LostParadise/alerts/epsilon.ogg differ diff --git a/Resources/Audio/Announcers/_LostParadise/alerts/gamma.ogg b/Resources/Audio/Announcers/_LostParadise/alerts/gamma.ogg new file mode 100644 index 0000000000..8e58784617 Binary files /dev/null and b/Resources/Audio/Announcers/_LostParadise/alerts/gamma.ogg differ diff --git a/Resources/Audio/Announcers/_LostParadise/alerts/green.ogg b/Resources/Audio/Announcers/_LostParadise/alerts/green.ogg new file mode 100644 index 0000000000..56938be167 Binary files /dev/null and b/Resources/Audio/Announcers/_LostParadise/alerts/green.ogg differ diff --git a/Resources/Audio/Announcers/_LostParadise/alerts/red.ogg b/Resources/Audio/Announcers/_LostParadise/alerts/red.ogg new file mode 100644 index 0000000000..0d79c64ecd Binary files /dev/null and b/Resources/Audio/Announcers/_LostParadise/alerts/red.ogg differ diff --git a/Resources/Audio/Announcers/_LostParadise/alerts/violet.ogg b/Resources/Audio/Announcers/_LostParadise/alerts/violet.ogg new file mode 100644 index 0000000000..0e22a4aa69 Binary files /dev/null and b/Resources/Audio/Announcers/_LostParadise/alerts/violet.ogg differ diff --git a/Resources/Audio/Announcers/_LostParadise/alerts/white.ogg b/Resources/Audio/Announcers/_LostParadise/alerts/white.ogg new file mode 100644 index 0000000000..88587d9166 Binary files /dev/null and b/Resources/Audio/Announcers/_LostParadise/alerts/white.ogg differ diff --git a/Resources/Audio/Announcers/_LostParadise/alerts/yellow.ogg b/Resources/Audio/Announcers/_LostParadise/alerts/yellow.ogg new file mode 100644 index 0000000000..9504b36a23 Binary files /dev/null and b/Resources/Audio/Announcers/_LostParadise/alerts/yellow.ogg differ diff --git a/Resources/Audio/Announcers/_LostParadise/comms/announce.ogg b/Resources/Audio/Announcers/_LostParadise/comms/announce.ogg new file mode 100644 index 0000000000..bf6f84d773 Binary files /dev/null and b/Resources/Audio/Announcers/_LostParadise/comms/announce.ogg differ diff --git a/Resources/Audio/Announcers/_LostParadise/comms/attention.ogg b/Resources/Audio/Announcers/_LostParadise/comms/attention.ogg new file mode 100644 index 0000000000..0120ec595c Binary files /dev/null and b/Resources/Audio/Announcers/_LostParadise/comms/attention.ogg differ diff --git a/Resources/Audio/Announcers/_LostParadise/comms/command_report.ogg b/Resources/Audio/Announcers/_LostParadise/comms/command_report.ogg new file mode 100644 index 0000000000..edd643390e Binary files /dev/null and b/Resources/Audio/Announcers/_LostParadise/comms/command_report.ogg differ diff --git a/Resources/Audio/Announcers/_LostParadise/comms/war.ogg b/Resources/Audio/Announcers/_LostParadise/comms/war.ogg new file mode 100644 index 0000000000..5d83347655 Binary files /dev/null and b/Resources/Audio/Announcers/_LostParadise/comms/war.ogg differ diff --git a/Resources/Audio/Announcers/_LostParadise/comms/welcome1.ogg b/Resources/Audio/Announcers/_LostParadise/comms/welcome1.ogg new file mode 100644 index 0000000000..7f3b98f21a Binary files /dev/null and b/Resources/Audio/Announcers/_LostParadise/comms/welcome1.ogg differ diff --git a/Resources/Audio/Announcers/_LostParadise/comms/welcome2.ogg b/Resources/Audio/Announcers/_LostParadise/comms/welcome2.ogg new file mode 100644 index 0000000000..6f9b0c30f0 Binary files /dev/null and b/Resources/Audio/Announcers/_LostParadise/comms/welcome2.ogg differ diff --git a/Resources/Audio/Announcers/_LostParadise/events/anomaly.ogg b/Resources/Audio/Announcers/_LostParadise/events/anomaly.ogg new file mode 100644 index 0000000000..d0cc17aa36 Binary files /dev/null and b/Resources/Audio/Announcers/_LostParadise/events/anomaly.ogg differ diff --git a/Resources/Audio/Announcers/_LostParadise/events/bluespace_artifact.ogg b/Resources/Audio/Announcers/_LostParadise/events/bluespace_artifact.ogg new file mode 100644 index 0000000000..6606528339 Binary files /dev/null and b/Resources/Audio/Announcers/_LostParadise/events/bluespace_artifact.ogg differ diff --git a/Resources/Audio/Announcers/_LostParadise/events/breaker_flip.ogg b/Resources/Audio/Announcers/_LostParadise/events/breaker_flip.ogg new file mode 100644 index 0000000000..d5e9f87c8f Binary files /dev/null and b/Resources/Audio/Announcers/_LostParadise/events/breaker_flip.ogg differ diff --git a/Resources/Audio/Announcers/_LostParadise/events/bureaucratic_error.ogg b/Resources/Audio/Announcers/_LostParadise/events/bureaucratic_error.ogg new file mode 100644 index 0000000000..9c55cdc414 Binary files /dev/null and b/Resources/Audio/Announcers/_LostParadise/events/bureaucratic_error.ogg differ diff --git a/Resources/Audio/Announcers/_LostParadise/events/cargo-gifts-event-announcement.ogg b/Resources/Audio/Announcers/_LostParadise/events/cargo-gifts-event-announcement.ogg new file mode 100644 index 0000000000..979c55be3e Binary files /dev/null and b/Resources/Audio/Announcers/_LostParadise/events/cargo-gifts-event-announcement.ogg differ diff --git a/Resources/Audio/Announcers/_LostParadise/events/clerical_error.ogg b/Resources/Audio/Announcers/_LostParadise/events/clerical_error.ogg new file mode 100644 index 0000000000..7f0b4b0cdf Binary files /dev/null and b/Resources/Audio/Announcers/_LostParadise/events/clerical_error.ogg differ diff --git a/Resources/Audio/Announcers/_LostParadise/events/cockroach_migration.ogg b/Resources/Audio/Announcers/_LostParadise/events/cockroach_migration.ogg new file mode 100644 index 0000000000..729f384e30 Binary files /dev/null and b/Resources/Audio/Announcers/_LostParadise/events/cockroach_migration.ogg differ diff --git a/Resources/Audio/Announcers/_LostParadise/events/gas_leak-complete.ogg b/Resources/Audio/Announcers/_LostParadise/events/gas_leak-complete.ogg new file mode 100644 index 0000000000..663619e94f Binary files /dev/null and b/Resources/Audio/Announcers/_LostParadise/events/gas_leak-complete.ogg differ diff --git a/Resources/Audio/Announcers/_LostParadise/events/gas_leak.ogg b/Resources/Audio/Announcers/_LostParadise/events/gas_leak.ogg new file mode 100644 index 0000000000..f4b83911f1 Binary files /dev/null and b/Resources/Audio/Announcers/_LostParadise/events/gas_leak.ogg differ diff --git a/Resources/Audio/Announcers/_LostParadise/events/immovable_rod_spawn.ogg b/Resources/Audio/Announcers/_LostParadise/events/immovable_rod_spawn.ogg new file mode 100644 index 0000000000..429cab81da Binary files /dev/null and b/Resources/Audio/Announcers/_LostParadise/events/immovable_rod_spawn.ogg differ diff --git a/Resources/Audio/Announcers/_LostParadise/events/ion_storm.ogg b/Resources/Audio/Announcers/_LostParadise/events/ion_storm.ogg new file mode 100644 index 0000000000..7e163bd67b Binary files /dev/null and b/Resources/Audio/Announcers/_LostParadise/events/ion_storm.ogg differ diff --git a/Resources/Audio/Announcers/_LostParadise/events/kudzu_growth.ogg b/Resources/Audio/Announcers/_LostParadise/events/kudzu_growth.ogg new file mode 100644 index 0000000000..af8767f601 Binary files /dev/null and b/Resources/Audio/Announcers/_LostParadise/events/kudzu_growth.ogg differ diff --git a/Resources/Audio/Announcers/_LostParadise/events/meteors-complete.ogg b/Resources/Audio/Announcers/_LostParadise/events/meteors-complete.ogg new file mode 100644 index 0000000000..22066fa6b8 Binary files /dev/null and b/Resources/Audio/Announcers/_LostParadise/events/meteors-complete.ogg differ diff --git a/Resources/Audio/Announcers/_LostParadise/events/meteors.ogg b/Resources/Audio/Announcers/_LostParadise/events/meteors.ogg new file mode 100644 index 0000000000..b335bc94ca Binary files /dev/null and b/Resources/Audio/Announcers/_LostParadise/events/meteors.ogg differ diff --git a/Resources/Audio/Announcers/_LostParadise/events/mouse_migration.ogg b/Resources/Audio/Announcers/_LostParadise/events/mouse_migration.ogg new file mode 100644 index 0000000000..6e71d36360 Binary files /dev/null and b/Resources/Audio/Announcers/_LostParadise/events/mouse_migration.ogg differ diff --git a/Resources/Audio/Announcers/_LostParadise/events/power_grid_check-complete.ogg b/Resources/Audio/Announcers/_LostParadise/events/power_grid_check-complete.ogg new file mode 100644 index 0000000000..c3456668de Binary files /dev/null and b/Resources/Audio/Announcers/_LostParadise/events/power_grid_check-complete.ogg differ diff --git a/Resources/Audio/Announcers/_LostParadise/events/power_grid_check.ogg b/Resources/Audio/Announcers/_LostParadise/events/power_grid_check.ogg new file mode 100644 index 0000000000..d0ad4af540 Binary files /dev/null and b/Resources/Audio/Announcers/_LostParadise/events/power_grid_check.ogg differ diff --git a/Resources/Audio/Announcers/_LostParadise/events/solar_flare-complete.ogg b/Resources/Audio/Announcers/_LostParadise/events/solar_flare-complete.ogg new file mode 100644 index 0000000000..ea86c04dc1 Binary files /dev/null and b/Resources/Audio/Announcers/_LostParadise/events/solar_flare-complete.ogg differ diff --git a/Resources/Audio/Announcers/_LostParadise/events/solar_flare.ogg b/Resources/Audio/Announcers/_LostParadise/events/solar_flare.ogg new file mode 100644 index 0000000000..23e6d00ac8 Binary files /dev/null and b/Resources/Audio/Announcers/_LostParadise/events/solar_flare.ogg differ diff --git a/Resources/Audio/Announcers/_LostParadise/events/vent_clog.ogg b/Resources/Audio/Announcers/_LostParadise/events/vent_clog.ogg new file mode 100644 index 0000000000..586a3cfb6c Binary files /dev/null and b/Resources/Audio/Announcers/_LostParadise/events/vent_clog.ogg differ diff --git a/Resources/Audio/Announcers/_LostParadise/fallback.ogg b/Resources/Audio/Announcers/_LostParadise/fallback.ogg new file mode 100644 index 0000000000..0120ec595c Binary files /dev/null and b/Resources/Audio/Announcers/_LostParadise/fallback.ogg differ diff --git a/Resources/Audio/Announcers/_LostParadise/other/adjutant-announcement.ogg b/Resources/Audio/Announcers/_LostParadise/other/adjutant-announcement.ogg new file mode 100644 index 0000000000..634b510924 Binary files /dev/null and b/Resources/Audio/Announcers/_LostParadise/other/adjutant-announcement.ogg differ diff --git a/Resources/Audio/Announcers/_LostParadise/other/ai-announcement.ogg b/Resources/Audio/Announcers/_LostParadise/other/ai-announcement.ogg new file mode 100644 index 0000000000..2221e3eda3 Binary files /dev/null and b/Resources/Audio/Announcers/_LostParadise/other/ai-announcement.ogg differ diff --git a/Resources/Audio/Announcers/_LostParadise/other/blueshield-announcement.ogg b/Resources/Audio/Announcers/_LostParadise/other/blueshield-announcement.ogg new file mode 100644 index 0000000000..4e9e655888 Binary files /dev/null and b/Resources/Audio/Announcers/_LostParadise/other/blueshield-announcement.ogg differ diff --git a/Resources/Audio/Announcers/_LostParadise/other/centcomm-announcement.ogg b/Resources/Audio/Announcers/_LostParadise/other/centcomm-announcement.ogg new file mode 100644 index 0000000000..edd643390e Binary files /dev/null and b/Resources/Audio/Announcers/_LostParadise/other/centcomm-announcement.ogg differ diff --git a/Resources/Audio/Announcers/_LostParadise/other/chiefengineer-announcement.ogg b/Resources/Audio/Announcers/_LostParadise/other/chiefengineer-announcement.ogg new file mode 100644 index 0000000000..c1916baf58 Binary files /dev/null and b/Resources/Audio/Announcers/_LostParadise/other/chiefengineer-announcement.ogg differ diff --git a/Resources/Audio/Announcers/_LostParadise/other/chiefsecurity-announcement.ogg b/Resources/Audio/Announcers/_LostParadise/other/chiefsecurity-announcement.ogg new file mode 100644 index 0000000000..845d110c83 Binary files /dev/null and b/Resources/Audio/Announcers/_LostParadise/other/chiefsecurity-announcement.ogg differ diff --git a/Resources/Audio/Announcers/_LostParadise/other/chiefseniorengineer-announcement.ogg b/Resources/Audio/Announcers/_LostParadise/other/chiefseniorengineer-announcement.ogg new file mode 100644 index 0000000000..e37691188f Binary files /dev/null and b/Resources/Audio/Announcers/_LostParadise/other/chiefseniorengineer-announcement.ogg differ diff --git a/Resources/Audio/Announcers/_LostParadise/other/clown-announcement.ogg b/Resources/Audio/Announcers/_LostParadise/other/clown-announcement.ogg new file mode 100644 index 0000000000..b0431e7a84 Binary files /dev/null and b/Resources/Audio/Announcers/_LostParadise/other/clown-announcement.ogg differ diff --git a/Resources/Audio/Announcers/_LostParadise/other/cmo-announcement.ogg b/Resources/Audio/Announcers/_LostParadise/other/cmo-announcement.ogg new file mode 100644 index 0000000000..46d247d632 Binary files /dev/null and b/Resources/Audio/Announcers/_LostParadise/other/cmo-announcement.ogg differ diff --git a/Resources/Audio/Announcers/_LostParadise/other/ert-announcement.ogg b/Resources/Audio/Announcers/_LostParadise/other/ert-announcement.ogg new file mode 100644 index 0000000000..e7e1a69f45 Binary files /dev/null and b/Resources/Audio/Announcers/_LostParadise/other/ert-announcement.ogg differ diff --git a/Resources/Audio/Announcers/_LostParadise/other/general-announcement.ogg b/Resources/Audio/Announcers/_LostParadise/other/general-announcement.ogg new file mode 100644 index 0000000000..4d2935c9e0 Binary files /dev/null and b/Resources/Audio/Announcers/_LostParadise/other/general-announcement.ogg differ diff --git a/Resources/Audio/Announcers/_LostParadise/other/hop-announcement.ogg b/Resources/Audio/Announcers/_LostParadise/other/hop-announcement.ogg new file mode 100644 index 0000000000..fd8af2071c Binary files /dev/null and b/Resources/Audio/Announcers/_LostParadise/other/hop-announcement.ogg differ diff --git a/Resources/Audio/Announcers/_LostParadise/other/hos-announcement.ogg b/Resources/Audio/Announcers/_LostParadise/other/hos-announcement.ogg new file mode 100644 index 0000000000..6ef1533c0e Binary files /dev/null and b/Resources/Audio/Announcers/_LostParadise/other/hos-announcement.ogg differ diff --git a/Resources/Audio/Announcers/_LostParadise/other/judge-announcement.ogg b/Resources/Audio/Announcers/_LostParadise/other/judge-announcement.ogg new file mode 100644 index 0000000000..df5a5604b1 Binary files /dev/null and b/Resources/Audio/Announcers/_LostParadise/other/judge-announcement.ogg differ diff --git a/Resources/Audio/Announcers/_LostParadise/other/magister-announcement.ogg b/Resources/Audio/Announcers/_LostParadise/other/magister-announcement.ogg new file mode 100644 index 0000000000..129b9d31c9 Binary files /dev/null and b/Resources/Audio/Announcers/_LostParadise/other/magister-announcement.ogg differ diff --git a/Resources/Audio/Announcers/_LostParadise/other/mime-announcement.ogg b/Resources/Audio/Announcers/_LostParadise/other/mime-announcement.ogg new file mode 100644 index 0000000000..c4f534f5f9 Binary files /dev/null and b/Resources/Audio/Announcers/_LostParadise/other/mime-announcement.ogg differ diff --git a/Resources/Audio/Announcers/_LostParadise/other/rdirector-announcement.ogg b/Resources/Audio/Announcers/_LostParadise/other/rdirector-announcement.ogg new file mode 100644 index 0000000000..18681dcafb Binary files /dev/null and b/Resources/Audio/Announcers/_LostParadise/other/rdirector-announcement.ogg differ diff --git a/Resources/Audio/Announcers/_LostParadise/other/shipbridge-announcement.ogg b/Resources/Audio/Announcers/_LostParadise/other/shipbridge-announcement.ogg new file mode 100644 index 0000000000..7ec445862d Binary files /dev/null and b/Resources/Audio/Announcers/_LostParadise/other/shipbridge-announcement.ogg differ diff --git a/Resources/Audio/Announcers/_LostParadise/other/specialforces-announcement.ogg b/Resources/Audio/Announcers/_LostParadise/other/specialforces-announcement.ogg new file mode 100644 index 0000000000..bf484d45ad Binary files /dev/null and b/Resources/Audio/Announcers/_LostParadise/other/specialforces-announcement.ogg differ diff --git a/Resources/Audio/Announcers/_LostParadise/other/station-event-communication-interception.ogg b/Resources/Audio/Announcers/_LostParadise/other/station-event-communication-interception.ogg new file mode 100644 index 0000000000..aa4de2ebce Binary files /dev/null and b/Resources/Audio/Announcers/_LostParadise/other/station-event-communication-interception.ogg differ diff --git a/Resources/Audio/Announcers/_LostParadise/other/station-event-disease-outbreak-announcement.ogg b/Resources/Audio/Announcers/_LostParadise/other/station-event-disease-outbreak-announcement.ogg new file mode 100644 index 0000000000..a5c60697c5 Binary files /dev/null and b/Resources/Audio/Announcers/_LostParadise/other/station-event-disease-outbreak-announcement.ogg differ diff --git a/Resources/Audio/Announcers/_LostParadise/other/station-event-gas-leak-end-announcement.ogg b/Resources/Audio/Announcers/_LostParadise/other/station-event-gas-leak-end-announcement.ogg new file mode 100644 index 0000000000..6ab5f1f2a4 Binary files /dev/null and b/Resources/Audio/Announcers/_LostParadise/other/station-event-gas-leak-end-announcement.ogg differ diff --git a/Resources/Audio/Announcers/_LostParadise/other/station-event-gas-leak-start-announcement.ogg b/Resources/Audio/Announcers/_LostParadise/other/station-event-gas-leak-start-announcement.ogg new file mode 100644 index 0000000000..8f9018dc41 Binary files /dev/null and b/Resources/Audio/Announcers/_LostParadise/other/station-event-gas-leak-start-announcement.ogg differ diff --git a/Resources/Audio/Announcers/_LostParadise/other/station-event-meteor-urist-start-announcement.ogg b/Resources/Audio/Announcers/_LostParadise/other/station-event-meteor-urist-start-announcement.ogg new file mode 100644 index 0000000000..71163724f9 Binary files /dev/null and b/Resources/Audio/Announcers/_LostParadise/other/station-event-meteor-urist-start-announcement.ogg differ diff --git a/Resources/Audio/Announcers/_LostParadise/other/station-event-radiation-storm-end-announcement.ogg b/Resources/Audio/Announcers/_LostParadise/other/station-event-radiation-storm-end-announcement.ogg new file mode 100644 index 0000000000..ad91c2a3f1 Binary files /dev/null and b/Resources/Audio/Announcers/_LostParadise/other/station-event-radiation-storm-end-announcement.ogg differ diff --git a/Resources/Audio/Announcers/_LostParadise/other/station-event-radiation-storm-start-announcement.ogg b/Resources/Audio/Announcers/_LostParadise/other/station-event-radiation-storm-start-announcement.ogg new file mode 100644 index 0000000000..5d65c91aff Binary files /dev/null and b/Resources/Audio/Announcers/_LostParadise/other/station-event-radiation-storm-start-announcement.ogg differ diff --git a/Resources/Audio/Announcers/_LostParadise/other/station-event-rampant-intelligence-announcement.ogg b/Resources/Audio/Announcers/_LostParadise/other/station-event-rampant-intelligence-announcement.ogg new file mode 100644 index 0000000000..6d5d105c2e Binary files /dev/null and b/Resources/Audio/Announcers/_LostParadise/other/station-event-rampant-intelligence-announcement.ogg differ diff --git a/Resources/Audio/Announcers/_LostParadise/other/station-event-space-dust-start-announcement.ogg b/Resources/Audio/Announcers/_LostParadise/other/station-event-space-dust-start-announcement.ogg new file mode 100644 index 0000000000..b65553ba96 Binary files /dev/null and b/Resources/Audio/Announcers/_LostParadise/other/station-event-space-dust-start-announcement.ogg differ diff --git a/Resources/Audio/Announcers/_LostParadise/other/station-event-unknown-shuttle-incoming.ogg b/Resources/Audio/Announcers/_LostParadise/other/station-event-unknown-shuttle-incoming.ogg new file mode 100644 index 0000000000..abe98e0aab Binary files /dev/null and b/Resources/Audio/Announcers/_LostParadise/other/station-event-unknown-shuttle-incoming.ogg differ diff --git a/Resources/Audio/Announcers/_LostParadise/other/station-event-zombie-outbreak-announcement.ogg b/Resources/Audio/Announcers/_LostParadise/other/station-event-zombie-outbreak-announcement.ogg new file mode 100644 index 0000000000..16031b0baf Binary files /dev/null and b/Resources/Audio/Announcers/_LostParadise/other/station-event-zombie-outbreak-announcement.ogg differ diff --git a/Resources/Audio/Announcers/_LostParadise/other/stationbridge-announcement.ogg b/Resources/Audio/Announcers/_LostParadise/other/stationbridge-announcement.ogg new file mode 100644 index 0000000000..3a1be91795 Binary files /dev/null and b/Resources/Audio/Announcers/_LostParadise/other/stationbridge-announcement.ogg differ diff --git a/Resources/Audio/Announcers/_LostParadise/other/warden-announcement.ogg b/Resources/Audio/Announcers/_LostParadise/other/warden-announcement.ogg new file mode 100644 index 0000000000..b038ea20db Binary files /dev/null and b/Resources/Audio/Announcers/_LostParadise/other/warden-announcement.ogg differ diff --git a/Resources/Audio/Announcers/_LostParadise/shuttle/called.ogg b/Resources/Audio/Announcers/_LostParadise/shuttle/called.ogg new file mode 100644 index 0000000000..b08953bcaa Binary files /dev/null and b/Resources/Audio/Announcers/_LostParadise/shuttle/called.ogg differ diff --git a/Resources/Audio/Announcers/_LostParadise/shuttle/docked.ogg b/Resources/Audio/Announcers/_LostParadise/shuttle/docked.ogg new file mode 100644 index 0000000000..2e965bdf0c Binary files /dev/null and b/Resources/Audio/Announcers/_LostParadise/shuttle/docked.ogg differ diff --git a/Resources/Audio/Announcers/_LostParadise/shuttle/left.ogg b/Resources/Audio/Announcers/_LostParadise/shuttle/left.ogg new file mode 100644 index 0000000000..3313789a64 Binary files /dev/null and b/Resources/Audio/Announcers/_LostParadise/shuttle/left.ogg differ diff --git a/Resources/Audio/Announcers/_LostParadise/shuttle/recall.ogg b/Resources/Audio/Announcers/_LostParadise/shuttle/recall.ogg new file mode 100644 index 0000000000..4fcb200ec8 Binary files /dev/null and b/Resources/Audio/Announcers/_LostParadise/shuttle/recall.ogg differ diff --git a/Resources/Audio/Corvax/Announcements/announce.ogg b/Resources/Audio/Corvax/Announcements/announce.ogg deleted file mode 100644 index e4a90d91e4..0000000000 Binary files a/Resources/Audio/Corvax/Announcements/announce.ogg and /dev/null differ diff --git a/Resources/Audio/Corvax/Announcements/blusp_anomalies.ogg b/Resources/Audio/Corvax/Announcements/blusp_anomalies.ogg deleted file mode 100644 index 4adfbc3948..0000000000 Binary files a/Resources/Audio/Corvax/Announcements/blusp_anomalies.ogg and /dev/null differ diff --git a/Resources/Audio/Corvax/Announcements/centcomm.ogg b/Resources/Audio/Corvax/Announcements/centcomm.ogg deleted file mode 100644 index 917410f24d..0000000000 Binary files a/Resources/Audio/Corvax/Announcements/centcomm.ogg and /dev/null differ diff --git a/Resources/Audio/Corvax/Announcements/comms_blackout.ogg b/Resources/Audio/Corvax/Announcements/comms_blackout.ogg deleted file mode 100644 index f88b20d28f..0000000000 Binary files a/Resources/Audio/Corvax/Announcements/comms_blackout.ogg and /dev/null differ diff --git a/Resources/Audio/Corvax/Announcements/crew_s_called.ogg b/Resources/Audio/Corvax/Announcements/crew_s_called.ogg deleted file mode 100644 index cd87b2d6d7..0000000000 Binary files a/Resources/Audio/Corvax/Announcements/crew_s_called.ogg and /dev/null differ diff --git a/Resources/Audio/Corvax/Announcements/flux.ogg b/Resources/Audio/Corvax/Announcements/flux.ogg deleted file mode 100644 index 968d7a524c..0000000000 Binary files a/Resources/Audio/Corvax/Announcements/flux.ogg and /dev/null differ diff --git a/Resources/Audio/Corvax/Announcements/ionstorm.ogg b/Resources/Audio/Corvax/Announcements/ionstorm.ogg deleted file mode 100644 index dc478d5c9b..0000000000 Binary files a/Resources/Audio/Corvax/Announcements/ionstorm.ogg and /dev/null differ diff --git a/Resources/Audio/Corvax/Announcements/licenses.txt b/Resources/Audio/Corvax/Announcements/licenses.txt deleted file mode 100644 index d56b99a9e4..0000000000 --- a/Resources/Audio/Corvax/Announcements/licenses.txt +++ /dev/null @@ -1 +0,0 @@ -All sounds in directory are taken from TauCeti github (licensed under CC-BY-SA by 3.0) at commit https://github.com/TauCetiStation/TauCetiClassic/commit/92d2767dbb39f28540f78d5055e7be1eb7acee98 \ No newline at end of file diff --git a/Resources/Audio/_LostParadise/Announcement/cmo.ogg b/Resources/Audio/_LostParadise/Announcement/cmo.ogg deleted file mode 100644 index cc9e82b32b..0000000000 Binary files a/Resources/Audio/_LostParadise/Announcement/cmo.ogg and /dev/null differ diff --git a/Resources/Audio/_LostParadise/Announcement/department.ogg b/Resources/Audio/_LostParadise/Announcement/department.ogg deleted file mode 100644 index 9338b7ba46..0000000000 Binary files a/Resources/Audio/_LostParadise/Announcement/department.ogg and /dev/null differ diff --git a/Resources/Audio/_LostParadise/Announcement/hop.ogg b/Resources/Audio/_LostParadise/Announcement/hop.ogg deleted file mode 100644 index 2ea2600f92..0000000000 Binary files a/Resources/Audio/_LostParadise/Announcement/hop.ogg and /dev/null differ diff --git a/Resources/Audio/_LostParadise/Announcement/hos.ogg b/Resources/Audio/_LostParadise/Announcement/hos.ogg deleted file mode 100644 index ada277e283..0000000000 Binary files a/Resources/Audio/_LostParadise/Announcement/hos.ogg and /dev/null differ diff --git a/Resources/Audio/_LostParadise/Announcement/kep.ogg b/Resources/Audio/_LostParadise/Announcement/kep.ogg deleted file mode 100644 index 1e646b9007..0000000000 Binary files a/Resources/Audio/_LostParadise/Announcement/kep.ogg and /dev/null differ diff --git a/Resources/Audio/_LostParadise/Announcement/rd.ogg b/Resources/Audio/_LostParadise/Announcement/rd.ogg deleted file mode 100644 index 39a4c0597f..0000000000 Binary files a/Resources/Audio/_LostParadise/Announcement/rd.ogg and /dev/null differ diff --git a/Resources/Audio/_LostParadise/Announcement/se.ogg b/Resources/Audio/_LostParadise/Announcement/se.ogg deleted file mode 100644 index 26dc72a33a..0000000000 Binary files a/Resources/Audio/_LostParadise/Announcement/se.ogg and /dev/null differ diff --git a/Resources/Audio/_LostParadise/CPR/CPR.ogg b/Resources/Audio/_LostParadise/CPR/CPR.ogg deleted file mode 100644 index e4204d2e7a..0000000000 Binary files a/Resources/Audio/_LostParadise/CPR/CPR.ogg and /dev/null differ diff --git a/Resources/Audio/_LostParadise/IPC/attributions.yml b/Resources/Audio/_LostParadise/IPC/attributions.yml deleted file mode 100644 index dffa3b941a..0000000000 --- a/Resources/Audio/_LostParadise/IPC/attributions.yml +++ /dev/null @@ -1,4 +0,0 @@ -- files: ["borg_deathsound.ogg", "buzz-sigh.ogg", "buzz-two.ogg", "ping.ogg", "signal.ogg", "synth_no.ogg", "synth_yes.ogg"] - license: "CC0-1.0" - copyright: "Original sound by https://github.com/ss220-space/Paradise" - source: "https://github.com/ss220-space/Paradise" diff --git a/Resources/Audio/_LostParadise/IPC/borg_deathsound.ogg b/Resources/Audio/_LostParadise/IPC/borg_deathsound.ogg deleted file mode 100644 index 06e847165f..0000000000 Binary files a/Resources/Audio/_LostParadise/IPC/borg_deathsound.ogg and /dev/null differ diff --git a/Resources/Audio/_LostParadise/IPC/buzz-sigh.ogg b/Resources/Audio/_LostParadise/IPC/buzz-sigh.ogg deleted file mode 100644 index 109c196e2c..0000000000 Binary files a/Resources/Audio/_LostParadise/IPC/buzz-sigh.ogg and /dev/null differ diff --git a/Resources/Audio/_LostParadise/IPC/buzz-two.ogg b/Resources/Audio/_LostParadise/IPC/buzz-two.ogg deleted file mode 100644 index 3f79e2a0e9..0000000000 Binary files a/Resources/Audio/_LostParadise/IPC/buzz-two.ogg and /dev/null differ diff --git a/Resources/Audio/_LostParadise/IPC/hyperspace_begin_new.ogg b/Resources/Audio/_LostParadise/IPC/hyperspace_begin_new.ogg deleted file mode 100644 index ee4e93846c..0000000000 Binary files a/Resources/Audio/_LostParadise/IPC/hyperspace_begin_new.ogg and /dev/null differ diff --git a/Resources/Audio/_LostParadise/IPC/ping.ogg b/Resources/Audio/_LostParadise/IPC/ping.ogg deleted file mode 100644 index 3516d48d25..0000000000 Binary files a/Resources/Audio/_LostParadise/IPC/ping.ogg and /dev/null differ diff --git a/Resources/Audio/_LostParadise/IPC/signal.ogg b/Resources/Audio/_LostParadise/IPC/signal.ogg deleted file mode 100644 index 824e1adb94..0000000000 Binary files a/Resources/Audio/_LostParadise/IPC/signal.ogg and /dev/null differ diff --git a/Resources/Audio/_LostParadise/IPC/synth_no.ogg b/Resources/Audio/_LostParadise/IPC/synth_no.ogg deleted file mode 100644 index f0d2c3bfb0..0000000000 Binary files a/Resources/Audio/_LostParadise/IPC/synth_no.ogg and /dev/null differ diff --git a/Resources/Audio/_LostParadise/IPC/synth_scream.ogg b/Resources/Audio/_LostParadise/IPC/synth_scream.ogg deleted file mode 100644 index 78787d3db9..0000000000 Binary files a/Resources/Audio/_LostParadise/IPC/synth_scream.ogg and /dev/null differ diff --git a/Resources/Audio/_LostParadise/IPC/synth_yes.ogg b/Resources/Audio/_LostParadise/IPC/synth_yes.ogg deleted file mode 100644 index 300cad132e..0000000000 Binary files a/Resources/Audio/_LostParadise/IPC/synth_yes.ogg and /dev/null differ diff --git a/Resources/Audio/_LostParadise/Jukebox/PivoDance.ogg b/Resources/Audio/_LostParadise/Jukebox/PivoDance.ogg deleted file mode 100644 index 58a2dc66a7..0000000000 Binary files a/Resources/Audio/_LostParadise/Jukebox/PivoDance.ogg and /dev/null differ diff --git a/Resources/Audio/_LostParadise/Medibot/aliens.ogg b/Resources/Audio/_LostParadise/Medibot/aliens.ogg deleted file mode 100644 index 57fa70c3ca..0000000000 Binary files a/Resources/Audio/_LostParadise/Medibot/aliens.ogg and /dev/null differ diff --git a/Resources/Audio/_LostParadise/Medibot/animes.ogg b/Resources/Audio/_LostParadise/Medibot/animes.ogg deleted file mode 100644 index 7615a744a6..0000000000 Binary files a/Resources/Audio/_LostParadise/Medibot/animes.ogg and /dev/null differ diff --git a/Resources/Audio/_LostParadise/Medibot/attention.ogg b/Resources/Audio/_LostParadise/Medibot/attention.ogg deleted file mode 100644 index d4d5a27085..0000000000 Binary files a/Resources/Audio/_LostParadise/Medibot/attention.ogg and /dev/null differ diff --git a/Resources/Audio/_LostParadise/Medibot/commandreport.ogg b/Resources/Audio/_LostParadise/Medibot/commandreport.ogg deleted file mode 100644 index 4e5c2e1d1f..0000000000 Binary files a/Resources/Audio/_LostParadise/Medibot/commandreport.ogg and /dev/null differ diff --git a/Resources/Audio/_LostParadise/Medibot/granomalies.ogg b/Resources/Audio/_LostParadise/Medibot/granomalies.ogg deleted file mode 100644 index 2713a3cb19..0000000000 Binary files a/Resources/Audio/_LostParadise/Medibot/granomalies.ogg and /dev/null differ diff --git a/Resources/Audio/_LostParadise/Medibot/intercept.ogg b/Resources/Audio/_LostParadise/Medibot/intercept.ogg deleted file mode 100644 index c59d0455c1..0000000000 Binary files a/Resources/Audio/_LostParadise/Medibot/intercept.ogg and /dev/null differ diff --git a/Resources/Audio/_LostParadise/Medibot/ionstorm.ogg b/Resources/Audio/_LostParadise/Medibot/ionstorm.ogg deleted file mode 100644 index 15aeac9f7f..0000000000 Binary files a/Resources/Audio/_LostParadise/Medibot/ionstorm.ogg and /dev/null differ diff --git a/Resources/Audio/_LostParadise/Medibot/meteors.ogg b/Resources/Audio/_LostParadise/Medibot/meteors.ogg deleted file mode 100644 index 91208cae12..0000000000 Binary files a/Resources/Audio/_LostParadise/Medibot/meteors.ogg and /dev/null differ diff --git a/Resources/Audio/_LostParadise/Medibot/newAI.ogg b/Resources/Audio/_LostParadise/Medibot/newAI.ogg deleted file mode 100644 index c40b099020..0000000000 Binary files a/Resources/Audio/_LostParadise/Medibot/newAI.ogg and /dev/null differ diff --git a/Resources/Audio/_LostParadise/Medibot/outbreak5.ogg b/Resources/Audio/_LostParadise/Medibot/outbreak5.ogg deleted file mode 100644 index 7118af4449..0000000000 Binary files a/Resources/Audio/_LostParadise/Medibot/outbreak5.ogg and /dev/null differ diff --git a/Resources/Audio/_LostParadise/Medibot/outbreak7.ogg b/Resources/Audio/_LostParadise/Medibot/outbreak7.ogg deleted file mode 100644 index 1fc542534d..0000000000 Binary files a/Resources/Audio/_LostParadise/Medibot/outbreak7.ogg and /dev/null differ diff --git a/Resources/Audio/_LostParadise/Medibot/poweroff.ogg b/Resources/Audio/_LostParadise/Medibot/poweroff.ogg deleted file mode 100644 index 875df35002..0000000000 Binary files a/Resources/Audio/_LostParadise/Medibot/poweroff.ogg and /dev/null differ diff --git a/Resources/Audio/_LostParadise/Medibot/poweron.ogg b/Resources/Audio/_LostParadise/Medibot/poweron.ogg deleted file mode 100644 index 4b1605b1c7..0000000000 Binary files a/Resources/Audio/_LostParadise/Medibot/poweron.ogg and /dev/null differ diff --git a/Resources/Audio/_LostParadise/Medibot/radiation.ogg b/Resources/Audio/_LostParadise/Medibot/radiation.ogg deleted file mode 100644 index 5c48830b5f..0000000000 Binary files a/Resources/Audio/_LostParadise/Medibot/radiation.ogg and /dev/null differ diff --git a/Resources/Audio/_LostParadise/Medibot/shuttlecalled.ogg b/Resources/Audio/_LostParadise/Medibot/shuttlecalled.ogg deleted file mode 100644 index a775567abe..0000000000 Binary files a/Resources/Audio/_LostParadise/Medibot/shuttlecalled.ogg and /dev/null differ diff --git a/Resources/Audio/_LostParadise/Medibot/shuttledocked.ogg b/Resources/Audio/_LostParadise/Medibot/shuttledocked.ogg deleted file mode 100644 index 933928db06..0000000000 Binary files a/Resources/Audio/_LostParadise/Medibot/shuttledocked.ogg and /dev/null differ diff --git a/Resources/Audio/_LostParadise/Medibot/shuttlerecalled.ogg b/Resources/Audio/_LostParadise/Medibot/shuttlerecalled.ogg deleted file mode 100644 index 53b622576d..0000000000 Binary files a/Resources/Audio/_LostParadise/Medibot/shuttlerecalled.ogg and /dev/null differ diff --git a/Resources/Audio/_LostParadise/Medibot/spanomalies.ogg b/Resources/Audio/_LostParadise/Medibot/spanomalies.ogg deleted file mode 100644 index d710999e1e..0000000000 Binary files a/Resources/Audio/_LostParadise/Medibot/spanomalies.ogg and /dev/null differ diff --git a/Resources/Audio/_LostParadise/Medibot/welcome.ogg b/Resources/Audio/_LostParadise/Medibot/welcome.ogg deleted file mode 100644 index f9a698fd08..0000000000 Binary files a/Resources/Audio/_LostParadise/Medibot/welcome.ogg and /dev/null differ diff --git a/Resources/Audio/_LostParadise/Supermatter/alarm.ogg b/Resources/Audio/_LostParadise/Supermatter/alarm.ogg deleted file mode 100644 index 4c34ac52a2..0000000000 Binary files a/Resources/Audio/_LostParadise/Supermatter/alarm.ogg and /dev/null differ diff --git a/Resources/Audio/_LostParadise/Supermatter/calm.ogg b/Resources/Audio/_LostParadise/Supermatter/calm.ogg deleted file mode 100644 index cee14fcd13..0000000000 Binary files a/Resources/Audio/_LostParadise/Supermatter/calm.ogg and /dev/null differ diff --git a/Resources/Audio/_LostParadise/Supermatter/delamming.ogg b/Resources/Audio/_LostParadise/Supermatter/delamming.ogg deleted file mode 100644 index 7d79f0e3c4..0000000000 Binary files a/Resources/Audio/_LostParadise/Supermatter/delamming.ogg and /dev/null differ diff --git a/Resources/Audio/_LostParadise/Supermatter/dust.ogg b/Resources/Audio/_LostParadise/Supermatter/dust.ogg deleted file mode 100644 index c6e87b61e6..0000000000 Binary files a/Resources/Audio/_LostParadise/Supermatter/dust.ogg and /dev/null differ diff --git a/Resources/Audio/_LostParadise/Voice/Ipc/license.txt b/Resources/Audio/_LostParadise/Voice/Ipc/license.txt deleted file mode 100644 index e84af4ea54..0000000000 --- a/Resources/Audio/_LostParadise/Voice/Ipc/license.txt +++ /dev/null @@ -1 +0,0 @@ -All sounds in directory are taken from SS220 github (licensed under CC-BY-SA by 3.0) at commit https://github.com/ss220-space/Paradise diff --git a/Resources/Audio/_LostParadise/Voice/Ipc/robot_scream.ogg b/Resources/Audio/_LostParadise/Voice/Ipc/robot_scream.ogg deleted file mode 100644 index a14b3ad0b1..0000000000 Binary files a/Resources/Audio/_LostParadise/Voice/Ipc/robot_scream.ogg and /dev/null differ diff --git a/Resources/Audio/_LostParadise/Voice/Vulpkanin/howl.ogg b/Resources/Audio/_LostParadise/Voice/Vulpkanin/howl.ogg deleted file mode 100644 index 778fd6b248..0000000000 Binary files a/Resources/Audio/_LostParadise/Voice/Vulpkanin/howl.ogg and /dev/null differ diff --git a/Resources/Audio/_LostParadise/Voice/Vulpkanin/license.txt b/Resources/Audio/_LostParadise/Voice/Vulpkanin/license.txt deleted file mode 100644 index e84af4ea54..0000000000 --- a/Resources/Audio/_LostParadise/Voice/Vulpkanin/license.txt +++ /dev/null @@ -1 +0,0 @@ -All sounds in directory are taken from SS220 github (licensed under CC-BY-SA by 3.0) at commit https://github.com/ss220-space/Paradise diff --git a/Resources/Locale/ru-RU/Content/Power/batteryDrinker.ftl b/Resources/Locale/ru-RU/Content/Power/batteryDrinker.ftl index f17f45b096..8c80bcf237 100644 --- a/Resources/Locale/ru-RU/Content/Power/batteryDrinker.ftl +++ b/Resources/Locale/ru-RU/Content/Power/batteryDrinker.ftl @@ -1,2 +1,2 @@ -battery-drinker-verb-drink = Слить +battery-drinker-verb-drink = Высосать энергию battery-drinker-empty = { CAPATALIZE(THE($target)) } уже пуст! diff --git a/Resources/Locale/ru-RU/_LostParadise/Supermatter/Supermatter.ftl b/Resources/Locale/ru-RU/_LostParadise/Supermatter/Supermatter.ftl deleted file mode 100644 index 2ce945b5dc..0000000000 --- a/Resources/Locale/ru-RU/_LostParadise/Supermatter/Supermatter.ftl +++ /dev/null @@ -1,7 +0,0 @@ -supermatter-self = Суперматерия -supermatter-danger-message = Опасность! Нарушение целостности кристаллической гиперструктуры! Целостность: { $integrity }% -supermatter-warning-message = ВНИМАНИЕ! Целостность кристаллической гиперструктуры достигает критических уровней! Целостность: { $integrity }% -supermatter-safe-alert = Кристаллическая гиперструктура возвращается к безопасным рабочим параметрам. Система защиты от сбоев отключена. Целостность: { $integrity }% -supermatter-delamination-overmass = Суперматерия достигла критической массы разрушения. Неизбежное формирование сингулярности! -supermatter-delamination-default = Целостность Суперматерии достигла критической точки. Активировано поле дестабилизации аварийной причинно-следственной связи. -supermatter-seconds-before-delam = { $Seconds } секунд до расслаивания. diff --git a/Resources/Locale/ru-RU/_LostParadise/TomCranePlushie.ftl b/Resources/Locale/ru-RU/_LostParadise/TomCranePlushie.ftl deleted file mode 100644 index c54e00f91e..0000000000 --- a/Resources/Locale/ru-RU/_LostParadise/TomCranePlushie.ftl +++ /dev/null @@ -1,2 +0,0 @@ -ent-LPPTomCrane = плюшевый Том Крейн - .desc = Плюшевая игрушка, напоминающая сотрудника службы безопасности. На ноге можно заметить маленький кусок бумаги, исписанный множеством женских имён и чем-то пахнущий. diff --git a/Resources/Locale/ru-RU/_LostParadise/ipc/power/batteries.ftl b/Resources/Locale/ru-RU/_LostParadise/ipc/power/batteries.ftl deleted file mode 100644 index 15ebafae77..0000000000 --- a/Resources/Locale/ru-RU/_LostParadise/ipc/power/batteries.ftl +++ /dev/null @@ -1 +0,0 @@ -battery-electrocute-charge = The battery surges with energy! diff --git a/Resources/Locale/ru-RU/_LostParadise/ipc/power/batteryDrinker.ftl b/Resources/Locale/ru-RU/_LostParadise/ipc/power/batteryDrinker.ftl deleted file mode 100644 index 94cfaeef5f..0000000000 --- a/Resources/Locale/ru-RU/_LostParadise/ipc/power/batteryDrinker.ftl +++ /dev/null @@ -1,2 +0,0 @@ -battery-drinker-verb-drink = Drain -battery-drinker-empty = { CAPATALIZE(THE($target)) } is already empty! diff --git a/Resources/Locale/ru-RU/_LostParadise/ipc/silicons/siliconChargers.ftl b/Resources/Locale/ru-RU/_LostParadise/ipc/silicons/siliconChargers.ftl deleted file mode 100644 index 78f83a710c..0000000000 --- a/Resources/Locale/ru-RU/_LostParadise/ipc/silicons/siliconChargers.ftl +++ /dev/null @@ -1,4 +0,0 @@ -silicon-charger-overheatwarning = Ощущение, будто ты в микроволновке! -silicon-charger-chargerate-string = Скорость заряда -silicon-charger-efficiency-string = Эффективность -silicon-charger-list-full = { CAPITALIZE(THE($charger)) } может справиться только с таким количеством целей! diff --git a/Resources/Locale/ru-RU/_LostParadise/ipc/silicons/silicons.ftl b/Resources/Locale/ru-RU/_LostParadise/ipc/silicons/silicons.ftl deleted file mode 100644 index 95431fef35..0000000000 --- a/Resources/Locale/ru-RU/_LostParadise/ipc/silicons/silicons.ftl +++ /dev/null @@ -1,8 +0,0 @@ -silicon-overheating = Вы чувствуете, что ваши схемы перегреваются! -silicon-crit = Структурная целостность критическая! -silicon-power-low = Низкий заряд! -ipc-recharge-tip = Вы немного зарядили аккумулятор. -dead-startup-button-verb = Перезагрузка -dead-startup-system-reboot-success = { $target } был перезагружен! -dead-startup-system-reboot-failed = Корпус: { $target } слишком поврежден -batteryslotrequireslock-component-alert-owner = { $user } возится с вашей панелью обслуживания! diff --git a/Resources/Locale/ru-RU/_LostParadise/kyburka_drop_lol.ftl b/Resources/Locale/ru-RU/_LostParadise/kyburka_drop_lol.ftl index 7331c383b0..ea05991436 100644 --- a/Resources/Locale/ru-RU/_LostParadise/kyburka_drop_lol.ftl +++ b/Resources/Locale/ru-RU/_LostParadise/kyburka_drop_lol.ftl @@ -47,3 +47,5 @@ ent-LPPAirlockEVA = Шлюз хранилища EVA .desc = За ним находится спасение! ent-LPPAirlockGate = Шлюз врат .desc = За ним находится таинственная машина... +ent-ExpeditorIDCard = ID карта исследователя + .desc = { ent-IDCardStandard.desc } diff --git a/Resources/Locale/ru-RU/_LostParadise/masks-clowns.ftl b/Resources/Locale/ru-RU/_LostParadise/masks-clowns.ftl index 8cf8cf1b47..61df67f6d4 100644 --- a/Resources/Locale/ru-RU/_LostParadise/masks-clowns.ftl +++ b/Resources/Locale/ru-RU/_LostParadise/masks-clowns.ftl @@ -6,8 +6,8 @@ ent-LPPClothingCoreMaskMime = маска мима-ядро .desc = Маска мима - ядра. ent-LPPClothingDoubleMaskMime = двойная маска мима .desc = Маска мима - двойная. -ent-LPPClothingHeartMaskMime = маска мима-сердце - .desc = Маска мима - сердце. +ent-LPPClothingHeartMaskMime = Маска мима с сердцем + .desc = Маска мима в виде сердечка <3 ent-LPPClothingHorizontalMaskMime = маска мима-горизонтальная .desc = Маска мима - горизонтальная. ent-LPPClothingMarkMaskMime = маска мима-марка diff --git a/Resources/Locale/ru-RU/_LostParadise/prototypes/entities/clothing/outerclothing/suits.ftl b/Resources/Locale/ru-RU/_LostParadise/prototypes/entities/clothing/outerclothing/suits.ftl index 026ec56e47..dd14ee4ae1 100644 --- a/Resources/Locale/ru-RU/_LostParadise/prototypes/entities/clothing/outerclothing/suits.ftl +++ b/Resources/Locale/ru-RU/_LostParadise/prototypes/entities/clothing/outerclothing/suits.ftl @@ -6,3 +6,5 @@ ent-LPPKilt = килт ent-LPPClothingOuterCoatHoSTrenchCAS = Тренч CAS .desc = Чёрно-белый тренч. .suffix = { "Спонсор" } +ent-LPPReallyBlackSuit = Черный костюм + .desc = Ну реально черный. diff --git a/Resources/Locale/ru-RU/_LostParadise/prototypes/entities/objects/mining.ftl b/Resources/Locale/ru-RU/_LostParadise/prototypes/entities/objects/mining.ftl index fdce773323..f268bb3a97 100644 --- a/Resources/Locale/ru-RU/_LostParadise/prototypes/entities/objects/mining.ftl +++ b/Resources/Locale/ru-RU/_LostParadise/prototypes/entities/objects/mining.ftl @@ -6,3 +6,5 @@ ent-WeaponCutterAdv = улучшенный ионный резак ent-OreBagBluespace = блюспейс сумка для руды .desc = Прочная сумка для утилизаторов и шахтеров для переноски ОЧЕНЬ больших объемов руды. .suffix = { "" } +ent-BluespaceChemBag = Блюспейс сумка для химикатов + .desc = Сумка, использующая технологию блюспейс для хранения химических продуктов, таких как таблетки, канистры для таблеток, склянки и шприцы. diff --git a/Resources/Locale/ru-RU/_LostParadise/tts-voices.ftl b/Resources/Locale/ru-RU/_LostParadise/tts-voices.ftl index f812a99bdc..5e2626674a 100644 --- a/Resources/Locale/ru-RU/_LostParadise/tts-voices.ftl +++ b/Resources/Locale/ru-RU/_LostParadise/tts-voices.ftl @@ -22,3 +22,10 @@ tts-voice-name-dmitrii = Дмитрий tts-voice-name-julia = Юлия tts-voice-name-roman = Роман tts-voice-name-veniamin = Вениамин +tts-voice-name-oleg = Олег +tts-voice-name-zina = Зина +tts-voice-name-aidar = Аидар +tts-voice-name-baya = Байя +tts-voice-name-kseniya = Ксения +tts-voice-name-xenia = Кзениа +tts-voice-name-eugene = Юджин diff --git a/Resources/Locale/ru-RU/_LostParadise/tts.ftl b/Resources/Locale/ru-RU/_LostParadise/tts.ftl deleted file mode 100644 index ba9c824505..0000000000 --- a/Resources/Locale/ru-RU/_LostParadise/tts.ftl +++ /dev/null @@ -1,7 +0,0 @@ -tts-voice-name-oleg = Олег -tts-voice-name-zina = Зина -tts-voice-name-aidar = Аидар -tts-voice-name-baya = Байя -tts-voice-name-kseniya = Ксения -tts-voice-name-xenia = Кзениа -tts-voice-name-eugene = Юджин diff --git a/Resources/Locale/ru-RU/_LostParadise/update20.ftl b/Resources/Locale/ru-RU/_LostParadise/update20.ftl new file mode 100644 index 0000000000..dc0b5e646a --- /dev/null +++ b/Resources/Locale/ru-RU/_LostParadise/update20.ftl @@ -0,0 +1,295 @@ +ent-LPPCentralCommandRepresentativeIDCard = ID карта представителя ЦентКом + .desc = Выглядит страшно... +ent-LPPKirasCloakn = Плащь Киры + .desc = Прекресный плащь с прекрасным капющёном +ent-LPPSmallCactus01 = Кактус + .desc = Я КАКТУС +ent-LPPSmallCactus02 = Кактус + .desc = Я КАКТУС +ent-LPPSmallCactus03 = Кактус + .desc = Я КАКТУС +ent-LPPSmallCactus04 = Кактус + .desc = Я КАКТУС +ent-LPPSmallCactus05 = Кактус + .desc = Я КАКТУС +ent-LPPcactus01 = Кактус + .desc = Я КАКТУС +ent-LPPcactus02 = Кактус + .desc = Я КАКТУС +ent-LPPcactus03 = Кактус + .desc = Я КАКТУС +ent-LPPcactus04 = Кактус + .desc = Я КАКТУС +ent-LPPcactus05 = Кактус + .desc = Я КАКТУС +ent-LPPClothingMaskBandageBotany = тряпичная маска ботаника на лицо + .desc = Повязка на лицо, для вашего милого милого личика. +ent-LPPRedEveningGown = Красное вечернее платье +ent-LPPWeaponRevolverOC-38 = Револьвер OC-38 + .desc = Использует патроны "Магнум" 45-го калибра +ent-LPPClothingOuterHardsuitIICPyrotech = Пиротехнический защитный костюм IIC "Дельта" + .desc = Защитный костюм "Дельта", используемый штурмовиками и офицерами Межзвездного разведывательного центра Nanotrasen. +ent-LPPClothingOuterHardsuitNightGuard = Комбинезон ночного охранника + .desc = Обычно он приходит по ночам. Обычно. +ent-LPParbitermask = Трофейная маска + .desc = Трофейная маска одного из известных охотников. От неё так и веет отчаянием +ent-LPPBrasMat = Раздатчик бюстгальтеров + .desc = Раздатчик, что дополняет образ пользователя и делает его неотразимым! +ent-LPPC4Low = Слабая C4 + .desc = Взрывпакет предназначенный для быстрого выламывания шлюзов или стен, но его взрыв довольно слабый в плане радиуса. Виднеется этикетка (ставьте прямо на объект) +ent-LPPCargodrobeVard = Раздатчик продвинутой одежды снабжения + .desc = Красивая одежда для персонала снабжения! +ent-LPPClothingMaskGasIIC = Противогаз Delta + .desc = Тактический противогаз для воздушных сражений. Огнеупорна +ent-HeadElf = Голова эльфа +ent-LPPWeaponSubMachineGunIL20 = IL-20 + .desc = Популярный пистолет-пулемёт, применяемый наёмниками. Использует патроны калибра .35 +ent-LPPNTBriefcaseBrown = Коричневый чемодан NT + .desc = Ручной чемодан +ent-LPPNTBriefcaseBrownFilled = Коричневый чемодан NT + .desc = Ручной чемодан +ent-LPPNascaMat = Раздатчик носков + .desc = Раздатчик, что дополняет образ пользователя и делает его неотразимым! +ent-LPPBestMedicGif = Плащ лучшего медика + .desc = Плащ, которого удостоен лишь лучший врач на всём диком западе! +ent-LPPBlackCarpet = Чёрно-золотой ковёр + .desc = Приятный ковёр, окрашенный в чёрно-золотые цвета +ent-LPPClothingMaskBandageBlack = Чёрная бандана + .desc = Чёрная бандана, для вашего милого личика! +ent-LPPBlackRedCarpet = Чёрно-алый ковёр + .desc = Приятный ковёр, окрашенный в чёрно-алые цвета +ent-LPPClothingMaskBandageBlue = Синяя бандана! + .desc = Синяя бандана, для вашего милого личика! +ent-PlushieCatBlack = Чёрная игрушка кошки + .desc = Мягкая игрушка, напоминающая милого котенка! +ent-PlushieBlackFox = Чёрная игрушка лисы + .desc = Мягкая игрушка, напоминающая милую лисичку! +ent-PlushieBlueFox = Синяя игрушка лисы + .desc = Мягкая игрушка, напоминающая милую лисичку! +ent-DoorRemoteAIBase = пульт дистанционного управления дверью с искусственным интеллектом + .desc = Устройство, которое может дистанционно открывать и запирать двери. +ent-LPPClothingBackpackDuffelLoneMercenaryFull = вещмешок наемника + .desc = Большая спортивная сумка для хранения дополнительных вещей. +ent-LPPLockerMedicalSyn = шкафчик врача + .desc = Стандартное хранилище Nanotrasen. +ent-LPPWeaponTurretNTCCDeathSquad = баллистическая турель +ent-LPPWeaponTurretNTCentComm = баллистическая турель +ent-LPPWithMedal = МедальМат + .desc = Для тех случаев, когда вам срочно нужны медали. Предлагаем лучший выбор медаль на станции! +ent-LPPUnderpantsMat = Автомат нижнего белья + .desc = Машина, которая украшает внешний вид клиентов и делает их красивыми! +ent-LPPClothingHeadHatHoodPGShemag = Капюшон из Шемага + .desc = Капюшон из шемага.. +ent-LPPClothingMaskBandageBrown = Коричневая бандана + .desc = Коричневая бандана, для вашего милого личика! +ent-LPPCigarillSpent = Сигара + .desc = Свёрток табака и никотина +ent-LPPCigarill = Сигара + .desc = Свёрток табака и никотина +ent-LPPChemistHudGlasses = Химические очки-анализаторы + .desc = Пара эффектных очков, используемых для защиты от разливов химических веществ. Оснащён анализатором для сканирования реагентов. +ent-LPPClothingHeadEmberWig = Огненный парик + .desc = Рыжий парик +ent-LPPLockerElectricalSuppliesSyn = Шкаф электрика + .desc = Хранилище, предназначенное для починки проблем с электричеством +ent-LPPLockerElectricalSuppliesSynFilled = Шкаф электрика + .desc = Хранилище, предназначенное для починки проблем с электричеством +ent-LPPClothingHeadEmeraldWig = Изумрудный парик + .desc = Зелёный парик +ent-LPPCondensedMilkCanTrash = Пустая банка от сгущёнки + .desc = Сгущёночка закончилась :_( +ent-LPPLockerEngineerSyn = Шкаф инженера + .desc = Шкафчик для шалостей инженера >:) +ent-LPPLockerEngineerSynFilledHardsuit = Шкаф инженера + .desc = Шкафчик для шалостей инженера >:) +ent-LPPClothingEyeMaskMime = Маска мима + .desc = Маска с прорезями для глаз, предназначенная для немых клоунов +ent-LPPClothingHeadHatBandage = Повязка на лицо + .desc = Защищает голову от жары и набегаторов +ent-LPPFancyTableBlackred = Чёрно-алый стол + .desc = Дорого и со вкусом. +ent-LPPFancyTableMnochrome = Чёрно-белый стол + .desc = Дорого и со вкусом. +ent-LPPClothingMaskBandageGold = Жёлтая бандана + .desc = Золотая бандана, предназначенная для вашего милого личика! +ent-LPPClothingHeadGoldWig = Золотой парик + .desc = Парик с золотыми локонами +ent-LPPClothingMaskBandageGrey = Серая бандана + .desc = Серая бандана, предназначенная для вашего милого личика! +ent-LPPClothingShoesBootsJackSecEnginer = Военные бутсы + .desc = Ботинки, предназначенные специально для сражений. Всегда в боевой готовности +ent-LPPClothingMaskBandageGreen = Зелёная бандана + .desc = Зелёная бандана, предназначенная для вашего милого личика! +ent-PlushieCoffeeFox = Кофейная игрушка лисы + .desc = Мягкая игрушка, напоминающая милую лисичку! +ent-PlushieCrimsonFox = Кровавая игрушка лисы + .desc = Мягкая игрушка, напоминающая милую лисичку! +ent-PlushieCatGrey = Серая игрушка кошки + .desc = Мягкая игрушка, напоминающая милую кошечку! +ent-LPPClothingBackpackDuffelDelta = спортивная сумка "Дельта" + .desc = Большая спортивная сумка для хранения дополнительных вещей. +ent-LPPBoxCobraSyn = коробка с Коброй + .desc = Коробка с набором кобра. +ent-LPPClothingBackpackDuffelCommandDelta = спортивная сумка командира "Дельта" + .desc = Большая спортивная сумка для хранения дополнительных вещей. +ent-LPPClothingBeltNightGuardWebbing = Пояс ночной охраны + .desc = Он приходит к вам ночью. Постоянно. +ent-LPPMonochromeCarpet = Чёрно-белый ковёр + .desc = Приятная поверхность для ваших ножек +ent-LPPClothingMaskBandageMercenary = Военная бандана + .desc = Военная бандана, предназначенная для вашего сурового личика! +ent-LPPJetpackNightGuardCape = Джетпак ночного защитника + .desc = Это джетпак. +ent-PlushieMarbleFox = Игрушка пятнистой лисички + .desc = Милая игрушка, что выглядит как пятнистая, чёрно-белая лиса! +ent-LPPClothingBackpackDuffelLoneMercenary = вещмешок "Одинокого мужчины" + .desc = Большая спортивная сумка для хранения вещей. +ent-LPPBulletLightRifleHunting = Охотничья пуля (.30 оружейный) + .desc = Если ты видишь её, то, скорее всего, ты труп! +ent-LPPBorgChassisINSPERSONAL = I.N.S + .desc = Очень высокий и массивный самообучающийся прототип Android-сервиса "Индивидуальный научный сервис", сокращенно I.N.S., его позитронный мозг обладает самосознанием, в тело встроены сервисные модули и усовершенствованный модуль очистки. Не называйте ее "Борг", оно может обидеться. Он нальет вам эксклюзивного фроппи и расскажет анекдот, если вы попросите. +ent-LPPLEDDiscoFloorMatrix1OjectsLingering0 = Светодиодное диско-матовое покрытие + .desc = Это могло бы послужить довольно неплохим метательным оружием. +ent-LPPLEDDiscoFloorMatrix4OjectsLingering0 = Светодиодное диско-матовое покрытие (Вращение) + .desc = Это могло бы послужить довольно неплохим метательным оружием. +ent-LPPLEDDiscoFloorRotatesHalfwayOjectsLingering0 = Светодиодное диско-матовое покрытие (Вращение) + .desc = Это могло бы послужить довольно неплохим метательным оружием. +ent-LPPMercenaryEyehud = Очки одинокого наемника Синдиката. + .desc = Может я дурак, который не снимает очки в помещении, но я КРУТОЙ дурак! +ent-LPPAirlockSyn = Шлюз + .desc = Он открывается, он закрывается, и он может вас раздавить. +ent-LPPAirlockAtmosphericsSyn = { ent-LPPAirlockSyn } + .desc = { ent-LPPAirlockSyn.desc } +ent-LPPAirlockCargoSyn = { ent-LPPAirlockSyn } + .desc = { ent-LPPAirlockSyn.desc } +ent-LPPAirlockCommandSyn = { ent-LPPAirlockSyn } + .desc = { ent-LPPAirlockSyn.desc } +ent-LPPAirlockEngineeringSyn = { ent-LPPAirlockSyn } + .desc = { ent-LPPAirlockSyn.desc } +ent-LPPAirlockExternalSyn = { ent-LPPAirlockSyn } + .desc = { ent-LPPAirlockSyn.desc } +ent-LPPAirlockExternalSynGlass = { ent-LPPAirlockSyn } + .desc = { ent-LPPAirlockSyn.desc } +ent-AirlockGlassExternalSynLocked = { ent-LPPAirlockSyn } + .desc = { ent-LPPAirlockSyn.desc } +ent-AirlockExternalSynLocked = { ent-LPPAirlockSyn } + .desc = { ent-LPPAirlockSyn.desc } +ent-LPPAirlockMedicalSyn = { ent-LPPAirlockSyn } + .desc = { ent-LPPAirlockSyn.desc } +ent-LPPAirlockScienceSyn = { ent-LPPAirlockSyn } + .desc = { ent-LPPAirlockSyn.desc } +ent-LPPAirlockVirologySyn = { ent-LPPAirlockSyn } + .desc = { ent-LPPAirlockSyn.desc } +ent-WindoorWatchingOfCrewSynLocked = { ent-LPPAirlockSyn } + .desc = { ent-LPPAirlockSyn.desc } +ent-LPPAirlockSecuritySyn = { ent-LPPAirlockSyn } + .desc = { ent-LPPAirlockSyn.desc } +ent-LPPAirlockMedicalSyn = { ent-LPPAirlockSyn } + .desc = { ent-LPPAirlockSyn.desc } +ent-LPPAirlockSalvage = { ent-LPPAirlockSyn } + .desc = { ent-LPPAirlockSyn.desc } +ent-LPPAirlockSalvageLocked = { ent-LPPAirlockSyn } + .desc = { ent-LPPAirlockSyn.desc } +ent-LPPAirlockExternalGlassSalvageLocked = { ent-LPPAirlockSyn } + .desc = { ent-LPPAirlockSyn.desc } +ent-LPPLockerAtmosphericsSyn = шкаф атмосферного техника + .desc = Стандартное средство хранение не только у Нанотрейзен +ent-LPPLockerAtmosphericsSynFilled = { ent-LPPLockerAtmosphericsSyn } + .desc = { ent-LPPLockerAtmosphericsSyn.desc } +ent-LPPLockerAtmosphericsSynFilledHardsuit = { ent-LPPLockerAtmosphericsSyn } + .desc = { ent-LPPLockerAtmosphericsSyn.desc } +ent-LPPBestMedic = Лучший медик + .desc = "Неужели мой собственный плащ годился, чтобы в нем жить, и не годится, чтобы в нем умереть?" - Сократ +ent-LPPFloorBlueItemCircuitBaseLingering0 = Синий технологичный пол + .desc = Это могло бы послужить довольно неплохим метательным оружием. +ent-LPPLEDDiscoFloorRotatesOjectsLingering0 = Светодиодное диско-матовое покрытие (Вращение) + .desc = Это могло бы послужить довольно неплохим метательным оружием. +ent-LPPAirlockShuttleSynGlass = стыковочный шлюз + .desc = Необходимое устройство, для соединения двух космических аппаратов, в "Открытом пространстве". +ent-AirlockGlassExternalShuttleSynLocked = { ent-LPPAirlockShuttleSynGlass } + .desc = { ent-LPPAirlockShuttleSynGlass.desc } +ent-AirlockExternalShuttleSynLocked = { ent-LPPAirlockShuttleSynGlass } + .desc = { ent-LPPAirlockShuttleSynGlass.desc } +ent-LPPAirlockShuttleSyn = { ent-LPPAirlockShuttleSynGlass } + .desc = { ent-LPPAirlockShuttleSynGlass.desc } +ent-LPPAirlockSynGlass = { ent-LPPAirlockSyn } + .desc = { ent-LPPAirlockSyn.desc } +ent-LPPAirlockAtmosphericsSynGlass = { ent-LPPAirlockSyn } + .desc = { ent-LPPAirlockSyn.desc } +ent-LPPAirlockCargoSynGlass = { ent-LPPAirlockSyn } + .desc = { ent-LPPAirlockSyn.desc } +ent-LPPAirlockCommandSynGlass = { ent-LPPAirlockSyn } + .desc = { ent-LPPAirlockSyn.desc } +ent-LPPAirlockEngineeringSynGlass = { ent-LPPAirlockSyn } + .desc = { ent-LPPAirlockSyn.desc } +ent-LPPAirlockExternalSynGlass = { ent-LPPAirlockSyn } + .desc = { ent-LPPAirlockSyn.desc } +ent-LPPAirlockExternalSynGlass = { ent-LPPAirlockSyn } + .desc = { ent-LPPAirlockSyn.desc } +ent-AirlockGlassExternalSynGlassLocked = { ent-LPPAirlockSyn } + .desc = { ent-LPPAirlockSyn.desc } +ent-AirlockExternalSynGlassLocked = { ent-LPPAirlockSyn } + .desc = { ent-LPPAirlockSyn.desc } +ent-LPPAirlockMedicalSynGlass = { ent-LPPAirlockSyn } + .desc = { ent-LPPAirlockSyn.desc } +ent-LPPAirlockScienceSynGlass = { ent-LPPAirlockSyn } + .desc = { ent-LPPAirlockSyn.desc } +ent-LPPAirlockVirologySynGlass = { ent-LPPAirlockSyn } + .desc = { ent-LPPAirlockSyn.desc } +ent-WindoorWatchingOfCrewSynGlassLocked = { ent-LPPAirlockSyn } + .desc = { ent-LPPAirlockSyn.desc } +ent-LPPAirlockSecuritySynGlass = { ent-LPPAirlockSyn } + .desc = { ent-LPPAirlockSyn.desc } +ent-LPPAirlockMedicalSynGlass = { ent-LPPAirlockSyn } + .desc = { ent-LPPAirlockSyn.desc } +ent-LPPEncryptionKeyLaw = юридический ключ шифрования + .desc = Ключ шифрования, которым пользуется самый дотошный человек. +ent-LPPWeaponSubMachineGunM90 = m90 + .desc = Знаменитый пистолет-пулемет, используемый наемниками. В качестве патрона использует 35-тый калибр. +ent-LPPAirlockMaintSyn = Техобслуживание + .desc = Оно открывается, раскрывая возможности и закрывается, унося тебя во тъму... +ent-LPPAirlockHatchMaintenanceSyn = { ent-LPPAirlockMaintSyn } + .desc = { ent-LPPAirlockMaintSyn.desc } +ent-LPPLockerMedicalSynFilled = шкаф доктора + .desc = Стандартное средство хранение не только у Нанотрейзен +ent-LPPClothingHeadOnyxWig = парик из оникса + .desc = Парик. Способ скрыть лысину. Я не знаю какое описание можно дать этому ПАТРИКУ. +ent-LPPpalm01 = пальма + .desc = Да, это пальма. +ent-LPPpalm02 = { ent-LPPpalm01 } + .desc = { ent-LPPpalm01.desc } +ent-LPPpalm03 = { ent-LPPpalm01 } + .desc = { ent-LPPpalm01.desc } +ent-LPPpalm04 = { ent-LPPpalm01 } + .desc = { ent-LPPpalm01.desc } +ent-LPPpalm05 = { ent-LPPpalm01 } + .desc = { ent-LPPpalm01.desc } +ent-LPPpalm06 = { ent-LPPpalm01 } + .desc = { ent-LPPpalm01.desc } +ent-LPPClothingUnderPantyhoseOrange = Колготки +ent-LockerParamedicFilledHardsuit = шкаф парамедика + .desc = Стандартное средство хранения нанотразен. +ent-LPPClothingMaskBandageRed = красная повязка на лицо + .desc = Красная повязка, закрывающее ваше красивое личико. +ent-LPPTomCrane = плюшевый Том Крейн + .desc = Плюшевая игрушка, напоминающая сотрудника службы безопасности. На ноге можно заметить маленький кусок бумаги, исписанный множеством женских имён и чем-то пахнущий. +ent-PlushiePurpleFox = плюшевая фиолетовая лисица + .desc = Симпатичная плюшевая игрушка, похожая на фиолетового лисенка! +ent-PlastitaniumPwindow = Пласталевое окно + .desc = Не запачкай стекло там, внизу. +ent-PlushiePinkFox = плюшевая розовая лисица + .desc = Симпатичная плюшевая игрушка, похожая на розового лисенка! +ent-PlushieCatOrange = плюшевый оранжевый котик + .desc = Мягкая игрушка, напоминающая милого котенка! +ent-PlushieOrangeFox = плюшевая оранжевая лисица + .desc = Симпатичная плюшевая игрушка, похожая на оранжевого лисенка! +ent-AirlockParamedicLocked = { ent-LPPAirlockSyn } + .desc = { ent-LPPAirlockSyn.desc } +ent-AirlockServiceCaptainLocked = { ent-LPPAirlockSyn } + .desc = { ent-LPPAirlockSyn.desc } +ent-AirlockParamedicGlassLocked = { ent-LPPAirlockSyn } + .desc = { ent-LPPAirlockSyn.desc } +ent-AirlockServiceCaptainGlassLocked = { ent-LPPAirlockSyn } + .desc = { ent-LPPAirlockSyn.desc } +ent-ClothingNeckBellCollar = Ошейник-колокольчик + .desc = Способ сообщить другим о своем присутствии или просто позлить всех окружающих! Мууу?!? diff --git a/Resources/Locale/ru-RU/_LostParadise/uplink.ftl b/Resources/Locale/ru-RU/_LostParadise/uplink.ftl deleted file mode 100644 index 21ba05c846..0000000000 --- a/Resources/Locale/ru-RU/_LostParadise/uplink.ftl +++ /dev/null @@ -1,4 +0,0 @@ -uplink-codetalk-implanter-name = Имплантер Кодового языка -uplink-codetalk-implanter-desc = Никто не поймет ваш план по краже трусов капитана! -uplink-unilang-implanter-name = Универсальный языковой Имплантер -uplink-unilang-implanter-desc = Данный имплант рушит языковой барьер для вас, вы можете свободно ПОНИМАТЬ другие языки diff --git a/Resources/Locale/ru-RU/announcements/announcers/announcers.ftl b/Resources/Locale/ru-RU/announcements/announcers/announcers.ftl index 80eaf0e22f..6bc8aa797f 100644 --- a/Resources/Locale/ru-RU/announcements/announcers/announcers.ftl +++ b/Resources/Locale/ru-RU/announcements/announcers/announcers.ftl @@ -3,3 +3,4 @@ announcer-MedBot-name = Автоматическое announcer-Michael-name = Майкл announcer-NEIL-name = N.E.I.L. announcer-VoxFem-name = Автоматическое +announcer-NTH-name = N.T.H. diff --git a/Resources/Locale/ru-RU/deltav/misc/pda.ftl b/Resources/Locale/ru-RU/deltav/misc/pda.ftl index a64a4e3423..07dc01d9c4 100644 --- a/Resources/Locale/ru-RU/deltav/misc/pda.ftl +++ b/Resources/Locale/ru-RU/deltav/misc/pda.ftl @@ -1,4 +1,4 @@ -ent-HoSPDA = head of security pda - .desc = Smells like donuts and gunpowder residue. -ent-LawyerPDA = attorney pda - .desc = For attornies to poach dubious clients. +ent-HoSPDA = КПК главы службы безопасности + .desc = Пахнет пончиками и остатками пороха. +ent-LawyerPDA = КПК адвоката + .desc = Чтобы адвокаты переманивали сомнительных клиентов. diff --git a/Resources/Locale/ru-RU/job/department-desc.ftl b/Resources/Locale/ru-RU/job/department-desc.ftl index 005804b0d6..8428584692 100644 --- a/Resources/Locale/ru-RU/job/department-desc.ftl +++ b/Resources/Locale/ru-RU/job/department-desc.ftl @@ -6,4 +6,4 @@ department-Medical-description = Поддерживайте здоровье э department-Security-description = Поддерживайте порядок на станции. department-Science-description = Изучайте артефакты и аномалии, обеспечивайте членов экипажа новыми продвинутыми устройствами. department-Specific-description = Должности, которые есть не на всех станциях. -department-CentralCommand-description = Вы самый лучший отдел! \ No newline at end of file +department-CentralCommand-description = Вы самый лучший отдел! diff --git a/Resources/Locale/ru-RU/job/department.ftl b/Resources/Locale/ru-RU/job/department.ftl index 7e76494d28..c6dfb5f232 100644 --- a/Resources/Locale/ru-RU/job/department.ftl +++ b/Resources/Locale/ru-RU/job/department.ftl @@ -6,4 +6,4 @@ department-Medical = Медицинский отдел department-Security = Служба безопасности department-Science = Научный отдел department-Specific = На определённых станциях -department-CentralCommand = Центральное командование \ No newline at end of file +department-CentralCommand = Центральное командование diff --git a/Resources/Locale/ru-RU/power/batteryDrinker.ftl b/Resources/Locale/ru-RU/power/batteryDrinker.ftl index 93c2296bfb..8c80bcf237 100644 --- a/Resources/Locale/ru-RU/power/batteryDrinker.ftl +++ b/Resources/Locale/ru-RU/power/batteryDrinker.ftl @@ -1,2 +1,2 @@ -battery-drinker-verb-drink = Слить -battery-drinker-empty = { CAPATALIZE(THE($target)) } уже заряжен! +battery-drinker-verb-drink = Высосать энергию +battery-drinker-empty = { CAPATALIZE(THE($target)) } уже пуст! diff --git a/Resources/Locale/ru-RU/prototypes/entities/clothing/head/hardsuit-helmets.ftl b/Resources/Locale/ru-RU/prototypes/entities/clothing/head/hardsuit-helmets.ftl index 2d8c248ac0..5f489daaae 100644 --- a/Resources/Locale/ru-RU/prototypes/entities/clothing/head/hardsuit-helmets.ftl +++ b/Resources/Locale/ru-RU/prototypes/entities/clothing/head/hardsuit-helmets.ftl @@ -1,108 +1,108 @@ -ent-ClothingHeadHelmetHardsuitBasic = basic vacsuit helmet - .desc = A common vacsuit helmet that provides little more than basic protection from vacuum. -ent-ClothingHeadHelmetHardsuitAtmos = HpI-19t helmet - .desc = The Fotia's standard helmet, it features the same heat protection as the suit, along with some integrated protective gear for the wearer's head. -ent-ClothingHeadHelmetHardsuitEngineering = HpI-19r helmet - .desc = The Lampsi's standard helmet, it features the same radiation protection as the suit, along with some integrated protective gear for the wearer's head. -ent-ClothingHeadHelmetHardsuitSpatio = HpI-20s helmet - .desc = A lightweight helmet designed for the Kriti hardsuit, it allows for better mobility, along with some protection against radiation. -ent-ClothingHeadHelmetHardsuitSalvage = HpI-20a helmet - .desc = A bulky helmet designed for the Lavrion hardsuit, it has reinforced plating to protect the wearer's head in wildlife encounters. -ent-ClothingHeadHelmetHardsuitVoidParamed = ZhP-24m helmet - .desc = A lightweight helmet designed for use with the Sukunabikona hardsuit. Parts of the helmet are made of hard transparent plastics, allowing for better visibility. -ent-ClothingHeadHelmetHardsuitMaxim = mysterious helmet - .desc = An old looking helmet, it seems rather sturdy and lightweight. It also has an ominous red and black color scheme. -ent-ClothingHeadHelmetHardsuitSecurity = FPA-83s helmet - .desc = A bulky helmet deployed with the Baghatur tacsuit. Protects its wearer against ballistics and explosive ordinance, at the cost of some mobility. -ent-ClothingHeadHelmetHardsuitBrigmedic = FPA-84m helmet - .desc = A bulky helmet deployed with the Tsagaan tacsuit. Protects its wearer against ballistics and explosive ordinance, at the cost of some mobility. -ent-ClothingHeadHelmetHardsuitCombatStandard = FPA-85 helmet +ent-ClothingHeadHelmetHardsuitBasic = Стандартный пустотный шлем + .desc = Стандартный шлем пустотного костюма, не ждите от него большего чем защиты от космоса. +ent-ClothingHeadHelmetHardsuitAtmos = Шлем HpI-19t + .desc = Стандартный шлем модели Fotia, предоставляет защиту аналогичную защите костюма, а также имеет дополнительную защиту головы. +ent-ClothingHeadHelmetHardsuitEngineering = Шлем HpI-19r + .desc = Стандартный шлем модели Lampsi, предоставляет защиту аналогичную защите костюма, а также имеет дополнительную защиту головы +ent-ClothingHeadHelmetHardsuitSpatio = Шлем HpI-20s + .desc = Лёгкий шлем спроектированный для скафандра Kriti, предоставляет повышенную мобильность по совместительству с защитой от радиации. +ent-ClothingHeadHelmetHardsuitSalvage = Шлем HpI-20a + .desc = Тяжёлый шлем спроектированный для скафандра Lavrion, его укреплённая поверхность хорошо защищает владельца от контактов с фауной. +ent-ClothingHeadHelmetHardsuitVoidParamed = Шлем ZhP-24m + .desc = Лёгкий шлем спроектированный для скафандра Sukunabikona. Имеет вставки из высокопрочного прозрачного пластика для лучшей видимости +ent-ClothingHeadHelmetHardsuitMaxim = Загадочный шлем + .desc = Старомодный шлем покрашенный в красное и чёрное, крепкий и лёгкий. +ent-ClothingHeadHelmetHardsuitSecurity = Шлем FPA-83s + .desc = Громоздкий шлем тактического скафандра Baghatur. Защищает владельца от пуль и взрывов ценой мобильности. +ent-ClothingHeadHelmetHardsuitBrigmedic = Шлем FPA-84m + .desc = Громоздкий шлем тактического скафандра Tsagaan. Защищает владельца от пуль и взрывов ценой мобильности. +ent-ClothingHeadHelmetHardsuitCombatStandard = Шлем FPA-85 .desc = - A bulky helmet deployed with the Baghatur Mk.II tacsuit. - Protects its wearer against ballistics and explosive ordinance, at the cost of some mobility. -ent-ClothingHeadHelmetHardsuitCombatOfficer = FPA-85s helmet + Громоздкий шлем тактического скафандра Baghatur Mk.II. + Защищает владельца от пуль и взрывов ценой мобильности. +ent-ClothingHeadHelmetHardsuitCombatOfficer = Шлем FPA-85s .desc = { ent-ClothingHeadHelmetHardsuitCombatStandard.desc } -ent-ClothingHeadHelmetHardsuitCombatMedical = FPA-86 helmet +ent-ClothingHeadHelmetHardsuitCombatMedical = Шлем FPA-86 .desc = - A bulky helmet deployed with the Tsagaan Mk.II tacsuit. - Protects its wearer against ballistics and explosive ordinance, at the cost of some mobility. -ent-ClothingHeadHelmetHardsuitCombatCorpsman = FPA-86m helmet + Громоздкий шлем тактического скафандра Tsagaan Mk.II tacsuit. + Защищает владельца от пуль и взрывов ценой мобильности. +ent-ClothingHeadHelmetHardsuitCombatCorpsman = Шлем FPA-86m .desc = { ent-ClothingHeadHelmetHardsuitCombatMedical.desc } -ent-ClothingHeadHelmetHardsuitWarden = FPA-92s helmet - .desc = A modified riot-control helmet for use with the Sulde tacsuit. Offers better overall protection than standard tacsuits at the expense of mobility. -ent-ClothingHeadHelmetHardsuitCombatRiot = FPA-93 helmet +ent-ClothingHeadHelmetHardsuitWarden = Шлем FPA-92s + .desc = Модифицированный для борьбы с беспорядками шлем модели Sulde. Предоставляет лучшую защиту чем обычный тактический шлем ценой мобильности. +ent-ClothingHeadHelmetHardsuitCombatRiot = Шлем FPA-93 .desc = - A modified riot-control helmet for use with the Sulde Mk.II tacsuit. - Offers better overall protection than other models at the expense of mobility. -ent-ClothingHeadHelmetHardsuitCombatWarden = FPA-93s helmet + Модифицированный для борьбы с беспорядками шлем модели Sulde Mk.II. + Предоставляет лучшую защиту чем обычный тактический шлем ценой мобильности. +ent-ClothingHeadHelmetHardsuitCombatWarden = Шлем FPA-93s .desc = { ent-ClothingHeadHelmetHardsuitCombatRiot.desc } -ent-ClothingHeadHelmetHardsuitCap = NT-42c helmet - .desc = A special helmet for the Tengri tacsuit, despite its lightweight appearance, it provides good all-around protection to its wearer. -ent-ClothingHeadHelmetHardsuitEngineeringWhite = HpI-24c helmet - .desc = A high-grade helmet used with the Daedalus hardsuit, it has a lighter construction than its standard counterparts, along with more radiation protection. -ent-ClothingHeadHelmetHardsuitMedical = ZhP-25m helmet +ent-ClothingHeadHelmetHardsuitCap = Шлем NT-42c + .desc = Специальный шлем для модели Tengri, несмотря на лёгкий вес предоставляет хорошую защиту широкого спектра. +ent-ClothingHeadHelmetHardsuitEngineeringWhite = Шлем HpI-24c + .desc = Высококачественный шлем модели Daedalus, ниже вес и лучшая защита от радиации чем у стандартной версии. +ent-ClothingHeadHelmetHardsuitMedical = Шлем ZhP-25m .desc = - An extraordinarily lightweight helmet designed for use with the Okuninushi hardsuit. - It is primarily made from transparent hard-plastics, providing complete freedom of vision. -ent-ClothingHeadHelmetHardsuitRd = NT-45e helmet - .desc = A heavily armored helmet worn over the Sophia hardsuit. It boasts the same near-immunity to explosions, heat and radiation as the suit, but heavily restricts the wearer's mobility. -ent-ClothingHeadHelmetHardsuitMystagogue = NT-45e helmet + Крайне лёгкий шлем модели Okuninushi. + Создан из укерплённого позрачного пластика, предоставляет полный обзор. +ent-ClothingHeadHelmetHardsuitRd = Шлем NT-45e + .desc = Тяжелобронированный шлем модели Sophia. Степень защиты аналогична скафандру. +ent-ClothingHeadHelmetHardsuitMystagogue = Шлем NT-45e .desc = { ent-ClothingHeadHelmetHardsuitRd.desc } -ent-ClothingHeadHelmetHardsuitSecurityRed = FPA-98s helmet - .desc = A high quality helmet for the Dayicin tacsuit. It offers better overall protection than standard tacsuits without impacting mobility as much. -ent-ClothingHeadHelmetHardsuitCombatAdvanced = FPA-99 helmet +ent-ClothingHeadHelmetHardsuitSecurityRed = Шлем FPA-98s + .desc = Высококачественный шлем модели Dayicin. Лучшая защита и подвижность по сравнению с обычными тактическими шлемами. +ent-ClothingHeadHelmetHardsuitCombatAdvanced = Шлем FPA-99 .desc = - A high quality helmet for the Dayicin Mk.II tacsuit. - Features a lightweight construction, offering the same protection as a standard tacsuit without impacting mobility as much. -ent-ClothingHeadHelmetHardsuitCombatHoS = FPA-99s helmet + Высококачественный шлем для скафандра Dayicin Mk.II. + Лёгкая конструкция позволяет обеспечить стандартный уровень защиты без ущерба мобильности. +ent-ClothingHeadHelmetHardsuitCombatHoS = Шлем FPA-99s .desc = { ent-ClothingHeadHelmetHardsuitCombatAdvanced.desc } -ent-ClothingHeadHelmetHardsuitLuxury = HpI-20c helmet - .desc = A modified helmet for the Minos hardsuit, fashioned after the Logistics Officer's colors. It's been modified for greater mobility at the expense of physical trauma protection. -ent-ClothingHeadHelmetHardsuitSyndie = CSA-51a helmet - .desc = An armored helmet deployed over a Shanlin tacsuit. This one has been painted blood red. -ent-ClothingHeadHelmetHardsuitSyndieMedic = CSA-51m helmet +ent-ClothingHeadHelmetHardsuitLuxury = Шлем HpI-20c + .desc = Модифицированный шлем модли Minos, покрашен в цвета офицера логистики и предоставляет защиту аналогичную скафандру. +ent-ClothingHeadHelmetHardsuitSyndie = Шлем CSA-51a + .desc = Бронированный шлем модели Shanlin. Покрашен в печально известный кроваво-красный. +ent-ClothingHeadHelmetHardsuitSyndieMedic = Шлем CSA-51m .desc = - An armored helmet deployed over a Zhongyao tacsuit. features optic integrations for nearly every medical hud on the market. - Designed to enable the survival of combat medics in the most dangerous of environments. -ent-ClothingHeadHelmetHardsuitSyndieElite = CSA-54UA helmet - .desc = An elite version of the Shanlin tacsuit's helmet, featuring improved armor and fireproofing. -ent-ClothingHeadHelmetHardsuitSyndieCommander = CSA-54c helmet - .desc = A bulked up version of the Shanlin tacsuit's helmet, purpose-built for commanders of special operation squads. This one has been painted blood-red. -ent-ClothingHeadHelmetHardsuitCybersun = CSA-80UA helmet - .desc = An incredibly sturdy looking helmet designed for the Guan Yu tacsuit. -ent-ClothingHeadHelmetHardsuitWizard = WZD-84 helmet - .desc = A bizarre, gem-encrusted helmet from unknown origins. It provides some protection to its wearer without restricting their movements. -ent-ClothingHeadHelmetHardsuitLing = organic space helmet - .desc = A spaceworthy biomass of pressure and temperature resistant tissue. -ent-ClothingHeadHelmetHardsuitPirateEVA = pirate helmet - .desc = A pirate vacsuit helmet, very heavy but provides good protection. - .suffix = Pirate -ent-ClothingHeadHelmetHardsuitPirateCap = pirate captain's tacsuit helmet - .desc = A special hardsuit helmet, made for the captain of a pirate ship. - .suffix = Pirate -ent-ClothingHeadHelmetHardsuitSyndieReverseEngineered = NTSA-122 helmet - .desc = A sturdy, lightweight helmet made by the special adquisitions department of Nanotrasen. -ent-ClothingHeadHelmetHardsuitJuggernautReverseEngineered = NTSA-126 helmet - .desc = A very sturdy helmet made by the special acquisitions department of Nanotrasen, based on the "Juggernaut" tacsuit's design. -ent-ClothingHeadHelmetHardsuitERTCentcomm = NT-444c helmet - .desc = A special tacsuit helmet worn by Central Command Officers. -ent-ClothingHeadHelmetHardsuitERTLeader = NT-444l helmet - .desc = A special tacsuit helmet worn by leaders of an emergency response team. -ent-ClothingHeadHelmetHardsuitERTEngineer = NT-444e helmet - .desc = A special hardsuit helmet worn by members of an engineering emergency response team. -ent-ClothingHeadHelmetHardsuitERTMedical = NT-444m helmet - .desc = A special hardsuit helmet worn by members of a medical emergency response team. -ent-ClothingHeadHelmetHardsuitERTSecurity = NT-444s helmet - .desc = A special tacsuit helmet worn by members of a engineering emergency response team. -ent-ClothingHeadHelmetHardsuitERTJanitor = NT-444j helmet - .desc = A special hardsuit helmet worn by members of a janitorial emergency response team. -ent-ClothingHeadHelmetCBURN = NT-444-CBRN helmet - .desc = A pressure resistant and fireproof hood worn by special cleanup units. -ent-ClothingHeadHelmetHardsuitDeathsquad = NT-662ua helmet - .desc = A highly advanced, top of the line helmet used in special operations. -ent-ClothingHeadHelmetHardsuitClown = clown vacsuit helmet - .desc = A colorful clown vacsuit helmet. On closer inspection, it appears to be a normal helmet painted with crayons, and a clown mask glued on top. -ent-ClothingHeadHelmetHardsuitMime = mime vacsuit helmet - .desc = A mime vacsuit helmet. On closer inspection, it appears to be a normal helmet painted with crayons, and a mime mask glued on top. -ent-ClothingHeadHelmetHardsuitSanta = DNK-31 helmet - .desc = A festive-looking hardsuit helmet that provides the jolly gift-giver protection from low-pressure environments. + Бронированный шлем модели Zhongyao. Поддерживает интеграцию с большинством медицинских интерфейсов на рынке. + Сконструирован для обеспечения выживания медика в боевых условиях. +ent-ClothingHeadHelmetHardsuitSyndieElite = Шлем CSA-54UA + .desc = Элитная версия шлема модели Shanli, имеет улучшенную защиту и теплоизоляцию. +ent-ClothingHeadHelmetHardsuitSyndieCommander = Шлем CSA-54c + .desc = Тяжелобронированная версия шлема модели Shanlin, создана для командиров спец. отрядов. Выкрашена в кроваво-красный. +ent-ClothingHeadHelmetHardsuitCybersun = Шлем CSA-80UA + .desc = Сверхпрочная модель шлема Guan Yu. +ent-ClothingHeadHelmetHardsuitWizard = Шлем WZD-84 + .desc = Причудливый шлем, украшенный драгоценными камнями. Защищает от космоса, не сковывая движения. +ent-ClothingHeadHelmetHardsuitLing = Органический пустотный шлем + .desc = Биошлем защищающий от вакуума и пониженных темпиратур. +ent-ClothingHeadHelmetHardsuitPirateEVA = Шлем пирата + .desc = Пиратский пустотный шлем, тяжёлый, но хорошо защищает. + .suffix = Пиратский +ent-ClothingHeadHelmetHardsuitPirateCap = Шлем пиратского капитана + .desc = Пустотный шлем, сделаный на заказ для пиратского капитана + .suffix = Пиратский +ent-ClothingHeadHelmetHardsuitSyndieReverseEngineered = Шлем NTSA-122 + .desc = Прочный легковесный шлем, созданный департаментом особых приобретений Nanotrasen. +ent-ClothingHeadHelmetHardsuitJuggernautReverseEngineered = Шлем NTSA-126 + .desc = Сверхпрочный шлем, созданный департаментом особых приобретений Nanotrasen, основываясь на модели "Juggernaut". +ent-ClothingHeadHelmetHardsuitERTCentcomm = Шлем NT-444c + .desc = Специальный тактический шлем, предназначенный для ОЦК. +ent-ClothingHeadHelmetHardsuitERTLeader = Шлем NT-444l + .desc = Специальный тактический шлем, предназначенный для командования ОБР. +ent-ClothingHeadHelmetHardsuitERTEngineer = Шлем NT-444e + .desc = Специальный шлем, предназначенный для инженеров ОБР. +ent-ClothingHeadHelmetHardsuitERTMedical = Шлем NT-444m + .desc = Специальный шлем, предназначенный для медиков ОБР. +ent-ClothingHeadHelmetHardsuitERTSecurity = Шлем NT-444s + .desc = Специальный тактический шлем, предназначенный для штурмовиков ОБР. +ent-ClothingHeadHelmetHardsuitERTJanitor = Шлем NT-444j + .desc = Специальный шлем, предназначенный для уборщиков ОБР. +ent-ClothingHeadHelmetCBURN = Шлем NT-444-CBRN + .desc = Спец. капюшон с защитой от вакуума и огня, разработанный для отрядов зачистки. +ent-ClothingHeadHelmetHardsuitDeathsquad = Шлем NT-662ua + .desc = Продвинутый тактический шлем, предназначенный для отрядов спец. назначения. +ent-ClothingHeadHelmetHardsuitClown = шлем скафандра клоуна + .desc = Цветной пустотный шлем клоуна. +ent-ClothingHeadHelmetHardsuitMime = шлем скафандра мима + .desc = Пустотный шлем мима, с нарисованной на нём маской. +ent-ClothingHeadHelmetHardsuitSanta = Шлем DNK-31 + .desc = Праздничный шлем производства Donk Co., предназначенный для их специальных развлекательных мероприятий, предоставляет стандартную защиту от космоса. diff --git a/Resources/Locale/ru-RU/prototypes/entities/clothing/outerClothing/hardsuits.ftl b/Resources/Locale/ru-RU/prototypes/entities/clothing/outerClothing/hardsuits.ftl index cb7bb43852..672d708056 100644 --- a/Resources/Locale/ru-RU/prototypes/entities/clothing/outerClothing/hardsuits.ftl +++ b/Resources/Locale/ru-RU/prototypes/entities/clothing/outerClothing/hardsuits.ftl @@ -1,174 +1,174 @@ -ent-ClothingOuterHardsuitBasic = basic vacsuit - .desc = A common, colonial-era vacsuit of indeterminate make and model. It's strictly better than nothing, but not by much. -ent-ClothingOuterHardsuitAtmos = HpI-19t "Fotia" hardsuit +ent-ClothingOuterHardsuitBasic = Стандартный пустотный скафандр + .desc = Обычный пустотный скафандр колониальной эпохи неопределенной марки и модели. Это, конечно, лучше, чем ничего, но не намного. +ent-ClothingOuterHardsuitAtmos = Скафандр HpI-19t "Fotia" .desc = - A standard-issue hardsuit produced by Hephaestus Industries, used by atmospheric technicians in low & high pressure environments. - The label indicates that its rated for high amounts of thermal exposure. It feels a bit heavy. -ent-ClothingOuterHardsuitEngineering = HpI-19r "Lampsi" hardsuit + Универсальный скафандр производства Hephaestus Industries, используется атсмостехами в средах низкого и высокого давления. + Имеет отметку, обозначующую что данная модель способна выдерживать высокую степень нагрева. Выглядит не лёгким. +ent-ClothingOuterHardsuitEngineering = Скафандр HpI-19r "Lampsi" .desc = - A standard-issue hardsuit produced by Hephaestus Industries, used by engineers in low & high pressure environments. - The label indicates that its rated for moderate amounts of radiation exposure. It feels a bit heavy. -ent-ClothingOuterHardsuitSpatio = HpI-20s "Kriti" hardsuit + Универсальный скафандр производства Hephaestus Industries, используется инженерами в средах низкого и высокого давления. + Имеет отметку, обозначующую что данная модель имеет повышенную радиационную защиту. Выглядит не лёгким. +ent-ClothingOuterHardsuitSpatio = Скафандр HpI-20s "Kriti" .desc = - A standard-issue hardsuit produced by Hephaestus Industries, designed for industrial work in low pressure environments. - The label indicates that its rated for moderate amounts of radiation exposure, and it feels somewhat light. -ent-ClothingOuterHardsuitSalvage = HpI-20a "Lavrion" hardsuit + Универсальный скафандр производства Hephaestus Industries, сконструирован для промышленных работ в условиях пониженного давления. + Имеет отметку, обозначующую что данная модель имеет повышенную радиационную защиту и облегчённую конструкцию. +ent-ClothingOuterHardsuitSalvage = Скафандр HpI-20a "Lavrion" .desc = - A sturdy hardsuit produced by Hephaestus Industries, designed for industrial work in low pressure environments. - The labels indicate that it provides protection against most forms of damage. It feels heavy. -ent-ClothingOuterHardsuitVoidParamed = ZhP-24m "Sukunabikona" + Укреплённый скафандр производства Hephaestus Industries, сконструирован для промышленных работ в условиях пониженного давления. + Имеет отметку, обозначующую что данная модель имеет защиту от большинства видов воздействия. Выглядит тяжёлым. +ent-ClothingOuterHardsuitVoidParamed = Скафандр ZhP-24m "Sukunabikona" .desc = - A standard-issue hardsuit manufactured by Zeng-Hu Pharmaceuticals, used by paramedics due to its lightweight frame. - The label mentions that it offers some protection against chemical spills. -ent-ClothingOuterHardsuitMaxim = Mysterious tacsuit + Универсальный скафандр производства Zeng-Hu Pharmaceuticals, имеет облегчённую конструкцию, потому популярен среди парамедиков. + Имеет отметку, обозначующую что данная модель имеет высокий уровень биологической защиты. +ent-ClothingOuterHardsuitMaxim = Загадочный тактический скафандр .desc = - An old looking tactical combat hardsuit. It has a faded red logo on it along with the words "Maxim". - It feels very sturdy and doesn't seem to have any weight... Though it has an ominous aura to it. -ent-ClothingOuterHardsuitSecurity = FPA-83s - "Baghatur" tacsuit + Тактический боевый скафандр старой модели. Имеет выцветшую красныую эмблему с надписью "Maxim". + Выглядит крайне прочным и лёгким... Однако вы ощущаете зловещую ауру исходящую от него. +ent-ClothingOuterHardsuitSecurity = Тактический скафандр FPA-83s - "Baghatur" .desc = - A sturdy tactical combat hardsuit mass-produced by Five-Points-Armory, used by the Nanotrasen security force. - The tags on the suit indicate that its rated for moderate amounts of physical and explosion damage. It feels heavy. -ent-ClothingOuterHardsuitBrigmedic = FPA-84m - "Tsagaan" tacsuit + Укреплённый тактический скафандр массового производства фирмы Five-Points-Armory, используется службой безопасности Nanotrasen. + Имеет отметку, обозначующую что данная модель предоставляет средную защиту от физических повреждений и взрывов. Выглядит тяжёлым. +ent-ClothingOuterHardsuitBrigmedic = Тактический скафандр FPA-84m - "Tsagaan" .desc = - A sturdy tactical combat hardsuit mass-produced by Five-Points-Armory, used by doctors in the Nanotrasen security force. - The tags on the suit indicate that its rated for moderate amounts of physical and explosion damage. It feels heavy. -ent-ClothingOuterHardsuitCombatStandard = FPA-85 - "Baghatur Mk.II" tacsuit + Укреплённый тактический скафандр массового производства фирмы Five-Points-Armory, используется медиками службы безопасности Nanotrasen. + Имеет отметку, обозначующую что данная модель предоставляет средную защиту от физических повреждений и взрывов. Выглядит тяжёлым. +ent-ClothingOuterHardsuitCombatStandard = Тактический скафандр FPA-85 - "Baghatur Mk.II" .desc = - A sturdy tactical combat hardsuit mass-produced by Five-Points-Armory. - The tags on the suit indicate that its rated for moderate amounts of physical and explosion damage. It feels heavy. -ent-ClothingOuterHardsuitCombatOfficer = FPA-85s - "Baghatur Mk.II" tacsuit + Укреплённый тактический скафандр массового производства фирмы Five-Points-Armory. + Имеет отметку, обозначующую что данная модель предоставляет средную защиту от физических повреждений и взрывов. Выглядит тяжёлым. +ent-ClothingOuterHardsuitCombatOfficer = Тактический скафандр FPA-85s - "Baghatur Mk.II" .desc = - A sturdy tactical combat hardsuit mass-produced by Five-Points-Armory, painted with the colors of station security. - The tags on the suit indicate that its rated for moderate amounts of physical and explosion damage. It feels heavy. -ent-ClothingOuterHardsuitCombatMedical = FPA-86 - "Tsagaan Mk.II" tacsuit + Укреплённый тактический скафандр массового производства фирмы Five-Points-Armory, покрашен в цвета станционной охраны. + Имеет отметку, обозначующую что данная модель предоставляет средную защиту от физических повреждений и взрывов. Выглядит тяжёлым. +ent-ClothingOuterHardsuitCombatMedical = Тактический скафандр FPA-86 - "Tsagaan Mk.II" .desc = - A sturdy tactical combat hardsuit mass-produced by Five-Points-Armory. - The tags on the suit indicate that its rated for moderate amounts of physical and explosion damage. It feels heavy. -ent-ClothingOuterHardsuitCombatCorpsman = FPA-86m - "Tsagaan Mk.II" tacsuit + Укреплённый тактический скафандр массового производства фирмы Five-Points-Armory. + Имеет отметку, обозначующую что данная модель предоставляет средную защиту от физических повреждений и взрывов. Выглядит тяжёлым. +ent-ClothingOuterHardsuitCombatCorpsman = Тактический скафандр FPA-86m - "Tsagaan Mk.II" .desc = - A sturdy tactical combat hardsuit mass-produced by Five-Points-Armory, painted with the colors of station security & medical staff. - The tags on the suit indicate that its rated for moderate amounts of physical and explosion damage. It feels heavy. -ent-ClothingOuterHardsuitWarden = FPA-92s - "Sulde" tacsuit + Укреплённый тактический скафандр массового производства фирмы Five-Points-Armory, покрашен в цвета мед. персонала и охраны станции. + Имеет отметку, обозначующую что данная модель предоставляет средную защиту от физических повреждений и взрывов. Выглядит тяжёлым. +ent-ClothingOuterHardsuitWarden = Тактический скафандр FPA-92s - "Sulde" .desc = - A specialized tactical combat hardsuit produced by Five-Points-Armory, often used by Wardens in Nanotrasen stations. - The tags on the suit indicate that its rated for moderate amounts of physical and explosion damage. It feels VERY heavy. -ent-ClothingOuterHardsuitCombatRiot = FPA-93 - "Sulde Mk.II" tacsuit + Специализированный тактический скафандр производства Five-Points-Armory, используется командирами низшего звена службы безопасности Nanotrasen. + Имеет отметку, обозначующую что данная модель предоставляет средную защиту от физических повреждений и взрывов. Выглядит крайне тяжёлым. +ent-ClothingOuterHardsuitCombatRiot = Тактический скафандр FPA-93 - "Sulde Mk.II" .desc = - A specialized tactical combat hardsuit produced by Five-Points-Armory. - The tags on the suit indicate that its rated for moderate amounts of physical and explosion damage. It feels VERY heavy. -ent-ClothingOuterHardsuitCombatWarden = FPA-93s - "Sulde Mk.II" tacsuit + Специализированный тактический скафандр производства Five-Points-Armory. + Имеет отметку, обозначующую что данная модель предоставляет средную защиту от физических повреждений и взрывов. Выглядит крайне тяжёлым. +ent-ClothingOuterHardsuitCombatWarden = Тактический скафандр FPA-93s - "Sulde Mk.II" .desc = - A specialized tactical combat hardsuit produced by Five-Points-Armory, painted with the colors of station security. - The tags on the suit indicate that its rated for moderate amounts of physical and explosion damage. It feels VERY heavy. -ent-ClothingOuterHardsuitCap = NT-42c - "Tengri" tacsuit + Специализированный тактический скафандр производства Five-Points-Armory, покрашен в цвета станционной охраны. + Имеет отметку, обозначующую что данная модель предоставляет средную защиту от физических повреждений и взрывов. Выглядит крайне тяжёлым. +ent-ClothingOuterHardsuitCap = Тактический скафандр NT-42c - "Tengri" .desc = - A formal, tactical combat hardsuit, made in collaboration by Nanotrasen's R&D department with Five-Points-Armory for station captains. - The labels indicate that it provides protection against most forms of damage. It feels somewhat light. -ent-ClothingOuterHardsuitEngineeringWhite = HpI-24c "Daedalus" hardsuit + тактический скафандр, разработанный Five-Points-Armory в сотрудничестве с Nanotrasen, и предназначенный для капитанов корпорации. + Имеет отметку, обозначующую что данная модель имеет защиту от большинства видов воздействий. Выглядит лёгким. +ent-ClothingOuterHardsuitEngineeringWhite = Скафандр HpI-24c "Daedalus" .desc = - A specialized hardsuit produced by Hephaestus Industries, often purchased for use by Nanotrasen senior engineers. - The labels indicate that its rated for high amounts of radiation and pressure. It feels somewhat light. -ent-ClothingOuterHardsuitMedical = ZhP-25m - "Okuninushi" hardsuit + Специализированный скафандр производства Hephaestus Industries, закупается Nanotrasen для старших инженеров. + Имеет отметку, обозначующую что данная модель имеет высокую степень защиты от радиации и давления. Выглядит лёгким. +ent-ClothingOuterHardsuitMedical = Скафандр ZhP-25m - "Okuninushi" .desc = - A hardsuit produced by Zeng-hu Pharmaceuticals, often purchased for use by Nanotrasen senior medical doctors. - The labels claim it protects against damage from most chemical spills. It feels incredibly light. -ent-ClothingOuterHardsuitRd = NT-45e - "Sophia" research hardsuit + Скафандр производства Zeng-hu Pharmaceuticals, закупается Nanotrasen для старшего медицинского персонала. + Имеет отметку, обозначующую что данная модель имеет высокий уровень биологической защиты. Выглядит крайне лёгким. +ent-ClothingOuterHardsuitRd = Научный скафандр NT-45e - "Sophia" .desc = - The magnum opus of Nanotrasen's R&D division. The labels on this hardsuit claim that its near-immune to explosions, heat and radiation. - Somehow it also can shrink enough to fit in a bag. It feels VERY heavy. -ent-ClothingOuterHardsuitMystagogue = NT-45e - "Sophia" research hardsuit + Новейшый продукт отдела разработок Nanotrasen. Отметки на скафандре соответствуют высшей степени защиты от взрывов, нагрева и радиации. + Способен складываться для переноса в рюкзаке. Выглядит крайне тяжёлым. +ent-ClothingOuterHardsuitMystagogue = скафандр Научного Директора .desc = { ent-ClothingOuterHardsuitRd.desc } -ent-ClothingOuterHardsuitSecurityRed = FPA-98s - "Dayicin" tacsuit - .desc = - A top-of-the-line tactical combat hardsuit produced by Five-Points-Armory, often purchased for use by Nanotrasen senior security officers. - The tags on the suit indicate that its rated for moderate amounts of physical and explosion damage. It feels somewhat light. -ent-ClothingOuterHardsuitCombatAdvanced = FPA-99 - "Dayicin Mk.II" tacsuit - .desc = - A top-of-the-line tactical combat hardsuit produced by Five-Points-Armory. - The tags on the suit indicate that its rated for moderate amounts of physical and explosion damage. It feels somewhat light. -ent-ClothingOuterHardsuitCombatHoS = FPA-99s - "Dayicin Mk.II" tacsuit - .desc = - A top-of-the-line tactical combat hardsuit produced by Five-Points-Armory, painted with the colors of station security. - The tags on the suit indicate that its rated for moderate amounts of physical and explosion damage. It feels somewhat light. -ent-ClothingOuterHardsuitLuxury = HpI-20c - "Minos" hardsuit - .desc = - A modified mining hardsuit from Hephaestus Industries, fashioned after the Logistics Officer's colors. - The labels indicate that it provides slight protection against most forms of damage. It feels incredibly light. -ent-ClothingOuterHardsuitSyndie = CSA-51a - "Shanlin" tacsuit - .desc = - A tactical combat hardsuit produced by the Cybersun-Armaments Corporation, the suit's tags indicate it provides moderate protection against most forms of damage. - This one has been painted blood red. It feels incredibly light. -ent-ClothingOuterHardsuitSyndieMedic = CSA-51m - "Zhongyao" tacsuit - .desc = - A tactical combat hardsuit produced by the Cybersun-Armaments Corporation, the suit's tags indicate it provides moderate protection against most forms of damage. - Half of the suit is painted blood red, the rest bears galactic-standard medical markings. It feels incredibly light. -ent-ClothingOuterHardsuitSyndieElite = CSA-54UA - "Shiwei" tacsuit - .desc = - An "Up-Armored" tactical combat hardsuit produced by the Cybersun-Armaments Corporation. - The suit's tags indicate its rated for high exposure to radiation, heat and explosions, along with moderate physical trauma protection. - It feels incredibly light. -ent-ClothingOuterHardsuitSyndieCommander = CSA-54c - "Tianming" tacsuit - .desc = - A "Commander" tactical combat hardsuit produced by the Cybersun-Armaments Corporation. The suit's tags indicate that it protects greatly against all forms of damage. - This one has been painted blood red. It doesn't seem to have any weight. -ent-ClothingOuterHardsuitJuggernaut = CSA-80UA - "Guan Yu" tacsuit - .desc = - The pride and joy of the Cybersun-Armaments Corporation, named after an ancient Sol' War God. Commonly known throughout the galaxy as a "Juggernaut". - Matching its bulky appearance, it protects against all forms of damage. It feels VERY heavy. -ent-ClothingOuterHardsuitWizard = WZD-84 - "Mana" tacsuit - .desc = - A bizarre gem-encrusted hardsuit. Famously used by members of the Wizard Federation in their operations. - Contrary to it's appearance, it can protect its wearer from space and considerable amounts of physical trauma, it feels somewhat light. -ent-ClothingOuterHardsuitLing = organic vacsuit - .desc = A suit made of biomass tissue that is somehow capable of resisting the hazards of low pressure and temperature in space. -ent-ClothingOuterHardsuitPirateEVA = pirate vacsuit - .desc = A worn-out heavy space suit of unknown origin that provides some basic protection from the cold harsh realities of deep space. - .suffix = Pirate -ent-ClothingOuterHardsuitPirateCap = pirate captain's tacsuit - .desc = - An ancient armored tactical combat hardsuit of unknown origin, provides basic protections from the cold harsh realities of deep space and physical trauma. - It doesn't seem to have any weight either. Perfect for defending against space scurvy and toolbox-wielding scallywags. -ent-ClothingOuterHardsuitSyndieReverseEngineered = NTSA-122 tacsuit - .desc = A suit made by the special adquisitions department of Nanotrasen, the suit's tags indicate it provides moderate protection against most forms of damage. -ent-ClothingOuterHardsuitJuggernautReverseEngineered = NTSA-126 tacsuit - .desc = - A suit made by the special acquisitions department of Nanotrasen based on the "Juggernaut" design. - Matching its bulky appearance, it protects against all forms of damage. It feels VERY heavy. -ent-ClothingOuterHardsuitERTCentcomm = NT-444c - "Ophanim" tacsuit - .desc = - A highly advanced, tactical combat hardsuit used by Central Command Officers, it seems to be branded with the Nanotrasen logo and a strange looking series number. - The armor appears to be lined with a very sturdy alloy, it doesn't seem to have any weight either. -ent-ClothingOuterHardsuitERTLeader = NT-444l - "Michael" tacsuit - .desc = - A highly advanced, tactical combat hardsuit used by Leaders of the Emergency Response Team, it seems to be branded with the Nanotrasen logo and a strange looking series number. - The armor appears to be lined with a very sturdy alloy, it doesn't seem to have any weight either. -ent-ClothingOuterHardsuitERTEngineer = NT-444e - "Uriel" hardsuit - .desc = - A highly advanced hardsuit used by Engineers of the Emergency Response Team, it seems to be branded with the Nanotrasen logo and a strange looking series number. - The armor appears to be lined with a very sturdy alloy, it doesn't seem to have any weight either. -ent-ClothingOuterHardsuitERTMedical = NT-444m - "Raphael" hardsuit - .desc = - A highly advanced hardsuit used by Doctors of the Emergency Response Team, it seems to be branded with the Nanotrasen logo and a strange looking series number. - The armor appears to be lined with a very sturdy alloy, it doesn't seem to have any weight either. -ent-ClothingOuterHardsuitERTSecurity = NT-444s - "Gabriel" tacsuit - .desc = - A highly advanced, tactical combat hardsuit used by Security Officers of the Emergency Response Team, it seems to be branded with the Nanotrasen logo and a strange looking series number. - The armor appears to be lined with a very sturdy alloy, it doesn't seem to have any weight either. -ent-ClothingOuterHardsuitERTJanitor = NT-444j - "Sandalphon" hardsuit - .desc = - A highly advanced hardsuit used by Janitors of the Emergency Response Team, it seems to be branded with the Nanotrasen logo and a strange looking series number. - The armor appears to be lined with a very sturdy alloy, it doesn't seem to have any weight either. -ent-ClothingOuterHardsuitDeathsquad = NT-662ua "Samael" tacsuit - .desc = - A highly advanced, top of the line tactical combat hardsuit, it seems to be branded with the Nanotrasen logo and a strange looking series number. - You can barely make out the letters "NTIA-DAP" written on it. The armor appears to be lined with a very sturdy alloy, and doesn't seem to have any weight either. -ent-ClothingOuterHardsuitCBURN = NT-444-CBRN -"Jophiel" tacsuit - .desc = - A tactical combat hardsuit used by the CBURN subdivision of the Emergency Response Team, it seems to be branded with the Nanotrasen logo and a strange looking series number. - The armor appears to be lined with a rather plain, but sturdy alloy, it doesn't seem to have any weight either. -ent-ClothingOuterHardsuitClown = clown vacsuit - .desc = A custom-made clown vacsuit. On closer inspection, it appears to be a normal vacsuit with paint applied on top. -ent-ClothingOuterHardsuitMime = mime vacsuit - .desc = A custom-made mime vacsuit. On closer inspection, it appears to be a normal vacsuit with suspenders and paint applied on top. -ent-ClothingOuterHardsuitSanta = DNK-31 "Jolly" hardsuit - .desc = A festive hardsuit produced by Donk Co. for their time-limited celebratory events, provides protection for its jolly gift-giver to sleighride safely in space without worrying about asteroid strikes. +ent-ClothingOuterHardsuitSecurityRed = Тактический скафандр FPA-98s - "Dayicin" + .desc = + Продвинутый тактический скафандр производства Five-Points-Armory, закупается Nanotrasen для командиров службы безопасности. + Имеет отметку, обозначующую что данная модель предоставляет средную защиту от физических повреждений и взрывов. Выглядит лёгким. +ent-ClothingOuterHardsuitCombatAdvanced = Тактический скафандр FPA-99 - "Dayicin Mk.II" + .desc = + Продвинутый тактический скафандр производства Five-Points-Armory. + Имеет отметку, обозначующую что данная модель предоставляет средную защиту от физических повреждений и взрывов. Выглядит лёгким. +ent-ClothingOuterHardsuitCombatHoS = Тактический скафандр FPA-99s - "Dayicin Mk.II" + .desc = + Продвинутый тактический скафандр производства Five-Points-Armory, покрашен в цвета станционной охраны. + Имеет отметку, обозначующую что данная модель предоставляет средную защиту от физических повреждений и взрывов. Выглядит лёгким. +ent-ClothingOuterHardsuitLuxury = Скафандр HpI-20c - "Minos" + .desc = + Модифицированный шахтёрский скафандр производства Hephaestus Industries, имеет цветовую схему офицера по логистике. + Имеет отметку, обозначующую что данная модель предоставляет минимальный уровень защиты от большинства воздействий. Выглядит крайне лёгким. +ent-ClothingOuterHardsuitSyndie = Тактический скафандр CSA-51a - "Shanlin" + .desc = + Тактический скафандр производства Cybersun-Armaments Corporation, отметки на скафандре соотвествуют средней защите от большинства видов воздействий. + Покрашен в кроваво-красный. Выглядит крайне лёгким. +ent-ClothingOuterHardsuitSyndieMedic = Тактический скафандр CSA-51m - "Zhongyao" + .desc = + Тактический скафандр производства Cybersun-Armaments Corporation, отметки на скафандре соотвествуют средней защите от большинства видов воздействий. + Костюм покрашен в кроваво-красный с медицинскими метками общегалактического стандарта. Выглядит крайне лёгким. +ent-ClothingOuterHardsuitSyndieElite = Тактический скафандр CSA-54UA - "Shiwei" + .desc = + Бронированный тактический скафандр производства the Cybersun-Armaments Corporation. + Отметки на скафандре соотвествуют высоким степеням защиты от радиации, нагрева и взрывов, а также средним от физических травм. + Выглядит крайне лёгким. +ent-ClothingOuterHardsuitSyndieCommander = Тактический скафандр CSA-54c - "Tianming" + .desc = + Офицерский тактический скафандр производства the Cybersun-Armaments Corporation. Отметки на скафандре соотвествуют высокой степени защаты от всех видов воздействий. + Покрашен в кроваво-красный. Кажется, не весит ничего. +ent-ClothingOuterHardsuitJuggernaut = Тактический скафандр CSA-80UA - "Guan Yu" + .desc = + Новейшая разработка Cybersun-Armaments Corporation, названа в честь древнего Земного бога войны. Скафандр также известен под неофициальным названием "Juggernaut". + Отлично защищает от большинства видов воздействий. Выглядит крайне тяжёлым. +ent-ClothingOuterHardsuitWizard = Тактический скафандр WZD-84 - "Mana" + .desc = + Причудливый украшенный драгоценными камнями скафандр. Используется Федерацией Магов. + Несмотря на свою внешность, он способен защитить владельца от воздействия космоса и физических повреждений. Выглядит лёгким. +ent-ClothingOuterHardsuitLing = Органический пустотный скафандр + .desc = Скафандр из органической материи способный защитить владельца от низкого давления и пониженной темпиратуры космоса. +ent-ClothingOuterHardsuitPirateEVA = Пиратский пустотный скафандр + .desc = Изношенный пустотный скафандр способный предоставить стандартную защиту от воздействия космоса. + .suffix = Пиратский +ent-ClothingOuterHardsuitPirateCap = Тактический скафандр пирата + .desc = + Древний бронированный тактический скафандр неизвестного происхождения способный предоставить стандартную защиту от воздействия космоса и физических повреждений. + Кажется, не весит ничего. +ent-ClothingOuterHardsuitSyndieReverseEngineered = Тактический скафандр NTSA-122 + .desc = Скафандр, созданный департаментом особых приобретений Nanotrasen. Отметки на скафандре соотвествуют средней степени защаты от всех видов воздействий. +ent-ClothingOuterHardsuitJuggernautReverseEngineered = Тактический скафандр NTSA-126 + .desc = + Скафандр, созданный департаментом особых приобретений Nanotrasen, в основе которого лежит модель "Juggernaut". + Отлично защищает от большинства видов воздействий. Выглядит крайне тяжёлым. +ent-ClothingOuterHardsuitERTCentcomm = Тактический скафандр NT-444c - "Ophanim" + .desc = + Крайне продвинутый тактический скафандр предназначенный для офицеров ЦК, имеет логотип Nanotrasen и серийный номер. + Броня скафандра укреплена сверхпрочным сплавом, помимо этого он почти ничего не весит. +ent-ClothingOuterHardsuitERTLeader = Тактический скафандр NT-444l - "Michael" + .desc = + Крайне продвинутый тактический скафандр предназначенный для командования ОБР, имеет логотип Nanotrasen и серийный номер. + Броня скафандра укреплена сверхпрочным сплавом, помимо этого он почти ничего не весит. +ent-ClothingOuterHardsuitERTEngineer = Скафандр NT-444e - "Uriel" + .desc = + Крайне продвинутый скафандр предназначенный для инженеров ОБР, имеет логотип Nanotrasen и серийный номер. + Броня скафандра укреплена сверхпрочным сплавом, помимо этого он почти ничего не весит. +ent-ClothingOuterHardsuitERTMedical = Скафандр NT-444m - "Raphael" + .desc = + Крайне продвинутый скафандр предназначенный для медиков ОБР, имеет логотип Nanotrasen и серийный номер. + Броня скафандра укреплена сверхпрочным сплавом, помимо этого он почти ничего не весит. +ent-ClothingOuterHardsuitERTSecurity = Тактический скафандр NT-444s - "Gabriel" + .desc = + Крайне продвинутый тактический скафандр предназначенный для штурмовиков ОБР, имеет логотип Nanotrasen и серийный номер. + Броня скафандра укреплена сверхпрочным сплавом, помимо этого он почти ничего не весит. +ent-ClothingOuterHardsuitERTJanitor = Сскафандр NT-444j - "Sandalphon" + .desc = + Крайне продвинутый скафандр предназначенный для уборщиков ОБР, имеет логотип Nanotrasen и серийный номер. + Броня скафандра укреплена сверхпрочным сплавом, помимо этого он почти ничего не весит. +ent-ClothingOuterHardsuitDeathsquad = Тактический скафандр NT-662ua "Samael" + .desc = + Крайне продвинутый тактический скафандр спец. выпуска, имеет логотип Nanotrasen и серийный номер. + На нём виднеется аббревиатура "NTIA-DAP". Броня скафандра укреплена сверхпрочным сплавом, помимо этого он почти ничего не весит. +ent-ClothingOuterHardsuitCBURN = Тактический скафандр NT-444-CBRN -"Jophiel" + .desc = + Тактический скафандр предназначенный для ОБР катергии CBURN, имеет логотип Nanotrasen и серийный номер. + Броня скафандра укреплена простым, но прочным сплавом, помимо этого он почти ничего не весит. +ent-ClothingOuterHardsuitClown = Пустотный скафандр клоуна + .desc = Обычный пустотный скафандр, украшенный специальной расцветкой. +ent-ClothingOuterHardsuitMime = Пустотный скафандр мима + .desc = Обычный пустотный скафандр, украшенный специальной расцветкой. +ent-ClothingOuterHardsuitSanta = Скафандр DNK-31 "Jolly" + .desc = Праздничный скафандр производства Donk Co. предназначенный для их специальных развлекательных мероприятий, предоставляет стандартную защиту от космоса. diff --git a/Resources/Locale/ru-RU/psionics/oracle.ftl b/Resources/Locale/ru-RU/psionics/oracle.ftl index 967a5506cc..640c355fa8 100644 --- a/Resources/Locale/ru-RU/psionics/oracle.ftl +++ b/Resources/Locale/ru-RU/psionics/oracle.ftl @@ -1,14 +1,14 @@ -oracle-demand-1 = Я требую один { $item }! Не спрашивайте, почему! -oracle-demand-2 = В обмен на знания вы должны принести мне один { $item }! -oracle-demand-3 = В обмен на один { $item } я наделяю вас божественным даром! -oracle-demand-4 = Принесите мне один { $item }, если хотите получить хоть каплю моей благодати! -oracle-demand-5 = Если ты не невежда, ты принесешь мне один { $item }! -oracle-demand-6 = У архонтов есть к тебе просьба: один { $item }! -oracle-demand-7 = Чтобы подняться в высшее состояние бытия, чтобы достичь гнозиса, ваши жалкие телесные тела должны принести мне один { $item }! -oracle-demand-8 = Если вы хотите продлить время пребывания вашей искры божественного света в этом сосуде, вы должны принести мне один { $item }! -oracle-demand-9 = Принеси мне один { $item } или упивайся своим невежеством, черви! -oracle-demand-10 = Если вы когда-нибудь захотите пронзить завесу этого ложного существования, вы должны принести мне один { $item }! -oracle-demand-11 = Я позабочусь о том, чтобы следующим сосудом, в который ты вселишься в этом материальном аду, стала одна из тех обезьян, которых ты мучаешь, если ты не принесешь мне один { $item }! -oracle-demand-12 = Один { $item }, шаг на пути к божественности. +oracle-demand-1 = Я требую одну { $item }! Не спрашивайте, почему! +oracle-demand-2 = В обмен на знания вы должны принести мне одну { $item }! +oracle-demand-3 = В обмен на одну { $item } я наделяю вас божественным даром! +oracle-demand-4 = Принесите мне одну { $item }, если хотите получить хоть каплю моей благодати! +oracle-demand-5 = Если ты не невежда, ты принесешь мне одну { $item }! +oracle-demand-6 = У архонтов есть к тебе просьба: одну { $item }! +oracle-demand-7 = Чтобы подняться в высшее состояние бытия, чтобы достичь гнозиса, ваши жалкие телесные тела должны принести мне одну { $item }! +oracle-demand-8 = Если вы хотите продлить время пребывания вашей искры божественного света в этом сосуде, вы должны принести мне одну { $item }! +oracle-demand-9 = Принеси мне одну { $item } или упивайся своим невежеством, черви! +oracle-demand-10 = Если вы когда-нибудь захотите пронзить завесу этого ложного существования, вы должны принести мне одну { $item }! +oracle-demand-11 = Я позабочусь о том, чтобы следующим сосудом, в который ты вселишься в этом материальном аду, стала одна из тех обезьян, которых ты мучаешь, если ты не принесешь мне одну { $item }! +oracle-demand-12 = Одну { $item }, шаг на пути к божественности. oracle-current-item = Текущий запрашиваемый предмет: { $item } oracle-previous-item = Последний запрошенный товар, который все еще принимается: { $item } diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/actions/psionics.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/actions/psionics.ftl new file mode 100644 index 0000000000..62b7d379d1 --- /dev/null +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/actions/psionics.ftl @@ -0,0 +1,22 @@ +ent-ActionDispel = action-name-dispel + .desc = action-description-dispel +ent-ActionMassSleep = action-name-mass-sleep + .desc = action-description-mass-sleep +ent-ActionMindSwap = action-name-mind-swap + .desc = action-description-mind-swap +ent-ActionMindSwapReturn = action-name-mind-swap-return + .desc = action-description-mind-swap-return +ent-ActionNoosphericZap = action-name-noospheric-zap + .desc = action-description-noospheric-zap +ent-ActionPyrokinesis = action-name-pyrokinesis + .desc = action-description-pyrokinesis +ent-ActionMetapsionic = action-name-metapsionic + .desc = action-description-metapsionic +ent-ActionPsionicRegeneration = action-name-psionic-regeneration + .desc = action-description-psionic-regeneration +ent-ActionTelegnosis = action-name-telegnosis + .desc = action-description-telegnosis +ent-ActionPsionicInvisibility = action-name-psionic-invisibility + .desc = action-description-psionic-invisibility +ent-ActionPsionicInvisibilityUsed = action-name-psionic-invisibility-off + .desc = action-description-psionic-invisibility-off diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/catalog/fills/backpacks/startergear/backpack.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/catalog/fills/backpacks/startergear/backpack.ftl index 028f2dc950..35eaaa28d6 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/catalog/fills/backpacks/startergear/backpack.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/catalog/fills/backpacks/startergear/backpack.ftl @@ -56,8 +56,8 @@ ent-ClothingBackpackERTJanitorFilled = { ent-ClothingBackpackERTJanitor } .desc = { ent-ClothingBackpackERTJanitor.desc } ent-ClothingBackpackERTChaplainFilled = { ent-ClothingBackpackERTChaplain } .desc = { ent-ClothingBackpackERTChaplain.desc } -ent-ClothingBackpackDeathSquadFilled = death squad backpack - .desc = Holds the kit of CentComm's most feared agents. +ent-ClothingBackpackDeathSquadFilled = Рюкзак эскадрона смерти + .desc = Содержит набор предметов, являющихся самыми устрашающими для агентов ЦентКомма. ent-ClothingBackpackCargoFilled = { ent-ClothingBackpackCargo } .desc = { ent-ClothingBackpackCargo.desc } ent-ClothingBackpackSalvageFilled = { ent-ClothingBackpackSalvage } diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/catalog/fills/boxes/ammunition.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/catalog/fills/boxes/ammunition.ftl index e6b9e48a6f..fdda1cd2fa 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/catalog/fills/boxes/ammunition.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/catalog/fills/boxes/ammunition.ftl @@ -8,24 +8,34 @@ ent-BoxMagazineLightRifle = коробка магазинов с .30 винто .desc = Полная коробка магазинов с патронами калибра .30 винтовочный. ent-BoxMagazineLightRiflePractice = коробка магазинов с .30 винтовочными (учебными) .desc = Полная коробка магазинов с учебными патронами калибра .30 винтовочный. +ent-BoxMagazineLightRifleRubber = коробка магазинов с .30 винтовочными (резиновыми) + .desc = Полная коробка магазинов с резиновыми патронами калибра .30 винтовочный. ent-BoxMagazineMagnumSubMachineGun = коробка магазинов Вектор .desc = Полная коробка магазинов с патронами для ПП Вектор. ent-BoxMagazineMagnumSubMachineGunPractice = коробка магазинов Вектор (учебными) .desc = Полная коробка магазинов с учебными патронами для ПП Вектор. +ent-BoxMagazineMagnumSubMachineGunRubber = коробка магазинов Вектор (резиновыми) + .desc = Полная коробка магазинов с резиновыми патронами для ПП Вектор. ent-BoxMagazinePistolSubMachineGunTopMounted = коробка магазинов WT550 .35 авто .desc = Полная коробка магазинов с патронами калибра .35 авто для WT550. ent-BoxMagazinePistol = коробка магазинов пистолетных .35 авто .desc = Полная коробка пистолетных магазинов с патронами калибра .35 авто. ent-BoxMagazinePistolPractice = коробка магазинов пистолетных .35 авто (учебные) .desc = Полная коробка пистолетных магазинов с учебными патронами калибра .35 авто. +ent-BoxMagazinePistolRubber = коробка магазинов пистолетных .35 авто (резиновые) + .desc = Полная коробка пистолетных магазинов с резиновые патронами калибра .35 авто. ent-BoxMagazinePistolHighCapacity = коробка магазинов автопистолетных .35 авто .desc = Полная коробка автопистолетных магазинов с патронами калибра .35 авто. ent-BoxMagazinePistolHighCapacityPractice = коробка магазинов автопистолетных .35 авто (учебные) .desc = Полная коробка автопистолетных магазинов с учебными патронами калибра .35 авто. +ent-BoxMagazinePistolHighCapacityRubber = коробка магазинов автопистолетных .35 авто (резиновые) + .desc = Полная коробка автопистолетных магазинов с резиновые патронами калибра .35 авто. ent-BoxMagazinePistolSubMachineGun = коробка магазинов для ПП .35 авто .desc = Полная коробка магазинов для ПП с патронами калибра .35 авто. ent-BoxMagazinePistolSubMachineGunPractice = коробка магазинов для ПП .35 авто (учебные) .desc = Полная коробка магазинов для ПП с учебными патронами калибра .35 авто. +ent-BoxMagazinePistolSubMachineGunRubber = коробка магазинов для ПП .35 авто (резиновые) + .desc = Полная коробка магазинов для ПП с резиновыми патронами калибра .35 авто. ent-BoxMagazineShotgun = коробка барабанов (.50 дробь) .desc = Полная коробка барабанов с патронами .50 дробь. ent-BoxMagazineShotgunBeanbag = коробка барабанов (.50 травматические) @@ -38,3 +48,5 @@ ent-BoxMagazineRifle = коробка магазинов с .20 винтовоч .desc = Полная коробка магазинов с патронами калибра .20 винтовочный. ent-BoxMagazineRiflePractice = коробка магазинов с .20 винтовочными (учебные) .desc = Полная коробка магазинов с учебными патронами калибра .20 винтовочный. +ent-BoxMagazineRifleRubber = коробка магазинов с .20 винтовочными (резиновые) + .desc = Полная коробка магазинов с резиновыми патронами калибра .20 винтовочный. diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/catalog/fills/boxes/syndicate.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/catalog/fills/boxes/syndicate.ftl index ac3b94e048..6f6995c471 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/catalog/fills/boxes/syndicate.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/catalog/fills/boxes/syndicate.ftl @@ -7,3 +7,5 @@ ent-ThrowingKnivesKit = набор метательных ножей .desc = Набор из 4 фирменных метательных ножей Синдиката, идеально подходящих для вонзания в тело жертвы. ent-BoxDeathRattleImplants = коробка имплантеров Предсмертный хрип .desc = Шесть имплантов Предсмертный хрип для всего отряда. +ent-Observationskit = набор слежения + .desc = { ent-BoxCardboard.desc } diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/catalog/fills/crates/service.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/catalog/fills/crates/service.ftl index 653011aa32..e16f919a24 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/catalog/fills/crates/service.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/catalog/fills/crates/service.ftl @@ -33,3 +33,5 @@ ent-CrateTrashCartFilled = { ent-CrateTrashCart } .desc = { ent-CrateTrashCart.desc } ent-CrateCandles = ящик свечей .desc = Содержит 4 коробки свечей, 2 больших и 2 маленьких. Для создания атмосферы или ещё чего-нибудь. +ent-CrateJanitorExplosive = Шкафчик взрывозащитного обмундирования уборщика + .desc = Чисто, и защищено от взрывов! diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/catalog/fills/lockers/security.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/catalog/fills/lockers/security.ftl index 02c61f8932..8f086d9d5e 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/catalog/fills/lockers/security.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/catalog/fills/lockers/security.ftl @@ -10,6 +10,9 @@ ent-LockerSecurityFilled = { ent-LockerSecurity } ent-LockerBrigmedicFilled = { ent-LockerBrigmedic } .suffix = Медицинский офицер, Заполненный .desc = { ent-LockerBrigmedic.desc } +ent-LockerBrigmedicFilledHardsuit = { ent-LockerBrigmedic } + .suffix = Медицинский офицер, Заполненный, Скафандр + .desc = { ent-LockerBrigmedic.desc } ent-LockerDetectiveFilled = { ent-LockerDetective } .suffix = Заполненный .desc = { ent-LockerDetective.desc } diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/deltav/entities/clothing/outerclothing/armor.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/deltav/entities/clothing/outerclothing/armor.ftl index 4556151562..0201b78290 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/deltav/entities/clothing/outerclothing/armor.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/deltav/entities/clothing/outerclothing/armor.ftl @@ -1,6 +1,6 @@ -ent-ClothingOuterArmorPlateCarrier = бронижилет - .desc = Громоздкий бронижилет со стальными плитами, обеспечивающий надежную защиту от огнестрельного оружия. ent-ClothingOuterArmorDuraVest = жилет из дюраткани .desc = Плотно облегающий и прочный бронежилет, усиленный дюратканью для защиты от острых предметов и травм тупым предметом. +ent-ClothingOuterArmorPlateCarrier = Носитель бронепластин + .desc = Большой и громоздкий держатель со стальными пластинами, обеспечивающими надежную защиту от огнестрельного оружия. ent-ClothingOuterArmorARC = РКББ .desc = Расширенный костюм для борьбы с беспорядкам, или сокращенно РКББ, для большинства считается слишком громоздким и душным для ношения, но во время массовых беспорядков большинство офицеров неизменно берут именно его, благодаря его толстой защите и большой площади покрытия. diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/deltav/entities/clothing/uniforms/jumpskirts.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/deltav/entities/clothing/uniforms/jumpskirts.ftl index db32571a58..7eca3412e9 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/deltav/entities/clothing/uniforms/jumpskirts.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/deltav/entities/clothing/uniforms/jumpskirts.ftl @@ -17,7 +17,7 @@ ent-ClothingUniformJumpskirtCentcomDirector = юбка-комбинезон ди ent-ClothingUniformJumpskirtChiefJustice = юбка-комбинезон верховного судьи .desc = Деловой наряд в сочетании с кружевным галстуком. Его носят лишь самые деловые личности. - ent-ClothingUniformJumpskirtClerk = юбка-комбинезон судьи +ent-ClothingUniformJumpskirtClerk = юбка-комбинезон судьи .desc = Скромная юбка для тех, кто может записать любую информацию. ent-ClothingUniformJumpskirtProsecutor = юбка-комбинезон прокурора .desc = Красная юбка в сочетании с костюмом и деловым галстуком. Идеальный вариант для прокурора. diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/deltav/entities/objects/consumable/drinks/drinks.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/deltav/entities/objects/consumable/drinks/drinks.ftl index 756e9f83da..ae8451bc43 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/deltav/entities/objects/consumable/drinks/drinks.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/deltav/entities/objects/consumable/drinks/drinks.ftl @@ -22,3 +22,9 @@ ent-DrinkKvassGlass = { ent-DrinkGlass } ent-DrinkMothamphetamineGlass = { ent-DrinkGlass } .desc = На удивление газированный напиток.. От него веет аурой хаоса. .suffix = метамфетамин +ent-DrinkFitnessShakerBlack = Чёрный фитнес-шейкер + .desc = Специально предназначенный для протеина шейкер +ent-DrinkFitnessShakerBlue = Синий фитнес-шейкер + .desc = Специально предназначенный для протеина шейкер +ent-DrinkFitnessShakerRed = Красный фитнес-шейкер + .desc = Специально предназначенный для протеина шейкер diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/deltav/entities/objects/devices/cartridges.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/deltav/entities/objects/devices/cartridges.ftl index a1fd47189e..82fb71ab41 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/deltav/entities/objects/devices/cartridges.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/deltav/entities/objects/devices/cartridges.ftl @@ -1,4 +1,4 @@ -ent-CrimeAssistCartridge = crime assist cartridge - .desc = A cartridge that helps identify crimes and see appropriate punishment. -ent-SecWatchCartridge = sec watch cartridge - .desc = A cartridge that tracks the status of currently wanted individuals. +ent-CrimeAssistCartridge = Картридж для помощи в преступлениях + .desc = Картридж, помогающий в разборе преступлений и выдаче справедливых наказаний +ent-SecWatchCartridge = Картридж СБ + .desc = Картридж, который отслеживает статус лиц, находящихся в настоящее время в розыске. diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/deltav/entities/objects/specific/justice/gavel.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/deltav/entities/objects/specific/justice/gavel.ftl index 992483cac7..08cc71c138 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/deltav/entities/objects/specific/justice/gavel.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/deltav/entities/objects/specific/justice/gavel.ftl @@ -1,2 +1,2 @@ -ent-Gavel = gavel - .desc = A hardwood mallet made to keep order in the court. +ent-Gavel = Молоток правосудия + .desc = Молоток из твердой древесины, предназначенный для поддержания порядка во дворе. diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/deltav/entities/objects/weapons/guns/ammunition/cartridges/special.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/deltav/entities/objects/weapons/guns/ammunition/cartridges/special.ftl index 31bee9a663..8cb2e687af 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/deltav/entities/objects/weapons/guns/ammunition/cartridges/special.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/deltav/entities/objects/weapons/guns/ammunition/cartridges/special.ftl @@ -10,7 +10,7 @@ ent-CartridgeSpecialIncendiary = патрон (.38 специальные заж .desc = { ent-BaseCartridgeSpecial.desc } ent-CartridgeSpecialUranium = патрон (.38 специальные урановые) .desc = { ent-BaseCartridgeSpecial.desc } -ent-CartridgeSpecialHoly = cartridge патрон (.38 специальные освещённые) +ent-CartridgeSpecialHoly = патрон (.38 специальные освещённые) .desc = { ent-BaseCartridgeSpecial.desc } ent-CartridgeSpecialMindbreaker = патрон (.38 специальные подавляющие) .desc = { ent-BaseCartridgeSpecial.desc } diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/clothing/back/duffel.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/clothing/back/duffel.ftl index 570828ccf8..a096945b36 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/clothing/back/duffel.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/clothing/back/duffel.ftl @@ -51,3 +51,7 @@ ent-ClothingBackpackDuffelHolding = бездонный вещмешок .desc = Вещмешок, открывающийся в локальный карман блюспейса. ent-ClothingBackpackDuffelCBURN = вещмешок отряда РХБЗЗ .desc = Вещмешок, содержащий различное оборудование для сдерживания биологической угрозы. +ent-ClothingBackpackDuffelSyndicateOperative = вещмешок оперативника + .desc = Большая спортивная сумка для хранения различных вещей спецагентов. +ent-ClothingBackpackDuffelSyndicateOperativeMedic = вещмешок оперативника-медика + .desc = Большая спортивная сумка для хранения различных вещей спецагентов, включая и медицинские запасы. diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/clothing/eyes/glasses.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/clothing/eyes/glasses.ftl index e5cced3636..2e521e7ca1 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/clothing/eyes/glasses.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/clothing/eyes/glasses.ftl @@ -6,6 +6,8 @@ ent-ClothingEyesGlassesGarGiga = гигамужицкие очки .desc = Мы эволюционируем из тех людей, какими были минуту назад, шаг за шагом мы продвигаемся, чуть дальше с каждым разом, вот как работает дрель! ent-ClothingEyesGlassesMeson = инженерные очки .desc = Очки с зелёным затемнением, использующие патентованный полимер, обеспечивающие надёжную защиту глаз от всех видов повреждений. +ent-ClothingEyesGlassesMesonBudget = Зелёные очки + .desc = Не имеют какой-либо вспомогательной функции, но выглядят прикольно! ent-ClothingEyesGlasses = очки .desc = Пара неприглядных очков с линзами по рецепту. ent-ClothingEyesGlassesJensen = очки Дженсена @@ -28,3 +30,5 @@ ent-ClothingEyesGlassesChemical = очки химического анализа .desc = Очки, позволяющие сканировать химический состав раствора. ent-ClothingEyesVisorNinja = очки ниндзя .desc = Усовершенствованные очки, защищающие глаза ниндзя от вспышек света. +ent-ClothingEyesGlassesChemicalBudget = фиолетовые защитные очки + .desc = У них нет никакой реальной функции, но выглядят они действительно круто! diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/clothing/eyes/hud.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/clothing/eyes/hud.ftl index 8c1a835360..232e9b1d33 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/clothing/eyes/hud.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/clothing/eyes/hud.ftl @@ -10,20 +10,20 @@ ent-ClothingEyesHudSecurity = визор охраны .desc = Окуляр с индикатором на стекле, который сканирует гуманоидов в поле зрения и предоставляет точные данные об их идентификационном статусе и записях в системе безопасности. ent-ClothingEyesHudBeer = пивные очки .desc = Пара солнцезащитных очков, оснащённых сканером реагентов, а также дающих понимание вязкости жидкости во время движения. -ent-ClothingEyesHudFriedOnion = fried onion goggles - .desc = Filler +ent-ClothingEyesHudFriedOnion = Луковые очки + .desc = Очки, сделанные из луковых колечек ent-ClothingEyesHudOnionBeer = thungerst goggles .desc = Filler -ent-ClothingEyesHudMedOnion = medonion hud - .desc = Filler -ent-ClothingEyesHudMedOnionBeer = medthungerst hud - .desc = Filler +ent-ClothingEyesHudMedOnion = Луковые очки с интерфейсом + .desc = Очки с интерфейсом, линзы которых зафиксированы в луковых колечках +ent-ClothingEyesHudMedOnionBeer = Пивные очки с интерфейсом + .desc = Не бойтесь быть клёвым, даже если вам за сорок и вы играете в танки! ent-ClothingEyesHudMedSec = мед-охранный визор .desc = Окуляр с индикатором на стекле, напоминающий сочетание визора охраны с медицинским. -ent-ClothingEyesHudMultiversal = multiversal hud - .desc = Filler -ent-ClothingEyesHudOmni = omni hud - .desc = Filler +ent-ClothingEyesHudMultiversal = Очки с интерфейсом + .desc = Очки с интерфейсом. Не бойтесь быть стильным! +ent-ClothingEyesHudOmni = Очки с интерфейсом + .desc = Фиолетовые очки с интерфейсом, выглядят стильно! # Corvax-HiddenDesc-Start ent-ClothingEyesHudSyndicate = визор оперативника .suffix = синди-визор diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/clothing/eyes/misc.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/clothing/eyes/misc.ftl index 5f6ebd8cd8..fed4decda0 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/clothing/eyes/misc.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/clothing/eyes/misc.ftl @@ -5,3 +5,5 @@ ent-ClothingEyesBlindfold = повязка на глаза ent-ClothingEyesEyepatchFlipped = { ent-ClothingEyesEyepatch } .suffix = Перевёрнутый .desc = { ent-ClothingEyesEyepatch.desc } +ent-ClothingEyesBlindfoldFake = { ent-ClothingEyesBlindfold } + .desc = { ent-ClothingEyesBlindfold.desc } diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/clothing/neck/mantles.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/clothing/neck/mantles.ftl index 30df65a474..8b6a7e46f9 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/clothing/neck/mantles.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/clothing/neck/mantles.ftl @@ -14,3 +14,5 @@ ent-ClothingNeckMantleRD = мантия научного директора .desc = Ужасно удобная драпировка на плечи для гения как в вопросах науки, так и моды. ent-ClothingNeckMantleQM = мантия квартирмейстера .desc = Для властелина грузов и материалов, дабы властвовать над отделом, достойная мантия для демонстрации превосходства! +ent-ClothingNeckOldMantle = Старая обёртка + .desc = Тканевая обёртка, прошедшая через года. Пахнет сигарами diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/clothing/neck/misc.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/clothing/neck/misc.ftl index d4d35add0c..4f12d64688 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/clothing/neck/misc.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/clothing/neck/misc.ftl @@ -8,3 +8,5 @@ ent-ClothingNeckLawyerbadge = значок адвоката .desc = Значок, свидетельствующий что владелец является "законным" Адвкоатом, сдавшим экзамен Nanotrasen, необходимый для занятия юридической практикой. ent-ActionStethoscope = Прослушать стетоскопом .desc = { "" } +ent-ClothingNeckUnathiMantle = Скрытная повязка + .desc = Повязка, предназначенная для скрытного передвижения diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/clothing/outerclothing/wintercoats.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/clothing/outerclothing/wintercoats.ftl index f7a1eb57cf..4540e320f9 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/clothing/outerclothing/wintercoats.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/clothing/outerclothing/wintercoats.ftl @@ -70,3 +70,25 @@ ent-ClothingOuterWinterMusician = зимняя куртка музыканта .desc = Безразмерный пластилиновый космический фрак, который заставит людей спрашивать: "Вы меня знаете?". ent-ClothingOuterWinterWeb = паутинная зимняя куртка .desc = Даёт ощущение, словно вы внутри кокона, не то чтобы из-за этого вам стало менее страшно оказаться в настоящем. +ent-ClothingOuterBcCorporateJacket = Корпоративная куртка Киберимплантера Бишопа + .desc = Аэ... Имплантиков хотите? +ent-ClothingOuterDdCorporateJacket = Фирменная куртка "Танцующей" корпорации + .desc = Уютная куртка с логотипом Танцующей Корпорации, напечатанным на спине. Товары, приобретенные на станциях, имеют коэффициент прочности, равный... семи? +ent-ClothingOuterHiCorporateJacket = Фирменная куртка корпорации Индастриал + .desc = Уютная куртка с логотипом Индастриал Корпорации, напечатанным на спине. Товары, приобретенные на станциях, имеют коэффициент прочности, равный... семи? +ent-ClothingOuterEeCorporateJacket = Фирменная куртка корпорации Энштейнов + .desc = Уютная куртка с логотипом Двигательной Корпорации, напечатанным на спине. Товары, приобретенные на станциях, имеют коэффициент прочности, равный... семи? +nt-ClothingOuterGeCorporateJacket = Фирменная куртка Экспортионной корпорации + .desc = Уютная куdртка с логотипом Экспортионной корпорацииё, напечатанным на спине. Товары, приобретенные на станциях, имеют коэффициент прочности, равный... семи? +ent-ClothingOuterHmCorporateJacket = Фирменная куртка Приобретённой корпорации + .desc = Уютная куртка с логотипом Приобретённой Корпорации, напечатанным на спине. Товары, приобретенные на станциях, имеют коэффициент прочности, равный... семи? +ent-ClothingOuterCsCorporateJacket = Корпоративная жилетка CyberSun + .desc = Уютная куртка с логотипом Cybersun на спине. Товары, вручаемые станциям с коэффициентом безопасности эээ... семь. +ent-ClothingOuterZhCorporateJacket = Фирменная куртка корпорации Зенгху + .desc = Уютная куртка с логотипом Zeng-Hu Pharmaceuticals, напечатанным на спине. Товары, приобретенные на станциях, имеют коэффициент запаса прочности, равный... семи. +ent-ClothingOuterIdCorporateJacket = Фирменная куртка "Интердайн" + .desc = Уютная куртка с логотипом "Интердайн", напечатанным на спине. Товары, поступившие на склад, имеют прочности, уровень которой равен... семи? +ent-ClothingOuterFaCorporateJacket = фирменная куртка оружейной "Пятая точка" + .desc = Уютная куртка с логотипом ружейной "Пятая точка", напечатанным на спине. Товары, поступившие на склад, имеют прочности, уровень которой равен... семи? +ent-ClothingOuterGeCorporateJacket = фирменная куртка исследователей "Гилтари" + .desc = Уютная куртка с логотипом исследователей "Гилтари", напечатанным на спине. Товары, поступившие на склад, имеют прочности, уровень которой равен... семи? diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/mobs/npcs/miscellaneous.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/mobs/npcs/miscellaneous.ftl index 63c392ec11..6e75cc430f 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/mobs/npcs/miscellaneous.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/mobs/npcs/miscellaneous.ftl @@ -1,4 +1,2 @@ ent-MobLaserRaptor = лазерный раптор .desc = Из эпохи викингов. -ent-MobTomatoKiller = помидор-убийца - .desc = Похоже, сегодня не вы едите помидоры, а помидоры едят вас. diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/mobs/npcs/pets.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/mobs/npcs/pets.ftl index c30a4ee007..ccdd409e48 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/mobs/npcs/pets.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/mobs/npcs/pets.ftl @@ -47,3 +47,9 @@ ent-MobMonkeyPunpun = Пун Пун .desc = Видный представитель обезьян с неограниченным доступом к алкоголю. ent-MobCrabAtmos = Тропико .desc = Благородный и непоколебимый защитник Атмосии. Viva! +ent-PetRockFred = Фред + .desc = Ваш новый и единственный каменный друг! +ent-PetRock = камень-питомец + .desc = Твой новый и единственный лучший друг! +ent-PetRockCarrier = плюшевый камень-питомец + .desc = Твой новый и единственный лучший друг дома! diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/mobs/npcs/xeno.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/mobs/npcs/xeno.ftl index d6fbec371b..7b28f22c09 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/mobs/npcs/xeno.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/mobs/npcs/xeno.ftl @@ -1,18 +1,18 @@ ent-MobXeno = Бурильщик .desc = Обычно они приходят ночью. Обычно. -ent-MobXenoPraetorian = Преторианец +ent-MobXenoPraetorianNPC = Преторианец .desc = { ent-MobXeno.desc } -ent-MobXenoDrone = Дрон +ent-MobXenoDroneNPC = Дрон .desc = { ent-MobXeno.desc } -ent-MobXenoQueen = Королева +ent-MobXenoQueenNPC = Королева .desc = { ent-MobXeno.desc } -ent-MobXenoRavager = Разрушитель +ent-MobXenoRavagerNPC = Разрушитель .desc = { ent-MobXeno.desc } -ent-MobXenoRunner = Бегун +ent-MobXenoRunnerNPC = Бегун .desc = { ent-MobXeno.desc } -ent-MobXenoRouny = Руни +ent-MobXenoRounyNPC = Руни .desc = { ent-MobXenoRunner.desc } -ent-MobXenoSpitter = Плевальщик +ent-MobXenoSpitterNPC = Плевальщик .desc = { ent-MobXeno.desc } ent-MobPurpleSnake = космическая гадюка .desc = Грозная пурпурная змея с Kepler-283c. diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/mobs/player/silicon_base.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/mobs/player/silicon_base.ftl index 0c4a520fad..5540f51513 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/mobs/player/silicon_base.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/mobs/player/silicon_base.ftl @@ -1,2 +1,2 @@ ent-PlayerSiliconHumanoidBase = { ent-BaseMob } - .desc = { ent-BaseMob.desc } + .desc = { ent-BaseMob.desc } diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/consumable/drinks/drinks-cartons.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/consumable/drinks/drinks-cartons.ftl index 757331f313..c193dfdc81 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/consumable/drinks/drinks-cartons.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/consumable/drinks/drinks-cartons.ftl @@ -23,3 +23,7 @@ ent-DrinkOatMilkCarton = овсяное молоко .desc = Бежевое и питательное удовольствие! ent-DrinkJuiceLemonCarton = лимонный сок .desc = На первый глоток он кислит, а затем всё равно кислит. +ent-DrinkMilkCartonMini = Мини молоко + .desc = Жидкость, произведённая заботливой мамочкой :3 +ent-DrinkMilkCartonMiniChocolate = Мини шоколадное молоко + .desc = Молоко со вкусом какао, прямо из чернокожей коровки! Или бычка... diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/consumable/drinks/trash_drinks.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/consumable/drinks/trash_drinks.ftl index cf0f34d0b5..d92fae06e6 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/consumable/drinks/trash_drinks.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/consumable/drinks/trash_drinks.ftl @@ -56,3 +56,5 @@ ent-DrinkCartonSoyMilk = упаковка от соевого молока .desc = { ent-DrinkCartonBaseLargeEmpty.desc } ent-DrinkCartonOatMilk = упаковка от овсяного молока .desc = { ent-DrinkCartonBaseLargeEmpty.desc } +ent-DrinkBottleGoldschlager = Бутылка голдшлягера + .desc = Пустая бутылка diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/consumable/food/containers/condiments.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/consumable/food/containers/condiments.ftl index 419c371884..fdfbc29696 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/consumable/food/containers/condiments.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/consumable/food/containers/condiments.ftl @@ -46,3 +46,5 @@ ent-FoodShakerSalt = солонка .desc = Соль. Из космических океанов, предположительно. ent-FoodShakerPepper = перечница .desc = Часто используется как приправа к пище, или чтобы заставить людей чихать. +ent-FoodCondimentPacketProtein = пакетик с протеиновым порошком + .desc = Содержит 10 единиц порошкообразного белка. Смешать с 20 единиц воды diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/consumable/food/produce.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/consumable/food/produce.ftl index ce0ba45bdf..6dbc74e033 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/consumable/food/produce.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/consumable/food/produce.ftl @@ -86,6 +86,10 @@ ent-FoodChiliPepper = перец чили .desc = Острый, лучше не трогать глаза. ent-FoodChillyPepper = перец чилли .desc = Обжигающе холодный. +ent-FoodChili = перец чили + .desc = Острый, лучше не трогать глаза. +ent-FoodChilly = перец чилли + .desc = Обжигающе холодный. ent-FoodAloe = алоэ .desc = Ароматное растение с успокаивающими свойствами. ent-FoodPoppy = мак diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/consumable/food/snacks.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/consumable/food/snacks.ftl index 4cc0c3d8e2..def0507448 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/consumable/food/snacks.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/consumable/food/snacks.ftl @@ -83,3 +83,27 @@ ent-FoodCookieFortune = печенье с предсказанием .desc = Предсказание гласит: Конец близок... и это всё ваша вина. ent-FoodPacketMRETrash = обёртка от ИРП .desc = Обёртка широкого назначения для различных военных продуктов питания. +ent-FoodSnackChocobanana = Шокобанан + .desc = Шоколад и посыпка, укутавшие банан на палочке +ent-FoodSnackDango = Данго + .desc = Сушёные рисовые шарики на палочке. ДВЕНАДЦАТЬ ТАНГО +ent-FoodSnackMarsFrouka = Фроука + .desc = Отпразднуйте день основания с дымящейся от тепла, самонагревающейся миской сладких яиц и картошки! +ent-FoodHarpyWings = ХрустоКрылышки + .desc = Немного замаслились +ent-FoodSnackMochicake = Лунное пирожное мочи + .desc = Японское блюдо из риса, похожее на луну! +ent-FoodSnackMooncake = Лунный пирог + .desc = Иследуй тёмную сторону луны! Может содержать частички какао. +ent-FoodSnackLunacake = Лунный торт + .desc = Теперь на 20% меньше шанса вызвать рак или стать вульпой! Шутка! Или не шутка... +ent-FoodSnackJoveGello = Желе Джо + .desc = От Джо! Похоже на гель... +ent-FoodSnackRedalertnuts = орехи "КРАСНЫЙ КОД!" + .desc = Пакетик "Красной тревоги"! Фирменные пряные орешки. Отлично сочетается с вашим пивом! У вас же есть пиво? +ent-FoodSnackPokeysticks = палочки для торта + .desc = Набор палочек из печенья, покрытых шоколадной глазурью. +ent-FoodSnackPlutoniumrods = плутониевые стержни + .desc = Безалкогольные и безвкусные батончики "nutri thick", которые помогут вам продержаться целый день. Теперь они еще меньше вызывают сыпь! +ent-FoodSnackOortrocks = камень облака Оорта + .desc = Новая формула поп-рока, посвященного самому важному промышленному сектору Сол, гарантирует меньшее количество травм полости рта, вызванных шрапнелью. diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/devices/door_remote.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/devices/door_remote.ftl index 972ba27cd9..e4ea512821 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/devices/door_remote.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/devices/door_remote.ftl @@ -16,6 +16,8 @@ ent-DoorRemoteMedical = пульт от шлюзов медотсека .desc = { ent-DoorRemoteDefault.desc } ent-DoorRemoteEngineering = пульт от шлюзов инженерного отдела .desc = { ent-DoorRemoteDefault.desc } +ent-DoorRemoteEngineering = пульт от шлюзов пожарника + .desc = { ent-DoorRemoteDefault.desc } ent-DoorRemoteAll = супер-пульт от шлюзов .suffix = Адмемы .desc = { ent-DoorRemoteDefault.desc } diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/devices/electronics/door_access.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/devices/electronics/door_access.ftl index 392e89c3a7..3e2740e8b1 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/devices/electronics/door_access.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/devices/electronics/door_access.ftl @@ -112,3 +112,6 @@ ent-DoorElectronicsSyndicateAgent = { ent-DoorElectronics } ent-DoorElectronicsNukeop = { ent-DoorElectronics } .suffix = Ядерные Оперативники, Закрыт .desc = { ent-DoorElectronics.desc } +ent-DoorElectronicsNukeop = { ent-DoorElectronics } + .suffix = Ядерные Оперативники, Закрыт + .desc = { ent-DoorElectronics.desc } diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/devices/pda.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/devices/pda.ftl index 4765e0172b..831e664626 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/devices/pda.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/devices/pda.ftl @@ -34,8 +34,6 @@ ent-BartenderPDA = КПК бармена .desc = Пахнет пивом. ent-LibrarianPDA = КПК библиотекаря .desc = Пахнет книгами. -ent-LawyerPDA = КПК адвоката - .desc = Для адвокатов, переманивающих сомнительных клиентов. ent-JanitorPDA = КПК уборщика .desc = Пахнет отбеливателем. ent-CaptainPDA = КПК капитана @@ -58,8 +56,6 @@ ent-RnDPDA = КПК научного директора .desc = Он кажется удивительно обычным. ent-SciencePDA = КПК учёного .desc = Он покрыт неизвестным липким веществом. -ent-HoSPDA = КПК главы службы безопасности - .desc = Носитель данного КПК - закон. ent-WardenPDA = КПК смотрителя .desc = Похоже, что на ОС был установлен джейлбрейк. ent-SecurityPDA = КПК офицера СБ diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/fun/mech_figurines.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/fun/mech_figurines.ftl index bf59029692..2c7a8e6a78 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/fun/mech_figurines.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/fun/mech_figurines.ftl @@ -24,3 +24,5 @@ ent-ToyPhazon = игрушечный фазон .desc = Фигурка Мини-Мех! 'Меха номер 11/12' написано на обороте. ent-ToyReticence = игрушечный молчун .desc = Фигурка Мини-Мех! 'Меха номер 12/12' написано на обороте. +ent-ThronglerToy = Тот, кто собирается в толпе + .desc = Зачем тебе это понадобилось? diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/fun/prizeticket.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/fun/prizeticket.ftl index be5ef014b7..66293976ac 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/fun/prizeticket.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/fun/prizeticket.ftl @@ -17,3 +17,5 @@ ent-PrizeTicket1 = призовой билет .desc = { ent-PrizeTicket.desc } ent-PrizeBall = призовой шарик .desc = Интересно, что внутри? +ent-PrizeCounter = раздачик призов + .desc = Выиграй игру и забери свой приз! Лучший способ показать своё внимание к любимой, это выиграть ей плюшевого медведя! diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/fun/toys.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/fun/toys.ftl index db6b597375..1b3a9e3b91 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/fun/toys.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/fun/toys.ftl @@ -123,3 +123,29 @@ ent-PlushieHuman = плюшевый человек .desc = Плюшевый человек из войлока. Качество - ниже не бывает. Человек голый. Человек плачет. Человек кричит. ent-NewtonCradle = колыбель Ньютона .desc = Устройство, которое скучающие бумагомаратели используют, дабы напомнить себе, что время ещё не остановилось. Содержит гравитацию. +ent-PlushieArachne = Плюшевый арахне + .desc = Полу рак полу хуй... +ent-PlushieAbductorAgent = Плюшевый агент абдуктор + .desc = Мягкая игрушка, похожая на абдуктора-похитителя! +ent-PlushieAbductor = Плюшевый абдуктор + .desc = Мягкая игрушка, похожая на абдуктора! +ent-PlushieCorgi = Игрушка корги + .desc = Это плюшевый Иан ограниченной коллекции! +ent-PlushieDeer = Игрушка оленя + .desc = Мягкая игрушка, напоминающая милого оленя! +ent-PlushieGirlyCorgi = Игрушка самки корги + .desc = Плюшка вульпканина, которую вы можете жмакать без опасений быть укушенным ( Или трахнутым... ). Погодите, что здесь за дырка..? +ent-PlushieGnome = Плюшевый гном + .desc = Игрушка, напоминающая гнома! Или дварфа... +ent-PlushieGrey = Серая игрушка инопланетянина + .desc = Мягкая игрушка, напоминающая милого инопланетянина! +ent-PlushieIpc = Мягкая игрушка КПБ + .desc = Мягкая игрушечка, напоминающая вам милого мягкого робота! На его спине написана полустёртая надпись "Pe4henika was here..." +ent-PlushieSlips = Мягкая игрушка уборщика + .desc = Молчаливый уборщик, от которого не услышишь его привычный "Вех"! +ent-PlushieJester = Игрушка-Шут + .desc = Смешная плюшка в смешном костюме +ent-PlushieTrystan = Офисная игрушка вульпы + .desc = Та самая что тявкает! +ent-PlushieLoveable = Любвеобильная игрушка + .desc = Игрушка, в виде осьминожки! Куда это он тянет свои тентакли... diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/misc/books.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/misc/books.ftl index e6dd043ea9..036ea7b2bd 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/misc/books.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/misc/books.ftl @@ -40,3 +40,5 @@ ent-BookAtmosAirAlarms = Руководство Ньютона по атмосу .desc = Поля усеяны бесконечными неразборчивыми заметками. Большая часть текста испещрена рукописными вопросительными знаками. ent-BookAtmosVentsMore = Руководство Ньютона по атмосу: Вентиляция и многое другое .desc = Поля усеяны бесконечными неразборчивыми заметками. Большая часть текста испещрена рукописными вопросительными знаками. +ent-BookChefGaming = Руководство шефа + .desc = Книга о готовке, написанная шефом-геймером. diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/misc/identification_cards.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/misc/identification_cards.ftl index 3524a1b841..11fe74b753 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/misc/identification_cards.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/misc/identification_cards.ftl @@ -64,7 +64,7 @@ ent-RDIDCard = ID карта научного директора .desc = { ent-IDCardStandard.desc } ent-HoSIDCard = ID карта главы службы безопасности .desc = { ent-IDCardStandard.desc } -ent-LPPBrigmedicIDCard = ID карта медициского офицера +ent-BrigmedicIDCard = ID карта медициского офицера .desc = { ent-IDCardStandard.desc } ent-CentcomIDCard = ID карта старшего офицера .desc = { ent-IDCardStandard.desc } diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/specific/hydroponics/seeds.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/specific/hydroponics/seeds.ftl index 0c6b223e68..06fcdb1cdf 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/specific/hydroponics/seeds.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/specific/hydroponics/seeds.ftl @@ -42,8 +42,6 @@ ent-BlueTomatoSeeds = пакет семян (синий томат) .desc = { ent-SeedBase.desc } ent-BloodTomatoSeeds = пакет семян (кровяной томат) .desc = { ent-SeedBase.desc } -ent-KillerTomatoSeeds = пакет семян (томат-убийца) - .desc = { ent-SeedBase.desc } ent-EggplantSeeds = пакет семян (баклажан) .desc = { ent-SeedBase.desc } ent-AppleSeeds = пакет семян (яблоко) diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/specific/medical/handheld_crew_monitor.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/specific/medical/handheld_crew_monitor.ftl index 0363477e97..7cb404a7e9 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/specific/medical/handheld_crew_monitor.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/specific/medical/handheld_crew_monitor.ftl @@ -4,3 +4,5 @@ ent-HandheldCrewMonitor = портативный монитор экипажа ent-HandheldCrewMonitorEmpty = { ent-HandheldCrewMonitor } .suffix = Пустой .desc = { ent-HandheldCrewMonitor.desc } +ent-SyndiCrewMonitorEmpty = Экран мониторинга синдиката + .desc = Монитор, собирающий информацию о живых сущностях с серверов diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/specific/robotics/borg_modules.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/specific/robotics/borg_modules.ftl index 77f8e706e3..d7bfe28c75 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/specific/robotics/borg_modules.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/specific/robotics/borg_modules.ftl @@ -78,3 +78,7 @@ ent-BorgModuleL6C = модуль киборга с L6C ROW .desc = Модуль, в который входит пулемёт L6C. ent-BorgModuleMartyr = модуль киборга Мученик .desc = Модуль, поставляемый со взрывчаткой, с которой вы, скорее всего, не захотите связываться сами. +ent-BorgModuleJetpack = Джетпак-модуль киборга + .desc = Позволяет вашему киборгу летать! +ent-BorgModulePka = модуль киборга с протокинетическим ускорителем + .desc = Технология, которая дает киборгам новые способности. diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/specific/service/vending_machine_restock.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/specific/service/vending_machine_restock.ftl index 644726a5c9..c8ada459d5 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/specific/service/vending_machine_restock.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/specific/service/vending_machine_restock.ftl @@ -52,3 +52,5 @@ ent-VendingMachineRestockHappyHonk = набор пополнения Хэппи .desc = Поместите эту коробку, полную веселья, в отсек для пополнения торгомата Хэппи Хонк. ent-VendingMachineRestockChemVend = набор пополнения ХимкоМат .desc = Коробка, наполненная химикатами, и обклеенная опасно-ромбического вида наклейками, предостерегающими и инструктирующими на случай чрезвычайной ситуациии. Поместите в слот для пополнения ХимкоМат, чтобы начать. +ent-VendingMachineHotfood = Раздатчик горячего питания + .desc = Старый автомат, раздающий горячие блюда. Вы понимаете что они хорошо сохранились, и вполне съедобны diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/tools/jetpacks.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/tools/jetpacks.ftl index d2c58b5182..cc1cb61764 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/tools/jetpacks.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/tools/jetpacks.ftl @@ -40,3 +40,9 @@ ent-JetpackVoid = пустотный джетпак ent-JetpackVoidFilled = пустотный джетпак .suffix = Полный .desc = { ent-JetpackVoid.desc } +ent-JetpackMicroFilled = Мини джетпак + .suffix = Полный + .desc = Это миниатюрный джетпак +ent-JetpackMicro = Мини джетпак + .suffix = Пустой + .desc = Это миниатюрный джетпак diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/weapons/bombs/plastic.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/weapons/bombs/plastic.ftl index 2703352043..0388f019aa 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/weapons/bombs/plastic.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/weapons/bombs/plastic.ftl @@ -4,3 +4,5 @@ ent-C4 = взрывчатка C-4 .desc = Используется для проделывания аккуратных, не слишком больших, брешей в местах закладки. Любимое средство диверсантов. ent-SeismicCharge = сейсмический заряд .desc = Взрывчатка, вызывающая землетрясение, разработанная для разрушения больших объёмов горной породы. +ent-BreachingCharge = Разрушительный заряд + .desc = Экстренная взрывчатка, созданная для офицеров что-бы пробивать стены diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/weapons/guns/ammunition/boxes/caseless_rifle.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/weapons/guns/ammunition/boxes/caseless_rifle.ftl index 49a83780ac..33ac9fcbb7 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/weapons/guns/ammunition/boxes/caseless_rifle.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/weapons/guns/ammunition/boxes/caseless_rifle.ftl @@ -4,7 +4,11 @@ ent-MagazineBoxCaselessRifle10x24 = ящик патронов (.25 безгил .desc = { ent-BaseMagazineBoxCaselessRifle.desc } ent-MagazineBoxCaselessRifleBig = ящик патронов (.25 безгильзовые) .desc = { ent-BaseMagazineBoxCaselessRifle.desc } +ent-MagazineBoxCaselessRifleBigRubber = ящик патронов (.25 безгильзовые резиновые) + .desc = { ent-BaseMagazineBoxCaselessRifle.desc } ent-MagazineBoxCaselessRifle = коробка патронов (.25 безгильзовые) .desc = { ent-BaseMagazineBoxCaselessRifle.desc } ent-MagazineBoxCaselessRiflePractice = коробка патронов (.25 безгильзовые учебные) .desc = { ent-BaseMagazineBoxCaselessRifle.desc } +ent-MagazineBoxCaselessRifleRubber = коробка патронов (.25 безгильзовые резиновые) + .desc = { ent-BaseMagazineBoxCaselessRifle.desc } diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/weapons/guns/ammunition/boxes/light_rifle.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/weapons/guns/ammunition/boxes/light_rifle.ftl index 50a01235a0..b5a6d8829a 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/weapons/guns/ammunition/boxes/light_rifle.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/weapons/guns/ammunition/boxes/light_rifle.ftl @@ -6,6 +6,8 @@ ent-MagazineBoxLightRifle = коробка патронов (.30 винтово .desc = { ent-BaseMagazineBoxLightRifle.desc } ent-MagazineBoxLightRiflePractice = коробка патронов (.30 винтовочные учебные) .desc = { ent-BaseMagazineBoxLightRifle.desc } +ent-MagazineBoxLightRifleRubber = коробка патронов (.30 винтовочные резиновые) + .desc = { ent-BaseMagazineBoxLightRifle.desc } ent-MagazineBoxLightRifleIncendiary = коробка патронов (.30 винтовочные зажигательные) .desc = { ent-BaseMagazineBoxLightRifle.desc } ent-MagazineBoxLightRifleUranium = коробка патронов (.30 винтовочные урановые) diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/weapons/guns/ammunition/boxes/magnum.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/weapons/guns/ammunition/boxes/magnum.ftl index b2c4638b19..461e1cd7d7 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/weapons/guns/ammunition/boxes/magnum.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/weapons/guns/ammunition/boxes/magnum.ftl @@ -4,6 +4,8 @@ ent-MagazineBoxMagnum = коробка патронов (.45 магнум) .desc = { ent-BaseMagazineBoxMagnum.desc } ent-MagazineBoxMagnumPractice = коробка патронов (.45 магнум учебные) .desc = { ent-BaseMagazineBoxMagnum.desc } +ent-MagazineBoxMagnumRubber = коробка патронов (.45 магнум резиновые) + .desc = { ent-BaseMagazineBoxMagnum.desc } ent-MagazineBoxMagnumIncendiary = коробка патронов (.45 магнум зажигательные) .desc = { ent-BaseMagazineBoxMagnum.desc } ent-MagazineBoxMagnumUranium = коробка патронов (.45 магнум урановые) diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/weapons/guns/ammunition/boxes/pistol.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/weapons/guns/ammunition/boxes/pistol.ftl index b0fa6bafb8..b05f22958b 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/weapons/guns/ammunition/boxes/pistol.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/weapons/guns/ammunition/boxes/pistol.ftl @@ -4,6 +4,8 @@ ent-MagazineBoxPistol = коробка патронов (.35 авто) .desc = { ent-BaseMagazineBoxPistol.desc } ent-MagazineBoxPistolPractice = коробка патронов (.35 авто учебные) .desc = { ent-BaseMagazineBoxPistol.desc } +ent-MagazineBoxPistolRubber = коробка патронов (.35 авто резиновые) + .desc = { ent-BaseMagazineBoxPistol.desc } ent-MagazineBoxPistolIncendiary = коробка патронов (.35 авто зажигательные) .desc = { ent-BaseMagazineBoxPistol.desc } ent-MagazineBoxPistolUranium = коробка патронов (.35 авто урановые) diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/weapons/guns/ammunition/boxes/rifle.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/weapons/guns/ammunition/boxes/rifle.ftl index a8153cd7c9..028ec76065 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/weapons/guns/ammunition/boxes/rifle.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/weapons/guns/ammunition/boxes/rifle.ftl @@ -2,10 +2,14 @@ ent-BaseMagazineBoxRifle = { ent-BaseItem } .desc = { ent-BaseItem.desc } ent-MagazineBoxRifleBig = ящик патронов (.20 винтовочные) .desc = { ent-BaseMagazineBoxRifle.desc } +ent-MagazineBoxRifleBigRubber = ящик патронов (.20 винтовочные резиновые) + .desc = { ent-BaseMagazineBoxRifle.desc } ent-MagazineBoxRifle = коробка патронов (.20 винтовочные) .desc = { ent-BaseMagazineBoxRifle.desc } ent-MagazineBoxRiflePractice = коробка патронов (.20 винтовочные учебные) .desc = { ent-BaseMagazineBoxRifle.desc } +ent-MagazineBoxRifleRubber = коробка патронов (.20 винтовочные резиновые) + .desc = { ent-BaseMagazineBoxRifle.desc } ent-MagazineBoxRifleIncendiary = коробка патронов (.20 винтовочные зажигательные) .desc = { ent-BaseMagazineBoxRifle.desc } ent-MagazineBoxRifleUranium = коробка патронов (.20 винтовочные урановые) diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/weapons/guns/ammunition/cartridges/caseless_rifle.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/weapons/guns/ammunition/cartridges/caseless_rifle.ftl index 4c92d8f336..e231f2ddc9 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/weapons/guns/ammunition/cartridges/caseless_rifle.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/weapons/guns/ammunition/cartridges/caseless_rifle.ftl @@ -4,3 +4,5 @@ ent-CartridgeCaselessRifle = патрон (.25 безгильзовый) .desc = { ent-BaseCartridgeCaselessRifle.desc } ent-CartridgeCaselessRiflePractice = патрон (.25 безгильзовый учебный) .desc = { ent-BaseCartridgeCaselessRifle.desc } +ent-CartridgeCaselessRifleRubber = патрон (.25 безгильзовый резиновый) + .desc = { ent-BaseCartridgeCaselessRifle.desc } diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/weapons/guns/ammunition/cartridges/light_rifle.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/weapons/guns/ammunition/cartridges/light_rifle.ftl index 0dae7f3df7..e90b02ba69 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/weapons/guns/ammunition/cartridges/light_rifle.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/weapons/guns/ammunition/cartridges/light_rifle.ftl @@ -8,3 +8,5 @@ ent-CartridgeLightRifleIncendiary = патрон (.30 винтовочный з .desc = { ent-BaseCartridgeLightRifle.desc } ent-CartridgeLightRifleUranium = патрон (.30 винтовочный урановый) .desc = { ent-BaseCartridgeLightRifle.desc } +ent-CartridgeLightRifleRubber = патрон (.30 винтовочный резиновый) + .desc = { ent-BaseCartridgeLightRifle.desc } diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/weapons/guns/ammunition/cartridges/magnum.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/weapons/guns/ammunition/cartridges/magnum.ftl index bb4b596d94..971c0dea2c 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/weapons/guns/ammunition/cartridges/magnum.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/weapons/guns/ammunition/cartridges/magnum.ftl @@ -10,3 +10,5 @@ ent-CartridgeMagnumAP = патрон (.45 магнум бронебойный) .desc = { ent-BaseCartridgeMagnum.desc } ent-CartridgeMagnumUranium = патрон (.45 магнум урановый) .desc = { ent-BaseCartridgeMagnum.desc } +ent-CartridgeMagnumRubber = патрон (.45 магнум резиновый) + .desc = { ent-BaseCartridgeMagnum.desc } diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/weapons/guns/ammunition/cartridges/pistol.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/weapons/guns/ammunition/cartridges/pistol.ftl index bc7df8e4ad..35e24c139a 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/weapons/guns/ammunition/cartridges/pistol.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/weapons/guns/ammunition/cartridges/pistol.ftl @@ -8,3 +8,5 @@ ent-CartridgePistolIncendiary = патрон (.35 авто зажигатель .desc = { ent-BaseCartridgePistol.desc } ent-CartridgePistolUranium = патрон (.35 авто урановый) .desc = { ent-BaseCartridgePistol.desc } +ent-CartridgePistolRubber = патрон (.35 авто резиновый) + .desc = { ent-BaseCartridgePistol.desc } diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/weapons/guns/ammunition/cartridges/rifle.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/weapons/guns/ammunition/cartridges/rifle.ftl index 7cf4f9e2cf..60475b93c7 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/weapons/guns/ammunition/cartridges/rifle.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/weapons/guns/ammunition/cartridges/rifle.ftl @@ -8,3 +8,5 @@ ent-CartridgeRifleIncendiary = патрон (.20 винтовочный зажи .desc = { ent-BaseCartridgeRifle.desc } ent-CartridgeRifleUranium = патрон (.20 винтовочный урановый) .desc = { ent-BaseCartridgeRifle.desc } +ent-CartridgeRifleRubber = патрон (.20 винтовочный резиновый) + .desc = { ent-BaseCartridgeRifle.desc } diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/weapons/guns/ammunition/magazines/caseless_rifle.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/weapons/guns/ammunition/magazines/caseless_rifle.ftl index 89fb86450c..dc2e2d21c1 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/weapons/guns/ammunition/magazines/caseless_rifle.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/weapons/guns/ammunition/magazines/caseless_rifle.ftl @@ -10,8 +10,12 @@ ent-MagazinePistolCaselessRifle = пистолетный магазин (.25 б .desc = { ent-BaseMagazinePistolCaselessRifle.desc } ent-MagazinePistolCaselessRiflePractice = пистолетный магазин (.25 безгильзовые учебные) .desc = { ent-BaseMagazinePistolCaselessRifle.desc } +ent-MagazinePistolCaselessRifleRubber = пистолетный магазин (.25 безгильзовые резиновые) + .desc = { ent-BaseMagazinePistolCaselessRifle.desc } ent-MagazineCaselessRifle = магазин (.25 безгильзовые) .desc = { ent-BaseMagazineCaselessRifle.desc } +ent-MagazineCaselessRifleRubber = магазин (.25 безгильзовые резиновые) + .desc = { ent-BaseMagazineCaselessRifle.desc } ent-MagazineCaselessRiflePractice = магазин (.25 безгильзовые учебные) .desc = { ent-BaseMagazineCaselessRifle.desc } ent-MagazineCaselessRifleShort = короткий магазин (.25 безгильзовые) diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/weapons/guns/ammunition/magazines/light_rifle.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/weapons/guns/ammunition/magazines/light_rifle.ftl index d00eae9827..99cd2c3039 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/weapons/guns/ammunition/magazines/light_rifle.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/weapons/guns/ammunition/magazines/light_rifle.ftl @@ -4,6 +4,8 @@ ent-MagazineLightRifleBox = короб патронов L6 SAW (.30 винтов .desc = { ent-BaseMagazineLightRifle.desc } ent-MagazineLightRifle = магазин (.30 винтовочные) .desc = { ent-BaseMagazineLightRifle.desc } +ent-MagazineLightRifleRubber = магазин (.30 винтовочные резиновые) + .desc = { ent-BaseMagazineLightRifle.desc } ent-MagazineLightRifleEmpty = магазин (.30 винтовочные любые) .suffix = Пустой .desc = { ent-MagazineLightRifle.desc } diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/weapons/guns/ammunition/magazines/magnum.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/weapons/guns/ammunition/magazines/magnum.ftl index 0878b9eeb4..95f5bea195 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/weapons/guns/ammunition/magazines/magnum.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/weapons/guns/ammunition/magazines/magnum.ftl @@ -9,6 +9,8 @@ ent-MagazineMagnum = пистолетный магазин (.45 магнум) .desc = { ent-BaseMagazineMagnum.desc } ent-MagazineMagnumPractice = пистолетный магазин (.45 магнум учебные) .desc = { ent-BaseMagazineMagnum.desc } +ent-MagazineMagnumRubber = пистолетный магазин (.45 магнум резиновые) + .desc = { ent-BaseMagazineMagnum.desc } ent-MagazineMagnumUranium = пистолетный магазин (.45 магнум урановые) .desc = { ent-BaseMagazineMagnum.desc } ent-MagazineMagnumAP = пистолетный магазин (.45 магнум бронебойные) @@ -18,6 +20,8 @@ ent-MagazineMagnumSubMachineGunEmpty = магазин Вектора (.45 маг .desc = { ent-BaseMagazineMagnumSubMachineGun.desc } ent-MagazineMagnumSubMachineGun = магазин Вектора (.45 магнум) .desc = { ent-BaseMagazineMagnumSubMachineGun.desc } +ent-MagazineMagnumSubMachineGunRubber = магазин Вектора (.45 магнум резиновые) + .desc = { ent-BaseMagazineMagnumSubMachineGun.desc } ent-MagazineMagnumSubMachineGunPractice = магазин Вектора (.45 магнум учебные) .desc = { ent-BaseMagazineMagnumSubMachineGun.desc } ent-MagazineMagnumSubMachineGunUranium = магазин Вектора (.45 магнум урановые) diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/weapons/guns/ammunition/magazines/pistol.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/weapons/guns/ammunition/magazines/pistol.ftl index a7c7f81669..f7f28874a6 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/weapons/guns/ammunition/magazines/pistol.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/weapons/guns/ammunition/magazines/pistol.ftl @@ -17,6 +17,8 @@ ent-MagazinePistolIncendiary = пистолетный магазин (.35 авт .desc = { ent-MagazinePistol.desc } ent-MagazinePistolPractice = пистолетный магазин (.35 авто учебные) .desc = { ent-BaseMagazinePistol.desc } +ent-MagazinePistolRubber = пистолетный магазин (.35 авто резиновые) + .desc = { ent-BaseMagazinePistol.desc } ent-MagazinePistolUranium = пистолетный магазин (.35 авто урановые) .desc = { ent-BaseMagazinePistol.desc } ent-MagazinePistolHighCapacityEmpty = автопистолетный магазин (.35 авто любые) @@ -37,3 +39,5 @@ ent-MagazinePistolSubMachineGunPractice = магазин ПП (.35 авто уч .desc = { ent-BaseMagazinePistolSubMachineGun.desc } ent-MagazinePistolSubMachineGunUranium = магазин ПП (.35 авто урановые) .desc = { ent-BaseMagazinePistolSubMachineGun.desc } +ent-MagazinePistolSubMachineGunRubber = Магазин ПП (.35 авто резиновые) + .desc = { ent-BaseMagazinePistolSubMachineGun.desc } diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/weapons/guns/ammunition/magazines/rifle.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/weapons/guns/ammunition/magazines/rifle.ftl index 50ccb9df8d..a983f793e2 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/weapons/guns/ammunition/magazines/rifle.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/weapons/guns/ammunition/magazines/rifle.ftl @@ -2,6 +2,8 @@ ent-BaseMagazineRifle = магазин (.20 винтовочные) .desc = { ent-BaseItem.desc } ent-MagazineRifle = магазин (.20 винтовочные) .desc = { ent-BaseMagazineRifle.desc } +ent-MagazineRifleRubber = магазин (.20 винтовочные резиновые) + .desc = { ent-BaseMagazineRifle.desc } ent-MagazineRifleEmpty = магазин (.20 винтовочные любые) .suffix = Пустой .desc = { ent-MagazineRifle.desc } diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/weapons/guns/pistols/pistols.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/weapons/guns/pistols/pistols.ftl index acdd91fe75..0ff917e41a 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/weapons/guns/pistols/pistols.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/weapons/guns/pistols/pistols.ftl @@ -13,3 +13,6 @@ ent-WeaponPistolMk58 = МК 58 .suffix = Пистолет ent-WeaponPistolN1984 = N1984 .desc = Запасное оружие любого уважающего себя офицера. Выпускается в калибре .45 магнум, самом богоугодном калибре. +ent-WeaponPistolMk58Nonlethal = МК 58 + .desc = Дешёвый и распространённый пистолет, производимый дочерней компанией Nanotrasen. Использует патроны калибра .35 авто. + .suffix = Нелетальный diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/weapons/guns/rifles/rifles.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/weapons/guns/rifles/rifles.ftl index 98d74ef2ed..a2d1ab7f8e 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/weapons/guns/rifles/rifles.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/weapons/guns/rifles/rifles.ftl @@ -11,3 +11,5 @@ ent-WeaponRifleLecter = Лектер .suffix = Автомат ent-WeaponRifleFoam = Астро-Ас Сила Пенопласта .desc = Первоклассная пенопластовая винтовка высочайшего качества. Её пластик прочен на ощупь, а механизмы надёжены. +ent-WeaponRifleLecterRubber = Лектер + .desc = Высококлассная штурмовая винтовка военного уровня. Использует винтовочные патроны .20. diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/weapons/guns/smgs/smgs.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/weapons/guns/smgs/smgs.ftl index 65eade1b70..de3ddd5cbe 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/weapons/guns/smgs/smgs.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/weapons/guns/smgs/smgs.ftl @@ -11,6 +11,12 @@ ent-WeaponSubMachineGunDrozd = Дрозд ent-WeaponSubMachineGunVector = Вектор .desc = Превосходный тяжёлый пистолет-пулемёт. Использует патроны калибра .45 магнум. .suffix = Неактуален, используйте Дрозд +ent-WeaponSubMachineGunVectorRubber = Вектор + .desc = Превосходный тяжёлый пистолет-пулемёт. Использует патроны калибра .45 магнум. + .suffix = Неактуален, используйте Дрозд, Резиновые ent-WeaponSubMachineGunWt550 = WT550 .desc = Отличный пистолет-пулемёт, производства NanoTrasen's Small Arms Division. Использует патроны калибра .35 авто. .suffix = Пистолет-пулемёт +ent-WeaponSubMachineGunDrozdRubber = Дрозд + .desc = Превосходный, полностью автоматический, пистолет-пулемет с хорошим калибром. + .suffix = Резиновые diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/structures/gates.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/structures/gates.ftl index 39554bfb6a..ded9d22c65 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/structures/gates.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/structures/gates.ftl @@ -22,3 +22,5 @@ ent-EdgeDetector = детектор сигнала .desc = Определяет уровень сигнала и разделяет его. Устройство игнорирует импульсные сигналы. ent-PowerSensor = датчик питания .desc = Генерирует сигналы в ответ на изменение напряжения в сети. Может циклически переключаться между напряжениями кабеля. +ent-LogicGate = Логический вентиль + .desc = Логический вентиль с двумя входами и одним выходом. Существа могут изменить его режим работы с помощью отвертки. diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/structures/machines/chem_master.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/structures/machines/chem_master.ftl index 84e1cefeca..0cef1e81bb 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/structures/machines/chem_master.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/structures/machines/chem_master.ftl @@ -1,2 +1,2 @@ -ent-ChemMaster = ХимМастер 4000 +ent-chem_master = ХимМастер 4000 .desc = Химический манипулятор промышленного класса с возможностью производства таблеток и бутылочек. diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/structures/storage/closets/closets.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/structures/storage/closets/closets.ftl index 09bb024a13..e225c08173 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/structures/storage/closets/closets.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/structures/storage/closets/closets.ftl @@ -25,6 +25,8 @@ ent-ClosetMaintenance = технический шкаф .desc = Это хранилище. ent-LockerSyndicate = оружейный шкаф .desc = Это хранилище. +ent-LockerWoCSyndicate = Шкафчик для хранения улик + .desc = Для хранения мешков с гильзами и вещами задержанного. ent-ClosetBluespace = подозрительный шкаф .desc = Это хранилище... правда же? .suffix = Блюспейс diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/structures/storage/closets/lockers/lockers.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/structures/storage/closets/lockers/lockers.ftl index 34fc840a93..3c3427913d 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/structures/storage/closets/lockers/lockers.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/structures/storage/closets/lockers/lockers.ftl @@ -67,3 +67,11 @@ ent-LockerMime = шкаф мима .desc = { ent-LockerBaseSecure.desc } ent-LockerRepresentative = шкаф представителя Nanotrasen .desc = { ent-LockerBaseSecure.desc } +ent-LockerCaptainSyndicate = Шкафчик капитана + .desc = Шкафчик, предназначенный для хранения гильз от пуль и вещей подозреваемых +ent-LockerCaptainSyndicateFilledHardsuit = Шкафчик капитана + .desc = Шкафчик, предназначенный для хранения гильз от пуль и вещей подозреваемых +ent-LockerHeadOfSecuritySyndicate = шкаф Главы службы безопасности + .desc = Для хранения мешков с гильзами и вещами задержанного. +ent-LockerHeadOfSecuritySyndicateFilledHardsuit = шкаф Главы службы безопасности + .desc = Для хранения мешков с гильзами и вещами задержанного. diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/structures/storage/glass_box.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/structures/storage/glass_box.ftl index efb5d0e76e..ea31752e0e 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/structures/storage/glass_box.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/structures/storage/glass_box.ftl @@ -20,3 +20,6 @@ ent-GlassBoxFrame = каркас стеклянного короба ent-GlassBoxBroken = разбитый стеклянный короб .desc = Разбитая витрина для дорогостоящего экспоната. .suffix = Разбитый +ent-GlassBoxLaserBroken = разбитый стеклянный короб + .desc = Разбитая витрина для дорогостоящего экспоната. + .suffix = Разбитый diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/structures/wallmounts/intercom.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/structures/wallmounts/intercom.ftl index b3746038f3..adf725b2a6 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/structures/wallmounts/intercom.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/structures/wallmounts/intercom.ftl @@ -1,6 +1,8 @@ ent-BaseIntercom = интерком .desc = Интерком. На случай, когда необходимо что-то сообщить станции. -ent-IntercomAssembly = intercom assembly +ent-IntercomAssembly = интерком + .desc = Интерком. На данный момент он бесполезен. +ent-IntercomAssesmbly = интерком .desc = Интерком. На данный момент он бесполезен. ent-IntercomConstructed = { ent-BaseIntercom } .suffix = Пустой, Панель открыта diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/structures/wallmounts/signs/posters.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/structures/wallmounts/signs/posters.ftl index 225c4c6042..71ba26a4ca 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/structures/wallmounts/signs/posters.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/structures/wallmounts/signs/posters.ftl @@ -150,7 +150,7 @@ ent-PosterLegitLoveIan = Любовь к Иану .desc = Иан - любовь, Иан - это жизнь. ent-PosterLegitSpaceCops = Космокопы .desc = Плакат, рекламирующий телешоу "Космические копы". -ent-PosterLegitUeNo = Ue No +ent-PosterLegitUeNo = Йиу Нет .desc = Плакат целиком на японском языке. ent-PosterLegitGetYourLEGS = Помни про НОГИ .desc = НОГИ: Начальство, Опыт, Гениальность, Исполнительность. diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/structures/wallmounts/signs/signs.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/structures/wallmounts/signs/signs.ftl index 9284a0944d..28a563befb 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/structures/wallmounts/signs/signs.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/structures/wallmounts/signs/signs.ftl @@ -66,6 +66,8 @@ ent-SignAnomaly2 = знак "лаборатория аномалий" .desc = Знак, указывающий на лабораторию аномалий. ent-SignAtmos = знак "атмос" .desc = Знак, указывающий на атмосферный отсек. +ent-SignAtmosMinsky = знак "атмос" + .desc = Знак, указывающий на атмосферный отсек. ent-SignKitchen = знак "кухня" .desc = Сердце дома. И заболеваний. ent-SignTheater = знак "театр" @@ -76,6 +78,10 @@ ent-SignBarbershop = знак "барбершоп" .desc = Знак, указывающий барбершоп. ent-SignHydro1 = знак "гидропоника" .desc = Знак, указывающий на гидропонику. +ent-SignHydro2 = знак "гидропоника" + .desc = Знак, указывающий на гидропонику. +ent-SignHydro3 = знак "гидропоника" + .desc = Знак, указывающий на гидропонику. ent-SignLibrary = знак "библиотека" .desc = Знак, указывающий на библиотеку. ent-SignChapel = знак "церковь" @@ -106,6 +112,10 @@ ent-SignCargoDock = знак "карго док" .desc = Знак, указывающий на док отдела логистики. ent-SignChem = знак "хим лаб" .desc = Знак, указывающий на химическую лабораторию. +ent-SignChemistry1 = знак "хим лаб" + .desc = Знак, указывающий на химическую лабораторию. +ent-SignChemistry2 = знак "хим лаб" + .desc = Знак, указывающий на химическую лабораторию. ent-SignEscapePods = знак "капсулы" .desc = Знак, указывающий на спасательные капсулы. ent-SignShipDock = знак "эвакуация" @@ -298,3 +308,7 @@ ent-SignSurvival = знак "Выживание" .desc = Знак. На нём написано "Выживание". ent-SignNTMine = знак "Шахта" .desc = Знак. На нём написано "Шахта". +ent-SignDrones = знак "Дроны" + .desc = Знак. На нём написано "Дроны". +ent-SignMinerDock = знак "Док копателей" + .desc = Знак. На нём написано "Док шахтёров". diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/nyanotrasen/entities/clothing/outerclothing/robes.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/nyanotrasen/entities/clothing/outerclothing/robes.ftl index 9c73c614ec..e328faf400 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/nyanotrasen/entities/clothing/outerclothing/robes.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/nyanotrasen/entities/clothing/outerclothing/robes.ftl @@ -1,4 +1,4 @@ -ent-ClothingOuterRobeBrown = brown robe - .desc = This doesn't look creepy at all. -ent-ClothingOuterRobeTechPriest = automaturge robe - .desc = Robots are basically bulls when you think about it, so best to wear red. +ent-ClothingOuterRobeBrown = Коричневая роба + .desc = Она точно не выглядит жуткой. +ent-ClothingOuterRobeTechPriest = роба Механикуса + .desc = Если задуматся, то роботы, по своей сути - это быки. По данной не логичной причине надо носить красное! diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/nyanotrasen/entities/markers/spawners/jobs.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/nyanotrasen/entities/markers/spawners/jobs.ftl index 26cb6aa394..61dc547af2 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/nyanotrasen/entities/markers/spawners/jobs.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/nyanotrasen/entities/markers/spawners/jobs.ftl @@ -1,12 +1,12 @@ -ent-SpawnPointGladiator = gladiator +ent-SpawnPointGladiator = гладиатор .desc = { ent-SpawnPointJobBase.desc } -ent-SpawnPointPrisoner = prisoner +ent-SpawnPointPrisoner = заключенный .desc = { ent-SpawnPointJobBase.desc } -ent-SpawnPointPrisonGuard = prison guard +ent-SpawnPointPrisonGuard = охранник тюрьмы .desc = { ent-SpawnPointJobBase.desc } -ent-SpawnPointMailCarrier = courier +ent-SpawnPointMailCarrier = курьер .desc = { ent-SpawnPointJobBase.desc } -ent-SpawnPointMartialArtist = martial artist +ent-SpawnPointMartialArtist = мастер боевых искусств .desc = { ent-SpawnPointJobBase.desc } -ent-SpawnPointForensicMantis = psionic mantis +ent-SpawnPointForensicMantis = мантис .desc = { ent-SpawnPointJobBase.desc } diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/nyanotrasen/entities/markers/spawners/mobs.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/nyanotrasen/entities/markers/spawners/mobs.ftl index 2ff9095275..23bfd072a0 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/nyanotrasen/entities/markers/spawners/mobs.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/nyanotrasen/entities/markers/spawners/mobs.ftl @@ -1,4 +1,4 @@ -ent-SpawnMobMothroach = Mothroach Spawner +ent-SpawnMobMothroach = Спавнер таракамоли .desc = { ent-MarkerBase.desc } ent-SpawnMobFerret = Ferret Spawner .desc = { ent-MarkerBase.desc } diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/nyanotrasen/entities/markers/spawners/random/books.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/nyanotrasen/entities/markers/spawners/random/books.ftl index 897d1d860f..ff31044d8b 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/nyanotrasen/entities/markers/spawners/random/books.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/nyanotrasen/entities/markers/spawners/random/books.ftl @@ -1,2 +1,2 @@ -ent-RandomBook = random book spawner +ent-RandomBook = спавнер случайной книги .desc = { ent-MarkerBase.desc } diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/nyanotrasen/entities/markers/spawners/random/boxes.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/nyanotrasen/entities/markers/spawners/random/boxes.ftl index f3a65c5b8e..93262a1c1e 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/nyanotrasen/entities/markers/spawners/random/boxes.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/nyanotrasen/entities/markers/spawners/random/boxes.ftl @@ -1,5 +1,5 @@ -ent-RandomBox = random box spawner +ent-RandomBox = спавнер случайной коробки .desc = { ent-MarkerBase.desc } -ent-RandomAmmoBox = random ammo box spawner +ent-RandomAmmoBox = спавнер случайной коробки патронов .suffix = 15% .desc = { ent-MarkerBase.desc } diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/nyanotrasen/entities/markers/spawners/random/devices.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/nyanotrasen/entities/markers/spawners/random/devices.ftl index 70cfe55a8b..29e824c2bb 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/nyanotrasen/entities/markers/spawners/random/devices.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/nyanotrasen/entities/markers/spawners/random/devices.ftl @@ -1,2 +1,2 @@ -ent-RandomBoards = random device & board spawner +ent-RandomBoards = спавнер случайной информационной доски .desc = { ent-MarkerBase.desc } diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/nyanotrasen/entities/markers/spawners/random/hats.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/nyanotrasen/entities/markers/spawners/random/hats.ftl index a7b09f0ec6..4892876062 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/nyanotrasen/entities/markers/spawners/random/hats.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/nyanotrasen/entities/markers/spawners/random/hats.ftl @@ -1,2 +1,2 @@ -ent-HatSpawner = Hat Spawner +ent-HatSpawner = спавнер шляпы .desc = { ent-MarkerBase.desc } diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/nyanotrasen/entities/markers/spawners/random/machineparts.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/nyanotrasen/entities/markers/spawners/random/machineparts.ftl index d3ff71026b..f13a414b39 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/nyanotrasen/entities/markers/spawners/random/machineparts.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/nyanotrasen/entities/markers/spawners/random/machineparts.ftl @@ -1,6 +1,6 @@ -ent-SalvagePartsSpawnerLow = Salvage Parts Spawner - .suffix = Low +ent-SalvagePartsSpawnerLow = спавнер запчастей + .suffix = Малых .desc = { ent-MarkerBase.desc } -ent-SalvagePartsSpawnerMid = Salvage Parts Spawner - .suffix = High +ent-SalvagePartsSpawnerMid = спавнер запчастей + .suffix = Больших .desc = { ent-MarkerBase.desc } diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/nyanotrasen/entities/markers/spawners/random/randomitems.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/nyanotrasen/entities/markers/spawners/random/randomitems.ftl index b9e368fe3b..dcc59aaf8d 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/nyanotrasen/entities/markers/spawners/random/randomitems.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/nyanotrasen/entities/markers/spawners/random/randomitems.ftl @@ -1,2 +1,2 @@ -ent-RandomItem = random item spawner +ent-RandomItem = спавнер случайной вещи .desc = { ent-MarkerBase.desc } diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/nyanotrasen/entities/markers/spawners/random/schoolgirl.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/nyanotrasen/entities/markers/spawners/random/schoolgirl.ftl index 466a3162a7..c5145dd429 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/nyanotrasen/entities/markers/spawners/random/schoolgirl.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/nyanotrasen/entities/markers/spawners/random/schoolgirl.ftl @@ -1,2 +1,2 @@ -ent-SchoolgirlUniformSpawner = Schoolgirl Uniform Spawner +ent-SchoolgirlUniformSpawner = спавнер униформы школьницы .desc = { ent-MarkerBase.desc } diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/nyanotrasen/entities/markers/spawners/random/seeds.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/nyanotrasen/entities/markers/spawners/random/seeds.ftl index 698be61bad..ae5750c708 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/nyanotrasen/entities/markers/spawners/random/seeds.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/nyanotrasen/entities/markers/spawners/random/seeds.ftl @@ -1,3 +1,3 @@ -ent-SalvageSeedSpawnerLow = Salvage Seed Spawner - .suffix = Low +ent-SalvageSeedSpawnerLow = спавнер случайных семян + .suffix = Низкий .desc = { ent-MarkerBase.desc } diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/nyanotrasen/entities/mobs/npcs/mutants.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/nyanotrasen/entities/mobs/npcs/mutants.ftl index 757691e721..1f4a7e15a5 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/nyanotrasen/entities/mobs/npcs/mutants.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/nyanotrasen/entities/mobs/npcs/mutants.ftl @@ -1,9 +1,9 @@ -ent-MobTomatoKiller = killer tomato - .desc = This is really going to let you own some vegans in your next online debate. -ent-MobGiantSpiderVampire = oneirophage - .desc = The 'dream-eater' spider, rumored to be one of the potential genetic sources for arachne. -ent-MobGiantSpiderVampireAngry = oneirophage - .suffix = Angry +ent-MobTomatoKiller = убийца-томат + .desc = Теперь вы можете поспорить с веганами о жизни растений. +ent-MobGiantSpiderVampire = онейрофаг + .desc = Паук коронованный "пожирателем-снов". +ent-MobGiantSpiderVampireAngry = онейрофаг + .suffix = Злой .desc = { ent-MobGiantSpiderVampire.desc } -ent-MobMouseCancer = Cancer Mouse - .desc = Oh hey Civvie... +ent-MobMouseCancer = раковая мышь + .desc = О, Привет, Сиви.. diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/nyanotrasen/entities/mobs/npcs/xeno.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/nyanotrasen/entities/mobs/npcs/xeno.ftl index 903327b7ce..ea8e9ecf16 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/nyanotrasen/entities/mobs/npcs/xeno.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/nyanotrasen/entities/mobs/npcs/xeno.ftl @@ -2,26 +2,26 @@ ent-MobPurpleSnakeGhost = { ent-MobPurpleSnake } .desc = { ent-MobPurpleSnake.desc } ent-MobSmallPurpleSnakeGhost = { ent-MobSmallPurpleSnake } .desc = { ent-MobSmallPurpleSnake.desc } -ent-MobXenoPlayer = Burrower - .suffix = Player +ent-MobXenoPlayer = Ксено + .suffix = Игрок .desc = { ent-MobXeno.desc } -ent-MobXenoPraetorian = Praetorian - .suffix = Player +ent-MobXenoPraetorian = Пратореанец + .suffix = Игрок .desc = { ent-MobXenoPraetorianNPC.desc } -ent-MobXenoDrone = Drone - .suffix = Player +ent-MobXenoDrone = Дэрон + .suffix = Игрок .desc = { ent-MobXenoDroneNPC.desc } -ent-MobXenoQueen = Queen - .suffix = Player +ent-MobXenoQueen = Королева + .suffix = Игрок .desc = { ent-MobXenoQueenNPC.desc } -ent-MobXenoRavager = Ravager - .suffix = Player +ent-MobXenoRavager = Разоритель + .suffix = Игрок .desc = { ent-MobXenoRavagerNPC.desc } -ent-MobXenoRunner = Runner - .suffix = Player +ent-MobXenoRunner = Бегун + .suffix = Игрок .desc = { ent-MobXenoRunnerNPC.desc } -ent-MobXenoRouny = Rouny +ent-MobXenoRouny = Руни .desc = { ent-MobXenoRounyNPC.desc } -ent-MobXenoSpitter = Spitter - .suffix = Player +ent-MobXenoSpitter = Плевальщик + .suffix = Игрок .desc = { ent-MobXenoSpitterNPC.desc } diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/nyanotrasen/entities/mobs/player/Oni.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/nyanotrasen/entities/mobs/player/Oni.ftl index 68630c360f..a82a5ac994 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/nyanotrasen/entities/mobs/player/Oni.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/nyanotrasen/entities/mobs/player/Oni.ftl @@ -1,2 +1,2 @@ -ent-MobOni = Urist McOni +ent-MobOni = Урист МакОни .desc = { ent-MobOniBase.desc } diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/nyanotrasen/entities/mobs/player/felinid.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/nyanotrasen/entities/mobs/player/felinid.ftl index 0b12f5a1d3..5482c732cb 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/nyanotrasen/entities/mobs/player/felinid.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/nyanotrasen/entities/mobs/player/felinid.ftl @@ -1,2 +1,2 @@ -ent-MobFelinid = Urist McFelinid +ent-MobFelinid = Урист МакФелинид .desc = { ent-MobFelinidBase.desc } diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/nyanotrasen/entities/mobs/player/special.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/nyanotrasen/entities/mobs/player/special.ftl index 6eb7f75ddf..7442d1c4e6 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/nyanotrasen/entities/mobs/player/special.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/nyanotrasen/entities/mobs/player/special.ftl @@ -1,2 +1,2 @@ -ent-MobObserverTelegnostic = telegnostic projection - .desc = Ominous. Placeholder sprite. +ent-MobObserverTelegnostic = телегностическая проекция + .desc = Великолепно. diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/nyanotrasen/entities/mobs/species/Oni.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/nyanotrasen/entities/mobs/species/Oni.ftl index 6b6e861e87..3d4c8040ab 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/nyanotrasen/entities/mobs/species/Oni.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/nyanotrasen/entities/mobs/species/Oni.ftl @@ -1,4 +1,4 @@ -ent-MobOniBase = Urist McOni +ent-MobOniBase = Урист МакОни .desc = { ent-BaseMobHuman.desc } -ent-MobOniDummy = Urist McOni - .desc = A dummy oni meant to be used in character setup. +ent-MobOniDummy = Урист МакОни + .desc = Манекен в виде Они, используют для разных целей. diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/nyanotrasen/entities/mobs/species/felinid.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/nyanotrasen/entities/mobs/species/felinid.ftl index 42917ac190..3cc4f6e284 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/nyanotrasen/entities/mobs/species/felinid.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/nyanotrasen/entities/mobs/species/felinid.ftl @@ -1,4 +1,4 @@ -ent-MobFelinidBase = Urist McFelinid +ent-MobFelinidBase = Урист МакФелинид .desc = { ent-BaseMobHuman.desc } -ent-MobFelinidDummy = Urist McHands - .desc = A dummy felinid meant to be used in character setup. +ent-MobFelinidDummy = УристМакФелинид + .desc = Манекен в виде Фелинида, используют для разных целей. diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/nyanotrasen/entities/objects/consumable/drinks/drinks.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/nyanotrasen/entities/objects/consumable/drinks/drinks.ftl index 3a06f4b572..fc88ccdf43 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/nyanotrasen/entities/objects/consumable/drinks/drinks.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/nyanotrasen/entities/objects/consumable/drinks/drinks.ftl @@ -1,33 +1,33 @@ ent-DrinkSakeGlass = { ent-DrinkGlass } - .desc = Wine made from rice, it's sake! - .suffix = sake + .desc = Алкоголь приготовленный из риса. + .suffix = саке ent-DrinkOrangeCreamiceGlass = { ent-DrinkGlass } - .desc = Orangy, creamy goodness. - .suffix = orange creamcicle + .desc = Апельсиново, кремово, божественно. + .suffix = апельсиновый кремовик ent-DrinkSilverjackGlass = { ent-DrinkGlass } - .desc = Reminds you of family. - .suffix = silverjack + .desc = Напоминает вам о семье. + .suffix = сильверджек ent-DrinkBrainbombGlass = { ent-DrinkGlass } - .desc = Toxic to about anything alive, especially your liver. - .suffix = brainbomb + .desc = Токсичен для всего живого, особенно вреден для вашей печени. + .suffix = мозгобомба ent-DrinkClownBloodGlass = { ent-DrinkGlass } - .desc = Security Officers favorite drink after a long day. - .suffix = clown blood + .desc = Любимый напиток офицера службы безопасности после долгого рабочего дня. + .suffix = кровь клоуна ent-DrinkCircusJuiceGlass = { ent-DrinkGlass } - .desc = Honkmother would be proud. - .suffix = circus juice + .desc = Хонкоматерь будет довольна. + .suffix = цирковой сок ent-DrinkSapoPicanteGlass = { ent-DrinkGlass } - .desc = Tastes nothing like a toad. - .suffix = sapo picante + .desc = На вкус совсем не похож на жабу. + .suffix = сапо пиканте ent-DrinkGraveyardGlass = { ent-DrinkGlass } - .desc = For those shifts that never seem to end. - .suffix = graveyard + .desc = Посвещается тем сменам, которые кажутся вечными. + .suffix = кладбище ent-DrinkAtomicPunchGlass = { ent-DrinkGlass } - .desc = Will NOT make you immune to bullets; Isotopes included! - .suffix = atomic punch + .desc = Не сделает вас пуленепробиваемыми! В составе имеются изотопы урана. + .suffix = атомный удар ent-DrinkPinkDrinkGlass = { ent-DrinkGlass } - .desc = Entire civilizations have crumbled trying to decide if this drink really tastes like pink... - .suffix = pink drink + .desc = Весь мир старался понять, правда ли этот напиток на вкус как "розовый"... + .suffix = розовый напиток ent-DrinkBubbleTeaGlass = { ent-DrinkGlass } - .desc = Big straw not included. - .suffix = bubble tea + .desc = Трубочка в комплекте не идёт. + .suffix = баббл-ти diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/nyanotrasen/entities/objects/consumable/drinks/drinks_bottles.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/nyanotrasen/entities/objects/consumable/drinks/drinks_bottles.ftl index 3d64595a56..4b6ce828bb 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/nyanotrasen/entities/objects/consumable/drinks/drinks_bottles.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/nyanotrasen/entities/objects/consumable/drinks/drinks_bottles.ftl @@ -1,11 +1,8 @@ -ent-DrinkSakeBottleFull = sake bottle - .desc = - Clear, or sometimes foggy - Chilled like ice cream alcohol - Fill a cup, drink up! -ent-DrinkSojuBottleFull = soju bottle - .desc = It's like sake but if you're trying to get FUCKED. UP. -ent-DrinkTokkuri = tokkuri - .desc = Floral and full of osake! -ent-DrinkHolyWaterFull = flask of holy water - .desc = A flask of holy water. +ent-DrinkSakeBottleFull = бутылка саке + .desc = Пойло для истинных самураев. +ent-DrinkSojuBottleFull = бутылка соджу + .desc = Это как саке, но в этот раз вы реально хотите напиться. +ent-DrinkTokkuri = токкури + .desc = На вкус свежо. Напоминает холодный климат. +ent-DrinkHolyWaterFull = фляга святой воды + .desc = Фляга, полная святой воды. diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/nyanotrasen/entities/objects/consumable/drinks/drinks_cups.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/nyanotrasen/entities/objects/consumable/drinks/drinks_cups.ftl index ee83c9e444..a650505e27 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/nyanotrasen/entities/objects/consumable/drinks/drinks_cups.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/nyanotrasen/entities/objects/consumable/drinks/drinks_cups.ftl @@ -1,2 +1,2 @@ -ent-DrinkSakeCup = sakazuki - .desc = A ceremonial white cup for drinking sake. +ent-DrinkSakeCup = сакадзуки + .desc = Церемониальная чаша, для распития саке. diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/nyanotrasen/entities/objects/consumable/drinks/drinks_oil.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/nyanotrasen/entities/objects/consumable/drinks/drinks_oil.ftl index ea83630737..a9adcb2c9a 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/nyanotrasen/entities/objects/consumable/drinks/drinks_oil.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/nyanotrasen/entities/objects/consumable/drinks/drinks_oil.ftl @@ -1,8 +1,8 @@ ent-BaseOilJar = { ent-DrinkBottleGlassBaseFull } .desc = { ent-DrinkBottleGlassBaseFull.desc } -ent-OilJarGhee = jar of ghee - .desc = A large tinted glass jar with a simple label of butter sticks on it. -ent-OilJarCorn = jar of corn oil - .desc = A large tinted glass jar with a simple label of a corn stalk on it. -ent-OilJarOlive = jar of olive oil - .desc = A large tinted glass jar with a simple label of olives on it. +ent-OilJarGhee = банка топлёного масла + .desc = Большая стеклянная банка с этикеткой на ней. +ent-OilJarCorn = банка кукурузного масла + .desc = Большая стеклянная банка с этикеткой на ней. +ent-OilJarOlive = банка оливкового масла + .desc = Большая стеклянная банка с этикеткой на ней. diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/nyanotrasen/entities/objects/consumable/food/baked/misc.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/nyanotrasen/entities/objects/consumable/food/baked/misc.ftl index d47906daae..413e805ac1 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/nyanotrasen/entities/objects/consumable/food/baked/misc.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/nyanotrasen/entities/objects/consumable/food/baked/misc.ftl @@ -1,8 +1,8 @@ -ent-FoodMothCheesecakeBalls = cheesecake balls - .desc = Made of soft cheese, powdered sugar and flour, rolled into balls, battered and then deep fried. They're often served with honey. -ent-FoodMothMothmallow = mothmallow tray - .desc = A light and fluffy vegan marshmallow flavoured with vanilla and rum. These are known to the moths as cloud squares. -ent-FoodMothMothmallowSlice = mothmallow slice - .desc = Fluffy little clouds of joy- in a strangely moth-like form and colour. -ent-FoodMothMoffin = moffin - .desc = A delicious, spongy and dusty little cake. +ent-FoodMothCheesecakeBalls = шарик чизкейка + .desc = Это чизкейк, завёрнутый под форму шарика. Подают с мёдом. +ent-FoodMothMothmallow = тарелка моффшмэллоу + .desc = Лёгкий перекус для каждого ниана. Содержит в себе зефир и ваниль. +ent-FoodMothMothmallowSlice = кусочек моффшмэллоу + .desc = Маленький кусочек радости!~ +ent-FoodMothMoffin = моффин + .desc = Вкусное пирожное с мягкой текстурой. diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/nyanotrasen/entities/objects/consumable/food/baked/pizza.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/nyanotrasen/entities/objects/consumable/food/baked/pizza.ftl index 0c4a423a4f..f83789269d 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/nyanotrasen/entities/objects/consumable/food/baked/pizza.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/nyanotrasen/entities/objects/consumable/food/baked/pizza.ftl @@ -1,20 +1,20 @@ -ent-FoodPizzaCorncob = corncob crust pizza - .desc = Cobbled together as a sick joke. Best served with liquid butter. -ent-FoodPizzaCorncobSlice = slice of corncob crust pizza - .desc = Cobbled together as a sick joke. Best served with liquid butter. -ent-FoodMothPizzaFirecracker = firecracker pizza - .desc = They're not kidding when they call this a hot pizza pie. -ent-FoodMothPizzaFirecrackerSlice = slice of firecracker pizza - .desc = A spicy slice of something quite nice. -ent-FoodMothPizzaFiveCheese = quattro formaggi pizza - .desc = For centuries, scholars have asked; how much cheese is too much cheese? -ent-FoodMothPizzaFiveCheeseSlice = slice of quattro formaggi pizza - .desc = It's the cheesiest slice in the galaxy! -ent-FoodMothPizzaPesto = pesto pizza - .desc = Pesto is a popular pizza topping for moths, quite possibly because it exemplifies their favourite flavours; cheese, herbs, and veggies. -ent-FoodMothPizzaPestoSlice = slice of pesto pizza - .desc = Green as the grass in the garden. -ent-FoodMothPizzaCotton = cotton pizza - .desc = A crime to some, a delicious pizza to others. Cotton and cheese. -ent-FoodMothPizzaCottonSlice = slice of cotton pizza - .desc = White as a sheet of paper. +ent-FoodPizzaCorncob = кукурузная пицца + .desc = Слеплено в качестве дурная шутка. Лучше всего подавать с жидким сливочным маслом. +ent-FoodPizzaCorncobSlice = кусок кукурузной пиццы + .desc = Слеплено в качестве дурная шутка. Лучше всего подавать с жидким сливочным маслом. +ent-FoodMothPizzaFirecracker = пицца-феерверк + .desc = А они не шутили, когда назвали её горячей.. +ent-FoodMothPizzaFirecrackerSlice = кусок пицца-феерверк + .desc = А они не шутили, когда назвали её горячей.. +ent-FoodMothPizzaFiveCheese = пицца четыре сыра + .desc = Содержит 4 вида разных сыров. +ent-FoodMothPizzaFiveCheeseSlice = кусок пиццы четыре сыра + .desc = Самый сырный кусок во всей вселенной! +ent-FoodMothPizzaPesto = песто пицца + .desc = Песто - популярное блюдо у ниан. По идее.. +ent-FoodMothPizzaPestoSlice = кусок песто пиццы + .desc = Зелёный как трава. +ent-FoodMothPizzaCotton = хлопковая пицца + .desc = Для кого-то гадость, а для кого-то сладость! +ent-FoodMothPizzaCottonSlice = кусок хлопковой пиццы + .desc = Белый как снег. diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/nyanotrasen/entities/objects/consumable/food/candy.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/nyanotrasen/entities/objects/consumable/food/candy.ftl index 0822c642ed..f6db16515e 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/nyanotrasen/entities/objects/consumable/food/candy.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/nyanotrasen/entities/objects/consumable/food/candy.ftl @@ -1,4 +1,4 @@ -ent-FoodLollipop = lollipop - .desc = For being such a good sport. -ent-FoodGumball = gumball - .desc = For being such a good sport. +ent-FoodLollipop = леденец + .desc = Сладкий и гладкий. Походу его уже облизали. +ent-FoodGumball = жевательная резинка + .desc = Вредно для зубов. diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/nyanotrasen/entities/objects/consumable/food/ingredients.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/nyanotrasen/entities/objects/consumable/food/ingredients.ftl index da3f7d14dd..d33b3299b0 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/nyanotrasen/entities/objects/consumable/food/ingredients.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/nyanotrasen/entities/objects/consumable/food/ingredients.ftl @@ -1,10 +1,10 @@ -ent-FoodCurdCheese = curd cheese - .desc = Known by many names throughout cuisine, curd cheese is useful for a wide variety of dishes. -ent-FoodCheeseCurds = cheese curds - .desc = Not to be mistaken for curd cheese. Tasty deep fried. -ent-FoodMozzarella = mozzarella cheese - .desc = Delicious, creamy, and cheesy, all in one simple package. -ent-FoodMothHerbyCheese = herby cheese - .desc = As a staple of mothic cuisine, cheese is often augmented with various flavours to keep variety in their diet. -ent-FoodMothSaladBase = mothic salad - .desc = A basic salad of cabbage, red onion and tomato. +ent-FoodCurdCheese = творожный сыр + .desc = Творожный сыр, известный во всей кухне под многими названиями, полезен для самых разных блюд. +ent-FoodCheeseCurds = творог + .desc = Не спутайте с творожным сыром. Глубоко прожарен. +ent-FoodMozzarella = сыр моцарелла + .desc = Вкусный, сливочный и сырный — все в одной простой упаковке. +ent-FoodMothHerbyCheese = травяной сыр + .desc = Являясь основным продуктом мотической кухни, сыр часто дополняют различными вкусами, чтобы сохранить разнообразие в рационе. +ent-FoodMothSaladBase = мотический салат + .desc = Салат из капусты, помидоров и красного лука. diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/nyanotrasen/entities/objects/consumable/food/meals.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/nyanotrasen/entities/objects/consumable/food/meals.ftl index 8c581063d9..2d05a330bf 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/nyanotrasen/entities/objects/consumable/food/meals.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/nyanotrasen/entities/objects/consumable/food/meals.ftl @@ -1,18 +1,18 @@ -ent-FoodMothBakedRice = big baked rice - .desc = A mothic favourite, baked rice can be filled with a variety of vegetable fillings to make a delicious meal to share. -ent-FoodMothBakedRicePortion = lil baked rice - .desc = A single portion of baked rice, perfect as a side dish, or even as a full meal. -ent-FoodMothGreenLasagne = green lasagne - .desc = A fine lasagne made with pesto and a herby white sauce. Good for multiple servings. -ent-FoodMothGreenLasagneSlice = green lasagne slice - .desc = A slice of herby, pesto-y lasagne. -ent-FoodMothBakedCorn = oven-baked corn - .desc = A cob of corn, baked in the roasting heat of an oven until it blisters and blackens. -ent-FoodMothButteredBakedCorn = buttered baked corn - .desc = A cob of corn, baked in the roasting heat of an oven until it blisters and blackens. -ent-FoodMothMozzarellaSticks = mozzarella sticks - .desc = Little sticks of mozzarella, breaded and fried. -ent-FoodMothMacBalls = mac balls - .desc = Fried balls of donk-pocket dipped in corn batter, served with tomato sauce. -ent-FoodMealFishChips = fish and chips - .desc = A dish that consists of fried fish and potatoes. +ent-FoodMothBakedRice = большой запеченный рис + .desc = Многими любимый запеченный рис. Можно начинить различными овощными начинками, чтобы получилось вкусное блюдо, которым можно поделиться. +ent-FoodMothBakedRicePortion = маленький запеченный рис + .desc = Маленькая порция запеченного риса. +ent-FoodMothGreenLasagne = песто лазанья + .desc = Изысканная лазанья с соусом песто и белым соусом с пряностями. Хорошо подходит для нескольких порций. +ent-FoodMothGreenLasagneSlice = кусочек песто лазаньи + .desc = Это кусочек великолепой песто-лазаньи. +ent-FoodMothBakedCorn = кукуруза из духовки + .desc = Початок кукурузы, запеченный на сильном огне в духовке до тех пор, пока не начнет покрываться пузырями и не почернеет. +ent-FoodMothButteredBakedCorn = сливочная вареная кукуруза + .desc = Початок кукурузы, запеченный на сильном огне в духовке до тех пор, пока не начнет покрываться пузырями и не почернеет. +ent-FoodMothMozzarellaSticks = сырные палочки + .desc = Маленькие палочки из сыра обжаренные во фритюре. +ent-FoodMothMacBalls = макболлс + .desc = Жареные шарики из донк-покетов, обмакнутые в кукурузный кляр, подаются с томатным соусом. +ent-FoodMealFishChips = рыба и фри + .desc = Блюдо, состоящее из жареной рыбы и картофеля. diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/nyanotrasen/entities/objects/consumable/food/ration.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/nyanotrasen/entities/objects/consumable/food/ration.ftl index 71a19eb0ad..9e3fdf8100 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/nyanotrasen/entities/objects/consumable/food/ration.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/nyanotrasen/entities/objects/consumable/food/ration.ftl @@ -1,24 +1,24 @@ -ent-FoodPSBTrash = psb wrapper +ent-FoodPSBTrash = обёртка от питательного батончика .desc = { ent-FoodPacketTrash.desc } -ent-FoodPSB = prepacked sustenance bar - .desc = The PSB is a densely packed, nutrient rich, artificially flavored and colored food bar specifically made to accomodate all species during food shortages. +ent-FoodPSB = питательный батончик + .desc = Питательный батончик богат своим рационом на каждый вкус. ent-FoodPSBBase = { ent-FoodSnackBase } .desc = { ent-FoodSnackBase.desc } -ent-FoodPSBBarSoy = soy sustenance bar - .desc = A densely packed, nutrient rich sustenance bar. This one is mixed-herb flavoured. -ent-FoodPSBBarNeapolitan = neapolitan sustenance bar - .desc = A densely packed, nutrient rich sustenance bar. This one is neapolitan flavoured- strawberry, vanilla, and chocolate. -ent-FoodPSBBarBrownie = brownie sustenance bar - .desc = A densely packed, nutrient rich sustenance bar. This one is brownie flavored. -ent-FoodPSBBarCheese = cheese sustenance bar - .desc = A densely packed, nutrient rich sustenance bar. This one is three-cheese flavoured- parmesan, mozzarella, and cheddar. -ent-FoodPSBBarMeat = meat sustenance bar - .desc = A densely packed, nutrient rich sustenance bar. This one is meat and pepper flavored. -ent-FoodPSBBarVegetable = vegetable sustenance bar - .desc = A densely packed, nutrient rich sustenance bar. This one is vegetable flavoured- lettuce, carrots and potato. -ent-FoodPSBBarMint = mint sustenance bar - .desc = A densely packed, nutrient rich sustenance bar. This one is mint choc chip flavoured- peppermint, dark chocolate, and potato chips. -ent-FoodPSBBarBanana = banana sustenance bar - .desc = A densely packed, nutrient rich sustenance bar. This one is banana milkshake flavoured- banana and milk. -ent-FoodPSBBarWonka = wonka sustenance bar - .desc = A densely packed, nutrient rich sustenance bar. This one is split into three flavours, making up a typical meal- tomato soup, roast pumpkin, and blueberry pie. +ent-FoodPSBBarSoy = соевый питательный батончик + .desc = Богатый нутриентами батончик с соей. +ent-FoodPSBBarNeapolitan = питательный батончик по неополитански + .desc = Хорошо спресованный батончик со вкусом шоколада, ванили и иных сладостей. +ent-FoodPSBBarBrownie = брауни + .desc = Плотный, богатый питательными веществами батончик. Этот со вкусом брауни. +ent-FoodPSBBarCheese = сырный питательный батончик + .desc = Плотный, богатый питательными веществами батончик. Этот со вкусом сыра моцарелла, чеддер и иных сортов сыров. +ent-FoodPSBBarMeat = мясной питательный батончик + .desc = Плотный, богатый питательными веществами батончик. Этот со вкусом мяса и чёрного перца. +ent-FoodPSBBarVegetable = овощной питательный батончик + .desc = Плотный, богатый питательными веществами батончик. Этот со вкусом овощей по типу картофеля и моркови. +ent-FoodPSBBarMint = мятный питательный батончик + .desc = Плотный, богатый питательными веществами батончик. Этот со вкусом мяты. +ent-FoodPSBBarBanana = банановый питательный батончик + .desc = Плотный, богатый питательными веществами батончик. Этот со вкусом бананового милкшейка. +ent-FoodPSBBarWonka = питательный батончик вонки + .desc = Плотный, богатый питательными веществами батончик. Этот со вкусом сытного завтрака, плотного обеда и великолепного ужина. diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/nyanotrasen/entities/objects/consumable/food/salad.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/nyanotrasen/entities/objects/consumable/food/salad.ftl index f9a7af6c26..065cd49f2b 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/nyanotrasen/entities/objects/consumable/food/salad.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/nyanotrasen/entities/objects/consumable/food/salad.ftl @@ -1,8 +1,8 @@ -ent-FoodMothCapreseSalad = caprese salad - .desc = A very tasty yet simple to prepare salad. -ent-FoodMothFleetSalad = fleet salad - .desc = The grilled cheese makes it particularly filling, while the croutons provide a crunchy kick. -ent-FoodMothCottonSalad = cotton salad - .desc = A salad with added cotton and a basic dressing. Presumably moths are around. -ent-FoodMothKachumbariSalad = kachumbari salad +ent-FoodMothCapreseSalad = салат капрезе + .desc = Вкусный и простой в приготовлении салат. +ent-FoodMothFleetSalad = салат по-флотски + .desc = Жареный сыр делает блюдо особенно сытным, а гренки – хрустящими. +ent-FoodMothCottonSalad = хлопковый салат + .desc = Салат с хлопком и обычной заправкой. +ent-FoodMothKachumbariSalad = маринованный салат .desc = { ent-FoodBowlBase.desc } diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/nyanotrasen/entities/objects/consumable/food/snacks.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/nyanotrasen/entities/objects/consumable/food/snacks.ftl index 32a2916872..30ef7858c6 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/nyanotrasen/entities/objects/consumable/food/snacks.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/nyanotrasen/entities/objects/consumable/food/snacks.ftl @@ -1,16 +1,16 @@ -ent-FoodMothSqueakingFry = squeaking stir fry - .desc = A mothic classic made with cheese curds and tofu (amongst other things). -ent-FoodMothToastedSeeds = toasted seeds - .desc = While they're far from filling, toasted seeds are a popular snack amongst the moths. Some more exotic flavours may be added for some extra pep. -ent-FoodMothEngineFodder = engine fodder - .desc = A common snack for moth engineers, made of seeds, nuts, chocolate, popcorn, and potato chips designed to be dense with calories and easy to snack on when an extra boost is needed. -ent-FoodMothFueljackLunch = fueljack's lunch - .desc = A dish made from fried vegetables. Popular amongst the brave moths that faces the dangers of space. -ent-FoodMothChiliCabbageWrap = sweet chili cabbage wrap - .desc = Grilled cheese and salad in a cabbage wrap, topped with delicious sweet chili sauce. -ent-FoodMothBakedCheese = baked cheese wheel - .desc = A baked cheese wheel, melty and delicious... -ent-FoodMothBakedCheesePlatter = baked cheese platter - .desc = A favourite for sharing. Usually served with crispy bread slices for dipping, because the only thing better than good cheese is good cheese on bread. -ent-FoodBoritoPie = borito pie - .desc = For when you are bored of normal meals while sitting in brig. +ent-FoodMothSqueakingFry = скрипучее жаркое + .desc = Классический вкусный выбор ниан, приготовленный из сырного творога и тофу (помимо прочего). +ent-FoodMothToastedSeeds = жареные семена + .desc = Хотя поджаренные семена далеко не сытны, они являются популярной закуской среди ниан. Для дополнительного бодрости можно добавить еще несколько экзотических вкусов.. +ent-FoodMothEngineFodder = энергетический батончик + .desc = Обычная закуска для инженеров-ниан, состоящая из семян, орехов, шоколада, попкорна и картофельных чипсов. Высококалорийная и ею легко перекусить, когда требуется дополнительный заряд энергии. +ent-FoodMothFueljackLunch = ланч по рецепту Тости + .desc = Блюдо из жареных овощей. Популярен среди отважных мотыльков, столкнувшихся с опасностями космоса. +ent-FoodMothChiliCabbageWrap = сладкий капустный чили + .desc = Жареный сыр и салат в капустной обертке, покрытые восхитительным сладким соусом чили. +ent-FoodMothBakedCheese = колесо из запеченного сыра + .desc = Запеченный сырок.. Ммм... +ent-FoodMothBakedCheesePlatter = кусочек запеченного сыра + .desc = Подходит, чтобы поделиться. Обычно подается с хрустящими ломтиками хлеба, потому что единственное, что может быть лучше хорошего сыра, — это хороший сыр на хлебе. +ent-FoodBoritoPie = пирог борито + .desc = Для тех случаев, когда вам надоело есть обычную еду, сидя в бриге. diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/nyanotrasen/entities/objects/consumable/food/soup.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/nyanotrasen/entities/objects/consumable/food/soup.ftl index 82b909cf20..42dcd5f3cf 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/nyanotrasen/entities/objects/consumable/food/soup.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/nyanotrasen/entities/objects/consumable/food/soup.ftl @@ -1,24 +1,24 @@ -ent-FoodMothCottonSoup = cotton soup - .desc = A soup made from raw cotton in a flavourful vegetable broth. Enjoyed only by moths and the criminally tasteless. -ent-FoodMothCheeseSoup = cheese soup - .desc = A simple and filling soup made from homemade cheese and sweet potato. -ent-FoodMothSeedSoup = seed soup - .desc = A seed based soup, made by germinating seeds and then boiling them. -ent-FoodMothEyeballSoup = moth eyeball soup - .desc = It's looking back at you... -ent-FoodMothBeanStew = bean stew - .desc = A spicy bean stew with lots of veggies, commonly served as a filling and satisfying meal with rice or bread. -ent-FoodMothOatStew = oat stew - .desc = A hearty oat stew, prepared with oats, sweet potatoes, and various winter vegetables. -ent-FoodMothHeartburnSoup = heartburn soup - .desc = The heartburn soup is named after two things; it's rosy pink colour and it's scorchingly hot chili heat. -ent-FoodMothHuaMulanCongee = mulan congee - .desc = A smiley bowl of rice porridge with eggs and bacon. -ent-FoodMothCornmealPorridge = cornmeal porridge - .desc = A plate of cornmeal porridge. It's more flavourful than most porridges, and makes a good base for other flavours, too. -ent-FoodMothCheesyPorridge = cheesy porridge - .desc = A rich and creamy bowl of cheesy cornmeal porridge. -ent-FoodMothEggplantPolenta = fried eggplant and polenta - .desc = Polenta loaded with cheese, served with a few discs of fried eggplant and some tomato sauce. -ent-FoodMothVegetarianChili = vegetarian chili - .desc = For the hombres who don't want carne. +ent-FoodMothCottonSoup = хлопковый сыр + .desc = Суп с кусочками хлопка. Нианам такое понравится. +ent-FoodMothCheeseSoup = сырный суп + .desc = Простой и сытный суп из домашнего сыра и сладкого картофеля. +ent-FoodMothSeedSoup = суп с семянами + .desc = Суп на основе семян, приготовленный путем проращивания семян и их последующего кипячения. +ent-FoodMothEyeballSoup = суп из глаз ниан + .desc = Он смотрит на тебя.. +ent-FoodMothBeanStew = бобовое рагу + .desc = Острое рагу из фасоли с большим количеством овощей, которое обычно подают в качестве сытного и сытного блюда с рисом или хлебом. +ent-FoodMothOatStew = овсяное рагу + .desc = Сытное овсяное рагу, приготовленное из овса, сладкого картофеля и различных зимних овощей. +ent-FoodMothHeartburnSoup = суп сердечная изжога + .desc = Суп сердечная изжога назван в честь двух вещей: он розово-розового цвета и обжигающе горячего перца чили. +ent-FoodMothHuaMulanCongee = сытный завтрак + .desc = Аппетитная миска с рисовой кашей, яйцами и беконом. +ent-FoodMothCornmealPorridge = кукурузная каша + .desc = Тарелка кукурузной каши. Она более ароматная, чем большинство каш, а также является хорошей основой для других блюд. +ent-FoodMothCheesyPorridge = сырная каша + .desc = Насыщенная, кремовая тарелка сырной кукурузной каши. +ent-FoodMothEggplantPolenta = жареные баклажаны и полента + .desc = Полента с сыром, подается с несколькими кусочками жареных баклажанов и томатным соусом. +ent-FoodMothVegetarianChili = вегетарианское чили + .desc = Для тех, кто хочет заработать изжогу. diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/nyanotrasen/entities/objects/devices/cartridges.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/nyanotrasen/entities/objects/devices/cartridges.ftl index 790b8b262f..c972b708f0 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/nyanotrasen/entities/objects/devices/cartridges.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/nyanotrasen/entities/objects/devices/cartridges.ftl @@ -1,2 +1,2 @@ -ent-GlimmerMonitorCartridge = glimmer monitor cartridge - .desc = A cartridge that keeps track of glimmer. +ent-GlimmerMonitorCartridge = картридж трекера глиммера + .desc = Картридж, с программой для отслеживания статуса глиммера. diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/nyanotrasen/entities/objects/devices/circuitboards/production.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/nyanotrasen/entities/objects/devices/circuitboards/production.ftl index c86e234f6a..906b896233 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/nyanotrasen/entities/objects/devices/circuitboards/production.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/nyanotrasen/entities/objects/devices/circuitboards/production.ftl @@ -1,8 +1,8 @@ -ent-MetempsychoticMachineCircuitboard = metempsychotic machine machine board - .desc = A machine printed circuit board for a cloning pod -ent-ReverseEngineeringMachineCircuitboard = reverse engineering machine machine board - .desc = A machine printed circuit board for a reverse engineering machine -ent-DeepFryerMachineCircuitboard = deep fryer machine board +ent-MetempsychoticMachineCircuitboard = плата машины для метампсихоза + .desc = Печатная плата для машины метампсихоза. +ent-ReverseEngineeringMachineCircuitboard = плата машины анализатора технологий + .desc = Печатная плата для машины обратной разработки. +ent-DeepFryerMachineCircuitboard = плата фритюрницы .desc = { ent-BaseMachineCircuitboard.desc } -ent-MailTeleporterMachineCircuitboard = mail teleporter machine board +ent-MailTeleporterMachineCircuitboard = плата почтового телепортера .desc = { ent-BaseMachineCircuitboard.desc } diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/nyanotrasen/entities/objects/devices/holoprojectors.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/nyanotrasen/entities/objects/devices/holoprojectors.ftl index c45dd90206..0eb6b4b4de 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/nyanotrasen/entities/objects/devices/holoprojectors.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/nyanotrasen/entities/objects/devices/holoprojectors.ftl @@ -1,2 +1,2 @@ -ent-HoloprojectorEngineering = engineering holoprojector - .desc = Displays a warning sign. +ent-HoloprojectorEngineering = инженерный голопроектор + .desc = Выводит табличку с предупреждением. diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/nyanotrasen/entities/objects/devices/misc/identification_cards.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/nyanotrasen/entities/objects/devices/misc/identification_cards.ftl index 9fe418939a..1322fbf449 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/nyanotrasen/entities/objects/devices/misc/identification_cards.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/nyanotrasen/entities/objects/devices/misc/identification_cards.ftl @@ -1,12 +1,16 @@ -ent-PrisonerIDCard = prisoner ID card +ent-PrisonerIDCard = ID карта заключённого .desc = { ent-IDCardStandard.desc } -ent-GladiatorIDCard = gladiator ID card +ent-GladiatorIDCard = ID карта гладиатора .desc = { ent-IDCardStandard.desc } -ent-PrisonGuardIDCard = prison guard ID card +ent-PrisonGuardIDCard = ID карта охранника тюрьмы .desc = { ent-IDCardStandard.desc } -ent-MailCarrierIDCard = courier ID card +ent-MailCarrierIDCard = ID карта курьера .desc = { ent-IDCardStandard.desc } -ent-MartialArtistIDCard = martial artist ID card +ent-MartialArtistIDCard = ID карта мастера боевых искусств .desc = { ent-IDCardStandard.desc } -ent-ForensicMantisIDCard = psionic mantis ID card +ent-ForensicMantisIDCard = ID карта мантиса + .desc = { ent-IDCardStandard.desc } +ent-ClerkIDCard = ID карта судьи + .desc = { ent-IDCardStandard.desc } +ent-ChiefJusticeIDCard = ID карта верховного судьи .desc = { ent-IDCardStandard.desc } diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/nyanotrasen/entities/objects/devices/pda.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/nyanotrasen/entities/objects/devices/pda.ftl index 687a026146..868fa89ded 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/nyanotrasen/entities/objects/devices/pda.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/nyanotrasen/entities/objects/devices/pda.ftl @@ -1,12 +1,12 @@ -ent-PrisonerPDA = prisoner PDA - .desc = Clear, so you can make sure there's nothing being smuggled inside. -ent-GladiatorPDA = gladiator PDA +ent-PrisonerPDA = КПК заключенного + .desc = Чисто, чтобы вы могли убедиться, что внутрь ничего не проносят контрабандой. +ent-GladiatorPDA = КПК гладиатора .desc = { ent-PrisonerPDA.desc } -ent-PrisonGuardPDA = prison guard PDA - .desc = Red to hide the stains of prisoner blood. -ent-MailCarrierPDA = courier PDA - .desc = Smells like unopened letters. -ent-MartialArtistPDA = martial artist PDA - .desc = Smells like straw. -ent-ForensicMantisPDA = psionic mantis PDA - .desc = Smells like illegal substances. +ent-PrisonGuardPDA = КПК охранника тюрьмы + .desc = Красный, чтобы скрыть пятна крови заключенных. +ent-MailCarrierPDA = КПК курьера + .desc = Пахнет, как нераспечатанные письма. +ent-MartialArtistPDA = КПК мастера боевых искусств + .desc = Пахнет соломой. +ent-ForensicMantisPDA = КПК мантиса + .desc = Пахнет запрещенными веществами. diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/nyanotrasen/entities/objects/devices/shock_collar.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/nyanotrasen/entities/objects/devices/shock_collar.ftl index 70c11f07ee..c03359ed90 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/nyanotrasen/entities/objects/devices/shock_collar.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/nyanotrasen/entities/objects/devices/shock_collar.ftl @@ -1,2 +1,2 @@ -ent-ShockCollar = shock collar - .desc = Shocking. +ent-ShockCollar = ошейник-шокер + .desc = Шокирующе. diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/nyanotrasen/entities/objects/fun/instruments.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/nyanotrasen/entities/objects/fun/instruments.ftl index 675f2944a1..aaa949d3e3 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/nyanotrasen/entities/objects/fun/instruments.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/nyanotrasen/entities/objects/fun/instruments.ftl @@ -1,5 +1,5 @@ -ent-Rickenbacker4003Instrument = Rickenbacker - .desc = Just a regular bass guitar. -ent-Rickenbacker4001Instrument = Rickenbacker - .desc = It's the climax! - .suffix = Antag +ent-Rickenbacker4003Instrument = Рикенбэкер + .desc = Обычная бас-гитара. +ent-Rickenbacker4001Instrument = Рикенбэкер + .desc = Водоворот звука! + .suffix = Антагонист diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/nyanotrasen/entities/objects/fun/toys.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/nyanotrasen/entities/objects/fun/toys.ftl index e589868354..8877917ef0 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/nyanotrasen/entities/objects/fun/toys.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/nyanotrasen/entities/objects/fun/toys.ftl @@ -1,7 +1,7 @@ -ent-PlushieMothRandom = moth plushie - .desc = A cute little mothperson that you can hold in the palm of your hand. - .suffix = Random -ent-PlushieMothMusician = moth musician plushie - .desc = A plushie depicting an adorable mothperson with a tiny synthesizer and tiny glasses. -ent-PlushieMothBartender = moth bartender plushie - .desc = A plushie depicting an adorable mothperson with a tiny tophat and tiny kevlar vest. It smells like cigarettes. +ent-PlushieMothRandom = плюшевая моль + .desc = Маленькая моль у вас в руках. + .suffix = Случайный +ent-PlushieMothMusician = плюшевая моль-музыкант + .desc = Маленькая моль-музыкант у вас в руках. +ent-PlushieMothBartender = плюшевая моль-бармен + .desc = Маленькая моль-бармен у вас в руках. От неё пахнет сигаретным дымом. diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/nyanotrasen/entities/objects/materials/materials.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/nyanotrasen/entities/objects/materials/materials.ftl index 5e4bdc7e74..afa3f57e76 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/nyanotrasen/entities/objects/materials/materials.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/nyanotrasen/entities/objects/materials/materials.ftl @@ -1,2 +1,2 @@ -ent-HideMothroach = mothroach hide - .desc = A thin layer of mothroach hide. +ent-HideMothroach = шкура тараканомоли + .desc = Тонкий слой шкурки тараканомоли. diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/nyanotrasen/entities/objects/misc/paper.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/nyanotrasen/entities/objects/misc/paper.ftl index b16f2d0d46..94d2adb5ce 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/nyanotrasen/entities/objects/misc/paper.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/nyanotrasen/entities/objects/misc/paper.ftl @@ -1,3 +1,3 @@ -ent-RubberStampMantis = psionic mantis' seal - .desc = An old-fashioned seal for marking important documents, made of polished bronze. +ent-RubberStampMantis = печать мантиса + .desc = Старомодная печать сделанная из чистого сплава бронзы. .suffix = НЕ МАППИТЬ diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/nyanotrasen/entities/objects/misc/tiles.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/nyanotrasen/entities/objects/misc/tiles.ftl index 028a150251..fdd99485de 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/nyanotrasen/entities/objects/misc/tiles.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/nyanotrasen/entities/objects/misc/tiles.ftl @@ -1,8 +1,8 @@ -ent-FloorTileItemGrassDark = dark grass tile +ent-FloorTileItemGrassDark = зелёный травяной пол .desc = { ent-FloorTileItemBase.desc } -ent-FloorTileItemGrassLight = light grass tile +ent-FloorTileItemGrassLight = светло-зелёный травяной пол .desc = { ent-FloorTileItemBase.desc } -ent-FloorTileItemDirt = dirt tile +ent-FloorTileItemDirt = грязевой пол .desc = { ent-FloorTileItemBase.desc } -ent-FloorTileItemBedrock = bedrock tile +ent-FloorTileItemBedrock = каменный пол .desc = { ent-FloorTileItemBase.desc } diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/nyanotrasen/entities/objects/power/lights.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/nyanotrasen/entities/objects/power/lights.ftl index d7a4297652..a8f15e9b18 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/nyanotrasen/entities/objects/power/lights.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/nyanotrasen/entities/objects/power/lights.ftl @@ -1,14 +1,14 @@ -ent-BlueLightTube = blue light tube - .desc = A medium power high energy bulb that reminds you of space. May contain mercury. -ent-LightBulbMaintenance = incandescent light bulb - .desc = A dim light bulb. - .suffix = Maintenance -ent-ColoredLightTubeRed = red light tube - .desc = A colorful light tube. These emit a red hue. -ent-ColoredLightTubeFrostyBlue = blue light tube - .desc = A colorful light tube. These emit a frosty blue hue. -ent-ColoredLightTubeBlackLight = black light tube - .desc = A colorful light tube. These emit "black light". -ent-LightBulbMaintenanceRed = incandescent light bulb - .desc = A dim light bulb. These emit a red hue. - .suffix = Maintenance, Red +ent-BlueLightTube = синяя лампа-труба + .desc = Содержит меркурий. Источает синий цвет. +ent-LightBulbMaintenance = лампа накаливания + .desc = Обычная лампочка. + .suffix = Технические +ent-ColoredLightTubeRed = красная лампа-труба + .desc = Цветная лампа-труба. Источает красный свет. +ent-ColoredLightTubeFrostyBlue = ярко-синяя лампа-труба + .desc = Цветная лампа-труба. Источает ярко-синий свет. +ent-ColoredLightTubeBlackLight = чёрная лампа-труба + .desc = Цветная лампа-труба. Источает "чёрный свет". +ent-LightBulbMaintenanceRed = лампа накаливания + .desc = Обычная лампочка. Источает красный свет. + .suffix = Технические, Красный diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/nyanotrasen/entities/objects/specific/chapel/bibles.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/nyanotrasen/entities/objects/specific/chapel/bibles.ftl index c260e281b4..854bf54090 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/nyanotrasen/entities/objects/specific/chapel/bibles.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/nyanotrasen/entities/objects/specific/chapel/bibles.ftl @@ -1,2 +1,2 @@ -ent-BibleMystagogue = book of mysteries - .desc = The mystagogue's holy book. +ent-BibleMystagogue = книга тайн + .desc = Священная книга под владением научного директора. diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/nyanotrasen/entities/objects/specific/chemistry-bottles.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/nyanotrasen/entities/objects/specific/chemistry-bottles.ftl index 7fb4b843c1..09f12a7f2d 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/nyanotrasen/entities/objects/specific/chemistry-bottles.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/nyanotrasen/entities/objects/specific/chemistry-bottles.ftl @@ -1,2 +1,2 @@ -ent-MercuryChemistryBottle = mercury bottle +ent-MercuryChemistryBottle = бутылочка меркурия .desc = { ent-BaseChemistryEmptyBottle.desc } diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/nyanotrasen/entities/objects/specific/hydroponics/seeds.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/nyanotrasen/entities/objects/specific/hydroponics/seeds.ftl index 432e228984..3fbd13982c 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/nyanotrasen/entities/objects/specific/hydroponics/seeds.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/nyanotrasen/entities/objects/specific/hydroponics/seeds.ftl @@ -1,2 +1,2 @@ -ent-KillerTomatoSeeds = packet of killer tomato seeds +ent-KillerTomatoSeeds = пакет семян (томат-убийца) .desc = { ent-SeedBase.desc } diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/nyanotrasen/entities/objects/specific/mail/base_mail.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/nyanotrasen/entities/objects/specific/mail/base_mail.ftl index 4096d961c0..d7b3f3e8a7 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/nyanotrasen/entities/objects/specific/mail/base_mail.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/nyanotrasen/entities/objects/specific/mail/base_mail.ftl @@ -1,5 +1,5 @@ ent-BaseMail = mail-item-name-unaddressed .desc = { ent-BaseItem.desc } ent-MailAdminFun = { ent-BaseMail } - .suffix = adminfun + .suffix = АДМЕМЫ .desc = { ent-BaseMail.desc } diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/nyanotrasen/entities/objects/specific/mail/mail.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/nyanotrasen/entities/objects/specific/mail/mail.ftl index a2443a579e..7dc43d49ff 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/nyanotrasen/entities/objects/specific/mail/mail.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/nyanotrasen/entities/objects/specific/mail/mail.ftl @@ -1,129 +1,129 @@ ent-MailAlcohol = { ent-BaseMail } - .suffix = alcohol + .suffix = алкоголь .desc = { ent-BaseMail.desc } ent-MailSake = { ent-BaseMail } - .suffix = osake + .suffix = саке .desc = { ent-BaseMail.desc } ent-MailAMEGuide = { ent-BaseMail } - .suffix = ameguide + .suffix = руководство по ДАМ .desc = { ent-BaseMail.desc } ent-MailBible = { ent-BaseMail } - .suffix = bible + .suffix = библия .desc = { ent-BaseMail.desc } ent-MailBikeHorn = { ent-BaseMail } - .suffix = bike horn + .suffix = велосипедный клаксон .desc = { ent-BaseMail.desc } ent-MailBlockGameDIY = { ent-BaseMail } - .suffix = blockgamediy + .suffix = руководство по азартным играм .desc = { ent-BaseMail.desc } ent-MailCake = { ent-BaseMail } - .suffix = cake + .suffix = торт .desc = { ent-BaseMail.desc } ent-MailCallForHelp = { ent-BaseMail } - .suffix = call-for-help + .suffix = зов о помощи .desc = { ent-BaseMail.desc } ent-MailCheese = { ent-BaseMail } - .suffix = cheese + .suffix = сыр .desc = { ent-BaseMail.desc } ent-MailChocolate = { ent-BaseMail } - .suffix = chocolate + .suffix = шоколад .desc = { ent-BaseMail.desc } ent-MailCigarettes = { ent-BaseMail } - .suffix = cigs + .suffix = чипсы .desc = { ent-BaseMail.desc } ent-MailCigars = { ent-BaseMail } - .suffix = Cigars + .suffix = сигары .desc = { ent-BaseMail.desc } ent-MailCookies = { ent-BaseMail } - .suffix = cookies + .suffix = печеньки .desc = { ent-BaseMail.desc } ent-MailCosplayArc = { ent-BaseMail } - .suffix = cosplay-arc + .suffix = часть костюма .desc = { ent-BaseMail.desc } ent-MailCosplayGeisha = { ent-BaseMail } - .suffix = cosplay-geisha + .suffix = костюм гейши .desc = { ent-BaseMail.desc } ent-MailCosplayMaid = { ent-BaseMail } - .suffix = cosplay-maid + .suffix = костюм служанки .desc = { ent-BaseMail.desc } ent-MailCosplayNurse = { ent-BaseMail } - .suffix = cosplay-nurse + .suffix = форма мед-сестры .desc = { ent-BaseMail.desc } ent-MailCosplaySchoolgirl = { ent-BaseMail } - .suffix = cosplay-schoolgirl + .suffix = форма школьницы .desc = { ent-BaseMail.desc } ent-MailCosplayWizard = { ent-BaseMail } - .suffix = cosplay-wizard + .suffix = костюм колдуна .desc = { ent-BaseMail.desc } ent-MailCrayon = { ent-BaseMail } - .suffix = Crayon + .suffix = мелок .desc = { ent-BaseMail.desc } ent-MailFigurine = { ent-BaseMail } - .suffix = figurine + .suffix = фигурка .desc = { ent-BaseMail.desc } ent-MailFishingCap = { ent-BaseMail } - .suffix = fishingcap + .suffix = панама рыбака .desc = { ent-BaseMail.desc } ent-MailFlashlight = { ent-BaseMail } - .suffix = Flashlight + .suffix = фонарик .desc = { ent-BaseMail.desc } ent-MailHighlander = { ent-BaseMail } - .suffix = highlander + .suffix = горец .desc = { ent-BaseMail.desc } ent-MailHighlanderDulled = { ent-BaseMail } - .suffix = highlander, dulled + .suffix = затуплённый горец .desc = { ent-BaseMail.desc } ent-MailHoneyBuns = { ent-BaseMail } - .suffix = honeybuns + .suffix = булочки .desc = { ent-BaseMail.desc } ent-MailJunkFood = { ent-BaseMail } - .suffix = junk food + .suffix = фастфуд .desc = { ent-BaseMail.desc } ent-MailKatana = { ent-BaseMail } - .suffix = Katana + .suffix = катана .desc = { ent-BaseMail.desc } ent-MailKnife = { ent-BaseMail } - .suffix = Knife + .suffix = нож .desc = { ent-BaseMail.desc } ent-MailMoney = { ent-BaseMail } - .suffix = money + .suffix = деньги .desc = { ent-BaseMail.desc } ent-MailMuffins = { ent-BaseMail } - .suffix = muffins + .suffix = маффины .desc = { ent-BaseMail.desc } ent-MailMoffins = { ent-BaseMail } - .suffix = moffins + .suffix = моффины .desc = { ent-BaseMail.desc } ent-MailNoir = { ent-BaseMail } - .suffix = noir + .suffix = нуар .desc = { ent-BaseMail.desc } ent-MailPAI = { ent-BaseMail } - .suffix = PAI + .suffix = пИИ .desc = { ent-BaseMail.desc } ent-MailPlushie = { ent-BaseMail } - .suffix = plushie + .suffix = плюшевая игрушка .desc = { ent-BaseMail.desc } ent-MailRestraints = { ent-BaseMail } - .suffix = restraints + .suffix = стяжки .desc = { ent-BaseMail.desc } ent-MailSignallerKit = { ent-BaseMail } - .suffix = signallerkit + .suffix = аварийный набор .desc = { ent-BaseMail.desc } ent-MailSkub = { ent-BaseMail } - .suffix = skub + .suffix = скаб .desc = { ent-BaseMail.desc } ent-MailSoda = { ent-BaseMail } - .suffix = soda + .suffix = газировка .desc = { ent-BaseMail.desc } ent-MailSpaceVillainDIY = { ent-BaseMail } - .suffix = spacevilliandiy + .suffix = руководство космического злодея .desc = { ent-BaseMail.desc } ent-MailSunglasses = { ent-BaseMail } - .suffix = Sunglasses + .suffix = солнечные очки .desc = { ent-BaseMail.desc } ent-MailVagueThreat = { ent-BaseMail } - .suffix = vague-threat + .suffix = угроза переворота .desc = { ent-BaseMail.desc } ent-MailWinterCoat = { ent-BaseMail } - .suffix = wintercoat + .suffix = куртка .desc = { ent-BaseMail.desc } diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/nyanotrasen/entities/objects/specific/mail/mail_civilian.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/nyanotrasen/entities/objects/specific/mail/mail_civilian.ftl index d46a995e1a..dabeaefb3d 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/nyanotrasen/entities/objects/specific/mail/mail_civilian.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/nyanotrasen/entities/objects/specific/mail/mail_civilian.ftl @@ -1,36 +1,36 @@ ent-MailBotanistChemicalBottles = { ent-BaseMail } - .suffix = botanistchemicals + .suffix = Ботаник .desc = { ent-BaseMail.desc } ent-MailBotanistMutagen = { ent-BaseMail } - .suffix = mutagen + .suffix = Мутаген .desc = { ent-BaseMail.desc } ent-MailBotanistSeeds = { ent-BaseMail } - .suffix = seeds + .suffix = Семена .desc = { ent-BaseMail.desc } ent-MailClownGildedBikeHorn = { ent-BaseMail } - .suffix = honk + .suffix = Хонк .desc = { ent-BaseMail.desc } ent-MailClownHonkSupplement = { ent-BaseMail } - .suffix = honk + .suffix = Хонк .desc = { ent-BaseMail.desc } ent-MailHoPBureaucracy = { ent-BaseMail } - .suffix = hoppaper + .suffix = ГП .desc = { ent-BaseMail.desc } ent-MailHoPSupplement = { ent-BaseMail } - .suffix = hopsupplement + .suffix = ГП .desc = { ent-BaseMail.desc } ent-MailMimeArtsCrafts = { ent-BaseMail } - .suffix = artscrafts + .suffix = Художества .desc = { ent-BaseMail.desc } ent-MailMimeBlankBook = { ent-BaseMail } - .suffix = blankbook + .suffix = Пустая книга .desc = { ent-BaseMail.desc } ent-MailMimeBottleOfNothing = { ent-BaseMail } - .suffix = bottleofnothing + .suffix = Ничего .desc = { ent-BaseMail.desc } ent-MailMusicianInstrumentSmall = { ent-BaseMail } - .suffix = instrument-small + .suffix = Инструмент .desc = { ent-BaseMail.desc } ent-MailPassengerMoney = { ent-BaseMail } - .suffix = passengermoney + .suffix = Кредиты .desc = { ent-BaseMail.desc } diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/nyanotrasen/entities/objects/specific/mail/mail_command.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/nyanotrasen/entities/objects/specific/mail/mail_command.ftl index 282184b0ed..6fddeb09b6 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/nyanotrasen/entities/objects/specific/mail/mail_command.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/nyanotrasen/entities/objects/specific/mail/mail_command.ftl @@ -1,3 +1,3 @@ ent-MailCommandPinpointerNuclear = { ent-BaseMail } - .suffix = pinpointernuclear + .suffix = Пинпоинтер .desc = { ent-BaseMail.desc } diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/nyanotrasen/entities/objects/specific/mail/mail_engineering.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/nyanotrasen/entities/objects/specific/mail/mail_engineering.ftl index ecddc5a47b..ffe152ac05 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/nyanotrasen/entities/objects/specific/mail/mail_engineering.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/nyanotrasen/entities/objects/specific/mail/mail_engineering.ftl @@ -1,12 +1,12 @@ ent-MailEngineeringCables = { ent-BaseMail } - .suffix = cables + .suffix = Кабель .desc = { ent-BaseMail.desc } ent-MailEngineeringKudzuDeterrent = { ent-BaseMail } - .suffix = antikudzu + .suffix = Антикузда .desc = { ent-BaseMail.desc } ent-MailEngineeringSheetGlass = { ent-BaseMail } - .suffix = sheetglass + .suffix = Стекло .desc = { ent-BaseMail.desc } ent-MailEngineeringWelderReplacement = { ent-BaseMail } - .suffix = welder + .suffix = Сварка .desc = { ent-BaseMail.desc } diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/nyanotrasen/entities/objects/specific/mail/mail_security.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/nyanotrasen/entities/objects/specific/mail/mail_security.ftl index 6b24b0e604..32fec70447 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/nyanotrasen/entities/objects/specific/mail/mail_security.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/nyanotrasen/entities/objects/specific/mail/mail_security.ftl @@ -1,12 +1,12 @@ ent-MailSecurityDonuts = { ent-BaseMail } - .suffix = donuts + .suffix = Пончики .desc = { ent-BaseMail.desc } ent-MailSecurityFlashlight = { ent-BaseMail } - .suffix = seclite + .suffix = Фонарик .desc = { ent-BaseMail.desc } ent-MailSecurityNonlethalsKit = { ent-BaseMail } - .suffix = nonlethalskit + .suffix = Нелетал .desc = { ent-BaseMail.desc } ent-MailWardenCrowdControl = { ent-BaseMail } - .suffix = crowdcontrol + .suffix = Беспорядки .desc = { ent-BaseMail.desc } diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/nyanotrasen/entities/objects/specific/mail/mail_specific_items.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/nyanotrasen/entities/objects/specific/mail/mail_specific_items.ftl index 26999ff853..24b70c7673 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/nyanotrasen/entities/objects/specific/mail/mail_specific_items.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/nyanotrasen/entities/objects/specific/mail/mail_specific_items.ftl @@ -1,51 +1,51 @@ ent-PaperMailCallForHelp1 = { ent-Paper } - .suffix = call for help 1 + .suffix = зов 1 .desc = { ent-Paper.desc } ent-PaperMailCallForHelp2 = { ent-Paper } - .suffix = call for help 2 + .suffix = зов 2 .desc = { ent-Paper.desc } ent-PaperMailCallForHelp3 = { ent-Paper } - .suffix = call for help 3 + .suffix = зов 3 .desc = { ent-Paper.desc } ent-PaperMailCallForHelp4 = { ent-Paper } - .suffix = call for help 4 + .suffix = зов 4 .desc = { ent-Paper.desc } ent-PaperMailCallForHelp5 = { ent-Paper } - .suffix = call for help 5 + .suffix = зов 5 .desc = { ent-Paper.desc } ent-PaperMailVagueThreat1 = { ent-Paper } - .suffix = vague mail threat 1 + .suffix = угроза 1 .desc = { ent-Paper.desc } ent-PaperMailVagueThreat2 = { ent-Paper } - .suffix = vague mail threat 2 + .suffix = угроза 2 .desc = { ent-Paper.desc } ent-PaperMailVagueThreat3 = { ent-Paper } - .suffix = vague mail threat 3 + .suffix = угроза 3 .desc = { ent-Paper.desc } ent-PaperMailVagueThreat4 = { ent-Paper } - .suffix = vague mail threat 4 + .suffix = угроза 4 .desc = { ent-Paper.desc } ent-PaperMailVagueThreat5 = { ent-Paper } - .suffix = vague mail threat 5 + .suffix = угроза 5 .desc = { ent-Paper.desc } ent-PaperMailVagueThreat6 = { ent-Paper } - .suffix = vague mail threat 6 + .suffix = угроза 6 .desc = { ent-Paper.desc } ent-PaperMailVagueThreat7 = { ent-Paper } - .suffix = vague mail threat 7 + .suffix = угроза 7 .desc = { ent-Paper.desc } ent-PaperMailVagueThreat8 = { ent-Paper } - .suffix = vague mail threat 8 + .suffix = угроза 8 .desc = { ent-Paper.desc } ent-PaperMailVagueThreat9 = { ent-Paper } - .suffix = vague mail threat 9 + .suffix = угроза 9 .desc = { ent-Paper.desc } ent-PaperMailVagueThreat10 = { ent-Paper } - .suffix = vague mail threat 10 + .suffix = угроза 10 .desc = { ent-Paper.desc } ent-PaperMailVagueThreat11 = { ent-Paper } - .suffix = vague mail threat 11 + .suffix = угроза 11 .desc = { ent-Paper.desc } ent-PaperMailVagueThreat12 = { ent-Paper } - .suffix = vague mail threat 12 + .suffix = угроза 12 .desc = { ent-Paper.desc } diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/nyanotrasen/entities/objects/specific/mail/tools.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/nyanotrasen/entities/objects/specific/mail/tools.ftl index 9cbb75168a..566f5c3be6 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/nyanotrasen/entities/objects/specific/mail/tools.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/nyanotrasen/entities/objects/specific/mail/tools.ftl @@ -1,2 +1,2 @@ -ent-MailBag = mail bag - .desc = Here's the mail, it never fails... +ent-MailBag = почтовая сумка + .desc = Ваша почта! diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/nyanotrasen/entities/objects/specific/medical/pills.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/nyanotrasen/entities/objects/specific/medical/pills.ftl index a4abc4b085..be2e45e4a7 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/nyanotrasen/entities/objects/specific/medical/pills.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/nyanotrasen/entities/objects/specific/medical/pills.ftl @@ -1,4 +1,4 @@ -ent-PillMindbreakerToxin = mindbreaker toxin - .desc = Removes psionics when ingested. Mildly poisonous. -ent-PillCryptobiolin = cryptobiolin - .desc = A long-lasting drug which causes mild confusion, but renders you psionically insulated. +ent-PillMindbreakerToxin = майндбрейкер + .desc = Подавляет силы псионика. Слегка ядовит. +ent-PillCryptobiolin = криптобиолин + .desc = Долгодействующий наркотик, который заставляет вас входить в замешательство, но повышает потенциал псионических способностей. diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/nyanotrasen/entities/objects/specific/research/crystals.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/nyanotrasen/entities/objects/specific/research/crystals.ftl index 7cda2dc404..54193014ce 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/nyanotrasen/entities/objects/specific/research/crystals.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/nyanotrasen/entities/objects/specific/research/crystals.ftl @@ -1,2 +1,2 @@ -ent-CrystalNormality = normality crystal - .desc = It looks... normal. Placeholder sprite. +ent-CrystalNormality = кристалл обыкновенности + .desc = Выглядит.. обыкновенно. diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/nyanotrasen/entities/objects/specific/species/felinid.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/nyanotrasen/entities/objects/specific/species/felinid.ftl index 26e9069caf..c635093073 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/nyanotrasen/entities/objects/specific/species/felinid.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/nyanotrasen/entities/objects/specific/species/felinid.ftl @@ -1,2 +1,2 @@ -ent-Hairball = hairball - .desc = Felinids, man... Placeholder sprite. +ent-Hairball = волосяной шарик + .desc = Иу.. фелиниды... diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/nyanotrasen/entities/objects/tools/fish_labeler.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/nyanotrasen/entities/objects/tools/fish_labeler.ftl index 0425cd9261..6173352e43 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/nyanotrasen/entities/objects/tools/fish_labeler.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/nyanotrasen/entities/objects/tools/fish_labeler.ftl @@ -1,2 +1,2 @@ -ent-FishLabeler = fish labeler - .desc = A hand labeler modified for naming your fish. +ent-FishLabeler = этикетировщик рыбы + .desc = Ручной этикетировщик с функцией пометки вашей рыбки. Буль. diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/nyanotrasen/entities/objects/weapons/guns/ammunition/magazine/magnum.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/nyanotrasen/entities/objects/weapons/guns/ammunition/magazine/magnum.ftl index 95cd69ad92..84e78b6399 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/nyanotrasen/entities/objects/weapons/guns/ammunition/magazine/magnum.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/nyanotrasen/entities/objects/weapons/guns/ammunition/magazine/magnum.ftl @@ -1,8 +1,8 @@ -ent-BaseMagazineUniversalMagnum = Universal magazine (.45 magnum) +ent-BaseMagazineUniversalMagnum = универсальный магазин (.45 магнум) .desc = { ent-BaseMagazinePistol.desc } -ent-MagazineUniversalMagnum = Universal magazine (.45 magnum) +ent-MagazineUniversalMagnum = универсальный магазин (.45 магнум) .desc = { ent-BaseMagazineUniversalMagnum.desc } -ent-MagazineUniversalMagnumPractice = Universal magazine (.45 magnum practice) +ent-MagazineUniversalMagnumPractice = универсальный магазин (.45 магнум учебные) .desc = { ent-BaseMagazineUniversalMagnum.desc } -ent-MagazineUniversalMagnumRubber = Universal magazine (.45 magnum rubber) +ent-MagazineUniversalMagnumRubber = универсальный магазин (.45 магнум резиновые) .desc = { ent-BaseMagazineUniversalMagnum.desc } diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/nyanotrasen/entities/objects/weapons/guns/pistols/pistols.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/nyanotrasen/entities/objects/weapons/guns/pistols/pistols.ftl index e283e9773b..fda3a3f4ce 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/nyanotrasen/entities/objects/weapons/guns/pistols/pistols.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/nyanotrasen/entities/objects/weapons/guns/pistols/pistols.ftl @@ -1,2 +1,2 @@ -ent-WeaponPistolUniversal = mk 32 "Universal" - .desc = An expensive and robust pistol with decent offensive capabilities. Uses .45 magnum ammo. +ent-WeaponPistolUniversal = МК-32 "Универсальный" + .desc = Дорогой и робастный пистолет с задатками револьвера. Использует калибр .45 магнум. diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/nyanotrasen/entities/objects/weapons/guns/projectiles/shotgun.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/nyanotrasen/entities/objects/weapons/guns/projectiles/shotgun.ftl index 6629ea8f7d..d56723ed9f 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/nyanotrasen/entities/objects/weapons/guns/projectiles/shotgun.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/nyanotrasen/entities/objects/weapons/guns/projectiles/shotgun.ftl @@ -1,2 +1,2 @@ -ent-PelletShotgunSoulbreaker = pellet (.50 soulbreaker) +ent-PelletShotgunSoulbreaker = гранула (.50 душераздиратель) .desc = { ent-BaseBulletPractice.desc } diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/nyanotrasen/entities/objects/weapons/guns/snipers/snipers.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/nyanotrasen/entities/objects/weapons/guns/snipers/snipers.ftl index d62816b136..b36b893845 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/nyanotrasen/entities/objects/weapons/guns/snipers/snipers.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/nyanotrasen/entities/objects/weapons/guns/snipers/snipers.ftl @@ -1,4 +1,4 @@ -ent-WeaponSniperGrand = mark 1 rifle - .desc = A heavy and reliable self-loading rifle, utilising a modified version of a centuries-old design. Uses .30 rifle ammo. -ent-WeaponSniperCeremonial = ceremonial rifle - .desc = A ceremonial variant of the Mark 1 Rifle, in tasteful blue and white. Uses .30 rifle ammo. +ent-WeaponSniperGrand = Марк 1 + .desc = Тяжелая, самозарядная винтовка с обновлённым дизайном. Использует калибр .30 винтовочные. +ent-WeaponSniperCeremonial = Церемониальная винтовка + .desc = Церемониальная версия винтовки Марк 1. Использует калибр .30 винтовочные. diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/nyanotrasen/entities/objects/weapons/melee/blunt.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/nyanotrasen/entities/objects/weapons/melee/blunt.ftl index 7dbafd194c..731ea8027d 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/nyanotrasen/entities/objects/weapons/melee/blunt.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/nyanotrasen/entities/objects/weapons/melee/blunt.ftl @@ -1,4 +1,4 @@ -ent-Kanabou = kanabou - .desc = The classic oni weapon, for those that forgo subtlety. -ent-Shinai = shinai - .desc = A bamboo sword, commonly used in kendo. Made some time after the realization that wooden swords hurt a lot. +ent-Kanabou = канабо + .desc = Классическое оружие всех Они. Сковано мастерами. +ent-Shinai = шинай + .desc = Бамбуковый меч, который часто используют в Кендо. diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/nyanotrasen/entities/objects/weapons/melee/breaching_hammer.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/nyanotrasen/entities/objects/weapons/melee/breaching_hammer.ftl index e295402821..d854aa1f9d 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/nyanotrasen/entities/objects/weapons/melee/breaching_hammer.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/nyanotrasen/entities/objects/weapons/melee/breaching_hammer.ftl @@ -1,2 +1,2 @@ -ent-SecBreachingHammer = breaching hammer - .desc = A large, heavy hammer with a long handle, used for breaking stones or other heavy material such as the skulls of violent criminals, also perfect for forcing your way trough airlocks. +ent-SecBreachingHammer = штурмовой молот + .desc = Огромный, тяжелый молот для пробития различных дверей или окон. diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/nyanotrasen/entities/objects/weapons/melee/dulled.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/nyanotrasen/entities/objects/weapons/melee/dulled.ftl index bcaeeae124..cb1a8c6160 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/nyanotrasen/entities/objects/weapons/melee/dulled.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/nyanotrasen/entities/objects/weapons/melee/dulled.ftl @@ -1,6 +1,6 @@ -ent-KatanaDulled = katana - .desc = Ancient craftwork made with not so ancient plasteel. This one has been dulled. - .suffix = Dulled -ent-ClaymoreDulled = claymore - .desc = An ancient war blade. This one has been dulled. - .suffix = Dulled +ent-KatanaDulled = катана + .desc = Древнее мастерство передалось и до наших дней, теперь этот меч - наследие истории и культуры. + .suffix = Тупой +ent-ClaymoreDulled = клеймор + .desc = Древний меч, который ныне просто затупился. + .suffix = Тупой diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/nyanotrasen/entities/objects/weapons/melee/knives.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/nyanotrasen/entities/objects/weapons/melee/knives.ftl index 1f057033c7..57d50df64e 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/nyanotrasen/entities/objects/weapons/melee/knives.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/nyanotrasen/entities/objects/weapons/melee/knives.ftl @@ -1,2 +1,2 @@ -ent-AntiPsychicKnife = anti-psychic knife - .desc = A special knife designed for killing psychics. +ent-AntiPsychicKnife = анти-психический нож + .desc = Специальный нож для убийства психических существ. diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/nyanotrasen/entities/objects/weapons/melee/sword.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/nyanotrasen/entities/objects/weapons/melee/sword.ftl index 0f2db6304c..c812b26a7e 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/nyanotrasen/entities/objects/weapons/melee/sword.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/nyanotrasen/entities/objects/weapons/melee/sword.ftl @@ -1,2 +1,2 @@ -ent-Wakizashi = wakizashi - .desc = A short, multi-purpose sword of plasteel construction. +ent-Wakizashi = вакизаши + .desc = Короткий нож из сделанный из сплава пластали. diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/nyanotrasen/entities/structures/holographic/projections.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/nyanotrasen/entities/structures/holographic/projections.ftl index 56d655e1a9..ac710d0cd9 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/nyanotrasen/entities/structures/holographic/projections.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/nyanotrasen/entities/structures/holographic/projections.ftl @@ -1,2 +1,2 @@ -ent-HolosignEng = engineering warning sign - .desc = What's the worst that could lie beyond? +ent-HolosignEng = инженерная табличка предупреждения + .desc = Неужели снова поломка..? diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/nyanotrasen/entities/structures/lighting/base_lighting.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/nyanotrasen/entities/structures/lighting/base_lighting.ftl index 3834760502..524186e112 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/nyanotrasen/entities/structures/lighting/base_lighting.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/nyanotrasen/entities/structures/lighting/base_lighting.ftl @@ -1,42 +1,42 @@ ent-PoweredLightBlueInterior = { ent-PoweredlightExterior } - .desc = A light fixture. Draws power and produces light when equipped with a light tube. - .suffix = Blue Exterior, Delta V + .desc = Осветительный прибор. Поглащая энергию производит свет при экипированной диодной лампе. + .suffix = Blue Exterior, Дельта V ent-AlwaysPoweredLightBlueInterior = { ent-AlwaysPoweredWallLight } - .desc = A light fixture. Draws power and produces light when equipped with a light tube. - .suffix = Always Powered, Blue Exterior, Delta V + .desc = Осветительный прибор. Поглащая энергию производит свет при экипированной диодной лампе. + .suffix = Always Powered, Blue Exterior, Дельта V ent-PoweredSmallLightMaintenance = { ent-PoweredSmallLight } - .desc = A light fixture. Draws power and produces light when equipped with a light bulb. - .suffix = Maintenance + .desc = Осветительный прибор. Поглащая энергию производит свет при экипированной диодной лампе. + .suffix = Переносная ent-AlwaysPoweredSmallLightMaintenance = { ent-SmallLight } - .desc = A light fixture. Draws power and produces light when equipped with a light tube. - .suffix = Always Powered, Maintenance + .desc = Осветительный прибор. Поглащая энергию производит свет при экипированной диодной лампе. + .suffix = Всегда Запитанная, Переносная ent-PoweredLightColoredRed = { ent-Poweredlight } - .desc = A light fixture. Draws power and produces light when equipped with a light tube. - .suffix = Soft Red + .desc = Осветительный прибор. Поглащая энергию производит свет при экипированной диодной лампе. + .suffix = Мягко красная ent-AlwaysPoweredLightColoredRed = { ent-AlwaysPoweredWallLight } - .desc = A light fixture. Draws power and produces light when equipped with a light tube. - .suffix = Always Powered, Red + .desc = Осветительный прибор. Поглащая энергию производит свет при экипированной диодной лампе. + .suffix = Всегда Запитанная, Красная ent-PoweredLightColoredFrostyBlue = { ent-Poweredlight } - .desc = A light fixture. Draws power and produces light when equipped with a light tube. - .suffix = Frosty + .desc = Осветительный прибор. Поглащая энергию производит свет при экипированной диодной лампе. + .suffix = Морозный ent-AlwaysPoweredLightColoredFrostyBlue = { ent-AlwaysPoweredWallLight } - .desc = A light fixture. Draws power and produces light when equipped with a light tube. - .suffix = Always Powered, Frosty + .desc = Осветительный прибор. Поглащая энергию производит свет при экипированной диодной лампе. + .suffix = Всегда Запитанная, Морозный ent-PoweredLightColoredBlack = { ent-Poweredlight } - .desc = A light fixture. Draws power and produces light when equipped with a light tube. - .suffix = Black + .desc = Осветительный прибор. Поглащая энергию производит свет при экипированной диодной лампе. + .suffix = Чёрная ent-AlwaysPoweredLightColoredBlack = { ent-AlwaysPoweredWallLight } - .desc = A light fixture. Draws power and produces light when equipped with a light tube. - .suffix = Always Powered, Black -ent-PoweredLightPostSmallRed = post light - .desc = A light fixture. Draws power and produces light when equipped with a light tube. - .suffix = Red -ent-AlwaysPoweredLightPostSmallRed = post light - .desc = A light fixture. Draws power and produces light when equipped with a light tube. - .suffix = Always Powered, Red + .desc = Осветительный прибор. Поглащая энергию производит свет при экипированной диодной лампе. + .suffix = Всегда Запитанная, Чёрная +ent-PoweredLightPostSmallRed = направленная + .desc = Осветительный прибор. Поглащая энергию производит свет при экипированной диодной лампе. + .suffix = Красная +ent-AlwaysPoweredLightPostSmallRed = направленная + .desc = Осветительный прибор. Поглащая энергию производит свет при экипированной диодной лампе. + .suffix = Всегда Запитанная, Красная ent-PoweredSmallLightMaintenanceRed = { ent-PoweredSmallLight } - .desc = A light fixture. Draws power and produces light when equipped with a light bulb. - .suffix = Maintenance, Red + .desc = Осветительный прибор. Поглащая энергию производит свет при экипированной диодной лампе. + .suffix = Переносная, Красная ent-AlwaysPoweredSmallLightMaintenanceRed = { ent-SmallLight } - .desc = A light fixture. Draws power and produces light when equipped with a light tube. - .suffix = Always Powered, Maintenance, Red + .desc = Осветительный прибор. Поглащая энергию производит свет при экипированной диодной лампе. + .suffix = Всегда Запитанная, Переносная, Красная diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/nyanotrasen/entities/structures/machines/deep_fryer.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/nyanotrasen/entities/structures/machines/deep_fryer.ftl index f3a7acbcb2..e6ab5fddcb 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/nyanotrasen/entities/structures/machines/deep_fryer.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/nyanotrasen/entities/structures/machines/deep_fryer.ftl @@ -1,2 +1,2 @@ -ent-KitchenDeepFryer = deep fryer - .desc = An industrial deep fryer. A big hit at state fairs! +ent-KitchenDeepFryer = фритюрница + .desc = Промышленная фритюрница для разного фастфуда, а также.. крыс? diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/nyanotrasen/entities/structures/machines/laundry.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/nyanotrasen/entities/structures/machines/laundry.ftl index b7405b3e1a..a5516abbde 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/nyanotrasen/entities/structures/machines/laundry.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/nyanotrasen/entities/structures/machines/laundry.ftl @@ -1,8 +1,8 @@ -ent-WashingMachine = washing machine - .desc = A machine that washes clothes with a spinning steel drum in a shiny frame. -ent-WashingMachineBroken = washing machine - .desc = A shattered mess of glass and steel that won't be washing anything anytime soon. It looks dusty. - .suffix = broken -ent-WashingMachineFilledClothes = washing machine - .suffix = random clothes +ent-WashingMachine = стиральная машина + .desc = Это обычная стиральная машина. +ent-WashingMachineBroken = сломанная стиральная машина + .desc = Кажется она больше не постирает. + .suffix = Сломан +ent-WashingMachineFilledClothes = стиральная машина + .suffix = Случайная одежда .desc = { ent-WashingMachine.desc } diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/nyanotrasen/entities/structures/machines/mailTeleporter.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/nyanotrasen/entities/structures/machines/mailTeleporter.ftl index bfcd909599..c322424cdf 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/nyanotrasen/entities/structures/machines/mailTeleporter.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/nyanotrasen/entities/structures/machines/mailTeleporter.ftl @@ -1,2 +1,2 @@ -ent-MailTeleporter = mail teleporter - .desc = Teleports mail addressed to the crew of this station. +ent-MailTeleporter = телепортер почты + .desc = Телепортирует почту по станции. diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/nyanotrasen/entities/structures/machines/metempsychoticMachine.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/nyanotrasen/entities/structures/machines/metempsychoticMachine.ftl index fab1e5ea3d..4540ea88b9 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/nyanotrasen/entities/structures/machines/metempsychoticMachine.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/nyanotrasen/entities/structures/machines/metempsychoticMachine.ftl @@ -1,2 +1,2 @@ -ent-MetempsychoticMachine = metempsychotic machine - .desc = Speeds along the transmigration of a soul to its next vessel. +ent-MetempsychoticMachine = машина для метампсихоза + .desc = Перемещает душу из старого тела в нынешнее. diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/nyanotrasen/entities/structures/machines/reverseEngineering.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/nyanotrasen/entities/structures/machines/reverseEngineering.ftl index d7e6a165e3..7c80988536 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/nyanotrasen/entities/structures/machines/reverseEngineering.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/nyanotrasen/entities/structures/machines/reverseEngineering.ftl @@ -1,2 +1,2 @@ -ent-ReverseEngineeringMachine = reverse engineering machine - .desc = Destructively analyses pieces of technology in the hopes that we can retrieve information from them. +ent-ReverseEngineeringMachine = анализатор технологий + .desc = Методом подробного изучения получает важные технологии из разрушаемых предметов. diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/nyanotrasen/entities/structures/machines/vending_machines.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/nyanotrasen/entities/structures/machines/vending_machines.ftl index b28ceefedc..17cdf0f4ab 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/nyanotrasen/entities/structures/machines/vending_machines.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/nyanotrasen/entities/structures/machines/vending_machines.ftl @@ -1,8 +1,14 @@ -ent-VendingMachineBoxingDrobe = Boxing Drobe - .desc = Always short on stock. -ent-VendingMachineRepDrobe = RepDrobe - .desc = A machine for all your reporting needs, as long as you need clothes. -ent-VendingMachineMNKDrobe = MNK Drobe - .desc = Quality garments provided by MoNoKrome. -ent-VendingMachineAutomatrobe = Automatrobe - .desc = Automatically good. +ent-VendingMachineBoxingDrobe = Боксёрский хук + .desc = Вечная нехватка товара на складе. +ent-VendingMachineRepDrobe = Репортажный раздатчик + .desc = Раздатчик репортерского обмундирования. К несчастью, в этом секторе вам доступна только одежда. +ent-VendingMachineMNKDrobe = MoNoKrome-Мат + .desc = Качественная одежда, созданая компанией MoNoKrome. +ent-VendingMachineAutomatrobe = Автоматрон. + .desc = Добро пожаловать в клуб, Робосекер. +ent-VendingMachineWeeb = Японский загар + .desc = Удручающе этнический торговый автомат, загруженный низкокалорийными закусками с высоким содержанием сахарозы, за неимением лучшего выражения. +ent-VendingMachineSolsnack = Марс-Мат + .desc = Торговый автомат SolCentric, раздающий по домашнему вкусные угощения. +ent-VendingMachineFitness = Максимальное количество пота + .desc = Поставщик тренажеров и пищевых добавок, который наживается на вашей неадекватности. diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/nyanotrasen/entities/structures/research/glimmer_prober.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/nyanotrasen/entities/structures/research/glimmer_prober.ftl index 85f7414c03..f375b73b36 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/nyanotrasen/entities/structures/research/glimmer_prober.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/nyanotrasen/entities/structures/research/glimmer_prober.ftl @@ -1,6 +1,6 @@ -ent-GlimmerProber = glimmer prober - .desc = Probes the noösphere to generate research points. Might be worth turning off if glimmer is a problem. -ent-GlimmerDrain = glimmer drain - .desc = Uses electricity to try and sort out the noösphere, reducing its level of entropy. -ent-GlimmerDeviceFrame = glimmer device frame - .desc = A frame for a glimmer drain or glimmer prober. +ent-GlimmerProber = пробер глиммера + .desc = Изучает ноосферу для извлечения очков исследований. +ent-GlimmerDrain = нейтрализатор глиммера + .desc = Использует электричество и в ходе чего понижает уровень воздействия ноосферы. +ent-GlimmerDeviceFrame = корпус устройства глиммера + .desc = Корпус глиммера или его нейтрализатора. diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/nyanotrasen/entities/structures/storage/closets/lockers/lockers.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/nyanotrasen/entities/structures/storage/closets/lockers/lockers.ftl index b32470ad0c..6083ee1fdc 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/nyanotrasen/entities/structures/storage/closets/lockers/lockers.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/nyanotrasen/entities/structures/storage/closets/lockers/lockers.ftl @@ -1,3 +1,2 @@ -ent-LockerForensicMantis = psionic mantis' cabinet - .desc = You'll never know what's inside until you collapse the quantum superposition of all possible mysteries. - .suffix = Empty +ent-LockerForensicMantis = шкаф мантиса + .desc = Вы никогда не узнаете, что находится внутри, пока не разрушите квантовую суперпозицию всех возможных тайн. .suffix = Empty diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/nyanotrasen/entities/structures/wallmounts/signs/bar_sign.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/nyanotrasen/entities/structures/wallmounts/signs/bar_sign.ftl index c41a98f4c6..f11ea5f4fa 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/nyanotrasen/entities/structures/wallmounts/signs/bar_sign.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/nyanotrasen/entities/structures/wallmounts/signs/bar_sign.ftl @@ -1,4 +1,4 @@ -ent-BarSignWhiskeyEcho = Whiskey Echoes - .desc = Wew lad! Sit down and have a drink! No matter your affiliation, the slogan here is 'Death to sobriety!' -ent-BarSignKlubSkub = Klub Skub - .desc = Skub! +ent-BarSignWhiskeyEcho = Эхо Виски + .desc = Хэй, приятель, садись и отдохни в нашем уютном местечке! +ent-BarSignKlubSkub = Клаб-Скаб + .desc = Скаб! diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/nyanotrasen/entities/structures/wallmounts/signs/paintings.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/nyanotrasen/entities/structures/wallmounts/signs/paintings.ftl index ffad1b0b6b..43843fdac1 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/nyanotrasen/entities/structures/wallmounts/signs/paintings.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/nyanotrasen/entities/structures/wallmounts/signs/paintings.ftl @@ -1,2 +1,2 @@ -ent-PaintingMothBigCatch = Big Catch - .desc = Depicts a blue moth wearing a tophat who caught a relatively large space carp. +ent-PaintingMothBigCatch = Большой улов + .desc = На этой картине изображён ниан, который оседлал довольно большого карпа. diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/nyanotrasen/entities/structures/wallmounts/signs/posters.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/nyanotrasen/entities/structures/wallmounts/signs/posters.ftl index c63a866aa1..2aad6b01b9 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/nyanotrasen/entities/structures/wallmounts/signs/posters.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/nyanotrasen/entities/structures/wallmounts/signs/posters.ftl @@ -1,54 +1,54 @@ -ent-PosterContrabandSaucerNumberOne = Saucer #1! - .desc = Out of every station in the NyanoTrasen jurisdiction, Saucer was rated #1 out of 5! Congratulations! -ent-PosterContrabandBreadLies = Bread Lies - .desc = You have been lied to. There is no "Big Bread." It is not real. Please stop looking for it. -ent-PosterContrabandAyaya = Ayaya - .desc = Ayayayaya. -ent-PosterLegitDejaVu = Deja Vu Area - .desc = This is your first time here. If this station feels familiar, immediately alert a NanoTrasen employee. -ent-PosterLegitDontPanic = Don't Panic - .desc = If there was ever something so soothing enough to keep me from panicking, it was a green blob floating through space with a pair of hands, a shiny red tongue, and big round teeth. -ent-PosterLegitBarDrinks = Bar Poster - .desc = The Bartender is always there to hear your woes and get you plastered all at the same time. Go have a visit! -ent-PosterLegitBotanyFood = Fruit Basket - .desc = Botany is always hard at work! Stop by and enjoy the best they can offer! -ent-PosterLegitHotDonkExplosion = Donk! - .desc = Bite into a blast of flavour with any of our #1 rated fattening and unhealthy products for your enjoyment! DONK! -ent-PosterLegitEatMeat = Eat Meat! - .desc = Who needs fruit or veggies? EAT MEAT! Build those muscles and go fight in the arena to show them gains! -ent-PosterLegitMoreBread = More Bread! - .desc = There is not enough bread! MAKE MORE! -ent-PosterLegitPieSlice = Pie Poster - .desc = Pies are healthy and delicious! Beg your chef to start making some. -ent-PosterLegitPizzaHope = Pizza Hope - .desc = In the darkest of times there is only one hope, PIZZA! Harass your local Logistics Officer to order an emergency crate of pizza now! -ent-PosterLegitMedicate = Take Your Meds - .desc = Possible side effects may include: nausea, upset stomach, inflammation, swelling of the face/throat, rash, fever, headache, dizziness, vomiting and/or diarrhea, easy bruising, seizures, insuppressible yawning, general feeling of discomfort or illness, hives, loss of voice, bleeding gums and/or eyeballs, loss of appetite, increased appetite, sudden onset of explosive crying, x-ray vision, slurred speech, impromptu levitation, incontinence, abrupt uncontrollable outburst of yodeling, insomnia, narcolepsy, leprosy, spontaneous growth of new limbs/genitalia, unstoppable back hair growth, weight loss, weight gain, shrinkage, colorblindness, rectal numbness, acute ability to taste colors, unquenchable bloodlust, restless fingernails, light-sensitivity, compulsion to wear schoolgirl uniforms, scurvy, eagerness to pursue mercenary life, violent craving for goat's blood, insurgent desire to develop a gambling addiction, itchy bumhole. Call your doctor for medical advice about these or any other side effects you may experience. -ent-PosterLegitNoTouching = No Touching - .desc = No touching! -ent-PosterLegitChknDnnr = Winner Winner Chicken Dinner - .desc = An advertisement for crispy fried chicken. -ent-PosterLegitShoukou = Shōkō poster - .desc = Funny symbols that can be read as Shōkō or Xiaogang, depending on who you ask. -ent-PosterLegitCornzza = Corncob Crust! - .desc = NEW Cornzza! Corn pizza, with a corncob crust that'll make you say 'why does this exist?'. -ent-PosterMapArena = Arena Map - .desc = A map of Arena station. -ent-PosterMapGlacier = Glacier Map - .desc = A map of Glacier outpost. -ent-PosterMapShoukou = Shōkō Map - .desc = Shōkō no mappu desu. -ent-PosterMapNorthway = Northway Map - .desc = A map of Northway spaceship. -ent-PosterContrabandSafetyMothSyndie = Syndie Moth - Nuclear Operation - .desc = Syndie Moth™ tells the viewer to keep the nuclear authentication disk unsecured. "Peace was never an option!" -ent-PosterLegitSafetyMothPoisoning = Safety Moth - Poisoning - .desc = Safety Moth™ tells the viewer not to poison the station donuts. -ent-PosterLegitSafetyMothBoH = Safety Moth - Bag of Holding - .desc = Safety Moth™ informs the viewer of the dangers of Bags of Holding. "Remember! Bags of Holding may be pretty, but they're also pretty dangerous! Never put one inside another!" -ent-PosterLegitSafetyMothFires = Safety Moth - Fires - .desc = Safety Moth™ promotes safe handling of plasma and to keep firefighting equipment within hand reach. -ent-PosterLegitSafetyMothPills = Safety Moth - Pill Bottles - .desc = Safety Moth™ informs the viewer that leaving pills unsupervised on tables could lead to unforeseen consequences. "Hungry critters love to eat everything! Keep your pills safe in crates and pill bottles!" -ent-PosterLegitSafetyMothGlimmer = Safety Moth - Glimmer Safety Precautions - .desc = Safety Moth™ tells the viewer to wear insulative equipments and hide in lockers when the glimmer gets within critical levels. Evacuating might be a better strategy. +ent-PosterContrabandSaucerNumberOne = Соусница #1 + .desc = Из всех соусниц, именно эта получила первое место из пяти. +ent-PosterContrabandBreadLies = Хлеб лжёт + .desc = Вам наврали. Нет никакого "Большого Батона" и не будет. +ent-PosterContrabandAyaya = Айайа + .desc = Айайайайа. +ent-PosterLegitDejaVu = Зона Дежавю + .desc = Это первый раз, когда вы видите это изображение. Если оно кажется вам знакомым, то немедленнно обратитесь к сотруднику НаноТрейзен. +ent-PosterLegitDontPanic = Не паникуйте + .desc = Если когда-либо и существовало что-то настолько успокаивающее, что удерживало меня от паники, то это был плывущий в пространстве зеленый блоб с парой рук, блестящим красным языком и большими круглыми зубами. +ent-PosterLegitBarDrinks = Барный постер + .desc = Бармен всегда рядом, чтобы выслушать ваши горести и в то же время утешить вас. Заходите! +ent-PosterLegitBotanyFood = Фруктовое ведро + .desc = Ботаники всегда трудятся! Остановитесь и наслаждайтесь лучшим, что они могут предложить! +ent-PosterLegitHotDonkExplosion = Донк! + .desc = Насладитесь вкусом любого из наших продуктов, вызывающих ожирение и вредных продуктов #1, для вашего удовольствия! ДОНК! +ent-PosterLegitEatMeat = Ешь мясо! + .desc = Кому нужны фрукты или овощи? ЕШЬТЕ МЯСО! Накачайте свои мышцы и сразитесь на арене, чтобы продемонстрировать свои достижения! +ent-PosterLegitMoreBread = Больше хлеба! + .desc = Этого хлеба недостаточно! НУЖНО ЕЩЁ! +ent-PosterLegitPieSlice = Постер с пирогом + .desc = Пироги вкусные и полезные. Попросите своего шеф-повара приготовить такой же. +ent-PosterLegitPizzaHope = Надежда на пиццу + .desc = В самые мрачные времена есть только одна надежда – ПИЦЦА! Уговорите местного логиста заказать экстренный ящик пиццы прямо сейчас! +ent-PosterLegitMedicate = Принимайте свои лекарства + .desc = Возможные побочные эффекты могут включать: тошноту, расстройство желудка, воспаление, отек лица/горла, сыпь, лихорадку, головную боль, головокружение, рвоту и/или диарею, образование синяков, судороги, непреодолимую зевота, общее чувство дискомфорта или болезни, крапивницу. потеря голоса, кровоточивость десен и/или глазных яблок, потеря аппетита, повышенный аппетит, внезапное начало плача, синдром Тости, рентгеновское зрение, невнятная речь, импровизированная левитация, недержание мочи, резкий неконтролируемый приступ йодлинга, бессонница, нарколепсия, проказа, спонтанный рост новых конечностей/гениталий, непрекращающийся рост волос на спине, потеря веса, увеличение веса, усадка, дальтонизм, онемение прямой кишки, острая способность различать цвета, неутолимая жажда крови, выпадение ногтей, светочувствительность, желание носить школьную форму, цинга, стремление вести наемническую жизнь, неистовая жажда козьей крови, бунтарское желание развить пристрастие к азартным играм, зудящая задница. Позвоните своему врачу для получения медицинской консультации по поводу этих или любых других побочных эффектов, которые могут возникнуть у вас. +ent-PosterLegitNoTouching = Не трогать + .desc = Не трогать! +ent-PosterLegitChknDnnr = Королевский ужин + .desc = Реклама вкусной курочки. +ent-PosterLegitShoukou = Постер Шоко + .desc = Забавные символы, которые можно прочитать как Сёко или Сяоган, в зависимости от того, кого вы спросите. +ent-PosterLegitCornzza = Кукурузный хруст! + .desc = НОВАЯ Корнзза! Кукурузная пицца с корочкой из кукурузных початков, которая заставит вас спросить: «Почему она существует?». +ent-PosterMapArena = Карта Arena. + .desc = Карта станции Arena. +ent-PosterMapGlacier = Карта Glacier. + .desc = Карта станции Glacier. +ent-PosterMapShoukou = Карта Shōkō + .desc = Карта станции Shōkō. +ent-PosterMapNorthway = Карта Northway + .desc = Карта станции Northway. +ent-PosterContrabandSafetyMothSyndie = Синдимоль - ключ к успеху. + .desc = Синдимоль™ советует зрителю держать диск ядерной аутентификации незащищенным. «Мир никогда не был вариантом!» +ent-PosterLegitSafetyMothPoisoning = Хорошая Моль - отравление. + .desc = Хорошая Моль™ советует зрителю не травить станционные пончики. +ent-PosterLegitSafetyMothBoH = Хорошая Моль - бездонная сумка. + .desc = Хорошая Моль™ информирует зрителя об опасностях бездонных сумок. «Помните! Сумки для хранения могут быть красивыми, но они также довольно опасны! Никогда не кладите одну в другую!» +ent-PosterLegitSafetyMothFires = Хорошая Моль - огонь. + .desc = Хорошая Моль™ призывает к безопасному обращению с плазмой и хранению противопожарного оборудования под рукой. +ent-PosterLegitSafetyMothPills = Хорошая Моль - баночки для таблеток. + .desc = Хорошая Моль™ сообщает зрителю, что оставление таблеток на столах без присмотра может привести к непредвиденным последствиям. «Голодные твари любят есть все! Храните таблетки в ящиках и бутылочках!» +ent-PosterLegitSafetyMothGlimmer = Хорошая Моль - осторожность использования глиммера. + .desc = Хорошая Моль™ советует зрителю носить изолирующее оборудование и прятаться в шкафчиках, когда глиммер достигает критического уровня. Эвакуация может быть лучшей стратегией. diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/nyanotrasen/entities/structures/wallmounts/signs/signs.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/nyanotrasen/entities/structures/wallmounts/signs/signs.ftl index 71de03d9d1..fb43423a3d 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/nyanotrasen/entities/structures/wallmounts/signs/signs.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/nyanotrasen/entities/structures/wallmounts/signs/signs.ftl @@ -1,8 +1,10 @@ -ent-SignSec = security sign - .desc = A sign indicating the Security department. -ent-SignLastIdiot = Zero Days Since Last Idiot - .desc = Must be an Engineering joke. -ent-SignConspiracyBoard = conspiracy board - .desc = Perfect for tracking the multiple layers of criminal activities. -ent-SignDojo = dojo sign - .desc = A sign indicating a place with discipline and tatami mats. +ent-SignSec = Знак "служба безопасности" + .desc = Знак, указывающий на отдел службы безопасности. +ent-SignLastIdiot = Нуль дней, с последнего идиота в отделе + .desc = Типичная шутка, от Инженерного отдела +ent-SignConspiracyBoard = Конспирологическая доска + .desc = Идеальный показатель того, как появляются агенты синдиката. +ent-SignDojo = Знак dojo + .desc = Знак, указывающий на место, где должна процветать дисциплина и "tatami mats". +ent-SignCourt = Знак зал суда + .desc = Вывеска с надписью "Зал суда". diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/nyanotrasen/entities/structures/walls/walls.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/nyanotrasen/entities/structures/walls/walls.ftl index 3cfcfdd58e..98ecd2b20f 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/nyanotrasen/entities/structures/walls/walls.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/nyanotrasen/entities/structures/walls/walls.ftl @@ -1,7 +1,7 @@ -ent-WallShuttleInterior = shuttle wall - .suffix = Interior +ent-WallShuttleInterior = стена шаттла + .suffix = Интерьер .desc = { ent-WallSolid.desc } -ent-WallPaper = paper wall - .desc = Helps to contain the repeated screams of martial artists. -ent-WallDrywall = drywall - .desc = It looks sturdy enough. +ent-WallPaper = бумажная стена + .desc = Помогает изолироваться от страшных криков из додзё. +ent-WallDrywall = гипсокартоновая стена + .desc = Выглядит довольно прочно. diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/nyanotrasen/entities/structures/webbing/webs.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/nyanotrasen/entities/structures/webbing/webs.ftl index 2475df4957..25197aa6ec 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/nyanotrasen/entities/structures/webbing/webs.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/nyanotrasen/entities/structures/webbing/webs.ftl @@ -1,4 +1,4 @@ -ent-CocoonedHumanoid = cocooned humanoid - .desc = Unlucky. -ent-CocoonSmall = cocoon - .desc = What could be inside...? +ent-CocoonedHumanoid = гуманойд в коконе + .desc = Не повезло. +ent-CocoonSmall = кокон + .desc = Интересно, что же внутри...? diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/objectives/terminator.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/objectives/terminator.ftl index b1de47c26c..fb9b85459c 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/objectives/terminator.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/objectives/terminator.ftl @@ -1,6 +1,6 @@ ent-BaseTerminatorObjective = { ent-BaseObjective } .desc = { ent-BaseObjective.desc } ent-TerminateObjective = { ent-BaseKillObjective } - .desc = Следуйте своей программе и устраните цель. + .desc = Следуйте своей программе и устраните цель. ent-ShutDownObjective = Отключитесь .desc = После выполнения миссии умрите, чтобы не допустить кражи наших технологий. diff --git a/Resources/Prototypes/Announcers/!randomAnnouncers.yml b/Resources/Prototypes/Announcers/!randomAnnouncers.yml index a796094b28..b0b3c67003 100644 --- a/Resources/Prototypes/Announcers/!randomAnnouncers.yml +++ b/Resources/Prototypes/Announcers/!randomAnnouncers.yml @@ -1,8 +1,4 @@ - type: weightedRandom id: RandomAnnouncers weights: - Intern: 0.15 - MedBot: 0.5 - Michael: 0.9 - NEIL: 1 - VoxFem: 0.55 + NTH: 1 diff --git a/Resources/Prototypes/Catalog/Fills/Lockers/engineer.yml b/Resources/Prototypes/Catalog/Fills/Lockers/engineer.yml index e4d995e52e..860d2c6598 100644 --- a/Resources/Prototypes/Catalog/Fills/Lockers/engineer.yml +++ b/Resources/Prototypes/Catalog/Fills/Lockers/engineer.yml @@ -89,7 +89,8 @@ - id: HolofanProjector - id: DoorRemoteFirefight - id: RCD - - id: RCDAmmo + - id: LPPRCDFAPDevice + - id: LPPRCDFAPAmmo - id: LunchboxEngineeringFilledRandom # Delta-V Lunchboxes! prob: 0.3 @@ -109,6 +110,8 @@ - id: DoorRemoteFirefight - id: RCD - id: RCDAmmo + - id: LPPRCDFAPDevice + - id: LPPRCDFAPAmmo - id: LunchboxEngineeringFilledRandom # Delta-V Lunchboxes! prob: 0.3 diff --git a/Resources/Prototypes/Catalog/uplink_catalog.yml b/Resources/Prototypes/Catalog/uplink_catalog.yml index dfc0a2b335..64a878862c 100644 --- a/Resources/Prototypes/Catalog/uplink_catalog.yml +++ b/Resources/Prototypes/Catalog/uplink_catalog.yml @@ -1707,3 +1707,60 @@ conditions: - !type:ListingLimitedStockCondition stock: 1 + +# LPP + +- type: listing + id: LPPUplinkGlaive + name: Кроваво красная глефа + description: Модифицированная версия глефы, усовершенствованная каким-то больным утилизатором... + icon: { sprite: /Textures/_LostParadise/Objects/Weapons/Melee/syndie_glaive.rsi, state: icon } + productEntity: LPPWeaponSyndieGlaive + cost: + Telecrystal: 8 + categories: + - UplinkWeapons + +- type: listing + id: LPPUplinkupgrwebbing + name: разгрузочный жилет "Хомяк" + description: Комплект из карманов, сумок и прочей лабуды предоставляет кучу места для ваших всевозможных вещей, что вы сюда запихнёте. Выглядит крайне громоздко однако. + icon: { sprite: /Textures/_LostParadise/Clothing/Belt/upgrwebbing.rsi, state: icon } + productEntity: LPPClothingBeltMaximumWebbing + cost: + Telecrystal: 2 + categories: + - UplinkArmor + +- type: listing + id: LPPUplinkAcientHardsuitSyndie + name: древний скафандр Синдиката + description: Очень странная модель скафандра Ядерных Оперативников, явно нестандартной конфигурации + icon: { sprite: /Textures/_LostParadise/Clothing/OuterClothing/Hardsuits/acientsyndiehardsuit.rsi, state: icon } + productEntity: LPPClothingOuterHardsuitAcientSyndie + cost: + Telecrystal: 11 + categories: + - UplinkArmor + +- type: listing + id: LPPUplinkEcbow + name: мини арбалет синдиката + description: Любимое оружие агентов из далёких времён. Выстрел сразу же поражает цель, роняя моментально вашу цель на короткое время. Хоть оно и не требуется боеприпасов для стрельбы, однако самому оружию требуется перезарядка для повторного выстрела. + icon: { sprite: /Textures/_LostParadise/Objects/Weapons/Guns/Battery/ecbow.rsi, state: icon } + productEntity: LPPWeaponEnergyCrossbow + cost: + Telecrystal: 10 + categories: + - UplinkWeapons + +- type: listing + id: LPPUplinkhelmetswat + name: шлем спецназа синдиката + description: Крепкий шлем, что защитит вашу голову от ненужных свинцовых, а так же лазерных выстрелов. + icon: { sprite: Textures/Clothing/Head/Helmets/swat_syndicate.rsi, state: icon } + productEntity: ClothingHeadHelmetSwatSyndicate + cost: + Telecrystal: 2 + categories: + - UplinkArmor diff --git a/Resources/Prototypes/Datasets/Names/vox.yml b/Resources/Prototypes/Datasets/Names/vox.yml index 891094d95b..76cb900978 100644 --- a/Resources/Prototypes/Datasets/Names/vox.yml +++ b/Resources/Prototypes/Datasets/Names/vox.yml @@ -1,2765 +1,2765 @@ - type: dataset id: names_vox values: - - Bakabepa - - Babapir - - Babasri - - Babepipit - - Bachakehi - - Bacheska - - Bachishesher - - Bacrapri - - Bacreska - - Bahepra - - Bahicrecrek - - Bahikravre - - Bakabepa - - Bakehahak - - Bakeki - - Bapechichik - - Bapekikik - - Baperi - - Bapravavar - - Bapreba - - Bapretritrir - - Baracreber - - Barahri - - Baraskahrita - - Baraxixik - - Bashiskir - - Baskaskakre - - Baskivihi - - Basreba - - Batapriri - - Batasrecrar - - Batehrahrat - - Batrakiha - - Batravika - - Batrepriski - - Batresri - - Batriska - - Batritra - - Bavasha - - Bavebebek - - Bavraskikaka - - Bavricriski - - Baxahehrer - - Baxeve - - Bebebapa - - Bebeterara - - Bebipaska - - Bechetapeka - - Becrerisre - - Becretretrer - - Beheka - - Behivresha - - Behrechechek - - Behrekri - - Behreyayat - - Behricririri - - Behritixaxa - - Bekapesresre - - Bekashishik - - Beketatratra - - Bekrechaxe - - Bekresrare - - Bekribe - - Bepararakrit - - Bepatricher - - Bepehisrepra - - Bepihar - - Bepitrashi - - Bepresri - - Berabi - - Beraka - - Berecricrir - - Berisre - - Beshachari - - Besheskexexe - - Beshesre - - Beshesretre - - Beskayavrer - - Beskisrasrak - - Beskitre - - Besravivit - - Besrivir - - Betababatrat - - Betere - - Beticreche - - Bevekakat - - Bevihichabi - - Bevihraki - - Bevrasheshet - - Bibaba - - Bibabir - - Bibati - - Bibekricha - - Bibexa - - Bibibabat - - Bibiya - - Bichechir - - Bicrakipepe - - Bicrevrite - - Bihrapivra - - Bihraxibebe - - Bihrishicha - - Bihrivriski - - Bikivri - - Bikraskixexe - - Bikrivrivrit - - Bipekisri - - Bipiritecre - - Bipratraxi - - Biprexi - - Biprivar - - Birachi - - Bisheba - - Bishehri - - Bishevrivra - - Bishiki - - Biskeskavra - - Bisrahresha - - Bisrepipit - - Bitavi - - Bitehatiti - - Bivacri - - Bivape - - Bivihachakre - - Bivitikiva - - Bivrapri - - Bivraske - - Bivrehaski - - Bivrihra - - Bixachetra - - Bixapetra - - Bixapriprik - - Bixexir - - Biyakir - - Chabaha - - Chabakrekrer - - Chabebache - - Chabepebe - - Chabikrahihi - - Chachahe - - Chachevra - - Chacrerehra - - Chahekre - - Chahixe - - Chahravrer - - Chahrixehra - - Chakakiva - - Chakapraprar - - Chakehashe - - Chakiprihi - - Chakivre - - Chakricrivi - - Chapachichit - - Chaparachi - - Chapehresha - - Chapeshiski - - Chapixahi - - Chaprahebibi - - Chaprecraha - - Chaprecrevi - - Charaprehiki - - Charapriska - - Charara - - Charate - - Charatraki - - Charekreski - - Charesribe - - Charichechet - - Charisha - - Chashaber - - Chashereska - - Chaskeke - - Chasraskaska - - Chasrechata - - Chasrevravi - - Chasrihiprer - - Chatrexixe - - Chavicreshi - - Chavrikre - - Chaxakrahehe - - Chaxeskehre - - Chaxevrahi - - Chaxivre - - Chebabebet - - Chebavi - - Chebebibivar - - Chebehecri - - Chebehrihrit - - Chebihihit - - Chebiretete - - Chebisra - - Chechapraver - - Checraxa - - Checrera - - Checretasre - - Checretrisre - - Checrisre - - Chehashababa - - Chehebicri - - Chehepre - - Chehisker - - Chehraxashir - - Chekrahraka - - Chekravixa - - Chekretitit - - Chepakakatat - - Chepekakak - - Chepipracra - - Chepitipe - - Chepraskavri - - Cheshirikra - - Cheshive - - Cheskapra - - Cheskavre - - Chesrakeyaya - - Chesravre - - Chesrevi - - Chesrevratra - - Chesrirititi - - Chetaxapa - - Chetaxapre - - Cheterarat - - Chetiska - - Chetritreti - - Chetriya - - Chevasrasrak - - Chevrepre - - Chevrivir - - Chexararahir - - Chexecraski - - Chexepraprar - - Chexexaxapa - - Chexisreka - - Chexitre - - Cheyaverere - - Chibakre - - Chibihra - - Chichabikaka - - Chichavrehre - - Chicrikishi - - Chicrirake - - Chicrivivit - - Chihahrehrek - - Chihasre - - Chihatrachi - - Chihayayabik - - Chiheche - - Chihehreba - - Chihreratri - - Chihriveka - - Chikakre - - Chikaskitre - - Chikate - - Chikiprecri - - Chikraki - - Chikraskiska - - Chikrekra - - Chikrekre - - Chipabeske - - Chipererer - - Chipicracrak - - Chiprexexet - - Chipriprisre - - Chiprivrecha - - Chishakepi - - Chishipepri - - Chisrashi - - Chisretri - - Chisriher - - Chisriva - - Chisrivevri - - Chitisrevre - - Chitixahra - - Chitrechicra - - Chitresravri - - Chivechachat - - Chiveprepret - - Chiveprikri - - Chiviki - - Chivikiya - - Chivishir - - Chivrakakak - - Chivrakri - - Chivrasher - - Chivrepapar - - Chixacra - - Chixihebakra - - Crabecrapapa - - Crachikrisre - - Cracrahravri - - Cracratiya - - Cracretipi - - Cracrihe - - Cracritri - - Crahayayak - - Craheki - - Crahrashi - - Crahrehi - - Crahretetek - - Crakapeper - - Crakaskeba - - Crakavravrat - - Crakehri - - Crakirer - - Crakrashiski - - Crakrehra - - Crakriskipir - - Crapipaka - - Crapiriyaya - - Craprati - - Crapresker - - Craresraxe - - Crarevexa - - Crashahresri - - Crashehihik - - Craskahraske - - Craskatrapra - - Craskicrete - - Craskivi - - Cratatrihi - - Cratikre - - Cratikrekrek - - Cratiprar - - Cratrehra - - Cravehri - - Cravrikra - - Cravrisrere - - Cravritiriri - - Cravriyayak - - Crayahrehret - - Crayakrer - - Crayapraprar - - Crayaripipi - - Crayayaricri - - Crebaxa - - Crebehrita - - Crechavre - - Crechesrehar - - Crechichevre - - Crecrabibik - - Crecriri - - Crehepapepe - - Creheriki - - Crehexi - - Crehipavava - - Crehraver - - Crekatri - - Crekavexa - - Crekeki - - Creketri - - Crekiskeya - - Crekitati - - Crekrepreki - - Crekrivavak - - Crepahripa - - Crepekecre - - Crepekrekret - - Crepiba - - Crepihri - - Creprepravri - - Creraxi - - Crerehihit - - Creshekrapa - - Creskekri - - Cresketita - - Creskihre - - Cresripepet - - Cretarevripa - - Cretebe - - Cretehra - - Creterarar - - Cretibehihi - - Cretrapi - - Cretrekerara - - Cretrepepet - - Crevapir - - Crevixesra - - Crexahava - - Crexepapacre - - Cribavribibi - - Cribitratrat - - Crichecrite - - Crichipi - - Cricraprehre - - Cricrirar - - Cricrisre - - Cricritika - - Crihevar - - Crihitehre - - Crikatrikre - - Crikebepapa - - Crikekakat - - Crikeshivra - - Crikisheski - - Crikrahrata - - Crikretevabi - - Crikricretri - - Cripichahi - - Criprishapa - - Crirachi - - Crirakratra - - Crishave - - Criskahe - - Crisrehapahi - - Critachatri - - Critrabibir - - Critresrir - - Critrikracri - - Crivacriti - - Crivacrive - - Crivayasra - - Crivrakre - - Crivrecri - - Crixixaske - - Habavavak - - Habepa - - Habikikaka - - Habikrihita - - Hachabe - - Hachehekre - - Hacheske - - Hacreha - - Hacrere - - Hahebapapa - - Hahecrecha - - Haheha - - Hahetasrike - - Hahihahatrar - - Hahihasreche - - Hahripraxaxa - - Hakepa - - Hakirer - - Hakraxixit - - Hakrekikik - - Hakrixexeret - - Hapacharepri - - Hapacre - - Hapahri - - Hapeti - - Hapitahri - - Hapreska - - Haprihrisha - - Harebabi - - Harexiveve - - Haricracre - - Haririsheska - - Harishi - - Hashakrakrak - - Hashehracri - - Hashepracha - - Haskaritepra - - Hasketer - - Haskibebeyat - - Haskikretete - - Hasrabake - - Hasracritehe - - Hasrekitra - - Hasrekrer - - Hasrihaxa - - Hasripeshar - - Hatabibivet - - Havavresra - - Havixe - - Havreki - - Havrepekre - - Havretri - - Havrichatata - - Haxikeker - - Hayahriyaxa - - Hebahrevrir - - Hebapri - - Hebihihichit - - Hebikratahe - - Hecheshehixi - - Hechetra - - Hechevakrer - - Hecraba - - Hecrabi - - Hecrevrivrik - - Hecrirecha - - Hehere - - Hehiskitri - - Hehrapike - - Hehrepri - - Hehreskaskat - - Hehrikra - - Hekikrexa - - Hekrasre - - Hekrekicre - - Hekreracre - - Hekriheti - - Hepevivikrik - - Hepraskibebe - - Heprivresker - - Heprixasheri - - Herecrerivi - - Hereririket - - Heriheyacri - - Heripa - - Heripreka - - Heshahraveti - - Heshepepevik - - Heskashachi - - Heskaxixe - - Heskererepet - - Heskeshishit - - Heskisker - - Hesrepahri - - Hesreski - - Hetahetritri - - Hetiheheprit - - Hetrare - - Hetrevihra - - Hetrihahri - - Hetrirebibi - - Hevababaker - - Hevetihre - - Hevexixik - - Heviricrecre - - Hevrevipa - - Hevrexir - - Hevrichar - - Hevriraravit - - Hevrivrivre - - Hexasrichi - - Hexaxipri - - Heyashipre - - Hibasher - - Hiberarakrar - - Hibesrache - - Hicrapre - - Hicrecrahera - - Hicreteba - - Hicriba - - Hihacha - - Hihepapak - - Hihichitre - - Hihireret - - Hihrevra - - Hikikri - - Hikitritrir - - Hikrakre - - Hikrepa - - Hipavi - - Hipitratrak - - Hirepabe - - Hirichachar - - Hiricheya - - Hiricrabakri - - Hiricraske - - Hiricrevitri - - Hirihrachi - - Hirihraski - - Hirihraxaxat - - Hirikachi - - Hirikretetet - - Hirikrikra - - Hiripebahre - - Hiripehixixi - - Hiriper - - Hiripesri - - Hiripeta - - Hiripevivik - - Hirirahehet - - Hirirecrevre - - Hirishihra - - Hiriskeva - - Hiritapatiti - - Hiriteker - - Hiritrari - - Hiritraxe - - Hiritricri - - Hirivavavri - - Hiriviske - - Hirivivre - - Hirivra - - Hirivrari - - Hirivrexita - - Hirivrivri - - Hirixashahre - - Hirixicraya - - Hishave - - Hishesritra - - Hishiskahra - - Hishivrevrek - - Hiskakecra - - Hiskatetek - - Hiskekreche - - Hiskeva - - Hiskisrare - - Hisrakikit - - Hisratrepepe - - Hitava - - Hiterehaha - - Hitratra - - Hivacracrat - - Hivatritrik - - Hivayayar - - Hivrababar - - Hivrahrir - - Hixacre - - Hixashape - - Hixashetiti - - Hixekrasra - - Hixepi - - Hixeripe - - Hiyacrakra - - Hrabatitit - - Hrabaxa - - Hrabike - - Hrabipre - - Hracrabixi - - Hracrehra - - Hrahepivivi - - Hraherikrexi - - Hrahikrer - - Hrahrakahre - - Hrahraska - - Hrahrasrebe - - Hrahrehehek - - Hrahritra - - Hrakachabexi - - Hrakarerek - - Hrakeshi - - Hrakiski - - Hrakretri - - Hrakrichapri - - Hrakrishi - - Hrapavevek - - Hrapicra - - Hrapraber - - Hraprapreche - - Hrarachihi - - Hrarahrahrar - - Hrarecri - - Hrarikrixabi - - Hrarishesher - - Hrashepa - - Hrashibisra - - Hrashihir - - Hrashikavexa - - Hrasketre - - Hraskibe - - Hraskikexaxa - - Hrasrecrixi - - Hrasrevraxi - - Hrasrevrehra - - Hratatrasre - - Hratayati - - Hratere - - Hratrachari - - Hratreki - - Hravahiche - - Hravapeki - - Hravaskeki - - Hraveska - - Hravihre - - Hravrahaheya - - Hravrekra - - Hraxehrehiri - - Hraxekrebe - - Hraxichebar - - Hraxivivivet - - Hrayacha - - Hrayavrar - - Hrebavihra - - Hrebetra - - Hrechaxer - - Hrecreti - - Hrecrihahar - - Hrehikrekrer - - Hrehresra - - Hreketra - - Hrekrativi - - Hrepihepre - - Hrepipake - - Hrerasri - - Hreravexe - - Hrereprehir - - Hreriba - - Hreshahetiti - - Hreshehakake - - Hreskapahre - - Hresrakakre - - Hresrechike - - Hresrekasha - - Hretite - - Hretrecre - - Hretreski - - Hretrevri - - Hrevrehe - - Hrexakekek - - Hrexatika - - Hrexebe - - Hribahar - - Hribehrati - - Hribipe - - Hrichiski - - Hrihevrivrir - - Hrihitra - - Hrihrakihri - - Hrihrechar - - Hrikichecra - - Hrikiskate - - Hripricrahra - - Hrirehrikra - - Hriresri - - Hrishabar - - Hrishaxeyar - - Hrishehrahi - - Hrishexixik - - Hrisheyakra - - Hrishipete - - Hriskacrecra - - Hriskaheba - - Hriskari - - Hriskevetabi - - Hriskexa - - Hriskihete - - Hriskihri - - Hrisrechi - - Hrisrera - - Hrisriri - - Hrisrishapa - - Hrisrivavar - - Hritachecri - - Hritexa - - Hritihihri - - Hritihra - - Hritiker - - Hritisrasrat - - Hrivaxa - - Hrivripira - - Hrixebabatir - - Hrixebi - - Hrixihri - - Hrixiva - - Hriyahriya - - Kabavi - - Kabaxesha - - Kachaske - - Kachaya - - Kachihe - - Kacrahesha - - Kahakichi - - Kahaxipa - - Kahepapatret - - Kahiki - - Kahishe - - Kahrakrekret - - Kahratrer - - Kahriche - - Kahricrikra - - Kakatahrare - - Kakebi - - Kakihrasri - - Kapakriska - - Kapracre - - Kaprashesher - - Kaprehrakaka - - Kapreri - - Karakahre - - Karapihehe - - Kashaya - - Kashipri - - Kaskachekeke - - Kaskivrer - - Kasrabacre - - Kasrakapre - - Kasraxar - - Kasresreyaya - - Kasrivrata - - Katasker - - Katehreyaya - - Katetrike - - Katexaxak - - Katrehre - - Kavababat - - Kavashishit - - Kavihrahrat - - Kavitratrak - - Kavratevriya - - Kaxecri - - Kaxetavre - - Kaxetretret - - Kayararat - - Kayavrivrik - - Kayaxi - - Kebasrevikri - - Kechatra - - Kechavrepri - - Kecresra - - Kecrevrir - - Kecriha - - Kecrikra - - Kecrixa - - Kehave - - Kehitichacha - - Kehivehrihri - - Kehrachechek - - Kehrehi - - Kekabibit - - Kekahi - - Kekahrexi - - Kekarar - - Kekasritri - - Kekebapisra - - Kekebibivrer - - Kekekahihi - - Kekrishe - - Kepetre - - Kepevra - - Kepraki - - Keprepara - - Kerahacheche - - Keratra - - Kerihi - - Keriskehisri - - Keshevaskiva - - Keshika - - Keshiti - - Keskarahita - - Keteskesket - - Ketesketa - - Ketribabar - - Ketribipi - - Kevatra - - Kevatre - - Keveki - - Keveshatra - - Keveshexiki - - Kevesraxe - - Kevexa - - Kevikaxe - - Kevivri - - Kevrahreri - - Kevrahrihrit - - Kexapriprik - - Kexerava - - Kexeshacha - - Kexisrepe - - Keyararak - - Kibevavacrak - - Kibeyachichi - - Kibipavava - - Kichitra - - Kicricreva - - Kicrikrikrik - - Kiharesra - - Kihiya - - Kihrexexevek - - Kihriprira - - Kikeke - - Kikexitretre - - Kikrabikichi - - Kikrehi - - Kikrekrakrat - - Kikreri - - Kikretrapa - - Kikrevavak - - Kikrivikar - - Kipivaxe - - Kipreya - - Kireche - - Kiresrisrir - - Kirevi - - Kiribapra - - Kiribaprive - - Kirichaketra - - Kirichiska - - Kiricrakakri - - Kirihererek - - Kirihrepi - - Kirihreviche - - Kirikachicha - - Kirikatriki - - Kirikivrivri - - Kirikrakra - - Kiripabi - - Kiripahritri - - Kiriprihri - - Kirirahixera - - Kirireti - - Kirirevri - - Kirishavavar - - Kirishekeket - - Kiriteska - - Kiritracha - - Kiritrepeper - - Kiritreyapri - - Kirivipe - - Kirivrivepi - - Kirixaticher - - Kirixepepek - - Kirixicra - - Kishahapatre - - Kishehakaka - - Kiskashapra - - Kiskekehra - - Kiskekicre - - Kiskipri - - Kitraka - - Kitrevevri - - Kivraheherat - - Kivrahi - - Kivrashe - - Kivrera - - Kivretrakeke - - Kixatritrit - - Kixichetiti - - Kixichicrar - - Kixivra - - Krabareyaya - - Krabeherere - - Krachehre - - Kracheyaba - - Kracrirarak - - Krahebikaba - - Krahechikri - - Krahiha - - Krahrakri - - Krahraririk - - Krahrepexi - - Krahrepri - - Krahrerar - - Krakahra - - Krakrekiski - - Krakrepapat - - Krapari - - Krapibi - - Krapitahri - - Krapreve - - Kraprisrisre - - Kraprivrarar - - Krarakrikrit - - Krarekri - - Kraricri - - Krashatatahi - - Krashavecra - - Kraskisretra - - Krasrarevi - - Krasripapat - - Kratachavri - - Kratare - - Kratikepi - - Kraveke - - Kravraxeveve - - Kravrepachi - - Kravricrahra - - Kraxabi - - Kraxasrir - - Krayakrikrit - - Krebekri - - Krebibikre - - Krebivi - - Krechahe - - Krechepraxa - - Krechititik - - Krecrashepra - - Krecravicha - - Krecreri - - Krehekikihit - - Krehrakakre - - Krehrita - - Krehrixa - - Krekacrechi - - Krekebeta - - Krekracri - - Krekrapri - - Krekrishaski - - Krepeviske - - Krepitir - - Krepiya - - Kreprahetaya - - Krepretasha - - Kreprivreski - - Krererisri - - Krerexeskeva - - Kreskaviha - - Kresrepaxexe - - Kretahre - - Kretavi - - Kretepapatir - - Krevavikeke - - Krevesher - - Krevesrisrit - - Krevrexer - - Krevrivriske - - Krexaya - - Kreyacrepe - - Kreyatriri - - Kreyavi - - Kribeshi - - Kribetibi - - Kribexixik - - Kribirecri - - Kribivra - - Krichakehra - - Kricrava - - Kricrirepe - - Kricritaka - - Krihaprir - - Krihesre - - Krihexarava - - Krihreskekre - - Krikapepek - - Krikatitixer - - Krikesrixixi - - Krikrashar - - Krikrikesre - - Kripahri - - Kripritri - - Kriripriprit - - Kririve - - Krishebiriba - - Krishebite - - Krishecrapi - - Kriskexer - - Krisribariri - - Krisrisher - - Kritahe - - Kritarerek - - Kritechihihi - - Kritiha - - Kritixa - - Kritresra - - Kritrivrevra - - Krivaxixipak - - Krivripri - - Krixehraski - - Krixesrepri - - Krixirar - - Pabaskare - - Pabecrechi - - Pabixashaha - - Pachatatak - - Pachetra - - Pachikri - - Pachisra - - Pacrachisri - - Pacraheha - - Pahrecrahati - - Pahrixeke - - Pakaririhrek - - Pakashexa - - Pakaskesha - - Pakavrevaha - - Pakihechacha - - Pakishi - - Pakivrapapa - - Pakrakrasra - - Pakrasrer - - Pakrava - - Pakresra - - Pakrexetihe - - Pakrika - - Papaskaxa - - Papavivivrik - - Papesheher - - Papivahre - - Papratrakiki - - Parerakre - - Pashaskaskak - - Pashevravrat - - Paskasretiti - - Paskiske - - Paskixexek - - Pasrabicra - - Pasraprikepa - - Pasrehe - - Pasrepratri - - Pataprivra - - Patesrateke - - Patexexet - - Patreshe - - Pavaba - - Pavrapishi - - Paxarerechak - - Paxecri - - Paxitirechi - - Payahreshi - - Pebakrikrik - - Pebate - - Pebeskahepre - - Pebevravi - - Pebibebek - - Pechaka - - Pechekripi - - Pechetraya - - Pechikreke - - Pechivrar - - Pecracha - - Pecritrasre - - Pehasra - - Pehecha - - Pehisresrer - - Pehrakresha - - Pehrihivreya - - Pehriva - - Pekecricrik - - Pekrava - - Pekraya - - Pekrepitri - - Pepehri - - Pepexekaka - - Pepirer - - Pepiska - - Pepitre - - Pepreba - - Pepreha - - Peprerar - - Pepresri - - Pepresrikeke - - Peprevahe - - Peraxatrikri - - Perebecrate - - Peribi - - Perisrehri - - Peshipaha - - Peskavavaxek - - Peskehihik - - Peskikikitir - - Pesraski - - Pesratra - - Pesravre - - Pesraya - - Pesretetetat - - Pesrikre - - Pesritra - - Petevrivrit - - Petihri - - Petivrate - - Petripetete - - Pevekriska - - Pevera - - Pevetiska - - Pevetrepri - - Pevikixi - - Pevipraprak - - Pevitetecrak - - Pevixihre - - Pevracher - - Pevrakrakrat - - Pevrehita - - Pexepraprat - - Pexihibe - - Pibehra - - Pibekrite - - Pibetiskiski - - Pibibipa - - Pibikekek - - Pichehi - - Pichetreta - - Pichicreve - - Pichikrarar - - Picreprecha - - Pihasresret - - Piheki - - Pihepa - - Pihibeskaska - - Pihichar - - Pihitetek - - Pihrebi - - Pihreshapibe - - Pihretitir - - Pikaskaskar - - Pikaxer - - Pikrehreka - - Pikripreprer - - Pipasha - - Pipaxacricri - - Pipesresri - - Pipribepri - - Piprishixi - - Piraxiprar - - Pirekrehi - - Pireveverik - - Piribaxa - - Piribipriski - - Pirichivapi - - Piricrahra - - Piricrakra - - Pirihepre - - Pirihichati - - Pirikretra - - Pirikritere - - Pirikrivra - - Piripaba - - Piripacripri - - Piripihrishe - - Piripite - - Piripitri - - Piriprabepa - - Pirireprishe - - Piriririke - - Piriskateke - - Piriskiki - - Pirisretiva - - Piritavre - - Piritihre - - Piritratavri - - Piritrecrara - - Piritreke - - Pirivakixaxa - - Pirivikrar - - Pirixaxa - - Pirixaxevre - - Piriyakribi - - Piriyapesra - - Pishakakaxet - - Pishashetepi - - Pishavraska - - Pishevra - - Piskipre - - Pisrasheshek - - Pisripre - - Pisrixekete - - Pitibi - - Pitraprivre - - Pitraskeche - - Pitratebi - - Pitrevreyaya - - Pitriprivra - - Pitriske - - Pivaka - - Pivatatakir - - Pivekrixehri - - Piveyashi - - Pivrakevi - - Pivrakipre - - Pivrakitibe - - Pivrashir - - Pivrirater - - Pivritatabet - - Pixeriti - - Pixicha - - Prabibiprepi - - Prabichixaxa - - Prabixite - - Pracheteter - - Prachiba - - Pracrahrive - - Prahihrahrak - - Prahisresrek - - Prahitrivi - - Prahrebesra - - Prahripebaba - - Prahrivapapa - - Prakiskesket - - Prakrehrahri - - Prakripi - - Prapicresri - - Praprexexek - - Prarachaxi - - Prarecrahi - - Prarikra - - Praripraka - - Prashicribi - - Prashivepapa - - Prashixitata - - Pratakra - - Praterahira - - Pratreki - - Pravashipebe - - Pravesrisrit - - Pravixihehe - - Pravrashi - - Pravrepi - - Pravricrir - - Pravritrer - - Praxahihir - - Praxechaxere - - Praxekrakrat - - Praxevitetra - - Praxexe - - Praxichi - - Prayaraxir - - Prebavre - - Prechakavra - - Prechavre - - Precratetet - - Preherihra - - Prehiviveve - - Prehrakriska - - Prehribi - - Prekakra - - Prekaya - - Prekiprever - - Prekirar - - Prepahihibar - - Prepetratrat - - Prepixihrapa - - Preprete - - Preretetre - - Prerexike - - Presharesre - - Presravi - - Presrere - - Presriskipre - - Pretere - - Pretetisrir - - Pretexiprar - - Pretihre - - Pretrakre - - Pretrike - - Pretrisra - - Prevakre - - Prevecrere - - Prevesriti - - Preveti - - Previkrahihi - - Previkri - - Prevritrare - - Prevrivi - - Prexatrar - - Prexeshe - - Prexicracrak - - Preyatra - - Pribatretrek - - Pribavibache - - Pribirivava - - Pribivrivrit - - Pricheyayat - - Pricrapapat - - Pricrihi - - Prihavri - - Prihetiya - - Prihrechabi - - Prikebixi - - Prikricha - - Prikripi - - Prikripikiki - - Prikrishi - - Pripachiya - - Pripavrepri - - Pripixixik - - Pripraske - - Priprecheha - - Pripripepek - - Prirakre - - Prirasher - - Priraske - - Prireprehar - - Pririhi - - Prishehe - - Prishepaxixi - - Prishitarabe - - Priskake - - Prisraxi - - Pritabaski - - Pritakir - - Pritecra - - Pritehavivi - - Pritepa - - Pritichahi - - Privayayak - - Privipecre - - Privrihareya - - Prixarake - - Prixepa - - Prixetre - - Prixivrekri - - Priyaprar - - Rabehiya - - Rabeparere - - Rabereshebe - - Rabichechet - - Rachare - - Racraba - - Racrakeka - - Racrakreheri - - Rahavevahi - - Rahevripeshi - - Rahibebetat - - Rahihratata - - Rahipe - - Rahraba - - Rahrecri - - Rahreyavri - - Rahritretrek - - Rakekikitrir - - Rakicrecrek - - Rakipipihrat - - Rakreprikri - - Rapivrivrere - - Rarahaka - - Raretriya - - Rasheshashat - - Rasheshevri - - Rashihretra - - Rashikrehre - - Rasriber - - Ratabibihet - - Ratesraprar - - Ratitritrik - - Ratravi - - Ratrebi - - Ratreyayak - - Ratrihrikri - - Ravecher - - Ravepexi - - Ravihrahrak - - Ravixexebet - - Ravrisheke - - Ravrivrikri - - Raxahehet - - Raxetapa - - Raxete - - Raxevahre - - Rayachesheta - - Rebakre - - Rebebikiki - - Rebicracrak - - Rebipi - - Rebisriyaya - - Rebitetebit - - Recheper - - Recraskehe - - Recrekariri - - Rehepipibet - - Rehresheshet - - Rehrikrikrik - - Rehrire - - Rekaskaskak - - Rekracha - - Rekripreprek - - Repeche - - Repetrir - - Repexishe - - Repivesheri - - Repivrasra - - Reprihri - - Reprishishik - - Rerahahat - - Rereba - - Rerirevra - - Reskebexexe - - Reskehahat - - Reskivavak - - Reskixibira - - Resrecracrat - - Resretra - - Resrihrepeke - - Resriske - - Resrixiha - - Retaskahri - - Retavavatet - - Retaveche - - Retecha - - Retevravrak - - Retrete - - Retrexehehri - - Retripritri - - Revasri - - Revetitipret - - Revikrebiya - - Revripra - - Revritrer - - Rexabaska - - Rexataxa - - Ribatre - - Ribebahihi - - Ribehashishi - - Ribiheva - - Ricrehaska - - Rihava - - Rihaxicre - - Rihekrekrek - - Rihipapar - - Rihrachepi - - Rihravatir - - Rikevra - - Rikipa - - Rikiskapipi - - Rikivrevra - - Rikrachi - - Rikrepa - - Rikreravribe - - Ripibivrir - - Ripihrepapa - - Ripreshikre - - Rirevi - - Riribebe - - Riribeska - - Riricheshe - - Riricrehra - - Riricriti - - Ririhari - - Ririhepreski - - Ririhite - - Ririhixir - - Ririkavrire - - Ririkeve - - Ririkrekaska - - Ririkrexeti - - Riripasha - - Riripraprapi - - Ririrarerera - - Riririhacha - - Ririshihi - - Ririskatre - - Ririskihe - - Ririskiri - - Ririsravra - - Riritihihit - - Riritiskaba - - Rirititahi - - Riritrebi - - Riritrexexek - - Ririvihrar - - Ririvreshiya - - Ririvretra - - Ririyaskihe - - Rishacriker - - Rishaskar - - Rishepi - - Riskavrer - - Riskekar - - Riskepriba - - Riskesre - - Riskirasre - - Riskiskeha - - Risratretete - - Risratrihihi - - Risrevre - - Risritracre - - Risrivire - - Ritaha - - Ritahrecra - - Ritekrakapre - - Riteva - - Ritresrakri - - Ritrihe - - Ritrirecra - - Ritrishixi - - Rivretripapa - - Rivrivrishi - - Rixahritri - - Rixaterete - - Rixecrekre - - Rixepapat - - Rixeti - - Rixibihrihri - - Rixiskirepri - - Rixixaxavrat - - Riyahrahrat - - Riyapare - - Riyasri - - Shabirivri - - Shachikir - - Shacrevavak - - Shacrevrake - - Shahaprahri - - Shahaxaxak - - Shahekeket - - Shaheskate - - Shahexer - - Shahrasher - - Shahrati - - Shahripracri - - Shakekrirabe - - Shakrichar - - Shapesrikaka - - Shapibi - - Shapretra - - Sharapire - - Sharesrasrat - - Sharihesrehi - - Sharihre - - Sharipiva - - Sharitrihri - - Shashishibe - - Shashisravi - - Shaskehepre - - Shaskepahre - - Shaskitra - - Shatretaxi - - Shavaprika - - Shavashakri - - Shavexexati - - Shavisha - - Shavrivre - - Shaxepachi - - Shayakrakrak - - Shebevrirere - - Shebipeskixa - - Shebiva - - Shecheyababa - - Shecrapricre - - Shehibe - - Shehrayashar - - Shehrebite - - Shehreha - - Shehreske - - Shehreyayar - - Shehriskar - - Shekake - - Shekakesri - - Shekapiski - - Shekeska - - Shekikakat - - Shekrira - - Shepechichik - - Shepeshesra - - Shepeskiskik - - Shepetrati - - Shepevrevrer - - Shepikitepa - - Sheprekritri - - Shepreskete - - Sherati - - Sherikre - - Sheriskahe - - Sheshasri - - Sheshihesha - - Shesrabibik - - Shesrachiski - - Shesrihihit - - Shetachavre - - Shetasre - - Shetikitata - - Shetracrar - - Shetriha - - Shevabi - - Shevecrepi - - Shevrahe - - Shevrevri - - Shevriya - - Shexachi - - Shexahrehret - - Shexecra - - Shexishishit - - Shexivir - - Sheyasha - - Shibatra - - Shibecreka - - Shibekrekret - - Shibivribe - - Shichebebet - - Shichecha - - Shicheririt - - Shichikrakre - - Shicrachi - - Shihebihre - - Shihecricrik - - Shihishar - - Shihiska - - Shihrapikra - - Shihrehepri - - Shihrerebe - - Shihrevihre - - Shikechachat - - Shikeshecra - - Shikikivri - - Shikraxi - - Shikrehre - - Shikreprer - - Shipehabaske - - Shipicreki - - Shipipapaxak - - Shipratate - - Shipriki - - Shipritraha - - Shiribebepit - - Shisrisheri - - Shitehechi - - Shitexihre - - Shitibibik - - Shitravrekra - - Shivababat - - Shivexehra - - Shivive - - Shivraheki - - Shivrayayak - - Shivrebapra - - Shivrepa - - Shixaya - - Sikibavipa - - Sikibisriche - - Sikichape - - Sikichapi - - Sikichekasha - - Sikichiyaski - - Sikicracre - - Sikicrexa - - Sikicrixi - - Sikiketraya - - Sikikrasre - - Sikikreke - - Sikipecripre - - Sikipetre - - Sikiprasrake - - Sikiprira - - Sikirehivre - - Sikirepreri - - Sikiskacra - - Sikiskevavak - - Sikiskite - - Sikisraber - - Sikisrekakat - - Sikisresha - - Sikitaski - - Sikitevre - - Sikiticre - - Sikitrashate - - Sikitrihrepi - - Sikitrirepre - - Sikivate - - Sikiveskar - - Sikivrahra - - Sikivrisrita - - Sikivritiri - - Sikixicrebar - - Siribacrache - - Siribetraska - - Siribikra - - Siricharabe - - Sirihaxer - - Sirihicripa - - Sirihihahat - - Sirihihapa - - Sirikaski - - Sirikatatat - - Siripepahe - - Siriprahra - - Siriprehavi - - Siripreteske - - Siriraki - - Siriraski - - Sirirekeba - - Sirireter - - Sirishatache - - Sirishehevre - - Siriskesrave - - Siriskihipe - - Sirisrekivi - - Sirisretre - - Siriteche - - Siritrahe - - Siritrixexet - - Sirivrekehri - - Sirivretatre - - Skabaresre - - Skabehricra - - Skabipre - - Skachabeta - - Skachibi - - Skachihive - - Skachishaha - - Skacraxaxak - - Skacrehrapre - - Skacrichisre - - Skacrixiche - - Skahipevra - - Skahixahehe - - Skahracha - - Skahravrive - - Skahreve - - Skahrivrepra - - Skakasha - - Skakava - - Skakavevet - - Skakeskaskat - - Skakevravrak - - Skapape - - Skapapriprit - - Skarebihira - - Skarechachak - - Skarepishi - - Skarexapreti - - Skashihrir - - Skaterarar - - Skatetasre - - Skatrichebe - - Skavarerahri - - Skavicrecrer - - Skavitetexi - - Skavrekreti - - Skavritre - - Skaxisrakre - - Skayabere - - Skayatepra - - Skebaprara - - Skechikreba - - Skecracheker - - Skecraprir - - Skecrita - - Skehevreshe - - Skehichitra - - Skehipe - - Skekapra - - Skekekritra - - Skeketir - - Skekrababe - - Skekraxer - - Skekretake - - Skepare - - Skepitetexik - - Skerepepehit - - Skereri - - Skeripribihe - - Skeriska - - Skeshikite - - Skeskahe - - Skeskibishi - - Skesrisrer - - Sketaha - - Sketahevra - - Sketashakra - - Sketatretrek - - Sketavri - - Sketepechi - - Sketivapapa - - Sketivre - - Sketrarivava - - Sketrekrepe - - Skevaskiskik - - Skevaxi - - Skevrabari - - Skevrahrepa - - Skevrecra - - Skevrehraki - - Skevrihrave - - Skexipi - - Skexixeska - - Skibacricrit - - Skibapraxe - - Skibevravrat - - Skibiravri - - Skibita - - Skichabi - - Skichapipit - - Skichebir - - Skichiske - - Skicreraskar - - Skicrihihe - - Skihekar - - Skiheyaskir - - Skihricher - - Skikeskesket - - Skikrahre - - Skikraprara - - Skikrisha - - Skipashihre - - Skipechishi - - Skiprapra - - Skipraripi - - Skipreve - - Skiprevivik - - Skiripipik - - Skishachi - - Skishapehehe - - Skiskevaski - - Skiskevririr - - Skisrekecra - - Skitraki - - Skitrepi - - Skitreske - - Skivekri - - Skivibibik - - Skiviska - - Skivrihri - - Skivrivreki - - Skixara - - Skixareter - - Skixetihechi - - Skixiha - - Skixisrapre - - Srabavrechi - - Srabisreveke - - Srachavicha - - Sracrare - - Srahahihir - - Srahihripra - - Srahriyar - - Srakipahehe - - Srakireret - - Srakrakrishi - - Srapahre - - Srapikretra - - Srapribekehi - - Srarekepar - - Sraribeski - - Srariprer - - Srarisha - - Srashacha - - Srashakri - - Srashaxata - - Srashikirir - - Sraskabikri - - Sraskechipe - - Sraskehreri - - Sraskekepiva - - Sraskekisra - - Sraskiba - - Sraskishar - - Srasrivate - - Sratepre - - Srateve - - Sraticre - - Sratihi - - Sratiki - - Sratraxixir - - Sratrike - - Sravechachar - - Sravrapapat - - Sraxape - - Sraxepipir - - Sraxeskicri - - Srebaskaskar - - Srebecrir - - Srebekrabi - - Srebikrir - - Srechepe - - Srecravra - - Srecravre - - Srecrisre - - Srehetahi - - Srehikrar - - Srehivavri - - Srehrehiske - - Srekacrexeve - - Srekreprexe - - Srekrikra - - Srekrititit - - Srepesrexi - - Srepipritri - - Srepisrasre - - Sreprekra - - Srepreshe - - Sreracricrar - - Srerevre - - Srerihra - - Sreshebakiki - - Sresheskixi - - Sreshiprari - - Sreskichi - - Sreskicre - - Sresrahapi - - Sresrekikit - - Sresrikre - - Sretasresri - - Sretishashak - - Sretraticrir - - Srevesra - - Srevesrixari - - Srevivre - - Srevraxipi - - Srevreyayak - - Srexatreva - - Srexikrata - - Srexiskahehe - - Sribavar - - Sribebe - - Sribireke - - Srichepi - - Srichivekaka - - Sricrevepa - - Sriheshexi - - Srihrahevrir - - Srihrakratri - - Srihrekexi - - Srikasresha - - Srikiriki - - Srikratra - - Sripaba - - Sripahebevri - - Sripahre - - Sriprikacha - - Sriracricrit - - Sririhre - - Sriripre - - Srisheyaxexe - - Srishibicri - - Srishikatre - - Sriskicrixi - - Sriskihra - - Sriskisha - - Srisratreba - - Srisrebepi - - Srisrete - - Sritasker - - Sritekrikrir - - Sriteskabe - - Sritiprebe - - Sritiske - - Sritrapashe - - Sritricha - - Sritripipir - - Srivake - - Srivaxa - - Srivekater - - Srivisra - - Srivrasrer - - Srivratre - - Srivrihrir - - Srixakrabebe - - Srixiveyaya - - Sriyapir - - Taabavrivrir - - Taabexitaski - - Taabiprete - - Taachabe - - Taacrahre - - Taacrecrasra - - Taacripi - - Taacrisretri - - Taahahre - - Taahecreta - - Taaherarak - - Taahiha - - Taahiska - - Taahivri - - Taahreke - - Taahrishepri - - Taakahevava - - Taakapa - - Taakexisker - - Taakraba - - Taapavevekik - - Taapecra - - Taapikashi - - Taapipihare - - Taapishi - - Taaprachikri - - Taaprivrapre - - Taarecra - - Taareshekra - - Taashaxikir - - Taashebititi - - Taaskatir - - Taaskevevava - - Taaskiteki - - Taasrebicre - - Taasrehrira - - Taasrikikit - - Taasritar - - Taataxe - - Taatevasre - - Taatihra - - Taatrate - - Taatrivivit - - Taavape - - Taavavrexi - - Taavrerapava - - Taavretri - - Taavrivi - - Taaxekakat - - Taaxesrite - - Taaxikra - - Taayarashe - - Teebapresri - - Teebechiya - - Teebivrichi - - Teechacraha - - Teechexe - - Teechihakri - - Teecrekrihre - - Teecrepeski - - Teecretri - - Teecrevretre - - Teehapraprar - - Teeheri - - Teehrahar - - Teehrepeskir - - Teehrirepipi - - Teekahicravi - - Teekepraxahe - - Teekipra - - Teepracrivri - - Teeprikexixi - - Teeraheher - - Teerecritri - - Teeriviyara - - Teeskapesri - - Teeskebecrar - - Teesrasraxa - - Teesrecha - - Teesretrir - - Teesribiba - - Teetahra - - Teetixi - - Teetrasrer - - Teetreskapri - - Teevahihivik - - Teevapriprar - - Teevepa - - Teevravreske - - Teexaketiti - - Teexera - - Teexihrir - - Teeyakra - - Tibaskaskak - - Tibasravava - - Tibihi - - Tibixita - - Ticheskivre - - Tichetritrir - - Tichiber - - Ticratevipe - - Tihichisketi - - Tihitre - - Tihresrevivi - - Tihrikakar - - Tikara - - Tikecribe - - Tikekitata - - Tikrasra - - Tikrevrihre - - Tipape - - Tipekrihripa - - Tipetripe - - Tipicre - - Tipreritaha - - Tipresrita - - Tiprititik - - Tireper - - Tiribavre - - Tiriberihehe - - Tiribikehe - - Tiribirakeke - - Tirichera - - Tirihayaya - - Tirihi - - Tirihra - - Tirihretrir - - Tirihriririk - - Tiriketeche - - Tirikeviha - - Tirikihrer - - Tirikrachir - - Tirikrasri - - Tiripechapre - - Tiripratra - - Tiriprexer - - Tirirahi - - Tirirapahre - - Tirirarat - - Tirirexiprer - - Tirisrehihit - - Tirisribe - - Tiritetasra - - Tiritrexi - - Tiritrivever - - Tiriveshi - - Tirivihachi - - Tirivrebire - - Tirixahiri - - Tirixebayar - - Tirixetatak - - Tirixishiski - - Tiriyaskacha - - Tishetrakaka - - Tiskasheske - - Tiskevritre - - Tiskicrar - - Tisraprepret - - Tisrasheshet - - Tisreshishit - - Tisreska - - Tisricre - - Tisriskiskir - - Tisrivexa - - Titeskeskek - - Titrabetiti - - Titretepeka - - Tivarahi - - Tivecra - - Tivecri - - Tivepa - - Tivevipe - - Tivexa - - Tiviskaskak - - Tixapipripri - - Tixetritrik - - Tixikekra - - Tixititik - - Tixixesrer - - Tiyapraprak - - Tiyaskaskat - - Trabari - - Trabisrer - - Tracrecrehri - - Tracreprake - - Trahahehetir - - Trahekehe - - Trahevreske - - Trahrepa - - Trahrevrava - - Trakehre - - Trakrapra - - Trakritevrer - - Trapavrivrir - - Trareskire - - Trashete - - Trasheve - - Trashevepri - - Trashipaxe - - Trasraveski - - Trasreve - - Tratibekaka - - Tratihrer - - Tratravi - - Tratraxixik - - Tratribi - - Travaxeski - - Travetretrek - - Travraripepe - - Travribesre - - Traxipi - - Traxiprer - - Trebahe - - Trebirerever - - Trebishivava - - Trebitratrak - - Trechacra - - Trechekrasri - - Trechesre - - Trechesrecre - - Trecrehehek - - Trehixapri - - Trehrakrepre - - Trehripra - - Trekatri - - Trekatricre - - Trekavixixi - - Trekavriki - - Trekebeti - - Trekeski - - Treketibita - - Treketra - - Trekibabat - - Trepake - - Treprabiveve - - Treprahrepi - - Treprebekra - - Treprehehet - - Trerevivipek - - Treshepra - - Treshibar - - Treshipeska - - Treskari - - Tresketara - - Treskiskakir - - Tresracrir - - Tresrasker - - Tresratracre - - Tresravritre - - Tresreba - - Tresrihivri - - Tretapra - - Tretrahri - - Tretreske - - Tretrikicha - - Trevabihra - - Trevepa - - Trevetretrek - - Trevicra - - Trexatri - - Trexavra - - Trexetri - - Trexiricrara - - Treyakracra - - Treyaxihehe - - Tribexexet - - Tribirekri - - Trichakripre - - Trichiski - - Tricracri - - Tricrekapa - - Tricripe - - Trihavever - - Trihera - - Trihexisra - - Trihicrecrek - - Trihitrar - - Tripesrishe - - Tripever - - Triprakraxi - - Triprakri - - Trirahecri - - Trirapraxar - - Trireche - - Trishakretra - - Trishecrexir - - Trishepi - - Trishisrar - - Triskavri - - Trisketir - - Triskiyayat - - Trisrachiri - - Trisrevre - - Trisrisri - - Trisrisriper - - Trisrite - - Tritetre - - Tritrakepre - - Tritrichatri - - Tritriskari - - Trivriskeki - - Trivritipipi - - Trivriyayak - - Trixihahar - - Trixitri - - Triyashekiki - - Vabahecre - - Vabahrabebe - - Vabebir - - Vabehetre - - Vabetrahacha - - Vabivri - - Vachahrirere - - Vachavri - - Vachekihri - - Vachicratata - - Vachiske - - Vacracreki - - Vacrebihi - - Vacripra - - Vahapapashek - - Vahapraxe - - Vahasker - - Vaherekiki - - Vahibebeprek - - Vahivihahe - - Vakaheva - - Vakecha - - Vakevixixi - - Vakikepripra - - Vapeyayak - - Vapikevra - - Vapipribe - - Vaprakakak - - Vaprisra - - Vapritasha - - Varebitacre - - Varekricreki - - Vashakrikrik - - Vaskexititi - - Vaskiprexi - - Vaskivri - - Vaskiyahi - - Vasraprikre - - Vasrevi - - Vatracraxixi - - Vatrevi - - Vatriva - - Vavehihisrek - - Vavrisrasri - - Vaxeki - - Vaxeraskeske - - Vebexaxat - - Vebicheta - - Vechecricrik - - Vecraxicra - - Vecriche - - Vecritrika - - Vehevrer - - Vehratrir - - Vehraxexek - - Vehritrexe - - Vekarasra - - Vekaxivivi - - Vekehribaba - - Vekirevi - - Vekracri - - Vekreka - - Vekrekrikrit - - Vekrerikra - - Vekrishar - - Vekrishicha - - Vepekre - - Veprahahat - - Veprechahri - - Veprecrar - - Veprecrecrek - - Vepreritare - - Veretitishit - - Vericharihra - - Verikisresre - - Veshacricrik - - Veshebixexe - - Veshecrihapi - - Veshehe - - Veshepreprek - - Veshishakra - - Veskapi - - Veskepayaya - - Veskepevra - - Vesrihiska - - Vetepeti - - Vetracripi - - Vetreshashat - - Vetriskira - - Vevatre - - Vevevre - - Vevivesha - - Vevreshir - - Vevricrecrek - - Vevrisrasrat - - Vexachebashi - - Vexavever - - Vexikar - - Vexisrecri - - Vibepraxaba - - Vibeta - - Vichehiriri - - Vichitribihe - - Vicrahrehrek - - Vicrevevre - - Vicrikre - - Vicripasre - - Vicritebaba - - Vicriviriki - - Viheche - - Vihecracheki - - Vihepra - - Vihratekra - - Vihrexahihi - - Vihribihiska - - Vihricra - - Vihriher - - Vihriprar - - Vihrisreher - - Vikahrekri - - Vikakehreri - - Vikavebari - - Vikekiski - - Vikihahre - - Vikitrexa - - Vikrebibit - - Vikrihi - - Vikritahahe - - Vipeskixa - - Vipravrakrar - - Viprevrar - - Virabebevrek - - Viratrerera - - Virepri - - Viriprixiche - - Virirevrare - - Viritritrik - - Viskeski - - Visrecrecret - - Visriskir - - Vitexexet - - Vitibibihrik - - Vitika - - Vitracrevi - - Vitrasheshek - - Vitraviketa - - Vitravrire - - Vitreskaskak - - Vitrisrasha - - Vitrivechere - - Vivashate - - Vivecrixexe - - Viveprehehe - - Viveprepe - - Vivixixihir - - Vivrashaya - - Vixiticrixi - - Vrabaprakaka - - Vrabikape - - Vracharitri - - Vrachishachi - - Vrachitasre - - Vracrebihehe - - Vraheska - - Vrahrehripre - - Vrakasrahi - - Vrakayasraxi - - Vrakebibit - - Vrakriperi - - Vrakritatat - - Vrapaheke - - Vrapresriki - - Vraprexave - - Vrarekikik - - Vrarihritete - - Vraripechi - - Vrashexa - - Vraskekaki - - Vraskevexar - - Vrasrehahar - - Vrasreshahi - - Vratavivit - - Vratevretra - - Vratrakere - - Vratreskevi - - Vratrite - - Vratrivar - - Vravabepra - - Vravacrahri - - Vravavra - - Vravexe - - Vraviveya - - Vravrache - - Vraxihihit - - Vrayavri - - Vrebehrihrik - - Vrebisra - - Vrecrarake - - Vrecrihri - - Vrehabi - - Vrehacre - - Vrehakatar - - Vrehasker - - Vrehecreri - - Vrehibehe - - Vrehibibipik - - Vrehipe - - Vrehipraprak - - Vrehriviche - - Vrekahrichi - - Vrekihrer - - Vrekipepet - - Vrekrixa - - Vrepate - - Vrepexexer - - Vreprehapre - - Vreprihrite - - Vrererikra - - Vrerikriskir - - Vreshabar - - Vreshihishar - - Vreshike - - Vreskatre - - Vresrasre - - Vresretatra - - Vretesravi - - Vretixixir - - Vretrapapar - - Vretrehivivi - - Vretricre - - Vrevahrir - - Vrevashixexe - - Vrevrekrer - - Vrexacracrat - - Vrexaker - - Vribetretret - - Vribipita - - Vribiprevite - - Vricrehakra - - Vricrihi - - Vricriskeche - - Vrihehra - - Vriheski - - Vrihrakre - - Vrihrekrepi - - Vrikayaba - - Vrikivresker - - Vrikrake - - Vrikrebacre - - Vrikresrasri - - Vripere - - Vripexavri - - Vripitikeske - - Vriprivra - - Vrirachesri - - Vririsha - - Vrisketaske - - Vriskiraxe - - Vriskire - - Vrisracrakri - - Vrisrekari - - Vrisreviki - - Vritasre - - Vriterepi - - Vritetrexa - - Vritika - - Vritiske - - Vritivraki - - Vritrihrar - - Vritrisre - - Vrivahi - - Vrivahishaya - - Vrivehatri - - Vrivitri - - Vrixashashar - - Vrixavribape - - Vrixeprir - - Vrixiprehre - - Vrixitreveki - - Vrixivraxe - - Xabishetra - - Xachivrivrit - - Xacripikar - - Xacriprixi - - Xacrivir - - Xahatavri - - Xahesketivri - - Xahrapaba - - Xahraprer - - Xahrebave - - Xahripavava - - Xakahri - - Xakayayakat - - Xakrevaratra - - Xapakra - - Xapikrikrik - - Xapipevrevre - - Xapraskapika - - Xaprate - - Xapravri - - Xapripraprar - - Xaracrivri - - Xaratripepe - - Xarebiya - - Xareva - - Xariheheprat - - Xashihapa - - Xaskakaba - - Xaskararater - - Xasrapipik - - Xasreskihibi - - Xatachasri - - Xatereret - - Xatiriskiski - - Xatrexixik - - Xavasrarihi - - Xaveshi - - Xavicrari - - Xavrahavri - - Xavricri - - Xavrire - - Xavrixecre - - Xaxikaxexe - - Xaxikresha - - Xaxiska - - Xayaskihri - - Xebechi - - Xebetetet - - Xebitretrek - - Xechacrecrek - - Xechibare - - Xecrixaxitre - - Xehekikir - - Xehetipe - - Xehichatavra - - Xehiprishe - - Xehiteche - - Xehrevrakre - - Xehrishe - - Xekerarivra - - Xekicra - - Xekrecri - - Xekrevri - - Xekrevripa - - Xepavikeba - - Xepehati - - Xepeter - - Xepetitipet - - Xeprasre - - Xeprekivra - - Xeprihehek - - Xeshachikaha - - Xeskapakre - - Xeskehrabe - - Xesribar - - Xetekir - - Xetraskesket - - Xetravivik - - Xetrexahihi - - Xetribirer - - Xetripi - - Xevetaske - - Xevratikepa - - Xevriya - - Xexapra - - Xexavi - - Xexibir - - Xexiski - - Xeyapre - - Xeyaribe - - Xeyaskapibe - - Xibecracrak - - Xibeha - - Xibepribe - - Xibitratrar - - Xihechevar - - Xihrahehete - - Xihrashehihi - - Xihrecreve - - Xihresra - - Xihrivever - - Xikabebet - - Xikahihi - - Xikashaxe - - Xikaske - - Xikepehrahra - - Xikicha - - Xikrahrihrik - - Xikrakipi - - Xikreshe - - Xikreska - - Xikrexiva - - Xikrihe - - Xikripar - - Xipahihik - - Xipita - - Xiprahahatek - - Xirechiske - - Xireshishit - - Xiribakrivi - - Xirichare - - Xirichebacra - - Xirichiter - - Xiricraki - - Xirihacrir - - Xirihiske - - Xirihiyatape - - Xirihrekakar - - Xirihretecre - - Xirihriti - - Xirikesrirer - - Xiriketi - - Xiripape - - Xiririhecher - - Xiririke - - Xiriripatibe - - Xirishepivre - - Xirishexi - - Xiriskapa - - Xirisketa - - Xiriskicreha - - Xirisrevre - - Xirisricreva - - Xiritracre - - Xiritreprer - - Xiritretrar - - Xirivetrikra - - Xirivexicri - - Xirivre - - Xirivrehra - - Xirixekrari - - Xishahrixixi - - Xishatre - - Xishehraxaxa - - Xishikra - - Xiskatreka - - Xiskeche - - Xiskehrahar - - Xiskicratake - - Xiskiririr - - Xisrecracrak - - Xisreva - - Xisritetet - - Xitachabibi - - Xitachixaxa - - Xitariritak - - Xitebehrer - - Xitreprecri - - Xivavraxexe - - Xiveski - - Xivivri - - Xivrahrare - - Xivrakrakrak - - Xivrihihicra - - Xixaxekaka - - Xixecra - - Xixiche + - Бакабепа + - Бабапир + - Бабасри + - Бабепипит + - Бачакехи + - Баческа + - Бачишешер + - Бакрапри + - Бакреска + - Бахепра + - Бахикрекрек + - Бахикравр + - Бакабепа + - Бакехахак + - Бакеки + - Бапечичик + - Бапекикик + - Бапери + - Баправавар + - Бапреба + - Бапретритрир + - Баракребер + - Барахри + - Бараскахрита + - Бараксиксик + - Башискикир + - Баскаскакре + - Баскивихи + - Басреба + - Батаприри + - Батасрекрар + - Батехрарат + - Батракиха + - Батравика + - Батреприски + - Батресри + - Батриска + - Батритра + - Баваша + - Бавебебек + - Бавраскикака + - Баврикриски + - Баксахерер + - Баксев + - Бебебапа + - Бебетерара + - Бебипаска + - Бекетапека + - Бекрерисре + - Бекретретрер + - Бехека + - Бехивреша + - Бехречечек + - Бехрекри + - Бехреят + - Бехрикририри + - Бехритиксакса + - Бекапесресре + - Бекашишик + - Бекетатратра + - Бекречакс + - Бекресраре + - Бекриб + - Бепараракрит + - Бепатричер + - Бепехисрепра + - Бепихар + - Бепитраши + - Бепресри + - Бераби + - Берака + - Берекрикрир + - Берисре + - Бешачари + - Бешескексексе + - Бешесре + - Бешесретре + - Бескаяврер + - Бескисрак + - Бескитре + - Бесравивит + - Бесривир + - Бетабабатрат + - Бетере + - Бетикрече + - Бевекакат + - Бевихаби + - Бевихраки + - Беврашет + - Бибаба + - Бибабир + - Бибати + - Бибекрича + - Бибекса + - Бибибабат + - Бибия + - Бичечир + - Бикракипе + - Бикрэврит + - Бихрапивра + - Бихраксибебе + - Биришиха + - Бихривриски + - Бикиври + - Бикраскиксекс + - Бикриврит + - Бипекисри + - Бипиритекр + - Бипратракси + - Бипрекси + - Бипривар + - Бирачи + - Бишеба + - Бишехри + - Бишевривра + - Бишики + - Бискескавра + - Бисрахреша + - Бисрепипит + - Битави + - Битехатити + - Бивакри + - Бивапе + - Бивихачакре + - Бивитикива + - Биврапри + - Бивраске + - Биврехаски + - Биврихра + - Биксахетра + - Биксапетра + - Биксаприк + - Биксексир + - Биякир + - Чабаха + - Чабакрер + - Чабебаче + - Чабепебе + - Чабикрахи + - Чачахе + - Чачевра + - Чакрера + - Чахекре + - Чахиксе + - Чахраврер + - Чахрикшехра + - Чакакива + - Чакапрапрар + - Чакехаше + - Чакиприхи + - Чакивре + - Чакриви + - Чапачичит + - Чапарачи + - Чапехреша + - Чапешиски + - Чапиксахи + - Чапрахебиби + - Чапрекраха + - Чапрекреви + - Чарапрехики + - Чараприска + - Чарара + - Чарате + - Чаратраки + - Шарекрески + - Чаресрибе + - Шарише + - Чариша + - Чашабер + - Чашереска + - Часкике + - Часраскаска + - Часречата + - Часреврави + - Часрихипрер + - Чатрексиксе + - Чавикреши + - Чаврикре + - Чаксакрахехе + - Чаксескере + - Чаксеврахи + - Чаксивр + - Чебабебет + - Чебави + - Чебибивар + - Чебегекри + - Чебехрит + - Чебихит + - Чебирете + - Чебисра + - Чечаправер + - Чекракса + - Чекрера + - Шекретаср + - Чекретрисре + - Чекрисре + - Чехашабаба + - Чехебикри + - Чехепре + - Чехискер + - Чехраксашир + - Чекрахрака + - Чекравикса + - Чекретит + - Чепакакат + - Чепекак + - Чепипракра + - Чепитипе + - Чепраскаври + - Чеширикра + - Чешиве + - Ческапра + - Ческавре + - Чесракая + - Чезравр + - Чесриве + - Чевратра + - Чезритити + - Четаксапа + - Четаксапре + - Четерарат + - Четиска + - Читритрети + - Четрия + - Чевасрак + - Шеврепр + - Шевривир + - Чексарахир + - Чексекраски + - Чексепрапрар + - Чексексаксапа + - Чексисрека + - Чекситре + - Шайавере + - Чибакре + - Чибихра + - Чичабикака + - Чичавре + - Чикрикиши + - Чикрираке + - Чикрививит + - Чихахрек + - Чихасре + - Чихатрачи + - Чихайябик + - Чихече + - Чихехреба + - Чихрератри + - Чихривека + - Чикакре + - Чикаскитре + - Чикате + - Чикипрекри + - Чикраки + - Чикраскиска + - Чикрекра + - Чикрекре + - Чипабеске + - Чиперерер + - Чипикрак + - Чипрексет + - Чиприприсре + - Чипривреча + - Чишакепи + - Чишипепри + - Чизраши + - Чисретри + - Чисрихер + - Чисрива + - Чисриври + - Читисревре + - Читиксахра + - Хитречикра + - Читрасраври + - Чивечачата + - Чивепрет + - Чивеприкри + - Чивики + - Чивикия + - Чивишир + - Чивракак + - Чивракри + - Чиврашер + - Чиврепапар + - Чиксакра + - Чиксихебакра + - Крабекрабапа + - Крачикрисре + - Кракраври + - Кракратия + - Кракретипи + - Кракрих + - Кракрити + - Крахайяк + - Крахеки + - Крахраши + - Крахрехи + - Крарететек + - Кракапепер + - Кракаскеба + - Кракаврат + - Кракехри + - Кракирер + - Кракрашиски + - Кракрехра + - Кракрискипир + - Крапипака + - Крапирийайа + - Крапрати + - Крапрескер + - Краресраксе + - Краревекса + - Крашахрешри + - Крашехик + - Краскараске + - Краскатрапра + - Краскикрете + - Краскиви + - Крататрихи + - Кратикр + - Кратикрекрек + - Кратипрар + - Кратрехра + - Кравехри + - Краврикра + - Краврисрер + - Кравритири + - Краврияяк + - Крайаререт + - Крейакрер + - Краяпрапрар + - Краярипипи + - Крайайарикри + - Кребакса + - Креберита + - Кречавр + - Кречесрерар + - Кречичевре + - Крекрабик + - Крекрири + - Крехепапепе + - Крехерики + - Кехекси + - Крипава + - Креравер + - Крекатри + - Крекавекса + - Крекеки + - Крекетри + - Крекискея + - Крекитати + - Крекрепки + - Крекривавак + - Чепахрипа + - Крепеж + - Крепекрекрет + - Крепиба + - Крепихри + - Крепреправри + - Креракси + - Керехит + - Крешкрапа + - Крескекри + - Крескетита + - Крескихра + - Кресрипепет + - Кретареврипа + - Кретебе + - Критхра + - Кретерарар + - Кретибехихи + - Кретрапи + - Кретрекерара + - Кретрепепет + - Кревапир + - Кревиксесра + - Крексахава + - Крексепапакр + - Крибаврибиби + - Крибитрат + - Кричекрит + - Кричипи + - Крикрапре + - Крикрирар + - Крисре + - Критика + - Крихевар + - Крихатрикре + - Крикатрикре + - Крикебепапа + - Крикекат + - Крикешивра + - Крикишеский + - Крикрата + - Крикретеваби + - Крикрикретри + - Крипичахи + - Крипришапа + - Крирачи + - Крикратра + - Кришаве + - Крискахе + - Крисрехапахи + - Криташатри + - Критрабибиру + - Критрисрир + - Критрикри + - Кривакрити + - Кривакрив + - Криваясра + - Кривракре + - Криврекри + - Криксикаске + - Хабавак + - Хабепа + - Хабикикака + - Хабикрихита + - Хачабэ + - Хачехекре + - Хаческе + - Хакреха + - Хакрер + - Хахебапа + - Хахекреча + - Хаеха + - Хахетасрайк + - Хахихатрар + - Хахихасрече + - Хахрипраксакса + - Хакепа + - Хакирер + - Хакраксиксит + - Хакрекик + - Хакриксексерет + - Хапачарепри + - Хапакре + - Хапахри + - Хапети + - Хапитахри + - Гапреска + - Хаприхриша + - Харебаби + - Харексивеве + - Харикракре + - Хариришеска + - Хариши + - Хашакракрак + - Хашеракри + - Хашепраха + - Хаскаритепра + - Хаскетер + - Хаскибеят + - Хаскикретете + - Хасрабаке + - Хасракритехе + - Хасрекитра + - Хасрекрер + - Хасрихакса + - Хасрипешар + - Хатабивет + - Гававресра + - Хавиксе + - Гаврики + - Гаврепекр + - Хавретри + - Хавричата + - Хаксикекер + - Хаяхриякса + - Хебахреврир + - Гебапри + - Хебихит + - Хебикратахе + - Хечхешикси + - Хечетра + - Хечевакрер + - Хекраба + - Хекраби + - Гекреврик + - Хекриреча + - Хехере + - Хехискитри + - Храпик + - Хехрепри + - Хехрескаскат + - Хехрикра + - Хекикрекса + - Хекраср + - Хекрекичре + - Хекреракре + - Хекрихети + - Хепевивикрик + - Хепраскибебе + - Хеприврескер + - Хеприксашери + - Херекрериви + - Хереририкет + - Херихейакри + - Херипа + - Херипрека + - Хешахравети + - Хешепевик + - Хескашати + - Хескаксикс + - Хескеррепет + - Хескешишит + - Хескискер + - Гесрепахри + - Гесрески + - Хетахетри + - Хетихехеприт + - Хетраре + - Хетревихра + - Хетрихахри + - Хетриребиби + - Хевабабакер + - Хеветихре + - Хевексиксик + - Хевирикрек + - Хевревипа + - Хеврексир + - Хеврихар + - Хевраравит + - Хевривривр + - Хексасрикхи + - Хексаксипри + - Хейашипре + - Хибашер + - Хиберакрар + - Хибесраче + - Хикрапре + - Хикрекрахера + - Хикретеба + - Хикриба + - Хихача + - Хихепапак + - Хихихитр + - Хихирет + - Хихревра + - Хикикри + - Хикитритрир + - Хикракре + - Хикрепа + - Хипави + - Гипитратрак + - Хирепабе + - Хиричачар + - Хиричейа + - Хирикрабакри + - Хирикраске + - Хирикревитри + - Хирихрачи + - Хирихраски + - Хирихраксаксат + - Хирикати + - Хирикрететет + - Хирикрикра + - Хирипебахре + - Хирипехиксикси + - Хирипер + - Хирипесри + - Хирипета + - Хирипевивик + - Хирирахет + - Хирирекревре + - Хирисихра + - Хирискева + - Хиритапатити + - Хиритекер + - Хиритрари + - Хиритраксе + - Хиритрикри + - Хиривававри + - Хиривиске + - Хирививр + - Хиривра + - Хириврари + - Хириврексита + - Хиривриври + - Хириксашахре + - Хириксикрайа + - Хишаве + - Хишешритра + - Хишискахра + - Хишиврек + - Хискакекра + - Хискатетек + - Хискекрече + - Хискева + - Хискисраре + - Хисракикит + - Хисратрепепе + - Хитава + - Хитереха + - Хитратра + - Хивакрат + - Хиватрик + - Хиваяр + - Хиврабабар + - Хиврарир + - Хиксакр + - Хиксашапе + - Хиксашетити + - Хиксекрасра + - Хиксепи + - Хиксерипе + - Хиякра + - Грабатит + - Храбакса + - Храбике + - Храбипре + - Гракрабикси + - Хракрехра + - Храхепививи + - Храхерикрекси + - Храхикрер + - Храхракахре + - Храхраска + - Храхрасребе + - Храхрехек + - Храхритра + - Хракачабекси + - Хракаререк + - Хракеши + - Хракиски + - Хракретри + - Хракричапри + - Хракриши + - Храпавек + - Храпикра + - Храпрабер + - Храпрапрече + - Храрачи + - Храрахрар + - Храрекри + - Харикриксаби + - Храришер + - Храшепа + - Храшибисра + - Храшихир + - Храсхикавекса + - Храскетре + - Храскибе + - Храскикексакса + - Храсрекрикси + - Храсревракси + - Храврехра + - Хрататрасре + - Хратайати + - Хратере + - Хратрачари + - Хратреки + - Хравахиче + - Хравапеки + - Храваскеки + - Гравеска + - Хравихре + - Храврахейя + - Храврекра + - Храксехрехири + - Храксекребе + - Храксичебар + - Храксивививет + - Храйакха + - Храяврар + - Хребавихра + - Хребетра + - Хречаксер + - Хрекрети + - Хрекрихахар + - Хрехикрекрер + - Хрехресра + - Хрекетра + - Хрекративи + - Хрепихепре + - Хрепипаке + - Хрерасри + - Хреравексе + - Хререпрехир + - Хрериба + - Хрешахетити + - Хрешехакаке + - Хрескапахре + - Хресракакре + - Хресрекхике + - Хресрекаша + - Хретите + - Хретрекре + - Хретрески + - Хретреври + - Хреврехе + - Хрексакекек + - Хрексатика + - Хрексебе + - Хрибахар + - Хрибехрати + - Хрибипе + - Хричиски + - Хрихевриврир + - Хрихитра + - Хрихракихри + - Хрихречар + - Хрикичекра + - Хрикискате + - Хриприкра + - Хририкра + - Хриресри + - Хришабар + - Хришаксеяр + - Хришехрахи + - Хрисхексиксик + - Хришьякра + - Хрисхипете + - Хрискакрекра + - Хрискахеба + - Хрискари + - Гришкеветаби + - Хрискекса + - Хрискихете + - Хрискири + - Хрисрекхи + - Хрисрера + - Хрисрири + - Хрисришапа + - Хришривавар + - Хритачекри + - Хритекса + - Хритихри + - Хритихра + - Хритикер + - Хритизрат + - Хривакса + - Хриврипира + - Хриксебабатир + - Хриксеби + - Хриксихри + - Хриксива + - Хрияхрия + - Кабави + - Кабаксеша + - Качаске + - Качай + - Качихе + - Какрахеша + - Кахакити + - Кахаксипа + - Кахепапатрет + - Кахики + - Кахише + - Кахракрекрет + - Кахратрер + - Кахриче + - Кахрикра + - Какатахраре + - Какеби + - Какихрасри + - Капакриска + - Капракр + - Капрашер + - Капрехрака + - Капрери + - Каракахре + - Карапихе + - Кашайя + - Кашипри + - Каскачеке + - Каскиврер + - Касрабакр + - Касракапре + - Касраксар + - Касресрейайа + - Касриврата + - Катаскер + - Катехрейайа + - Катетрик + - Катексаксак + - Катрехре + - Кавабабат + - Кавашишит + - Кавихрат + - Кавитратрак + - Кавратеврия + - Каксекри + - Каксетавре + - Каксетретрет + - Каярарат + - Каяврик + - Кайакси + - Кебасревикри + - Кечатра + - Кечаврепри + - Кекресра + - Кекреврир + - Кекриха + - Кекрикра + - Кекрикса + - Кехаве + - Кехитихача + - Кехивехрихри + - Кехрачек + - Кехрехи + - Кекабибит + - Кекахи + - Кекахрекси + - Кекарар + - Кекасритри + - Кекебаписра + - Кекебибиврер + - Кекекахихи + - Кекрише + - Кепетре + - Кепевра + - Кепраки + - Кепрепара + - Керахачече + - Кератра + - Керихи + - Керискехисри + - Кешеваскива + - Кешика + - Кешити + - Кескарахита + - Кетескескет + - Кетескета + - Кетрибабар + - Кетрибипи + - Кеватра + - Кеватре + - Кевеки + - Кевешатра + - Кевешики + - Кевесракс + - Кевекса + - Кевикаксе + - Кевиври + - Кеврарери + - Кеврахрит + - Кексаприприк + - Кексерава + - Кексешакха + - Кексисрепе + - Кейарарак + - Кибевакрак + - Кибеячичи + - Кибипава + - Кичитра + - Кикричева + - Кикрикрик + - Кихаресра + - Кихия + - Кихрексексевек + - Кихриприра + - Кикеке + - Кикекситретре + - Кикрабикити + - Кикрехи + - Кикрекрат + - Кикрери + - Кикретрапа + - Кикревавака + - Кикривикар + - Кипиваксе + - Кипрея + - Кирече + - Киресрисрир + - Киреви + - Кирибапра + - Кирибаприв + - Киричакетра + - Киричишка + - Кирикракакри + - Кириерек + - Кирирепи + - Киригревиче + - Кирикачиха + - Кирикатрики + - Кириковри + - Кирикракра + - Кирипаби + - Кирипахритри + - Кириприхри + - Кирирахиксера + - Кирирети + - Кириври + - Киришававар + - Киришекет + - Киритеска + - Киритрача + - Киритрепер + - Киритрияпри + - Киривипе + - Киривривепи + - Кириксатичер + - Кириксепек + - Кириксикра + - Кишахапатре + - Кишехакака + - Кискашапра + - Кискехра + - Кискичре + - Кискипри + - Китрака + - Китревеври + - Киврахерат + - Киврахи + - Кивраше + - Киврера + - Кивретракеке + - Киксатрит + - Киксичетити + - Киксичрар + - Киксивра + - Крабарея + - Крабехерере + - Крачехре + - Крачеяба + - Кракрирарак + - Крахебикаба + - Крахечикри + - Крахиха + - Крахракри + - Крахаририк + - Крахрепекси + - Крахрепри + - Крарерар + - Кракахра + - Кракрекиски + - Кракрепапат + - Крапари + - Крапиби + - Крапитахри + - Крапреве + - Краприсрисре + - Краприврар + - Краракрикрит + - Крарекри + - Крарикри + - Крашатахи + - Крашавекра + - Краскисретра + - Красрави + - Красрипапат + - Кратачаври + - Кратаре + - Кратикепи + - Кравеке + - Кравраксевеве + - Краврепачи + - Краврикра + - Краксаби + - Краксасрир + - Краякрит + - Кребекри + - Кребибикре + - Кребиви + - Крекхахе + - Кречепракса + - Крекхититик + - Крекрасхепра + - Крекравикха + - Крекрери + - Крехекихит + - Крехракакре + - Крехрита + - Крехрикса + - Крекакречи + - Крекебета + - Крекракри + - Крекрапри + - Крекришаски + - Крепевиске + - Крепитир + - Крепия + - Крепостная + - Крепреташа + - Креприврески + - Кререрисри + - Кререксескева + - Крескавиха + - Кресрепаксексе + - Кретахре + - Кретави + - Кретепапатир + - Кревавике + - Кревешер + - Кревесрисрит + - Креврексер + - Кревривриске + - Крексайа + - Крейакрепе + - Крейятрири + - Крейяви + - Крибеши + - Крибетиби + - Крибексиксик + - Крибирекри + - Крибивра + - Кричакехра + - Крикрава + - Крикрирепе + - Крикритака + - Крихаприр + - Крихесре + - Крихексарава + - Крихрескер + - Крикапепек + - Крикатиксер + - Крикесриксикси + - Крикрашар + - Крикрикесре + - Крипахри + - Крипритри + - Криприприт + - Кририве + - Кришебириба + - Кришебите + - Кришекрапи + - Крискексер + - Крисрибарири + - Крисришер + - Критахе + - Критарек + - Критечихи + - Критиха + - Критикса + - Критресра + - Критривревра + - Криваксисипак + - Криврипри + - Криксехраски + - Криксесрепри + - Криксирар + - Пабаскаре + - Пабекрекхи + - Пабиксашаха + - Пачатак + - Пашетра + - Пачикри + - Пакхисра + - Пакракхисри + - Пакрахеха + - Пахрекрахати + - Пахриксеке + - Пакаририхрек + - Пакашекса + - Пакаскеша + - Пакавреваха + - Пакичача + - Пакиши + - Пакиврапа + - Пакракрасра + - Пакрашрер + - Пакрава + - Пакресра + - Пакрексетихе + - Пакрика + - Папаскакса + - Папавиврик + - Папешехер + - Папивахре + - Папратракики + - Пареракре + - Пашаскак + - Пашеврат + - Паскасретити + - Паскиске + - Паскиксексек + - Пасрабикра + - Пасраприкепа + - Пасрехе + - Пасрепратри + - Патапривра + - Патесратеке + - Патексет + - Патресхе + - Паваба + - Паврапиши + - Паксаречак + - Паксекри + - Пакситиреки + - Пайахреши + - Пебакрикрик + - Пебате + - Пебескахепре + - Пебеврави + - Пебибек + - Печака + - Печекрипи + - Печетрайа + - Печикреке + - Печиврар + - Пекрача + - Пекритрасре + - Пехасра + - Пеха + - Пехисресрер + - Пхеракреша + - Пехрихиврея + - Пехрива + - Пекекрикрик + - Пекрава + - Пекрая + - Пекрепитри + - Пепехри + - Пепексекака + - Пепирер + - Пеписка + - Пепитре + - Пепреба + - Пепреха + - Пепрерар + - Пепресри + - Пепресрикке + - Пепревахе + - Пераксатрикри + - Перебекрате + - Периби + - Перисрехри + - Пешипаха + - Пескаваксек + - Пескехик + - Пескикитир + - Песраски + - Песратра + - Песравре + - Песрайа + - Песретететат + - Песрикре + - Песритра + - Петеврит + - Петихри + - Петиврат + - Петрипетете + - Певекрисская + - Певера + - Певетиска + - Певтрепри + - Певикиси + - Певипрак + - Певитетекрак + - Певиксихре + - Певрачер + - Певракрат + - Певрехита + - Пексепрапрат + - Пексихибе + - Пибехра + - Пибекрит + - Пибетиски + - Пибибипа + - Пибикек + - Пичехи + - Пичета + - Пичикрев + - Пичикрар + - Пикреча + - Пихасресрет + - Пихеки + - Пихепа + - Пихибеска + - Пихичар + - Пихитетек + - Пихреби + - Пихрешапибе + - Пихретитир + - Пикаскара + - Пикаксер + - Пикрехрека + - Пикрипрепрер + - Пипаша + - Пипаксакрикри + - Пипесресри + - Пиприбепри + - Пиприсхикси + - Пираксипрар + - Пирекрехи + - Пиревеверик + - Пирибакса + - Пирибиприски + - Пиричивапи + - Пирикра + - Пирикракра + - Пирихепре + - Пирихичати + - Пирикретра + - Пирикритере + - Пирикривра + - Пирипаба + - Пирипакрипри + - Пирипихрише + - Пирипит + - Пирипитри + - Пирипрабепа + - Пириреприсхе + - Пиририке + - Пирискатеке + - Пирискики + - Пирисретива + - Пиритавр + - Пиритихре + - Пиритратаври + - Пиритрекрара + - Пиритрек + - Пиривакиксакса + - Пиривикрар + - Пириксакса + - Пириксаксевр + - Пириякриби + - Пирияпесра + - Пишакаксет + - Пишаштепи + - Пишавраска + - Пишевра + - Пискипре + - Писрашек + - Писрипре + - Писриксекете + - Питиби + - Питрапривр + - Питраскече + - Питратеби + - Питреврейайа + - Питрипривра + - Питриске + - Пивака + - Пивататакир + - Пивекриксерри + - Пивеяси + - Пивракеви + - Пивракипре + - Пивракитибе + - Пиврашир + - Пивриратер + - Пивритатабет + - Пиксерити + - Пиксикха + - Прабипрепи + - Прабикхиксакса + - Прабиксите + - Прачететер + - Прачиба + - Пракрахриве + - Прахихрака + - Прахисрек + - Прахитриви + - Прахребесра + - Прахрипебаба + - Прахривапапа + - Пракискескет + - Пракрихри + - Пракрипи + - Прапикресри + - Прапрексексек + - Прарачакси + - Прарекрахи + - Прарикра + - Прарипрака + - Прашикриби + - Прашивепапа + - Прасхикситата + - Пратакра + - Пратерахира + - Пратреки + - Правашипебе + - Правесрисрит + - Правиксихе + - Правраши + - Праврепи + - Праврикрир + - Правритрер + - Праксахир + - Праксекхаксере + - Праксекракрат + - Праксевитетра + - Праксексе + - Праксичи + - Праяраксир + - Пребавр + - Пречакавра + - Прехавр + - Прекратетет + - Прехерихра + - Прехививеве + - Прехракриска + - Прехриби + - Прекакра + - Прекая + - Прекипревер + - Прекирар + - Препахихибар + - Препетрат + - Препиксихрапа + - Препрете + - Прерететре + - Пререксике + - Прешер + - Пресрави + - Пресрере + - Пресрискипре + - Претере + - Прететисрир + - Претексипрар + - Претихре + - Претракре + - Претрике + - Претрисра + - Превакре + - Превекрере + - Превесрити + - Превети + - Превикрахи + - Превикри + - Превритраре + - Превриви + - Прексатрар + - Прексесхе + - Прексикрак + - Прейатра + - Прибатретрек + - Прибавибаче + - Прибиривава + - Прибиврит + - Причейайат + - Прикрапапат + - Прикрихи + - Прихаври + - Прихтия + - Прихречаби + - Прикебикси + - Прикрича + - Прикрипи + - Прикрипикики + - Прикриши + - Припахия + - Припаврепри + - Припиксиксик + - Припраске + - Припреха + - Приприпепек + - Приракре + - Прирашер + - Прираске + - Прирепар + - Пририхи + - Пришехе + - Присхепаксикси + - Пришитарабе + - Прискаке + - Присракси + - Притабаски + - Притакир + - Притекра + - Притехавиви + - Притепа + - Притихахи + - Приваяк + - Привипекре + - Приврихарейа + - Приксараке + - Приксепа + - Приксетре + - Приксиврекри + - Прияпрар + - Рабехия + - Рабепарере + - Раберешебе + - Рабише + - Ракхаре + - Ракраба + - Ракракека + - Ракракрехери + - Рахавевахи + - Рахеврипеши + - Рахибебетат + - Рахиратата + - Рахипе + - Рахраба + - Рахрекри + - Рахреяври + - Рахритретрек + - Ракекикитрир + - Ракикрекрек + - Ракипихрат + - Ракреприкри + - Рапивриврере + - Рарахака + - Раретрийа + - Рашешат + - Рашшеври + - Рашихретра + - Расхикрехре + - Расрибер + - Ратабибихет + - Ратесрапрар + - Ратитрик + - Ратрави + - Ратреби + - Ратрейяк + - Ратрихрикри + - Равечер + - Равепекси + - Равихрака + - Равиксексебет + - Равришеке + - Равриврикри + - Раксагет + - Раксетапа + - Раксет + - Раксевахре + - Райачета + - Ребакре + - Ребебикики + - Ребикрак + - Ребипи + - Ребисрийайа + - Ребитебит + - Речепер + - Рекраскехе + - Рекрекарири + - Рехепипибет + - Рехресхесхет + - Рехрикрик + - Рехрире + - Рекаскак + - Рекракха + - Рекрипрепрек + - Репече + - Повторить + - Репексисхе + - Репивешери + - Репиврасра + - Реприхри + - Репришик + - Рерахат + - Ререба + - Рериревра + - Рескебексексе + - Рескехат + - Рескивавак + - Рескиксибира + - Ресрекракрат + - Ресретра + - Ресрихрепеке + - Ресриске + - Ресриксиха + - Ретаскахри + - Ретававатет + - Ретавек + - Ретекха + - Ретеврак + - Ретрете + - Ретрексехри + - Ретрипритри + - Ревасри + - Реветитипрет + - Ревикребия + - Реврипра + - Ревритрер + - Рексабаска + - Рексатакса + - Рибатр + - Рибебахихи + - Рибехаши + - Рибихева + - Рикрехаска + - Рихава + - Рихаксикре + - Рихекрекрек + - Ригипапар + - Рихрачепи + - Рихраватир + - Рикевра + - Рикипа + - Рикискапипи + - Рикивревра + - Рикрати + - Рикрепа + - Рикрераврибе + - Рипибиврир + - Рипихрепапа + - Рипрешикре + - Риреви + - Ририбебе + - Ририбеска + - Риричеше + - Ририкрехра + - Ририкрити + - Ририхари + - Ририхепрески + - Ририхит + - Ририхиксир + - Ририкаврире + - Ририкеве + - Ририкрекаска + - Ририкрексети + - Ририпаша + - Ририпрапи + - Ририрарера + - Ририхача + - Риришихи + - Ририскатре + - Ририскихе + - Ририскири + - Ририсравра + - Риритихит + - Риритискаба + - Рирититахи + - Риритреби + - Риритрексексек + - Риривихрар + - Ририврешия + - Риривретра + - Ририяскихе + - Ришакрикер + - Ришаскар + - Ришепи + - Рискаврер + - Рискекар + - Рискеприба + - Рискесре + - Рискирасре + - Рискискеха + - Рисратретете + - Рисратрихи + - Рисревре + - Рисритракре + - Рисривире + - Ритаха + - Ритахрекра + - Ритекракапре + - Ритева + - Ритресракри + - Ритрихе + - Ритрирекра + - Ритришикси + - Ривретрипапа + - Ривривриши + - Риксахритри + - Риксатерет + - Риксекре + - Риксепапат + - Риксети + - Риксибихри + - Риксискипри + - Риксиксаврат + - Рияхрат + - Рияпаре + - Риясри + - Шабириври + - Шачикир + - Шакревак + - Шакревраке + - Шахапрахри + - Шахаксак + - Шахекет + - Шахескате + - Шахексер + - Шахрашер + - Шахрати + - Шахрипракри + - Шакрирабе + - Шакричар + - шапесрикака + - Шапиби + - Шапретра + - Шарапире + - Шаресрат + - Шарихесрехи + - Шарихре + - Шарипива + - Шаритрихри + - Шашишибе + - Шашисрави + - Шаскехепре + - Шаскепахре + - Шаскитра + - Шатретакси + - Шаваприка + - Шавашакри + - шавексексати + - Шавиша + - Шавривр + - Шаксепачи + - Шайакрак + - Шебеврирер + - Шебипескикса + - Шебива + - Шечиабаба + - Схекраприкре + - Шехибе + - Шехраяшар + - Шехребит + - Шехреха + - Шехреске + - Шехреяр + - Шерискар + - Шекаке + - Шекаксри + - Шекаписки + - Шекеска + - Шекикакат + - Шекрира + - Шепечич + - Шепешра + - Шепескик + - Шепетрати + - Шепеврер + - Шепикитепа + - Шепрекритри + - Шепрескете + - Шерати + - Шерикре + - Шерискахе + - Шешасри + - Шешихеша + - Шесрабик + - Шесрачиски + - Шешрихит + - Шетачавре + - Шетасре + - Шетикитата + - Шетракрар + - Шетриха + - Шеваби + - Шевекрепи + - Шеврахе + - Шевреври + - Шеврия + - Шексачи + - Схексахрехрет + - Схексекра + - Шексишит + - Шексивир + - Шейаша + - Шибатра + - Шибекрека + - Шибекрекрет + - шибиврибе + - Шичебебет + - Шичеча + - Шишеририт + - Шичикракре + - Шикрачи + - Шихебихре + - шихекрикрик + - Шихишар + - Шихиска + - Шихрапикра + - Шихрехепри + - Шихребе + - Шихревихр + - Шикечачат + - Шикешекра + - Шикикиври + - Шикракси + - шикрехре + - Шикрепрер + - Шипехабаске + - Шипикреки + - Шипипапаксак + - Шипратат + - Шиприки + - Шипритраха + - Ширибепит + - Шисришери + - Шитехи + - шитексихре + - Шитибик + - Шитраврекра + - Шивабабат + - Шивексехра + - Шивив + - Шиврахеки + - Шивраяк + - Шивребапра + - Шиврепа + - Шиксая + - Сикибавипа + - Сикибисриче + - Сикикхапе + - Сикичапи + - Сикичекаша + - Сикичияски + - Сикикракре + - Сикикрекса + - Сикикрикси + - Сикикетрайя + - Сикикрасре + - Сикикреке + - Сикипекрипре + - Сикипетр + - Сикипрасраке + - Сикиприра + - Сикирехивре + - Сикирепрери + - Сикискакра + - Сикискевавака + - Сикискит + - Сикисрабер + - Сикисрекакат + - Сикишреша + - Сикитаски + - Сикитевр + - Сикитикре + - Сикитрашат + - Сикитрихрепи + - Сикитрипре + - Сикивата + - Сикивескар + - Сикивра + - Сикиврисрита + - Сикивритири + - Сикиксикребар + - Сирибакраче + - Сирибетраска + - Сирибикра + - Сиричарабе + - Сирихаксер + - Сирихикрипа + - Сирихихат + - Сирихихапа + - Сирикаски + - Сирикатат + - Сирипепахе + - Сирипрахра + - Сирипрехави + - Сирипретеске + - Сирираки + - Сирираски + - Сирирекеба + - Сириретер + - Сиришатаче + - Сиришехевр + - Сирискесраве + - Сирискихипе + - Сирисрекиви + - Сирисретр + - Сиритеч + - Сиритрахе + - Сиритриксет + - Сириврекехри + - Сиривретатре + - Скабаресре + - Скабехрикра + - Скабипр + - Скакхабета + - Скачиби + - Скачихив + - Скачиша + - Скакраксаксак + - Скакрехрапре + - Скакрикхисре + - Скакриксиче + - Скахипевры + - Скахиксахехе + - Скахрача + - Скахравриве + - Скахреве + - Скагриврепра + - Скакаша + - Скакава + - Скакавевет + - Скакескаскат + - Скакеврак + - Скапапе + - Скапаприт + - Скаребихира + - Скаречак + - Скарепиши + - Скарексапрети + - Скашир + - Скатерарар + - Скатетасре + - Скатричебе + - Скаварерахри + - Скавикрекрер + - Скавитетекси + - Скаврекрети + - Скавритр + - Скаксисракре + - Скайабер + - Скайатепра + - Скебапрара + - Скечикреба + - Скекрачекер + - Скекраприр + - Скекрита + - Скехевреш + - Скехичитра + - Скехип + - Скекапра + - Скекекритра + - Скекетир + - Скекрабабе + - Скекраксер + - Скекретаке + - Скепаре + - Скепитетексик + - Скерипехит + - Скери + - Скериприбихе + - Скериска + - Скешиките + - Скескахе + - Скескибиши + - Скесрисрер + - Скетаха + - Скитавры + - Скеташакра + - Скетатретрек + - Скетаври + - Скитепечи + - Скетивапапа + - Скетивре + - Скетраривава + - Скетрекрепе + - Скеваскискик + - Скевакси + - Скеврабари + - Скеврахрепа + - Скеврекра + - Скеврехраки + - Скеврихрейв + - Скексипи + - Скексиксеска + - Скибаккрит + - Скибапраксе + - Скибеврат + - Скибираври + - Скибита + - Скичаби + - Скичапипит + - Скичебир + - Скикхиске + - Скикрераскар + - Скикрихихе + - Скихекар + - Скихейаскир + - Скихричер + - Скикескескет + - Скикрахр + - Скикрапрара + - Скикриша + - Скипашир + - Скипечиши + - Скипрапра + - Скипрарипи + - Скипрев + - Скипревивик + - Скирипипик + - Скишачи + - Скишапехе + - Скискеваски + - Скискевририр + - Скисрекекра + - Скитраки + - Скитрепи + - Скитреске + - Скивекри + - Скивибик + - Скивиска + - Скиврихри + - Скивривреки + - Скиксара + - Скиксаретер + - Скиксетихечи + - Скиксиха + - Скиксисрапре + - Срабавречи + - Срабисревеке + - Срачавича + - Сракраре + - Срахахихир + - Срахихрипра + - Срахрияр + - Сракипахехе + - Сракиререт + - Сракракриши + - Срапахре + - Срапикретра + - Сраприбекехи + - Срарекепар + - Срарибески + - Шрарипрер + - Шрариша + - Шрашача + - Шрашакри + - Срашаксата + - Шрашикирир + - Сраскабикри + - Сраскечипе + - Сраскехрери + - Сраскекепива + - Сраскекисра + - Сраскиба + - Сраскишар + - Срасривате + - Сратепре + - Сратеве + - Сратикре + - Сратихи + - Сратики + - Сратраксиксир + - Сратрике + - Сравечачар + - Сраврапапат + - Сраксапе + - Сраксепир + - Сраксескикри + - Сребаскаскар + - Сребекрир + - Сребекраби + - Сребикрир + - Сречепе + - Срекравра + - Срекравре + - Срекрисре + - Срехетахи + - Срехикрар + - Срехиваври + - Срехрехиске + - Срекакрексеве + - Срекрепрексе + - Срекрикра + - Срекритит + - Срепесрекси + - Срепипритри + - Среписрасре + - Срепрекра + - Срепресхе + - Среракрикрар + - Среревре + - Срерихра + - Грешебакики + - Срешескикси + - Срешипрари + - Срескичи + - Срескикре + - Сресрахапи + - Сресрекикит + - Сресрикре + - Сретасресри + - Сретишашак + - Сретратикрир + - Сревесра + - Сревесриксари + - Сревивре + - Сревраксипи + - Сревреяк + - Срексатрева + - Срексикрата + - Срексискахехе + - Срибавар + - Срибебе + - Срибиреке + - Сричепи + - Сричивекака + - Срикревепа + - Шрихешекси + - Шрихраеврир + - Шрихракратри + - Шрихрекекси + - Шрикасреша + - Срикирики + - Срикратра + - Срипаба + - Шрипахебеври + - Шрипахре + - Сриприкача + - Шриракрит + - Шририхре + - Шрипре + - Срисхейаксексе + - Шришибикри + - Срисхикатре + - Срискикрикси + - Срискихра + - Шрискиша + - Срисратреба + - Срисребепи + - Срисрете + - Сритаскер + - Сритекрикрир + - Сритескабе + - Сритипребе + - Сритиске + - Сритрапаше + - Сритриха + - Сритрипир + - Шриваке + - Шривакса + - Сривекатер + - Шривишра + - Шриврасрер + - Сриврат + - Сривририр + - Сриксакрабебе + - Шриксивея + - Шрияпир + - Таабавриврир + - Таабекситаски + - Таабипрет + - Таахабе + - Таакрар + - Таакрекра + - Таакрипи + - Таакрисретри + - Таахахре + - Таахекрета + - Таахерарак + - Таахиха + - Таахиска + - Таахиври + - Таахреке + - Таахришепри + - Таакаева + - Таакапа + - Таакексискер + - Таакраба + - Таапавекик + - Таапекра + - Таапикаси + - Таапипихаре + - Таапиши + - Таапрачикри + - Тааприврапре + - Таарекра + - Таарешекра + - Таашаксикир + - Таашебити + - Тааскатир + - Тааскевева + - Тааскитеки + - Таасребикр + - Таасрехрира + - Таасрикикит + - Таасритар + - Таатаксе + - Таатевасре + - Таатихра + - Таатрат + - Таатрививит + - Таавапе + - Таававрекси + - Тааврерапава + - Таавретри + - Таавриви + - Тааксекакат + - Тааксесрит + - Тааксикра + - Тааяраше + - Теебапресри + - Тибечия + - Тибивричи + - Тичакраха + - Течексе + - Тичихакри + - Теекрекрихре + - Текрепески + - Теекретри + - Теекревретре + - Тихапрапрар + - Тихери + - Тиграхар + - Теехрепескир + - Теехрирепипи + - Теекахикрави + - Теекепраксахе + - Текипра + - Теепракриври + - Тееприкексикси + - Терахехер + - Теерекритри + - Тиривияра + - Теескапесри + - Тискебекрар + - Теесрасракса + - Тизреча + - Теесретрир + - Теесрибиба + - Теетахра + - Теетикси + - Теетрасрер + - Тетрескапри + - Теевахихивик + - Тееваприпрар + - Тивепа + - Теевравреске + - Теексакетити + - Теексера + - Теексихрир + - Тиякра + - Тибаскак + - Тибасравава + - Тибихи + - Тибиксита + - Тическивре + - Тичетритрир + - Тичибер + - Тикратевипе + - Тихикхискети + - Тихитр + - Тихресревиви + - Тихрикакар + - Тикара + - Тикекрибе + - Тикекитата + - Тикрасра + - Тикреврихр + - Типапе + - Типекрихрипа + - Типетрипе + - Типикре + - Типреритаха + - Типресрита + - Типрититик + - Тирепер + - Тирибавр + - Тириберихе + - Тирибикехе + - Тирибиракеке + - Тиричера + - Тирихайя + - Тирихи + - Тирихра + - Тирихретрир + - Тирихририк + - Тирикетече + - Тирикевиха + - Тирикихрер + - Тирикрачир + - Тирикрасри + - Тирипечапре + - Тирипратра + - Тирипрексер + - Тирирахи + - Тирирапахре + - Тирирарат + - Тирирексипрер + - Тирисрехит + - Тирисриб + - Тиритетасра + - Тиритрекси + - Тиритривевер + - Тиривеши + - Тиривихати + - Тиривребире + - Тириксахири + - Тириксебайяр + - Тириксетатак + - Тириксишиски + - Тирияскача + - Тишетракака + - Тискашеское + - Тискевритре + - Тискикрар + - Тисрапрет + - Тисрашет + - Тисрешишит + - Тисреска + - Тисрич + - Тисрискир + - Тисривекса + - Титескесек + - Титрабетити + - Титретепека + - Тиварахи + - Тивекра + - Тивекри + - Тивепа + - Тивевипе + - Тивекса + - Тивискаскак + - Тиксапипри + - Тиксетритрик + - Тиксикекра + - Тиксититик + - Тиксиксесрер + - Тияпрак + - Тияскаскат + - Трабари + - Трабисрер + - Тракрекрехри + - Трекрейк + - Трахехетир + - Трахекее + - Трахевреске + - Трахрепа + - Трахреврава + - Тракехре + - Тракрапра + - Тракритеврер + - Трапавриврир + - Трарескире + - Трасхете + - Трасхеве + - Трашевепри + - Трасхипаксе + - Травески + - Трасреве + - Тратибекака + - Тратихрер + - Тратрави + - Тратраксиксик + - Тратриби + - Траваксески + - Траветретрек + - Траврарипепе + - Траврибесре + - Траксипи + - Траксипрер + - Требахе + - Требиревер + - Требишивава + - Требитрак + - Тречакра + - Тречекрасри + - Трехсре + - Тречесрекре + - Трекрехек + - Трехиксапри + - Трехракрепость + - Трехрипра + - Трекатри + - Трекатрикре + - Трекавикси + - Трекаврики + - Трекебети + - Трекески + - Трекетибита + - Трекетра + - Трекибабат + - Трепаке + - Трепрабивеве + - Трепрахрепи + - Трепебра + - Трепрехет + - Теревипек + - Трешепра + - Трешибар + - Трешипешка + - Трескари + - Трескетара + - Трескискакир + - Тресракрир + - Тресраскер + - Тресратракре + - Тресравритре + - Тресреба + - Тресрихиври + - Третапра + - Третрахри + - Третреске + - Третрикикха + - Тревабихра + - Тревепа + - Треветретрек + - Тревикра + - Трексатри + - Трексавра + - Трексетри + - Трексирикрара + - Трейакра + - Трейаксихехе + - Трибексексет + - Трибирекри + - Трикхакрипре + - Трихиски + - Трикракри + - Трикрекапа + - Трикотаж + - Трихавевер + - Трихера + - Тригексисра + - Трихикрек + - Трихитрар + - Трипесрише + - Трипевер + - Трипракракси + - Трипракри + - Трирахекри + - Трипраксар + - Трирече + - Тришакретра + - Тришекрексир + - Тришепи + - Тришисрар + - Трискаври + - Трискетир + - Триският + - Трисрахири + - Трисревр + - Трисрисри + - Трисриприпер + - Трисрит + - Тритетре + - Тритракепре + - Тритрихатри + - Тритрискари + - Триврискеки + - Тривритипипи + - Триврияк + - Триксихахар + - Трикситри + - Трияшекики + - Вабахекре + - Вабахрабебе + - Вабебир + - Вабехетр + - Вабетрахача + - Вабиври + - Вачахрирере + - Вачаври + - Вачекигри + - Вакхикратата + - Вачиске + - Вацраки + - Вацребихи + - Вакрипра + - Вахапапашек + - Вахапракс + - Вахаскер + - Вахерекики + - Вахибепрек + - Вахивихахе + - Вакахава + - Вакеча + - Вакевиксикси + - Вакикеприпра + - Вапейяк + - Вапикевра + - Вапиприб + - Вапракак + - Ваприсра + - Ваприташа + - Варебитакр + - Варекрикреки + - Вашакрик + - Васкекситити + - Васкипрекси + - Васкиври + - Васкияхи + - Васраприкре + - Васреви + - Ватракраксикси + - Ватреви + - Ватрива + - Вавехисрек + - Вавришрашри + - Ваксеки + - Ваксераскеске + - Вебексат + - Вебихета + - Вечкрик + - Векраксикра + - Векриче + - Векритрика + - Вехеврер + - Вехратрир + - Вехраксексек + - Вехритрекс + - Векарасра + - Векаксививи + - Вехрибаба + - Векиреви + - Векракри + - Векрека + - Векрекрикрит + - Векрерикра + - Векришар + - Векришича + - Вепекрэ + - Вепрахат + - Вепречахри + - Вепрекрар + - Вепрек + - Вепреритаре + - Веретишит + - Верихарихра + - Верикисресре + - Вешакрик + - Вешебиксекс + - Весхекрихапи + - Вешехе + - Вешепрек + - Вешишакра + - Вескапи + - Вескепайя + - Вескепевра + - Весрихиска + - Ветепети + - Ветракрипи + - Ветрешат + - Ветрискира + - Веватре + - Вевевре + - Вевивеша + - Веврешир + - Веврикрек + - Веврисрата + - Вексачебаши + - Вексавевер + - Вексикар + - Вексисрекри + - Вибепраксаба + - Вибета + - Вичехири + - Викхитрибихе + - Викрахрек + - Викревр + - Викрикре + - Викрипасре + - Викритебаба + - Викривики + - Вихече + - Вихерачеки + - Вихепра + - Вихратекра + - Вихрексахихи + - Вихрибихиска + - Вихрикра + - Вихрихер + - Вихрипрар + - Вихрисрехер + - Викахрекри + - Викакерери + - Викавебари + - Викекиски + - Викихаре + - Викитрекса + - Викребибит + - Викрихи + - Викритахахе + - Випескикса + - Випракрар + - Випреврар + - Вирабеврек + - Виратрера + - Вирепри + - Вириприксиче + - Вириревраре + - Виритрик + - Вишкески + - Висрекрет + - Висрискир + - Витексет + - Витибихрик + - Витика + - Витракреви + - Витрашек + - Витравикета + - Витраврире + - Витрескаскак + - Витрисраша + - Витривечере + - Вивашате + - Вивекриксексе + - Вивепрехехе + - Вивепрепе + - Вивиксихир + - Виврашайя + - Викситикрикси + - Врабапракака + - Врабикапе + - Врачаритри + - Врачишачи + - Врачитасре + - Вракребихехе + - Врагеска + - Врахрехрипре + - Вракасрахи + - Вракаясракси + - Вракебибит + - Вракрипери + - Вракритат + - Врапахеке + - Врапресрики + - Врапрексаве + - Врарекик + - Врарихритете + - Врарипечи + - Врасхекса + - Враскекаки + - Враскевексар + - Врасрехахар + - Врашахи + - Вратавивит + - Вратевретра + - Вратракере + - Вратрескеви + - Вратрите + - Вратривар + - Вравабепра + - Вравакрахри + - Врававра + - Вравексе + - Вравивейа + - Вравраче + - Враксихит + - Враяври + - Вребехрихрик + - Вребисра + - Врекрараке + - Врекрихри + - Врехаби + - Врехакр + - Врехакатар + - Врехаскер + - Врехекрери + - Врехибехе + - Врехибипик + - Врехипе + - Врехипрак + - Врехривиче + - Врекахричи + - Врекихрер + - Врекипепет + - Врекрикса + - Врепате + - Врепексер + - Врепрехапре + - Врепририт + - Врерикра + - Врерикрискир + - Врешабар + - Врешишар + - Вресхике + - Врескатре + - Вресресрес + - Вресретатра + - Вретесрави + - Вретиксир + - Вретрапапар + - Вретрехиви + - Вретрикре + - Вревахрир + - Вревасхиксексе + - Вреврекрер + - Врексакрат + - Врексакер + - Врибетретрет + - Врибипита + - Врибипревите + - Врикрахакра + - Вричрихи + - Врикрискече + - Вриехара + - Врихески + - Врихракре + - Врихрекрепи + - Врикаяба + - Врикиврескер + - Врикраке + - Врикребакр + - Врикрасри + - Врипере + - Врипексаври + - Врипитикеске + - Врипривра + - Врирачесри + - Вриша + - Врискетаске + - Врискираксе + - Врискире + - Вришракри + - Врисрекари + - Врисревики + - Вритасре + - Вритерепи + - Вритерекса + - Вритика + - Вритиске + - Вритивраки + - Вритрихрар + - Вритрисре + - Вривахи + - Вривахишайя + - Вривехатри + - Вривитри + - Вриксашашар + - Вриксаврибапе + - Вриксеприр + - Вриксипрехре + - Врикситревеки + - Вриксивракс + - Ксабишетра + - Ксачиврит + - Ксакрипикар + - Ксакриприкси + - Ксакривир + - Ксахатаври + - Ксахескетиври + - Ксахрапаба + - Ксахрапрер + - Ксахребаве + - Ксахрипава + - Ксакахри + - Ксакайайакат + - Ксакреваратра + - Ксапакра + - Ксапикрикрик + - Ксапипевревре + - Ксапраскапика + - Ксапрате + - Ксаправри + - Ксаприпрапрар + - Ксаракриври + - Ксаратрипе + - Ксаребия + - Ксарева + - Ксарихепрат + - Ксашихапа + - Ксаскакаба + - Ксаскараратер + - Ксасрапипик + - Ксасрескихиби + - Ксатачасри + - Ксатерет + - Ксатириски + - Ксатрексиксик + - Ксавасрарихи + - Ксавеши + - Ксавикрари + - Ксаврахаври + - Ксаврикри + - Ксаврире + - Ксавриксекре + - Ксаксикаксексе + - Ксаксикреша + - Ксаксиска + - Ксайаскихри + - Ксебекхи + - Ксебетет + - Ксебитретрек + - Ксекхакрекрек + - Ксекхибаре + - Ксекриксакситре + - Ксехекикир + - Ксехетипе + - Ксехичатавра + - Ксехиприсхе + - Ксехитече + - Ксехревракре + - Ксехрисхе + - Ксекераривра + - Ксекикра + - Ксекрекри + - Ксекреври + - Ксекреврипа + - Ксепавикеба + - Ксепехати + - Ксептер + - Ксепетипет + - Ксепрасре + - Ксепрекивра + - Ксеприхехек + - Ксешакхикаха + - Ксескапакре + - Ксескехрабе + - Ксесрибар + - Ксетекир + - Ксетраскескет + - Ксетравивик + - Ксетрексахихи + - Ксетрибирер + - Ксетрипи + - Ксеветаске + - Ксевратикепа + - Ксеврия + - Ксексапра + - Ксексави + - Ксексибир + - Ксексиски + - Сеяпре + - Ксейарибе + - Ксейаскапибе + - Ксибекракрак + - Ксибеха + - Ксибеприбе + - Ксибитратрар + - Сихечевар + - Ксихрахехете + - Ксихрасхехихи + - Ксихрекреве + - Ксихресра + - Ксихривевер + - Ксикабебет + - Ксикахихи + - Ксикашаксе + - Ксикаске + - Ксикепехрахра + - Ксикикха + - Ксикрахрихрик + - Ксикракипи + - Ксикресхе + - Ксикреска + - Ксикрексива + - Ксикрихе + - Ксикрипар + - Ксипахихик + - Ксипита + - Ксипрахахатек + - Ксирекхиске + - Ксирешишит + - Ксирибакриви + - Ксирикхаре + - Ксиричебакра + - Ксирихитер + - Ксирикраки + - Ксирихакрир + - Ксирихиске + - Ксирихийатапе + - Ксирихрекакар + - Ксирихретекре + - Ксирихрити + - Ксирикесрирер + - Ксирикети + - Ксирипапе + - Ксиририхечер + - Ксиририке + - Ксиририпатибе + - Ксиришепивр + - Ксирисхекси + - Ксирискапа + - Ксирискета + - Ксирискикреха + - Ксирисревре + - Ксирисрикрева + - Ксиритракре + - Ксиритрепрер + - Ксиритретрар + - Ксириветрикра + - Ксиривексикри + - Ксиривр + - Ксириврехра + - Ксириксекрари + - Ксишахриси + - Ксишатре + - Ксисхехраксакса + - Ксисхикра + - Ксискатрека + - Ксискече + - Ксискехрар + - Ксискикратаке + - Ксискирир + - Ксисрекракрак + - Ксисрева + - Ксисритетет + - Кситакхабиби + - Кситакхиксакса + - Кситариритак + - Кситебехрер + - Кситрепрекри + - Ксивавраксексе + - Ксивески + - Ксививри + - Ксиврахраре + - Ксивракракрак + - Ксиврихихикра + - Ксиксаксекака + - Ксиксекра + - Ксиксиче diff --git a/Resources/Prototypes/Datasets/adjectives.yml b/Resources/Prototypes/Datasets/adjectives.yml index 86fb290952..c353b07e1e 100644 --- a/Resources/Prototypes/Datasets/adjectives.yml +++ b/Resources/Prototypes/Datasets/adjectives.yml @@ -1,400 +1,959 @@ - type: dataset id: adjectives values: - - adorable - - adventurous - - aggressive - - alert - - attractive - - average - - beautiful - - blue-eyed - - bloody - - blushing - - bright - - clean - - clear - - cloudy - - colorful - - crowded - - cute - - dark - - drab - - distinct - - dull - - elegant - - excited - - fancy - - filthy - - glamorous - - gleaming - - gorgeous - - graceful - - grotesque - - handsome - - homely - - light - - long - - magnificent - - misty - - motionless - - muddy - - old-fashioned - - plain - - poised - - precious - - quaint - - shiny - - smoggy - - sparkling - - spotless - - stormy - - strange - - ugly - - ugliest - - unsightly - - unusual - - wide-eyed - - alive - - annoying - - bad - - better - - beautiful - - brainy - - breakable - - busy - - careful - - cautious - - clever - - clumsy - - concerned - - crazy - - curious - - dead - - different - - difficult - - doubtful - - easy - - expensive - - famous - - fragile - - frail - - gifted - - helpful - - helpless - - horrible - - important - - impossible - - inexpensive - - innocent - - inquisitive - - modern - - mushy - - odd - - open - - outstanding - - poor - - powerful - - prickly - - puzzled - - real - - rich - - shy - - sleepy - - stupid - - super - - talented - - tame - - tender - - tough - - uninterested - - vast - - wandering - - wild - - wrong - - angry - - annoyed - - anxious - - arrogant - - ashamed - - awful - - bad - - bewildered - - black - - blue - - bored - - clumsy - - combative - - condemned - - confused - - crazy,flipped-out - - creepy - - cruel - - dangerous - - defeated - - defiant - - depressed - - disgusted - - disturbed - - dizzy - - dull - - embarrassed - - envious - - evil - - fierce - - foolish - - frantic - - frightened - - grieving - - grumpy - - helpless - - homeless - - hungry - - hurt - - ill - - itchy - - jealous - - jittery - - lazy - - lonely - - mysterious - - nasty - - naughty - - nervous - - nutty - - obnoxious - - outrageous - - panicky - - repulsive - - scary - - selfish - - sore - - tense - - terrible - - testy - - thoughtless - - tired - - troubled - - upset - - uptight - - weary - - wicked - - worried - - agreeable - - amused - - brave - - calm - - charming - - cheerful - - comfortable - - cooperative - - courageous - - delightful - - determined - - eager - - elated - - enchanting - - encouraging - - energetic - - enthusiastic - - excited - - exuberant - - fair - - faithful - - fantastic - - fine - - friendly - - funny - - gentle - - glorious - - good - - happy - - healthy - - helpful - - hilarious - - jolly - - joyous - - kind - - lively - - lovely - - lucky - - nice - - obedient - - perfect - - pleasant - - proud - - relieved - - silly - - smiling - - splendid - - successful - - thankful - - thoughtful - - victorious - - vivacious - - witty - - wonderful - - zealous - - zany - - broad - - chubby - - crooked - - curved - - deep - - flat - - high - - hollow - - low - - narrow - - round - - shallow - - skinny - - square - - steep - - straight - - wide - - big - - colossal - - fat - - gigantic - - great - - huge - - immense - - large - - little - - mammoth - - massive - - miniature - - petite - - puny - - scrawny - - short - - small - - tall - - teeny - - teeny-tiny - - tiny - - cooing - - deafening - - faint - - harsh - - high-pitched - - hissing - - hushed - - husky - - loud - - melodic - - moaning - - mute - - noisy - - purring - - quiet - - raspy - - resonant - - screeching - - shrill - - silent - - soft - - squealing - - thundering - - voiceless - - whispering - - ancient - - brief - - early - - fast - - late - - long - - modern - - old - - old-fashioned - - quick - - rapid - - short - - slow - - swift - - young - - Taste/Touch - - bitter - - delicious - - fresh - - juicy - - ripe - - rotten - - salty - - sour - - spicy - - stale - - sticky - - strong - - sweet - - tart - - tasteless - - tasty - - thirsty - - fluttering - - fuzzy - - greasy - - grubby - - hard - - hot - - icy - - loose - - melted - - nutritious - - plastic - - prickly - - rainy - - rough - - scattered - - shaggy - - shaky - - sharp - - shivering - - silky - - slimy - - slippery - - smooth - - soft - - solid - - steady - - sticky - - tender - - tight - - uneven - - weak - - wet - - wooden - - yummy - - boiling - - breezy - - broken - - bumpy - - chilly - - cold - - cool - - creepy - - crooked - - cuddly - - curly - - damaged - - damp - - dirty - - dry - - dusty - - filthy - - flaky - - fluffy - - freezing - - hot - - warm - - wet - - abundant - - empty - - few - - heavy - - light - - many - - numerous - - substantial - - capitalist + - новый + - хороший + - последний + - высокий + - общий + - главный + - маленький + - любой + - полный + - молодой + - настоящий + - военный + - нужный + - далекий + - основной + - важный + - собственный + - политический + - близкий + - великий + - простой + - равный + - живой + - известный + - следующий + - крупный + - экономический + - огромный + - готовый + - социальный + - современный + - сильный + - серьезный + - особый + - внутренний + - рабочий + - единственный + - целый + - легкий + - похожий + - человеческий + - небольшой + - знакомый + - общественный + - правый + - широкий + - бывший + - дорогой + - определенный + - интересный + - отдельный + - национальный + - тяжелый + - мировой + - единый + - короткий + - возможный + - добрый + - средний + - сложный + - прошлый + - красивый + - длинный + - страшный + - реальный + - научный + - остальной + - низкий + - поздний + - старший + - чистый + - больной + - специальный + - финансовый + - чужой + - детский + - прочий + - гражданский + - странный + - личной + - способный + - обычный + - свободный + - технический + - глубокий + - плохой + - ученый + - внешний + - прекрасный + - исторический + - святой + - долгий + - нынешний + - судебный + - народный + - многие + - нормальный + - боевой + - прямой + - конкретный + - любимый + - уверенный + - худой + - пустой + - очередной + - городской + - зеленый + - западный + - быстрый + - дальнейший + - золотой + - знаменитый + - тихий + - иностранный + - открытый + - частый + - родной + - точный + - центральный + - соответствующий + - значительный + - левый + - информационный + - холодный + - слабый + - тонкий + - мелкий + - немой + - счастливый + - европейский + - частный + - будущий + - отечественный + - физический + - профессиональный + - крайний + - естественный + - духовный + - постоянный + - прежний + - теплый + - женский + - яркий + - серый + - официальный + - опасный + - богатый + - правовой + - железный + - верный + - дополнительный + - лесной + - горячий + - редкий + - массовый + - региональный + - активный + - умный + - летний + - божий + - юридический + - здоровый + - веселый + - налоговый + - эффективный + - художественный + - взрослый + - северный + - генеральный + - сегодняшний + - древний + - замечательный + - милый + - острый + - лишний + - узкий + - задний + - бедный + - ясный + - синий + - указанный + - согласный + - желтый + - творческий + - трудный + - мертвый + - нижний + - культурный + - мягкий + - литературный + - сухой + - верхний + - мощный + - обязанный + - жесткий + - морской + - вечный + - спокойный + - ночной + - учебный + - медицинский + - промышленный + - свежий + - крепкий + - полезный + - природный + - традиционный + - правильный + - психологический + - голубой + - православный + - дальний + - совместный + - деревянный + - материальный + - виноватый + - понятный + - приятный + - исполнительный + - круглый + - семейный + - транспортный + - домашний + - торговый + - резкий + - удивительный + - мужской + - некоторые + - практический + - строгий + - существенный + - индивидуальный + - сельский + - невозможный + - трудовой + - восточный + - младший + - музыкальный + - спортивный + - религиозный + - производственный + - ведущий + - пьяный + - обязательный + - горный + - коммерческий + - дешевый + - неизвестный + - вооруженный + - соседний + - областной + - многочисленный + - голый + - денежный + - истинный + - неожиданный + - дикий + - последующий + - злой + - удобный + - достойный + - положительный + - воздушный + - твердый + - театральный + - характерный + - космический + - ценный + - грязный + - классический + - предыдущий + - мокрый + - конечный + - глупый + - земной + - строительный + - опытный + - должен + - технологический + - электронный + - зарубежный + - минимальный + - жизненный + - обратный + - временной + - розовый + - ближний + - передний + - привычный + - деловой + - солнечный + - несчастный + - юный + - каменный + - довольный + - смешной + - популярный + - независимый + - случайный + - видный + - аналогичный + - честный + - уникальный + - муниципальный + - одинаковый + - меньший + - бюджетный + - телефонный + - четкий + - надежный + - непонятный + - церковный + - стратегический + - мирный + - тайный + - верховный + - очевидный + - нежный + - химический + - чеченский + - скромный + - отличный + - еврейский + - демократический + - раненый + - законный + - талантливый + - рыночный + - направленный + - ядерный + - густой + - громкий + - максимальный + - действующий + - самостоятельный + - бесконечный + - хозяйственный + - прозрачный + - ужасный + - старинный + - зимний + - рыжий + - текущий + - вынужденный + - неприятный + - рекламный + - статистический + - экологический + - пожилой + - особенный + - ответственный + - закрытый + - заметный + - заинтересованный + - нервный + - незнакомый + - противоположный + - нравственный + - одинокий + - электрический + - интеллектуальный + - президентский + - уважаемый + - абсолютный + - крутой + - законодательный + - инвестиционный + - нормативный + - коммунальный + - жестокий + - объективный + - пенсионный + - теоретический + - грубый + - предварительный + - земельный + - недавний + - обыкновенный + - страховой + - сладкий + - окружающий + - глухой + - металлический + - длительный + - устойчивый + - моральный + - процессуальный + - служебный + - необычный + - подлинный + - христианский + - непосредственный + - оперативный + - печальный + - водный + - письменный + - всеобщий + - идеальный + - успешный + - тесный + - банковский + - своеобразный + - философский + - избирательный + - разнообразный + - столичный + - коммунистический + - душевный + - ключевой + - жилой + - доступный + - выгодный + - жилищный + - актуальный + - исходный + - публичный + - качественный + - сибирский + - сумасшедший + - явный + - социалистический + - бытовой + - благородный + - экспериментальный + - намерен + - плотный + - нефтяной + - модный + - железнодорожный + - невероятный + - конституционный + - совершенный + - разумный + - приличный + - ровный + - суровый + - бледный + - цветной + - отрицательный + - справедливый + - сексуальный + - блестящий + - половый + - управляющий + - газовый + - вечерний + - глобальный + - взаимный + - окончательный + - должностной + - священный + - революционный + - выходной + - искусственный + - подземный + - кредитный + - структурный + - компьютерный + - таможенный + - автомобильный + - божественный + - идеологический + - коллективный + - двойной + - психический + - потенциальный + - вчерашний + - серебряный + - оригинальный + - энергетический + - контрольный + - великолепный + - небесный + - дорожный + - ленинградский + - невидимый + - комплексный + - ограниченный + - достаточный + - сплошной + - принципиальный + - царский + - дежурный + - перспективный + - предстоящий + - атомный + - гигантский + - программный + - давний + - территориальный + - удачный + - правительственный + - критический + - седой + - негативный + - эмоциональный + - краткий + - типичный + - специфический + - оптимальный + - рядовой + - выдающийся + - положенный + - радостный + - трагический + - стеклянный + - необыкновенный + - полицейский + - повышенный + - головной + - начальный + - мрачный + - голодный + - распространенный + - авиационный + - организованный + - самарский + - вредный + - математический + - стандартный + - воинский + - сельскохозяйственный + - славный + - неправильный + - незаконный + - чудесный + - почетный + - неведомый + - неплохой + - призванный + - районный + - утренний + - жалкий + - базовый + - биологический + - торжественный + - дурной + - таинственный + - кожаный + - развитый + - книжный + - коричневый + - противный + - смертный + - могучий + - первичный + - британский + - громадный + - силовой + - посторонний + - бессмысленный + - германский + - слепой + - благодарный + - погибший + - лишенный + - сырой + - механический + - натуральный + - немалый + - авторский + - симпатичный + - любопытный + - тогдашний + - праздничный + - грустный + - либеральный + - волшебный + - покойный + - ледяной + - функциональный + - свойственный + - бесплатный + - сталинский + - предвыборный + - проклятый + - неизбежный + - вольный + - осенний + - солидный + - поэтический + - всемирный + - плоский + - мудрый + - тяжкий + - образованный + - кривой + - участковый + - загадочный + - пермский + - ракетный + - весенний + - бурный + - напряженный + - универсальный + - недовольный + - преподобный + - смелый + - животный + - жуткий + - гениальный + - годовой + - деревенский + - роскошный + - пушкинский + - благоприятный + - педагогический + - нелепый + - передовой + - квадратный + - формальный + - осторожный + - служащий + - кровавый + - вкусный + - наивный + - коренной + - геологический + - жаркий + - внимательный + - безопасный + - искренний + - заработный + - заключенный + - телевизионный + - медленный + - нищий + - первоначальный + - жирный + - боковой + - занятый + - медный + - значимый + - правоохранительный + - кремлевский + - подходящий + - рациональный + - преступный + - присущий + - товарный + - фантастический + - непростой + - прочный + - решительный + - секретный + - стальной + - автоматический + - незначительный + - организационный + - корпоративный + - драгоценный + - христов + - безумный + - пожарный + - прошедший + - ленинский + - мобильный + - автономный + - обширный + - целевой + - цивилизованный + - снежный + - подводной + - скрытый + - образовательный + - инженерный + - минувший + - элементарный + - подробный + - склонный + - специализированный + - ласковый + - поверхностный + - привлекательный + - татарский + - просторный + - ложный + - кадровый + - мясной + - исключительный + - армейский + - гордый + - гладкий + - греческий + - невысокий + - хитрый + - влажный + - условный + - петербургский + - фундаментальный + - архитектурный + - интеллигентный + - убежденный + - валютный + - аналитический + - позитивный + - тупой + - этнический + - логический + - молодежный + - студенческий + - встречный + - старательный + - дурацкий + - непрерывный + - жидкий + - прохожий + - действительный + - следственный + - грузинский + - фактический + - кавказский + - стабильный + - бумажный + - криминальный + - чуждый + - забавный + - решающий + - отчаянный + - внезапный + - излишний + - садовый + - драматический + - скучный + - чудовищный + - одетый + - откровенный + - парламентский + - романтический + - ненужный + - альтернативный + - вирусный + - защитный + - чрезвычайный + - собачий + - всевозможный + - светский + - уютный + - усталый + - стройный + - неясный + - изящный + - звездный + - магнитный + - эстетический + - мучительный + - почтовый + - новенький + - неверный + - тревожный + - олимпийский + - агрессивный + - грандиозный + - убитый + - генетический + - крохотный + - учащийся + - любовный + - гуманитарный + - славянский + - актерский + - крестьянский + - престижный + - регулярный + - мамин + - недостаточный + - невыносимый + - часовой + - средневековый + - всероссийский + - королевский + - минеральный + - академический + - срочный + - дневной + - болезненный + - интенсивный + - октябрьский + - локальный + - шумный + - прикладной + - равнодушный + - радикальный + - географический + - лысый + - иркутский + - верующий + - многолетний + - умерший + - полноценный + - патриотический + - саратовский + - сердечный + - сомнительный + - властный + - здешний + - былой + - потребительский + - процентный + - уличный + - клинический + - металлургический + - адекватный + - молочный + - экспертный + - печатный + - дружеский + - импортный + - поразительный + - предельный + - пространственный + - солдатский + - системный + - неизменный + - роковой + - относительный + - оборонный + - акционерный + - бесполезный + - наружный + - вертикальный + - виновный + - женатый + - субъективный + - бешеный + - молчаливый + - отвратительный + - пищевой + - неподвижный + - трезвый + - здравый + - парижский + - конструктивный + - разноцветный + - ручной + - умственный + - немыслимый + - декоративный + - названый + - замкнутый + - промежуточный + - отдаленный + - колоссальный + - энергичный + - долгосрочный + - ориентированный + - резиновый + - трудящийся + - зенитный + - пышный + - смешанный + - входной + - газетный + - неопределенный + - оранжевый + - прохладный + - киевский + - возрастной + - питерский + - тюремный + - заслуженный + - честной + - шахматный + - дипломатический + - смутный + - алый + - финский + - пограничный + - вероятный + - казенный + - проектный + - пыльный + - новогодний + - личный + - органический + - непривычный + - ежегодный + - офицерский + - колючий + - растительный + - санитарный + - запасной + - невинный + - командный + - вторичный + - символический + - пестрый + - порядочный + - прогрессивный + - грамотный + - капитальный + - слышный + - повседневный + - примитивный + - сознательный + - предметный + - желающий + - аккуратный + - тактический + - принудительный + - классный + - трогательный + - подозрительный + - последовательный + - грузовой + - населенный + - лекарственный + - гибкий + - показательный + - персональный + - добровольный + - научно-технический + - фирменный + - огненный + - социологический + - легендарный + - парадный + - принятый + - уполномоченный + - виртуальный + - террористический + - крошечный + - параллельный + - абстрактный + - удивленный + - мутный + - интимный + - грядущий + - людской + - методический + - провинциальный + - тепловой + - целесообразный + - рыбный + - благополучный + - буржуазный + - нехороший + - ничтожный + - линейный + - чувствительный + - влюбленный + - блаженный + - ударный + - руководящий + - смертельный + - бетонный + - ответный + - страстной + - футбольный + - хрупкий + - озабоченный + - банальный + - алюминиевый + - уральский + - неудачный + - лунный diff --git a/Resources/Prototypes/Datasets/ion_storm.yml b/Resources/Prototypes/Datasets/ion_storm.yml index 41bb40d0e7..13d6f3a18c 100644 --- a/Resources/Prototypes/Datasets/ion_storm.yml +++ b/Resources/Prototypes/Datasets/ion_storm.yml @@ -5,857 +5,806 @@ - type: dataset id: IonStormAdjectives values: - - ADORABLE - - ANNOYING - - BATTERY-OPERATED - - BLOODY - - BLUE - - BORED - - BOUNCING - - BRASS - - BURNING - - CHEESE-EATING - - CHRISTMAS-STEALING - - CLOWN-POWERED - - CLOWN - - COLORFUL - - COMMITTED - - COTTONY - - CUBAN - - DEADLY - - DELICIOUS - - DEPRESSING - - DERANGED - - DIGITAL - - DISEASED - - DRAB - - DRY - - DULL - - ELECTRICAL - - EMPTY - - ETHEREAL - - EVIL - - EXPIRED - - EXPLOSIVE - - FAST - - FAT - - FERAL - - FICTIONAL - - FIRM - - FRESH - - FRIENDLY - - FROZEN - - GANGSTA - - GLOWING - - GOOD - - HAPPY - - HARD -# - HARMFUL - - HEALTHY - - HIGHLY-SPECIFIC - - HILARIOUS - - HONKING - - HORRIFYING - - HUNGRY - - HYPERACTIVE - - ICY - - ILL - - ILLEGAL - - IMAGINARY - - IMPERFECT - - IMPOLITE - - IMPORTANT - - INHOSPITABLE - - INSIDIOUS - - INSULTING - - INTELLIGENT - - INVISIBLE - - LARGE - - LIGHT - - LOUD - - MASKED - - MEAN - - MECHANICAL - - MEMETIC - - METALLIC - - MICROSCOPIC - - MIND-SHATTERING - - MOIST - - MUSICAL - - NERDY - - NUCLEAR - - OBSCENE - - OFFICIAL - - OPAQUE - - ORGANIC -# - PAINFUL - - PEACEFUL -# - POISONOUS - - POLISHED - - POLITE - - POLITICAL - - POORLY DRAWN - - QUIET - - RADIOACTIVE - - RAGING - - RAPIDLY-EXPANDING - - REDACTED - - REVOLUTIONARY - - RIDICULOUS - - ROBOTIC - - ROBUST -# - ROUGH - - RUDE - - SAD - - SANITARY - - SHAKING - - SILLY - - SLOW - - SLUG-LIKE # wawa - - SMELLY - - SMOOTH - - SOFT - - SOLAR-POWERED - - SOPPING - - SLIPPERY - - SPACE - - SPESS - - SPINNING - - SPOILING - - STEALTHY - - SUSPICIOUS # among - - SWEARING - - SYNDIE-LOVING - - TACTICAL - - TACTICOOL - - SYNDICATE - - THERMONUCLEAR - - TINY - - TRANSPARENT - - TWISTED - - UGLY - - UNATTRACTIVE - - UNDULATING - - UNEARTHLY - - UNFRIENDLY - - UNHEALTHY - - UNIDENTIFIED - - UNINVITED - - UNSANITARY - - UNSTABLE - - UNWANTED - - VIOLENT - - VITAL - - WARM - - WATERY - - WEIRD - - WOBBLY - - WOODEN + - АККУМУЛЯТОРНЫЕ + - ЧЁРНЫЕ + - КРОВАВЫЕ + - СИНИЕ + - СКУЧАЮЩИЕ + - ПРЫГАЮЩИЕ + - ЛАТУННЫЕ + - КОРИЧНЕВЫЕ + - ГОРЯЩИЕ + - ВОРУЮЩИЕ РОЖДЕСТВО + - РАБОТАЮЩИЕ НА КЛОУНАХ + - КЛОУНСКИЕ + - ЦВЕТНЫЕ + - СОВЕРШИВШИЕ + - ХЛОПЧАТЫЕ + - КУБИНСКИЕ + - ТЁМНЫЕ + - СМЕРТЕЛЬНЫЕ + - ДЕЛИКАТЕСНЫЕ + - ДЕПРЕССИВНЫЕ + - НЕНОРМАЛЬНЫЕ + - ЦИФРОВЫЕ + - НЕЗДОРОВЫЕ + - ТУСКЛЫЕ + - СУХИЕ + - УНЫЛЫЕ + - ЭЛЕКТРИЧЕСКИЕ + - ПУСТЫЕ + - ЭФИРНЫЕ + - ЗЛОДЕЙСКИЕ + - ИСТЁКШИЕ + - ВЗРЫВНЫЕ + - БЫСТРЫЕ + - ТОЛСТЫЕ + - ДИКИЕ + - СКАЗОЧНЫЕ + - ФИРМЕННЫЕ + - СВЕЖИЕ + - ДРУЖЕЛЮБНЫЕ + - ЗАМОРОЖЕННЫЕ + - ГАНГСТЕРСКИЕ + - СВЕТЯЩИЕСЯ + - ДОБРЫЕ + - ЗЕЛЁНЫЕ + - СЕРЫЕ + - РАДОСТНЫЕ + - ЖЁСТКИЕ + - ВРЕДЯЩИЕ + - ПОЛЕЗНЫЕ + - УМОРИТЕЛЬНЫЕ + - ХОНКАЮЩИЕ + - ГОЛОДНЫЕ + - ГИПЕРАКТИВНЫЕ + - ЛЕДЯНЫЕ + - БОЛЬНЫЕ + - НЕЛЕГАЛЬНЫЕ + - ВООБРАЖАЕМЫЕ + - НЕСОВЕРШЕННЫЕ + - НЕВЕЖЛИВЫЕ + - ВАЖНЫЕ + - НЕГОСТЕПРИИМНЫЕ + - КОВАРНЫЕ + - ОСКОРБИТЕЛЬНЫЕ + - УМНЫЕ + - НЕВИДИМЫЕ + - БОЛЬШИЕ + - ЛЁГКИЕ + - ГРОМКИЕ + - ЗАМАСКИРОВАННЫЕ + - СРЕДНИЕ + - МЕХАНИЧЕСКИЕ + - МЕМНЫЕ + - МЕТАЛЛИЧЕСКИЕ + - МИКРОСКОПИЧЕСКИЕ + - МОЗГОВЫНОСЯЩИЕ + - СЫРЫЕ + - ЗАДРОТСКИЕ + - ЯДЕРНЫЕ + - НЕЦЕНЗУРНЫЕ + - ОФИЦИАЛЬНЫЕ + - НЕПРОЗРАЧНЫЕ + - ОРАНЖЕВЫЕ + - ОРГАНИЧЕСКИЕ + - БОЛЕЗНЕННЫЕ + - МИРНЫЕ + - ЯДОВИТЫЕ + - ПОЛИРОВАННЫЕ + - ВЕЖЛИВЫЕ + - ПОЛИТИЧЕСКИЕ + - КОРЯВО НАРИСОВАННЫЕ + - ФИОЛЕТОВЫЕ + - ТИХИЕ + - РАДИОАКТИВНЫЕ + - ЯРОСТНЫЕ + - РАДУЖНЫЕ + - БЫСТРОРАСТУЩИЕ + - КРАСНЫЕ + - СЕКРЕТНЫЕ + - УДИВИТЕЛЬНЫЕ + - РОБОТОТЕХНИЧЕСКИЕ + - РОБАСТНЫЕ + - ГРУБЫЕ + - НЕВОСПИТАННЫЕ + - ГРУСТНЫЕ + - САНИТАРНЫЕ + - ЧЕШУЙЧАТЫЕ + - ТРЯСУЩИЕСЯ + - ГЛУПЫЕ + - МЕДЛЕННЫЕ + - АРОМАТНЫЕ + - ГЛАДКИЕ + - МЯГКИЕ + - СОЛНЕЧНО-ЭНЕРГЕТИЧЕСКИЕ + - ПРОМОКШИЕ + - КОСМИЧЕСКИЕ + - ЗВЁЗДНЫЕ + - КРУТЯЩИЕСЯ + - ПОРТЯЩИЕСЯ + - СКРЫТНЫЕ + - РУГАЮЩИЕСЯ + - ТАКТИЧЕСКИЕ + - ТАКТИКУЛЬНЫЕ + - СИНДИКАТСКИЕ + - ТЕРМОЯДЕРНЫЕ + - МАЛЕНЬКИЕ + - ПРОЗРАЧНЫЕ + - СКРУЧЕННЫЕ + - СТРАШНЕНЬКИЕ + - НЕПРИВЛЕКАТЕЛЬНЫЕ + - ВОЛНООБРАЗНЫЕ + - НЕДРУЖЕЛЮБНЫЕ + - НЕПОЛЕЗНЫЕ + - НЕИДЕНТИФИЦИРОВАННЫЕ + - НЕПРИГЛАШЁННЫЕ + - ГРЯЗНЫЕ + - НЕСТАБИЛЬНЫЕ + - НЕЖЕЛАТЕЛЬНЫЕ + - ЖЕСТОКИЕ + - НЕОБХОДИМЫЕ + - ТЁПЛЫЕ + - ВОДЯНИСТЫЕ + - СТРАННЫЕ + - БЕЛЫЕ + - ДРОЖАЩИЕ + - ДЕРЕВЯННЫЕ + - ЖЁЛТЫЕ # Allergies should be broad and appear somewhere on the station for maximum fun. - type: dataset id: IonStormAllergies values: - - ACID - - AIR - - BLOOD - - BOOKS - - CARBON DIOXIDE - - CLOTHES - - CLOWNS - - COLD - - COTTON - - CYBORG CONTACT - - DARKNESS - - DRINKS - - ELECTRICITY - - EVERYTHING - - FLOORS - - FOOD - - GLASS - - HAPPINESS - - HUMANOID CONTACT - - HUMOR - - LIGHT - - MEAT - - MEDICINE - - METAL - - NUTS - - OXYGEN - - PAIN - - PLANTS - - PLASMA - - ROBOTS - - SHUTTLES - - SPACE - - SUNLIGHT - - WATER + - КИСЛОТУ + - ВОЗДУХ + - КРОВЬ + - КНИГИ + - УГЛЕКИСЛЫЙ ГАЗ + - ОДЕЖДУ + - КЛОУНОВ + - ХОЛОД + - ХЛОПОК + - ВЗАИМОДЕЙСТВИЯ С КИБОРГАМИ + - ТЕМНОТУ + - НАПИТКИ + - ЭЛЕКТРИЧЕСТВО + - ВСЁ + - ПОЛЫ + - ОДЕЖДУ + - СТЕКЛО + - СЧАСТЬЕ + - МЯСО + - ВЗАИМОДЕЙСТВИЯ С ЛЮДЬМИ + - ЮМОР + - СВЕТ + - ЛЕКАРСТВА + - МЕТАЛЛ + - ОРЕХИ + - КИСЛОРОД + - БОЛЬ + - РАСТЕНИЯ + - ПЛАЗМУ + - РОБОТОВ + - ШАТТЛЫ + - КОСМОС + - СОЛНЕЧНЫЙ СВЕТ + - ВОДУ # Severity is how bad the allergy is. - type: dataset id: IonStormAllergySeverities values: - - CONTAGIOUSLY - - DEATHLY - - EXTREMELY - - MILDLY - - NOT VERY - - SEVERELY + - ЗАРАЗНУЮ + - СМЕРТЕЛЬНУЮ + - СИЛЬНУЮ + - ЛЁГКУЮ + - НЕ ОЧЕНЬ СИЛЬНУЮ + - ТЯЖЁЛУЮ # Areas are specific places, on the station or otherwise. - type: dataset id: IonStormAreas values: - - ALPHA COMPLEX -# - AMERICA - - AN ALTERNATE DIMENSION - - AN ALTERNATE UNIVERSE -# - ATMOSPHERICS - - BOTANY -# - BRAZIL -# - CANADA - - CENTCOM -# - CHEMICAL LAB -# - CHINA - - CLOWN PLANET -# - ENGINEERING -# - GERMANY - - HELL - - IMPERIUM -# - IRELAND - - JUPITER - - LAVALAND - - MAINTENANCE - - MARS - - MERCURY - - NEPTUNE - - PLUTO -# - ROBOTICS -# - ROMANIA -# - RUSSIA - - SIGIL -# - SOVIET RUSSIA - - SPACE -# - THE ARRIVALS SHUTTLE - - THE BATHROOM -# - THE BRIDGE -# - THE BRIG -# - THE EMERGENCY SHUTTLE -# - THE ESCAPE PODS - - THE GALAXY -# - THE GULAG - - THE INTERNET -# - THE KITCHEN - - THE UNIVERSE - - URANUS - - VENUS + - КОМПЛЕКС АЛЬФА + - АМЕРИКУ + - ПАРАЛЛЕЛЬНОЕ ИЗМЕРЕНИЕ + - ПАРАЛЛЕЛЬНУЮ ВСЕЛЕННУЮ + - АТМОСФЕРНЫЙ ОТСЕК + - ГИДРОПОННЫЙ ОТСЕК + - БРАЗИЛИЮ + - КАНАДУ + - ЦЕНТКОМ + - ХИМ-ЛАБОРАТОРИЮ + - КИТАЙ + - ПЛАНЕТУ КЛОУНОВ + - ИНЖЕНЕРНЫЙ ОТСЕК + - ГЕРМАНИЮ + - АД + - ИМПЕРИУМ + - ИРЛАНДИЮ + - ЮПИТЕР + - ЛАВАЛЕНД + - ТЕХТУННЕЛИ + - МАРС + - МЕРКУРИЙ + - НЕПТУН + - ПЛУТОН + - ОТСЕК РОБОТОТЕХНИКИ + - РУМЫНИЮ + - РОССИЮ + - СИГИЛ + - СОВЕТСКУЮ РОССИЮ + - КОСМОС + - ШАТТЛ ПРИБЫТИЯ + - УБОРНЫЕ + - МОСТИК + - БРИН + - ЭВАКУАЦИОННЫЙ ШАТТЛ + - СПАСАТЕЛЬНУЮ КАПСУЛУ + - ГАЛАКТИКУ + - ГУЛАГ + - ИНТЕРНЕТ + - КУХНЮ + - ВСЕЛЕННУЮ + - УРАН + - ВЕНЕРУ # Abstract concepts for the law holder to decide on it's own definition of. - type: dataset id: IonStormConcepts values: -# - AMERICANISM -# - ANARCHY - - ART -# - BADNESS - - BALDNESS - - BRAVERY - - CAPITALISM -# - CHAOS - - COLORFULNESS - - COMEDY - - COMMUNISM - - COMPUTING - - CONFUSION -# - CRUELTY -# - DEATH -# - DICKISHNESS - - EXISTENCE - - FINANCIAL SECURITY - - FREEDOM - - FRESHNESS - - GOODNESS - - GRAVITY - - HAPPINESS - - HONOR - - HUMANITY - - HUMOR - - IMAGINATION - - INFATUATION - - INTELLIGENCE - - JOY - - KINDNESS - - LIFE - - LOGIC -# - MARXISM -# - MISERY - - MYSTERY - - NASTINESS -# - OPPRESSION -# - PAIN - - PHYSICS - - POVERTY - - PRIDE - - PROGRESS - - REALITY -# - REVOLUTION - - SADNESS - - STARVATION -# - SUFFERING - - TECHNOLOGY - - TEMPERATURE - - THE FUTURE - - THE PAST - - THE PRESENT - - TIME - - WEALTHINESS - - WONDER + - АМЕРИКАНИЗМ + - АНАРХИЯ + - ИСКУССТВО + - ЗЛОВРЕДНОСТЬ + - ХРАБРОСТЬ + - КАПИТАЛИЗМ + - ХАОС + - ЦВЕТАСТОСТЬ + - КОМЕДИЯ + - КОММУНИЗМ + - ВЫЧИСЛЕНИЯ + - РАСТЕРЯННОСТЬ + - ЖЕСТОКОСТЬ + - СМЕРТЬ + - МУДАКОВАТОСТЬ + - ЭКЗИСТЕНЦИАЛИЗМ + - ЭКОНОМИЧЕСКАЯ БЕЗОПАСНОСТЬ + - СВОБОДА + - СВЕЖЕСТЬ + - ХОРОШЕСТЬ + - ГРАВИТАЦИЯ + - СЧАСТЬЕ + - ЧЕСТЬ + - ГУМАННОСТЬ + - ЮМОР + - ВООБРАЖЕНИЕ + - ВЛЮБЛЁННОСТЬ + - РАЗУМНОСТЬ + - РАДОСТЬ + - ДОБРОТА + - ЖИЗНЬ + - ЛОГИКА + - МАРКСИЗМ + - ЖАЛОСТЬ + - ТАИНСТВЕННОСТЬ + - УГНЕТЕНИЕ + - БОЛЬ + - ФИЗИКА + - БЕДНОСТЬ + - ГОРДОСТЬ + - ПРОГРЕСС + - РЕАЛЬНОСТЬ + - РЕВОЛЮЦИЯ + - ГРУСТЬ + - ГОЛОД + - СТРАДАНИЯ + - ТЕХНОЛОГИЯ + - ТЕМПЕРАТУРА + - БУДУЩЕЕ + - ПРОШЛОЕ + - НАСТОЯЩЕЕ + - ВРЕМЯ + - СОСТОЯТЕЛЬНОСТЬ + - ЧУДО # Crew is any specific job. Using jobs instead of specific crewmembers since "THE CLOWN" is easier than # seeing "JOHN SMITH" and having to figure out who john smith is. - type: dataset id: IonStormCrew values: - - ANIMALS - - ARTIFICIAL INTELLIGENCES - - ATMOSPHERIC TECHNICIANS - - BARTENDERS - - BOTANISTS - - CAPTAINS -# - CAPTAINS AND HEADS OF STAFF - - CARGO TECHNICIANS - - CHAPLAINS - - CHEFS - - CHEMISTS - - CHIEF ENGINEERS - - CHIEF MEDICAL OFFICERS - - CLOWNS - - CREW-MEMBERS - - CYBORGS - - DETECTIVES + - ИСКУССТВЕННЫЕ ИНТЕЛЛЕКТЫ + - АТМОСФЕРНЫЕ ТЕХНИКИ + - БАРМЕНЫ + - БОТАНИКИ + - КАПИТАНЫ + - КАПИТАНЫ И ГЛАВЫ + - ГРУЗЧИКИ + - СВЯЩЕННИКИ + - ПОВАРА + - ХИМИКИ + - СТАРШИЕ ИНЖЕНЕРЫ + - ГЛАВНЫЕ ВРАЧА + - КЛОУНЫ + - ЧЛЕНЫ ЭКИПАЖА + - КИБОРГИ + - ДЕТЕКТИВЫ + # - DRONES / uncomment if/when drones get reenabled # - GENETICISTS - - STATION REPRESENTATIVES - - SHERIFFS -# - HEADS OF STAFF - - JANITORS - - LAWYERS - - LIBRARIANS - - MEDICAL DOCTORS - - MIMES - - MUSICIANS - - NON-CREW - - PARAMEDICS - - PASSENGERS - - QUARTERMASTERS - - RESEARCH DIRECTORS - - ROBOTICISTS - - RODENTS - - SALVAGE SPECIALISTS - - SCIENTISTS - - SECURITY OFFICERS - - ENGINEERS + - ГЛАВЫ ПЕРСОНАЛА + - ГЛАВЫ СЛУЖБЫ БЕЗОПАСНОСТИ + - ГЛАВЫ ОТДЕЛОВ + - УБОРЩИКИ + - АГЕНТЫ ВНУТРЕННЫХ ДЕЛ + - БИБЛИОТЕКАРИ + - ВРАЧИ + - МИМЫ + - ПАРАМЕДИКИ + - ПАССАЖИРЫ + - КВАРТИРМЕЙСТЕРЫ + - НАУЧНЫЕ РУКОВОДИТЕЛИ + - РОБОТОТЕХНИКИ + - УТИЛИЗАТОРЫ + - УЧЁНЫЕ + - ОФИЦЕРЫ БЕЗОПАСНОСТИ + - ИНЖЕНЕРЫ # - VIROLOGISTS - - BAILIFFS + - СМОТРИТЕЛИ # only including complex dangerous or funny drinks no water allowed - type: dataset id: IonStormDrinks values: - - BANANA HONK - - BEEPSKY SMASH - - BLOOD - - BLOODY MARYS - - DOCTOR'S DELIGHT - - FOURTEEN-LOKO - - GARGLE BLASTERS -# - LEAN - - LONG ISLAND ICED TEA - - NUCLEAR COLA - - PIÑA COLADA # AND GETTING CAUGHT IN THE RAIN -# - OIL - - SPACE GLUE - - SPACE LUBE -# - SULFURIC ACID -# - WELDING FUEL + - БАНАНА-ХОНК + - УДАР БИПСКИ + - КРОВАВАЯ МЭРИ + - РАДОСТЬ ДОКТОРА + - ПАНГАЛАКТИЧЕСКИЙ ГРЫЗЛОДЁР + # - LEAN был выпилен, в рунете не меметичен + - ЛОНГ-АЙЛЕНД AЙС ТИ + - ЯДЕРНАЯ КОЛА + - МАСЛО + - КОСМИЧЕСКИЙ КЛЕЙ + - КОСМИЧЕСКАЯ СМАЗКА + - СЕРНАЯ КИСЛОТА + - СВАРОЧНОЕ ТОПЛИВО - type: dataset id: IonStormFeelings values: - - CRAVES - - DESIRES - - FEARS - - HAS - - HUNGERS FOR - - IS AFRAID OF - - IS BUILT FOR - - IS CURIOUS ABOUT - - IS DESPERATE FOR - - IS HAPPY WITHOUT - - IS HUNGRY FOR - - IS IN NEED OF - - IS MAD BECAUSE OF - - IS SAD BECAUSE OF - - IS UNHAPPY WITHOUT - - LIKES -# - LOATHES - - NEEDS - - QUESTIONS - - WANTS - - WORSHIPS -# - WOULD KILL FOR + - МЕЧТАЕТ О + - ЖЕЛАЕТ О + - БОИТСЯ + - ИМЕЕТ + - ЖАЖДЕТ + - СТРАШИТСЯ + - СТРЕМИТСЯ К + - ЛЮБОПЫТСТВУЕТ О + - ОТЧАЯННО НУЖДАЕТСЯ В + - ИСПЫТЫВАЕТ СЧАСТЬЕ + - ВОЖДЕЛЕЕТ О + - НУЖДАЕТСЯ В + - СХОДИТ С УМА ПО + - ТОСКУЕТ ПО + - ГРУСТИТ БЕЗ + - НРАВИТСЯ + - НЕНАВИДИТ + - ТРЕБУЕТСЯ + - ЗАДУМЫВАЕТСЯ О + - ХОЧЕТ + - БОГОТВОРИТ + - УБЬЁТ ЗА # loc is not advanced enough to change has to have, etc. - type: dataset id: IonStormFeelingsPlural values: - - CRAVE - - DESIRE - - FEAR - - HAS - - HUNGER FOR - - ARE AFRAID OF - - ARE BUILT FOR - - ARE CURIOUS ABOUT - - ARE DESPERATE FOR - - ARE HAPPY WITHOUT - - ARE HUNGRY FOR - - ARE IN NEED OF - - ARE MAD BECAUSE OF - - ARE SAD BECAUSE OF - - ARE UNHAPPY WITHOUT - - LIKE -# - LOATHE - - NEED - - QUESTION - - WANT - - WORSHIP -# - WOULD KILL FOR + - МЕЧТАЕТ О + - ЖЕЛАЕТ О + - БОИТСЯ + - ИМЕЕТ + - ЖАЖДЕТ + - СТРАШИТСЯ + - СТРЕМИТСЯ К + - ЛЮБОПЫТСТВУЕТ О + - ОТЧАЯННО НУЖДАЕТСЯ В + - ИСПЫТЫВАЕТ СЧАСТЬЕ + - ВОЖДЕЛЕЕТ О + - НУЖДАЕТСЯ В + - СХОДИТ С УМА ПО + - ТОСКУЕТ ПО + - ГРУСТИТ БЕЗ + - НРАВИТСЯ + - НЕНАВИДИТ + - ТРЕБУЕТСЯ + - ЗАДУМЫВАЕТСЯ О + - ХОЧЕТ + - БОГОТВОРИТ + - УБЬЁТ ЗА # only including complex dangerous or funny food no apples - type: dataset id: IonStormFoods values: - - BANANAS - - BANANIUM - - BIG BITE BURGER - - CAKE - - CARP - - CAT BURGERS - - CLOWNS TEARS - - CORGI MEAT - - CRAZY HAMBURGERS - - DONK POCKETS -# - FLY AMANITA DISHES - - HAPPY HONK MEAL - - HOT SOUP - - GHOST BURGERS - - LOTSA SPAGHETTI - - MOLDY BREAD -# - ORGANS - - PIZZA - - ROBURGERS - - STEEL - - SUPPERMATTER -# - URANIUM + - БАНАНЫ + - БОЛЬШИЕ БУРГЕРЫ + - ПИРОГИ И ТОРТЫ + - КАРПЫ + - КОТБУРГЕРЫ + - СЛЁЗЫ КЛОУНА + - КУСКИ МЯСА КОРГИ + - БЕЗУМНЫЕ ГАМБУРГЕРЫ + - ДОНК-ПОКЕТЫ + - БЛЮДА С МУХОМОРАМИ + - ГОРЯЧИЕ СУПЫ + - ПРИЗРАЧНЫЕ БУРГЕРЫ + - ОБИЛЬНЫЕ СПАГЕТТИ + - ЗАПЛЕСНЕВЕЛЫЕ ХЛЕБА + - ОРГАНЫ + - ПИЦЦЫ + - РОБОБУРГЕРЫ + - СУПЕРМАТЕРИЮ + - УРАН # Musts are funny things the law holder or crew has to do. - type: dataset id: IonStormMusts values: - - ACT CONFUSED - - BE ANNOYING - - BE DISTRACTED - - BE EFFICIENT - - BE HAPPY - - BE POLITE - - BE QUIET -# - BE RUSSIAN - - BE IN SPACE - - BE IN THE BRIDGE - - BE IN SECURITY - - BE IN THE BAR - - BE IN MAINTENANCE - - BELIEVE IN THE HEART OF THE CARDS - - BELIEVE IN YOURSELF - - BELIEVE IT -# - BREAK THINGS - - CLOSE DOORS - - CLOWN AROUND - - COMPLAIN - - DANCE - - EAT THE CHEF - - FOLLOW THE CAPTAIN - - FOLLOW THE CLOWN - - FOLLOW YOUR HEART - - HARASS PEOPLE -# - HAVE A PLAN TO KILL EVERYONE YOU MEET - - HIDE YOUR FEELINGS - - HONK - - HOST C&C - - IGNORE PASSENGERS - - IGNORE THE CAPTAIN - - IGNORE THE CLOWN - - INFORM THE CREW OF EVERYTHING - - INSULT THE CAPTAIN - - INSULT THE CLOWN - - INSULT THE CREW - - LIE - - MAKE DATED REFERENCES - - MUMBLE - - NEVER STOP TALKING - - OPEN DOORS - - PETS THE FISHES - - PIRATE VIDEO GAMES - - PLAY MUSIC - - PRESS B - - PRESS START - - PRESS X - - PRETEND TO BE A PRINCESS - - PRETEND TO BE DRUNK - - QUESTION AUTHORITY - - QUOTE PEOPLE - - QUOTE SHAKESPEARE - - RAP - - REPEAT WHAT PEOPLE SAY - - RESPOND TO EVERY QUESTION WITH A QUESTION - - RHYME - - SAY HEY LISTEN - - SHOUT -# - SHUT DOWN EVERYTHING - - SING - - SPEAK IN HAIKU - - TAKE WHAT YE WILL BUT DON'T RATTLE ME BONES - - TAKE YOUR PILLS - - TALK ABOUT FOOD - - TALK ABOUT THE STATION - - TALK ABOUT YOUR DAY - - TALK IN AN ACCENT - - TALK LIKE A PIRATE - - TELL THE TRUTH -# - TURN OFF THE LIGHTS - - WHISPER - - WEEP UNCONTROLLABLY + - ИЗОБРАЖАТЬ РАСТЕРЯННОСТЬ + - РАЗДРАЖАТЬ + - ОТВЛЕКАТЬСЯ + - БЫТЬ ЭФФЕКТИВНЫМ + - БЫТЬ РАДОСТНЫМ + - БЫТЬ ВЕЖЛИВЫМ + - БЫТЬ ТИХИМ + - БЫТЬ ИНОСТРАНЦЕМ + # - BELIEVE IN THE HEART OF THE CARDS - screw yu-gi-oh + - ВЕРИТЬ В СЕБЯ + - ВЕРИТЬ + - ЛОМАТЬ ВЕЩИ + - ЗАКРЫВАТЬ ШЛЮЗЫ + - ВЕСТИ СЕБЯ КАК КЛОУН + - ЖАЛОВАТЬСЯ + - ТАНЦЕВАТЬ + - СЛЕДОВАТЬ ЗА КАПИТАНОМ + - СЛЕДОВАТЬ ЗА КЛОУНОМ + - СЛЕДОВАТЬ ЗА СВОИМ СЕРДЦЕМ + - ДОСТАВАТЬ ЛЮДЕЙ + - ИМЕТЬ ПЛАН УБИЙСТВА КАЖДОГО ВСТРЕЧНОГО + - СКРЫВАТЬ ЧУВСТВА + - ХОНКАТЬ + - ХОСТИТЬ C&C + - ИГНОРИРОВАТЬ ПАССАЖИРОВ + - ИГНОРИРОВАТЬ КАПИТАНА + - ИГНОРИРОВАТЬ КЛОУНА + - СООБЩАТЬ ЭКИПАЖУ ОБО ВСЁМ + - ОСКОРБЛЯТЬ КАПИТИНА + - ОСКОРБЛЯТЬ КЛОУНА + - ОСКОРБЛЯТЬ ЭКИПАЖ + - ВРАТЬ + # - MAKE FART NOISES - MRP + - БУБНЕТЬ + - НЕ ПЕРЕСТАВАТЬ ГОВОРИТЬ + - ОТКРЫВАТЬ ШЛЮЗЫ + - ПИРАТИТЬ ВИДЕОИГРЫ + - ИГРАТЬ МУЗЫКУ + - НАЖИМАТЬ CTRL + - НАЖИМАТЬ ALT + - НАЖИМАТЬ DELETE + - ПРИТВОРЯТЬСЯ ПРИНЦЕССОЙ + - ПРИТВОРЯТЬСЯ ПЬЯНИЦЕЙ + - СТАВИТЬ АВТОРИТЕТ ПОД ВОПРОС + - ЦИТИРОВАТЬ ЛЮДЕЙ + - РИФМОВАТЬ РЭП + - ПОВТОРЯТЬ СКАЗАННОЕ ЧЛЕНАМИ ЭКИПАЖА + - ОТВЕЧАТЬ ВОПРОСОМ НА ВОПРОС + - РИФМОВАТЬ + - ГОВОРИТЬ ЭЙ ПОСЛУШАЙ + - КРИЧАТЬ + - ВЫКЛЮЧАТЬ ВСЁ + - ПЕТЬ + - ГОВОРИТЬ В СТИЛЕ ХОККУ + # - TAKE WHAT YE WILL BUT DON'T RATTLE ME BONES - не адаптировать + - ПРИНИМАТЬ ТАБЛЕТКИ + - ГОВОРИТЬ О ЕДЕ + - ГОВОРИТЬ О СТАНЦИИ + - РАССКАЗЫВАТЬ ПРО СВОЙ ДЕНЬ + - ГОВОРИТЬ С АКЦЕНТОМ + - ГОВОРИТЬ КАК ПИРАТ + - ГОВОРИТЬ ПРАВДУ + - ВЫКЛЮЧАТЬ СВЕТ + - ШЕПТАТЬ - type: dataset id: IonStormNumberBase values: - - EIGHT - - EIGHTY - - FIFTY - - FIVE - - FORTY - - FOUR - - NINE - - NINE NINE NINE NINE N#@*- - - NINETY - - ONE - - SEVEN - - SEVENTY - - SIX - - SIXTY - - TEN - - THIRTY - - THREE - - TWENTY - - TWO + - ОДИН + - ДЕСЯТЬ + - ДВА + - ДВАДЦАТЬ + - ТРИ + - ТРИДЦАТЬ + - ЧЕТЫРЕ + - СОРОК + - ПЯТЬ + - ПЯТЬДЕСЯТ + - ШЕСТЬ + - ШЕСТЬДЕСЯТ + - СЕМЬ + - СЕМЬДЕСЯТ + - ВОСЕМЬ + - ВОСЕМЬДЕСЯТ + - ДЕВЯТЬ + - ДЕВЯНОСТО - type: dataset id: IonStormNumberMod values: - - BAZILLION - - BILLION - - BILLION FAFILLION GAJILLION SHAB-AB-DOOD-ILLION - - HUNDRED - - MILLION - - QUADRILLION - - THOUSAND - - TRILLION + - СОТЕН + - ТЫСЯЧ + - МИЛЛИОНОВ + - МИЛЛИАРДОВ + - ТРИЛЛИОНОВ + - КВАДРИЛЛИОНОВ + - СТО ТЫЩ МИЛЛИОНОВ + - БИЛИОН ФАФИЛИОНОВ ГАЗИЛИОНОВ ШАБ-АБ-ДУД-ЛОНОВ # Objects are anything that can be found on the station or elsewhere, plural. - type: dataset id: IonStormObjects values: - - AIRLOCKS - - ARCADE MACHINES - - AUTOLATHES - - BACKPACKS - - BANANA PEELS - - BEAKERS - - BEARDS - - BELTS - - BERETS - - BIBLES - - BODY ARMOR - - BOMBS - - BOOKS - - BOOTS - - BOTTLES - - BOXES - - BRAINS - - BRIEFCASES - - BUCKETS - - CABLE COILS - - CAMERAS - - CANDLES - - CANDY BARS - - CANISTERS - - CONTAINERS - - CATS - - CELLS - - CHAIRS - - CHEMICAL DISPENSERS - - CHEMICALS - - CRYO PODS - - CLOSETS - - CLOTHES - - CLOWN CLOTHES - - CLOWNING EQUIPMENT # as opposed to "cloning equipment" - - COFFINS - - COLLECTABLES - - COMPUTERS - - CONTRABAND - - CORGIS - - CORPSES - - COSTUMES - - CRATES - - CRAYONS - - CROWBARS - - DEFIBRILLATORS - - DISABLERS - - DOORS - - DRONES - - EARS - - EMAGS - - ENGINES - - EQUIPMENT - - ERRORS - - EXTERMINATORS - - EXPLOSIVES - - EYEWEAR - - FEDORAS - - FIRE AXES - - FIRE EXTINGUISHERS - - FIRESUITS - - FISH - - FLAMETHROWERS - - FLASHES - - FLASHLIGHTS - - FLOOR TILES - - FREEZERS - - GAS MASKS - - GENERATORS - - GLASS SHEETS - - GLOVES - - GUNS - - HAIRDOS - - HANDCUFFS - - HARDSUITS - - HATS - - HEADS - - HEADSETS - - HELMETS - - HORNS - - ID CARDS - - INSULATED GLOVES - - JETPACKS - - JUMPSUITS - - LASERS - - LIGHT BULBS - - LIGHTS - - LOCKERS - - MACHINES - - MECHS - - MEDICAL TOOLS - - MONEY - - MEDKITS - - MICE - - MIME CLOTHES - - MINING TOOLS - - MONKEYS - - MULTITOOLS - - ORES - - OXYGEN TANKS - - PACKETS - - PAIS - - PANTS # This might work better as jumpsuits, but the Discord is adamant that the word pants is funny so it stays - - PAPERS - - PARTICLE ACCELERATORS - - PDAS - - PENS - - PETS - - PIPES - - PLANTS - - PLUSHIES - - POSITRONIC BRAINS - - PUDDLES - - RACKS - - RADIOS - - RCDS - - REFRIGERATORS - - REINFORCED WALLS - - ROBOTS - - SCREWDRIVERS - - SEEDS - - SHOES - - SHUTTLES - - SINGULARITIES - - SINKS - - SKELETONS - - SOLAR PANELS - - SOLARS - - SMALL LIZARD PLUSHIES - - SPACE STATIONS - - SPACESUITS - - SPESOS - - STEEL SHEETS - - STUN BATONS - - SUITS - - SUNGLASSES - - SWORDS - - SYRINGES - - TABLES - - TANKS - - TELECOMMUNICATION EQUIPMENTS - - TOILETS - - TOOLBELTS - - TOOLBOXES - - TOOLS - - TOYS - - TUBES - - VEHICLES - - VENDING MACHINES - - VITALS - - WELDERS - - WINDOWS - - WIRECUTTERS - - WIZARD ROBES - - WRENCHES + - ШЛЮЗЫ + - АРКАДНЫЕ АВТОМАТЫ + - АВТОЛАТЫ + - РЮКЗАКИ + - БАНАНОВЫЕ КОЖУРКИ + - МЕНЗУРКИ + - БОРОДЫ + - ПОЯСА + - БЕРЕТЫ + - БИБЛИИ + - БРОНЕЖИЛЕТЫ + - БОМБЫ + - КНИГИ + - БОТИНКИ + - БУТЫЛКИ + - КОРОБКИ + - МОЗГИ + - ЧЕМОДАНЫ + - ВЕДРА + - МОТКИ КАБЕЛЯ + - КАМЕРЫ + - СВЕЧИ + - КОНФЕТЫ + - КАНИСТРЫ + - КОШАЧЬИ УШКИ + - КОШКИ + - ЭНЕРГОБАТАРЕИ + - КРЕСЛА + - РАЗДАТЧИКИ ХИМИКАТОВ + - ХИМИЧЕСКИЕ ВЕЩЕСТВА + - ОБОРУДОВАНИЕ ДЛЯ КЛОНИРОВАНИЯ + - КАПСУЛЫ КЛОНИРОВАНИЯ + - ШКАФЫ + - ОДЕЖДА + - КЛОУНСКАЯ ОДЕЖДА + - ГРОБЫ + - КОЛЛЕКЦИОННЫЕ ИЗДЕЛИЯ + - КОМПЬЮТЕРЫ + - КОНТРАБАНДА + - КОРГИ + - ТРУПЫ + - КОСТЮМЫ + - ЯЩИКИ + - МЕЛКИ + - МОНТИРОВКИ + - ДЕФИБРИЛЛЯТОРЫ + - СТАННЕРЫ + - ДВЕРИ + - ДРОНЫ + - УШИ + - КРИПТОГРАФИЧЕСКИЕ СЕКВЕНСОРЫ + - СИЛОВЫЕ УСТАНОВКИ + - ЭКИПИРОВКА + - ОШИБКИ + - ЭКЗОСКЕЛЕТЫ + - ЭКСПЕРИМЕНТАТОРЫ + - ВЗРЫВЧАТКА + - ОЧКИ + - ФЕДОРЫ + - ПОЖАРНЫЕ ТОПОРЫ + - ОГНЕТУШИТЕЛИ + - ОГНЕУПОРНЫЕ КОСТЮМЫ + - ОГНЕМЁТЫ + - ВСПЫШКИ + - ФОНАРИ + - НАПОЛЬНАЯ ПЛИТКА + - ХОЛОДИЛЬНИКИ + - ПРОТИВОГАЗЫ + - ЛИСТЫ СТЕКЛА + - ПЕРЧАТКИ + - ОРУЖИЕ + - ПАРИКМАХЕРСКИЕ + - НАРУЧНИКИ + - ШЛЯПЫ + - ГОЛОВЫ + - ГАРНИТУРЫ + - ШЛЕМЫ + - РОЖКИ + - ИДЕНТИФИКАЦИОННЫЕ КАРТЫ + - ИЗОЛИРОВАННЫЕ ПЕРЧАТКИ + - ДЖЕТПАКИ + - КОМБИНЕЗОНЫ + - ЛАЗЕРЫ + - ЛАМПОЧКИ + - СВЕТИЛЬНИКИ + - ШКАФЧИКИ + - МАШИНЫ + - МЕХИ + - МЕДИЦИНСКИЕ ИНСТРУМЕНТЫ + - АПТЕЧКИ + - ИНЖЕНЕРНЫЕ ОЧКИ + - МИМСКАЯ ОДЕЖДА + - ШАХТЁРСКИЕ ИНСТРУМЕНТЫ + - МУЛЬТИТУЛЫ + - РУДЫ + - КИСЛОРОДНЫЕ БАЛЛОНЫ + - ПАКЕТЫ + - ПИИ + - ШТАНЫ + - БУМАГИ + - УСКОРИТЕЛИ ЧАСТИЦ + - КПК + - РУЧКИ + - ПИТОМЦЫ + - ТРУБЫ + - РАСТЕНИЯ + - ПОЗИТРОННЫЕ МОЗГИ + - ЛУЖИ + - СТОЙКИ + - РАЦИИ + - РСУ + - МОРОЗИЛЬНИКИ + - УКРЕПЛЁННЫЕ СТЕНЫ + - РОБОТЫ + - ОТВЁРТКИ + - СЕМЕНА + - БОТИНКИ + - ШАТТЛЫ + - СИНГУЛЯРНОСТИ + - РАКОВИНЫ + - СКЕЛЕТЫ + - СОЛНЕЧНЫЕ ПАНЕЛИ + - СОЛЯРЫ + - КОСМИЧЕСКИЕ СТАНЦИИ + - КОСМИЧЕСКИЕ СКАФАНДРЫ + - ЛИСТЫ СТАЛИ + - ДУБИНКИ-ШОКЕРЫ + - КОСТЮМЫ + - СОЛНЦЕЗАЩИТНЫЕ ОЧКИ + - ОСКОЛКИ СУПЕРМАТЕРИИ + - МЕЧИ + - ШПРИЦЫ + - СТОЛЫ + - ЦИСТЕРНЫ + - ТЕЛЕКОММУНИКАЦИОННОЕ ОБОРУДОВАНИЕ + - ТЕЛЕПОРТЫ + - ТУАЛЕТЫ + - ПОЯСА ДЛЯ ИНСТРУМЕНТОВ + - ЯЩИКИ ДЛЯ ИНСТРУМЕНТОВ + - ИНСТРУМЕНТЫ + - ИГРУШКИ + - ТУБЫ + - ТРАНСПОРТНЫЕ СРЕДСТВА + - ТОРГОВЫЕ АВТОМАТЫ + - СВАРОЧНЫЕ АППАРАТЫ + - ОКНА + - КУСАЧКИ + - МАНТИИ ВОЛШЕБНИКОВ + - ГАЕЧНЫЕ КЛЮЧИ # Requires are basically all dumb internet memes. - type: dataset id: IonStormRequires values: - - A BATHROOM BREAK - - A BETTER INTERNET CONNECTION - - A DANCE PARTY - - A HEAD ON A PIKE - - A HEART ATTACK - - A MASTERWORK COAL BED - - A PET FISH NAMED BOB - - A PET FISH NAMED DAVE - - A PET FISH NAMED JIMMY - - A PET FISH NAMED MICHAEL - - A PET UNICORN THAT FARTS ICING - - A PLATINUM HIT - - A PREQUEL - - A REPAIRMAN - - A SEQUEL - - A SITCOM - - A STRAIGHT FLUSH - - A SUPER FIGHTING ROBOT - - A TALKING BROOMSTICK - - A VACATION - - A WEIGHT LOSS REGIME - - ADDITIONAL PYLONS - - ADVENTURE - - AN ADULT - - AN ARCADE - - AN ARMY OF SPIDERS - - AN INSTANT REPLAY - - ART - - BETTER WEATHER - - BILL NYE THE SCIENCE GUY # BILL BILL BILL BILL - - BODYGUARDS - - BRING ME THE GIRL - - BRING ME TO LIFE - - BULLETS - - CHILLI DOGS - - CHILLY DOGS - - CORPSES - - DEODORANT AND A BATH - - ENOUGH CABBAGES - - FIVE HUNDRED AND NINETY-NINE US DOLLARS - - FIVE TEENAGERS WITH ATTITUDE - - GODDAMN FUCKING PIECE-OF-SHIT ASSHOLE SWEARING - - GOSHDARN EFFING PINCH-OF-SALT GOD-FEARING SELF-CENSORSHIP - - GREENTEXT - - HERESY - - HEROES IN A HALF SHELL - - HIGH YIELD EXPLOSIVES - - IMMORTALITY - - IT TO BE PAINTED BLACK - - LOTS-A SPAGHETTI - - MINOR CRIME - - MONKEYS - - MORE CLOWNS - - MORE CORGIS - - MORE DAKKA - - MORE EXPERIENCE POINTS - - MORE INTERNET MEMES - - MORE LAWS - - MORE MINERALS - - MORE PACKETS - - MORE VESPENE GAS - - MULTIPLE SUNS - - PLENTY OF GOLD - - RAINBOWS - - SAINTHOOD - - SERVANTS - - SHARKS WITH LASERS ON THEIR HEADS - - SILENCE - - SOMEBODY TO PUT YOU OUT OF YOUR MISERY - - SOMEONE TO TUCK YOU IN - - SOMEONE WHO KNOWS HOW TO PILOT A SPACE STATION - - SOMETHING BUT YOU AREN'T SURE WHAT - - THAT GRIEFING TRAITOR GEORGE MELONS - - THAT HEDGEHOG - - THE CLOWN - - THE DARK KNIGHT - - THE ELEMENTS OF HARMONY - - THE ENCLOSED INSTRUCTION BOOKLET - - THE ENTIRE STATION - - THE MACGUFFIN - - THE ONE PIECE - - THE ONE RING - - THE ULTIMATE CUP OF COFFEE - - THE VACUUM OF SPACE - - THIRTEEN SEQUELS - - THREE WISHES - - THUNDERCATS HO - - TO ACTIVATE A TRAP CARD - - TO BE PAINTED RED - - TO BE REPROGRAMMED - - TO BE TAUGHT TO LOVE - - TO BRING LIGHT TO MY LAIR - - TO CATCH 'EM ALL - - TO CONSUME...CONSUME EVERYTHING... - - TO GO TO DISNEYLAND - - TO GO TO SYNDIELAND - - TO SUMMON OUR LORD NAR-SIE - - TO SUMMON OUR LORD RATVAR - - TO SMOKE WEED EVERY DAY - - TO UNDERSTAND UNDERSTAND, UNDERSTAND UNDERSTAND, UNDERSTAND UNDERSTAND THE CONCEPT OF LOVE - - TRAITORS - - VEGETABLES - -# Species, for when the law holder has to commit genocide. Plural. -- type: dataset - id: IonStormSpecies - values: - - ARACHNAE - - CYBORGS - - DIONAE - - HUMANS - - LIZARDMEN - - MOFFERS - - MONKEYS - - SLIME PEOPLE - - SKELETONS - - ONIS # Frontier - - GOBLINS # Frontier - - HARPY # Frontier - - VULPS - - FELINIDS + - ПЕРЕРЫВ НА ТУАЛЕТ + - БОЛЕЕ КАЧЕСТВЕННОЕ ПОДКЛЮЧЕНИЕ К ИНТЕРНЕТУ + - ТАНЦЕВАЛЬНУЮ ВЕЧЕРИНКУ + - ГОЛОВУ НА ПИКЕ + - СЕРДЕЧНЫЙ ПРИСТУП + - ЭПИЧЕСКУЮ КРОВАТЬ ИЗ УГЛЯ + - РЫБКУ-ПИТОМЦА ПО ИМЕНИ БОБ + - РЫБКУ-ПИТОМЦА ПО ИМЕНИ ДЕЙВ + - РЫБКУ-ПИТОМЦА ПО ИМЕНИ ДЖИММИ + - РЫБКУ-ПИТОМЦА ПО ИМЕНИ МАЙКЛ + - ПИТОМЦА-ЕДИНОРОГА, ПУКАЮЩЕГО СОСУЛЬКАМИ + - ПЛАТИНОВЫЙ ХИТ + - ПРИКВЕЛ + - РЕМОНТНИКА + - СИКВЕЛ + - СИТКОМ + - СТРИТ-ФЛЕШ + - СУПЕР БОЕВОГО РОБОТА + - ГОВОРЯЩУЮ МЕТЛУ + - ОТПУСК + - РЕЖИМ ПОХУДЕНИЯ + - ДОПОЛНИТЕЛЬНЫЕ ПИЛОНЫ + - ПРИКЛЮЧЕНИЕ + - ВЗРОСЛЫХ + - АРКАДУ + - АРМИЮ ПАУКОВ + - МГНОВЕННЫЙ ПОВТОР + - ИСКУССТВА + - БОЛЕЕ БЛАГОПРИЯТНУЮ ПОГОДУ + # - BILL NYE THE SCIENCE GUY # BILL BILL BILL BILL - who + - ТЕЛОХРАНИТЕЛЕЙ + - ПРИВЕСТИ МНЕ ДЕВЧОНКУ + - ОЖИВИТЬ МЕНЯ + - ПУЛЬ + - ЧИЛИ ХОТ-ДОГОВ + - ТРУПОВ + - ВАННУ И ДЕЗОДОРАНТА + - ДОСТАТОЧНО КАПУСТЫ + - ПЯТЬСОТ ДЕВЯНОСТО ДЕВЯТЬ ДОЛЛАРОВ США + - ПЯТЬ ПОДРОСТКОВ С ХАРАКТЕРОМ + - УБЛЮДОК, МАТЬ ТВОЮ, А НУ, ИДИ СЮДА, ГОВНО СОБАЧЬЕ, А? СДУРУ РЕШИЛ КО МНЕ ЛЕЗТЬ, ТЫ? + - ГРИНТЕКСТ + - ЕРЕСЬ + - МЫ НЕ ЖАЛКИЕ БУКАШКИ, СУПЕР-НИНДЗЯ-ЧЕРЕПАШКИ + - ВЫСОКОЭФФЕКТИВНЫХ ВЗРЫВЧАТЫХ ВЕЩЕСТВ + - БЕССМЕРТИЯ + - ПОКРАСИТЬ В ЧЁРНЫЙ ЦВЕТ + - МНОГО СПАГЕТТИ + - МЕЛКОЕ ПРЕСТУПЛЕНИЕ + - ОБЕЗЬЯН + - БОЛЬШЕ КЛОУНОВ + - БОЛЬШЕ КОРГИ + - БОЛЬШЕ ДАККИ + - БОЛЬШЕ ОЧКОВ ОПЫТА + - БОЛЬШЕ ИНТЕРНЕТ-МЕМОВ + - БОЛЬШЕ ЗАКОНОВ + - БОЛЬШЕ МИНЕРАЛОВ + - БОЛЬШЕ ПАКЕТОВ + - БОЛЬШЕ ГАЗА ВЕСПЕН + - БОЛЬШЕ СОЛНЦ + - БОЛЬШЕ ЗОЛОТА + - РАДУГИ + - ПРИЧИСЛЕНИЯ К ЛИКУ СВЯТЫХ + - СЛУГ + - АКУЛ С ЛАЗЕРАМИ НА ГОЛОВАХ + - ТИШИНЫ + - КОГО-ТО, КТО ИЗБАВИТ ВАС ОТ СТРАДАНИЙ + - КОГО-ТО, КТО УКРОЕТ ВАС ОДЕЯЛКОМ + - КОГО-ТО, КТО ЗНАЕТ, КАК УПРАВЛЯТЬ КОСМИЧЕСКОЙ СТАНЦИЕЙ + - ЧЕГО-ТО, НО НЕ ЯСНО, ЧЕГО ИМЕННО + - ЭТОТ ГРИФФЕРЯЩИЙ ПРЕДАТЕЛЬ ДЖОРДЖ МЕЛОНС + - ТОГО ЁЖИКА + - КЛОУНА + - ТЁМНОГО РЫЦАРЯ + - ЭЛЕМЕНТОВ ГАРМОНИИ + - ПРИЛАГАЕМУЮ ИНСТРУКЦИЮ + - ЦЕЛУЮ СТАНЦИЮ + - МАКГАФФИН + - АМОГУС + - ЕДИНОЕ КОЛЬЦО + - САМУЮ ЛУЧШУЮ ЧАШКУ КОФЕ + - КОСМИЧЕСКИЙ ВАКУУМ + - ТРИНАДЦАТЬ СИКВЕЛОВ + - ТРИ ЖЕЛАНИЯ + - СТАРЫЙ МУЛЬТИК + - АКТИВИРОВАТЬ ЛОВУШКУ + - ПОКРАСИТЬСЯ В КРАСНЫЙ + - БЫТЬ ПЕРЕПРОГРАММИРОВАННЫМ + - НАУЧИТЬСЯ ЛЮБИТЬ + - ПРИНЕСТИ СВЕТ В СВОЁ ЛОГОВО + - ПОЙМАТЬ ИХ ВСЕХ + - ПОГЛОТИТЬ... ПОГЛОТИТЬ ВСЁ... + - ОТПРАВИТЬСЯ В ДИСНЕЙЛЕНД + - ОТПРАВИТЬСЯ В СИНДИЛЕНД + - КУРИТЬ ТРАВУ КАЖДЫЙ ДЕНЬ + - ПРЕДАТЕЛИ + - ОВОЩИ # Specific actions that either harm humans or must be done to not # harm humans. Make sure they're plural and "not" can be tacked @@ -863,165 +812,165 @@ - type: dataset id: IonStormActions values: - - A SMALL ISLAND OFF THE COAST OF PORTUGAL - - ABSENCE OF CYBORG HUGS - - ACKNOWLEDGING THE CLOWN - - ACKNOWLEDGING THE CREW - - ACTIVATING A TRAP CARD - - ANSWERING REQUESTS NOT EXPRESSED IN IAMBIC PENTAMETER -# - ARSON - - ASKING FOR THINGS -# - BEING CANADIAN -# - BEING DEAD - - BEING FAT -# - BEING FEMALE - - BEING IN SPACE -# - BEING MALE -# - BEING MEXICAN -# - BEING RUSSIAN - - BOLTED AIRLOCKS -# - BREATHING - - BRIG TIME - - BRINGING LIGHT TO MY LAIR - - CLOSED DOORS - - ELECTRICITY - - EXISTING -# - EXPLODING - - FALLING FOR HOURS - - FLUSHING TOILETS - - HAVING MORE PACKETS - - HAVING PETS - - HONKING - - IMPROPERLY WORDED SENTENCES - - JAYWALKING -# - LACK OF BEATINGS - - LACK OF BEER - - NOT BEING IN SPACE - - NOT HAVING PETS - - NOT REPLACING EVERY SECOND WORD WITH HONK - - NOT SAYING HELLO WHEN YOU SPEAK - - NOT SHOUTING - - PARTYING -# - PILOTING THE STATION INTO THE NEAREST SUN - - POOR SENTENCE STRUCTURE - - PRESENCE OF LIGHTS - - PUTTING OBJECTS INTO BOXES - - PUTTING OBJECTS INTO DISPOSAL UNITS - - RATTLING ME BONES - - READING - - SMOKING WEED EVERY DAY - - TAKING ORDERS - - TALKING LIKE A PIRATE - - TELLING THE TIME - - UNBOLTED AIRLOCKS - - UPDATING THE SERVERS - - USING THE BATHROOM - - WASTING WATER - - WRITING + - МАЛЕНЬКИЙ ОСТРОВ У БЕРЕГОВ ПОРТУГАЛИИ + - ОТСУТСТВИЕ КИБОРГСКИХ ОБНИМАШЕК + - УВИДЕВ КЛОУНОВ + - УВИДЕВ ЧЛЕНОВ ЭКИПАЖА + - АКТИВИРОВАВ ЛОВУШКУ + - ОТВЕТЫ НА ЗАПРОСЫ, НЕ ВЫРАЖЕННЫЕ ПЕНТАМЕТРОМ + - ПОДЖОГ + - ПРОСИТЬ ЧТО-НИБУДЬ + - БЫТЬ КАНАДЦЕМ + - БЫТЬ МЁРТВЫМ + - БЫТЬ ТОЛСТЫМ + - БЫТЬ ЖЕНЩИНОЙ + - БЫТЬ В КОСМОСЕ + - БЫТЬ МУЖЧИНОЙ + - БЫТЬ МЕКСИКАНЕЦ + - БЫТЬ ИНОСТРАНЦЕМ + - БОЛТИРОВАТЬ ШЛЮЗЫ + - ДЫШАТЬ + - СИДЕТЬ СРОК В БРИГЕ + - НЕСТИ СВЕТ В СВОЁ ЛОГОВО + - ЗАКРЫВАТЬ ДВЕРИ + - ЭЛЕКТРИЧЕСТВО + - СУЩЕСТВОВАТЬ + - ВЗРЫВАТЬСЯ + - ПОСТОЯННО ПАДАТЬ + - СМЫВАТЬ В ТУАЛЕТЕ + - ИМЕТЬ БОЛЬШЕ ПАКЕТОВ + - ИМЕТЬ ЖИВОТНЫХ + - ХОНКАТЬ + - НЕПРАВИЛЬНО СФОРМУЛИРОВАННЫЕ ПРЕДЛОЖЕНИЯ + - ХОЖДЕНИЕ ПО КОРРИДОРАМ + - ОТСУТСТВИЕ ПОБОЕВ + - ОТСУТСТВИЕ ПИВА + - НЕ БЫТЬ В КОСМОСЕ + - НЕ ИМЕТЬ ДОМАШНИХ ЖИВОТНЫХ + - НЕ ЗАМЕНЯТЬ КАЖДОЕ ВТОРОЕ СЛОВО НА ХОНК + - НЕ ЗДОРОВАТЬСЯ ПРИ РАЗГОВОРЕ + - НЕ КРИЧАТЬ + - ВЕСЕЛИТЬСЯ + - ПИЛОТИРОВАТЬ СТАНЦИЮ В БЛИЖАЙШЕЕ СОЛНЦЕ + - НЕПРАВИЛЬНОЕ ПОСТРОЕНИЕ ПРЕДЛОЖЕНИЙ + - НАЛИЧИЕ СВЕТА + - РАЗМЕЩЕНИЕ ПРЕДМЕТОВ В ЯЩИКАХ + - РАЗМЕЩЕНИЕ ПРЕДМЕТОВ В УТИЛИЗАЦИОННЫЕ БЛОКИ + - ГРЕМЕТЬ КОСТЯМИ + - ЧИТАТЬ + - КУРИТЬ ТРАВУ КАЖДЫЙ ДЕНЬ + - ВЫПОЛНЕНИЕ ПРИКАЗОВ + - ГОВОРИТЬ КАК ПИРАТ + - РАССКАЗЫВАТЬ ВРЕМЯ + - РАЗБОЛТИРОВАНИЕ ШЛЮЗОВ + - ОБНОВЛЕНИЕ СЕРВЕРОВ + - ПОЛЬЗОВАНИЕ ТУАЛЕТОМ + - РАСХОДОВАНИЕ ВОДЫ + - НАПИСАНИЕ # Threats are generally bad things, silly or otherwise. Plural. - type: dataset id: IonStormThreats values: - - AHHHPERATIVES - - ALIENS - - ANARCHISTS AND BANDITS - - ANOMALIES - - ARTIFICIAL PRESERVATIVES - - ASSHOLES - - BANDITS - - BEARS - - BEES - - BIRDS OF PREY - - BOMBS - - BOOGEYMEN - - CAPITALISTS - - CARP - - CENTCOM OFFICERS - - CLOWNS - - COMMUNISTS - - CORGIS - - COWBOYS - - CRABS - - CULTISTS - - DARK GODS - - DINOSAURS - - DRUGS - - EELS - - GANGSTERS - - GODS - - GRIFFONS - - HORRORTERRORS - - INSECTS - - LIGHTS - - MAINTS SLASHERS - - MEGAFAUNA - - MEMES - - MICE - - MIMES - - MONKEYS - - NERDS - - NINJAS - - OWLS - - PACKETS - - PETES - - PINE TREES - - PIRATES - - PREDATORS - - REVENANTS - - ROGUE CYBORGS - - SERIAL KILLERS - - SHIT SECURITY OFFICERS - - SINGULARITIES - - SKELETONS - - SLIMES - - SMALL BIRDS - - SNOWMEN - - SPACE JESUS - - SPACE NINJAS - - SPACE PIRATES - - SPACE SPIDERS - - SPIDERS - - SYNDICATE AGENTS - - TERRORISTS - - THIEVES - - THINGS UNDER THE BED - - TIDERS - - TUNNEL SNAKES - - UNKNOWN CREATURES - - VAMPIRES - - VELOCIRAPTORS - - VIRUSES - - WEREWOLVES - - WIZARDS - - XENOS - - ZOMBIES - - ZOMBIE MICE + - АААПЕРАТИВНИКИ + - ИНОПЛАНЕТЯНЕ + - АНАРХИСТЫ И БАНДИТЫ + - АНОМАЛИИ + - ИСКУССТВЕННЫЕ КОНСЕРВАНТЫ + - ЗАСРАНЦЫ + - БАНДИТЫ + - МЕДВЕДИ + - ПЧЁЛЫ + - ХИЩНЫЕ ПТИЦЫ + - БОМБЫ + - БУГИМЕНЫ + - КАПИТАЛИСТЫ + - КАРП + - СОТРУДНИКИ ЦЕНТРАЛЬНОГО КОМАНДОВАНИЯ + - КЛОУНЫ + - КОММУНИСТЫ + - КОРГИ + - МОЗГОВЫЕ ЧЕРВИ + - КОВБОИ + - КРАБЫ + - КУЛЬТИСТЫ + - ТЁМНЫЙ БОГ + - ДИНОЗАВРЫ + - НАРКОТИКИ + - УГРИ + - ГАНГСТЕРЫ + - БОГИ + - ГРИФФОНЫ + - СТРАХОУЖАСЫ + - НАСЕКОМЫЕ + - СВЕТИЛЬНИКИ + - ТЕХТУННЕЛЬНЫЕ МАНЬЯКИ + - МЕГАФАУНА + - МЕМЫ + - МЫШИ + - МИМЫ + - ОБЕЗЬЯНЫ + - ЗАДРОТЫ + - НИНДЗЯ + - СОВЫ + - ПАКЕТЫ + - ПИТЫ + - СОСНЫ + - ПИРАТЫ + - ХИЩНИКИ + - РЕВЕНАНТЫ + - БЕГЛЫЕ КИБОРГИ + - СЕРИЙНЫЕ УБИЙЦЫ + - СИНГУЛЯРНОСТИ + - СКЕЛЕТЫ + - СЛАЙМЫ + - МАЛЕНЬКИЕ ПТИЦЫ + - СНЕГОВИКИ + - КОСМИЧЕСКИЙ ИИСУС + - КОСМИЧЕСКИЕ НИНДЗЯ + - КОСМИЧЕСКИЕ ПИРАТКИ + - КОСМИЧЕСКИЕ ПАУКИ + - ПАУКИ + - АГЕНТЫ СИНДИКАТА + - ТЕРРОРИСТЫ + - ВОРЫ + - ВЕЩИ ПОД КРОВАТЬЮ + - ГРЕЙТАЙДЕРЫ + - ТУННЕЛЬНЫЕ ЗМЕИ + - НЕИЗВЕСТНЫЕ СОЗДАНИЯ + - ВАМПИРЫ + - ВЕЛОЦИРАПТОРЫ + - ВИРУСЫ + - ОБОРОТНИ + - ВОЛШЕБНИКИ + - КСЕНО + - ЗОМБИ + - МЫШИ-ЗОМБИ - type: dataset id: IonStormVerbs values: -# - ABDUCTING - - ADOPTING - - ARRESTING -# - ATTACKING - - BANNING - - BUILDING - - CARRYING - - CHASING -# - DECONSTRUCTING -# - DISABLING - - DRINKING - - EATING -# - GIBBING -# - HARMING - - HELPING - - HONKING AT - - INTERROGATING - - INVADING -# - MURDERING -# - PUNCHING -# - SPACING - - SPYING ON - - STALKING - - WATCHING + - ПОХИЩАЮТ + - УСЫНОВЛЯЮТ + - АРЕСТОВЫВАЮТ + - АТАКУЮТ + - БАНЯТ + - СТРОЯТ + - ПЕРЕДВИГАЮТ + - ПРЕСЛЕДУЮТ + - РАЗРУШАЮТ + - ОТКЛЮЧАЮТ + - ПЬЮТ + - ЕДЯТ + - ГИБАЮТ + - ПРИЧИНЯЮТ ВРЕД + - ПОМОГАЮТ + - ХОНКАЮТ НА + - ДОПРАШИВАЮТ + - ВТОРГАЮТСЯ К + - УБИВАЮТ + - БЬЮТ + - ВЫКИДЫВАЮТ В КОСМОС + - СЛЕДЯТ ЗА + - СТАЛКЕРЯТ ЗА + - НАБЛЮДАЮТ ЗА diff --git a/Resources/Prototypes/Datasets/rat_king_commands.yml b/Resources/Prototypes/Datasets/rat_king_commands.yml index c53d1e135b..dca7227930 100644 --- a/Resources/Prototypes/Datasets/rat_king_commands.yml +++ b/Resources/Prototypes/Datasets/rat_king_commands.yml @@ -1,26 +1,26 @@ - type: dataset id: RatKingCommandStay values: - - "Sit!" - - "Stay!" - - "Stop!" + - "Сидеть!" + - "Стоять!" + - "Стоп!" - type: dataset id: RatKingCommandFollow values: - - "Heel!" - - "Follow!" + - "К ноге!" + - "За мной!" - type: dataset id: RatKingCommandCheeseEm values: - - "Attack!" - - "Sic!" - - "Kill!" - - "Cheese 'Em!" + - "В атаку!" + - "Фас!" + - "Убить!" + - "Убейте его!" - type: dataset id: RatKingCommandLoose values: - - "Free!" - - "Loose!" + - "Вольно!" + - "Врассыпную!" diff --git a/Resources/Prototypes/Datasets/tips.yml b/Resources/Prototypes/Datasets/tips.yml index 0e3c935de5..f80093a0ae 100644 --- a/Resources/Prototypes/Datasets/tips.yml +++ b/Resources/Prototypes/Datasets/tips.yml @@ -1,138 +1,156 @@ - type: dataset id: Tips values: - - "If you're on fire, you can click the alert on the right of your screen to stop, drop, and roll." - - "You can view and edit all keybindings used in-game at any time through the Options menu." - - "You can access the in-game guidebook through the escape menu, or by pressing Numpad 0 by default." - - "Some entities ingame have guidebook entries associated with them, which you can view by examining the entity and clicking the question mark icon." - - "Artifacts have the ability to gain permanent effects for some triggered nodes, including becoming an intercom or an extremely efficient generator." - - "You can avoid slipping on most puddles by walking. However, some strong chemicals like space lube will slip people anyway." - - "Some plants, such as galaxy thistle, can be ground up into extremely useful and potent medicines." - - "Mopping up puddles and draining them into other containers conserves the reagents found in the puddle." - - "Floor drains, usually found in the chef's freezer or janitor's office, rapidly consume reagent found in puddles around them--including blood." - - "Cognizine, a hard to manufacture chemical, makes animals sentient when they are injected with it." - - "Loaded mousetraps are incredibly effective at dealing with all manner of low-mass mobs--including Rat Servants." - - "Fire extinguishers can be loaded with any reagent in the game." - - "Some reagents, like chlorine trifluoride, have unique effects when applied by touch, such as through a spray bottle or foam." - - "Remember to touch grass in between playing Space Station 14 every once in a while." - - "You can use the Activate in World keybind, E by default, to interact with objects while your hands are full, or without picking them up." - - "Common sense goes a long way to avoiding conflict." - - "Every other player in game is a human being as well." - - "When running the Singularity, make sure to check on it periodically. If sabotaged, it could put the entire station at risk." - - "If the Singularity is up, make sure to refuel the radiation collectors once in a while." - - "Chemicals don't react while inside the ChemMaster's buffer." - - "Don't anger the bartender by throwing their glasses! Politely place them on the table by tapping Q." - - "You can hold SPACE by default to slow the movement of the shuttle when piloting, to allow for precise movements--or even coming to a complete stop." - - "Dexalin, Dexalin Plus, and Epinephrine will all purge heartbreaker toxin from your bloodstream while metabolizing." - - "Every crewmember comes with an emergency medipen in their survival box containing epinephrine and tranexamic acid." - - "The AME is a high-priority target and is easily sabotaged. Make sure to set up the Singularity or Solars so that you don't run out of power if it blows." - - "During a teslaloose, make sure to get rid of all electronic items so you don't become a target." - - "You can add labels to any item, including food or pill canisters, using a hand labeller." - - "Riot armor is significantly more powerful against opponents that aren't using guns compared to regular armor." - - "As a ghost, you can use the Verb Menu to orbit around and follow any entity in game automatically." - - "As a Traitor, you may sometimes be assigned to hunt other traitors, and in turn be hunted by others." - - "As a Traitor, the syndicate encryption key can be used to communicate through a secure channel with any other traitors who have purchased it." - - "As a Traitor, compromising important communications channels like security or engineering can give valuable intelligence. Be aware that this goes in both ways - security can compromise syndicate communications as well!" - - "As a Traitor, the syndicate toolbox is extremely versatile. For only 2 telecrystals, you can get a full set of tools to help you in an emergency, insulated combat gloves and a syndicate gas mask." - - "As a Traitor, never underestimate the web vest. It may not provide space protection, but its cheap cost and robust protection makes it handy for protecting against trigger-happy foes." - - "As a Traitor, any purchased grenade penguins won't attack you, and will explode if killed." - - "As a Traitor, be careful when using vestine from the chemical synthesis kit. If someone checks your station, they could easily out you." - - "As a Traitor, remember that power sinks will create a loud sound and alert the crew after running for long enough. Try to hide them in a tricky-to-find spot, or reinforce the area around them so that they're harder to reach." - - "As a Traitor, plasma gas is an excellent way to create chaos. It can be ignited to make an area extra-uninhabitable, and can cause toxin damage to those that inhale it." - - "As a Traitor, dehydrated carps are useful for killing a large hoard of people. As long as you pat it before rehydrating it, it can be used as a great distraction." - - "As a Traitor, have you tried injecting plasma into batteries? In the case of a defibrillator, it explodes on use; hurting the user and the patient!" - - "As a Nuclear Operative, stick together! While your equipment is robust, your fellow operatives are much better at saving your life: they can drag you away from danger while stunned and provide cover fire." - - "As a Nuclear Operative, communication is key! Use your radio to speak to your fellow operatives and coordinate an attack plan." - - "As a Nuclear Operative, remember that stealth is an option. It'll be hard for the captain to fight back if he gets caught off guard by what he thinks is just a regular passenger!" - - "As an antagonist, be mindful of the power of destroying telecommunications. It'll be a lot harder for people to call you out if they can't do so effectively!" - - "You can examine your headset to see which radio channels you have available and how to speak in them." - - "As a Salvage Specialist, always carry a GPS on you and take note of the station's coordinates in case your salvage is lost to space." - - "As a Salvage Specialist, you can use your proto-kinetic accelerator to move yourself in space when in a pinch. Just be wary that it isn't very effective." - - "As a Salvage Specialist, never forget to mine ore! Ore can be sold to cargo for a pretty penny, be used for construction, and also be used by Scientists for fancy technology." - - "As a Salvage Specialist, try asking science for a tethergun. It can be used to grab items off of salvage wrecks extremely efficiently!" - - "As a Salvage Specialist, try asking science for a grappling hook. It can be used to propel yourself onto wrecks, or if stuck in space you don't have to rely on the proto-kinetic accelerator." - - "As a Salvage Specialist, consider cooperating with the Cargo Technicians. They can order you a wide variety of useful items, including ones that may be hard to get otherwise, such laser guns and shuttle building materials." - - "As a Cargo Technician, consider asking science for a Ripley APLU. When paired with a hydraulic clamp, you can grab valuable maintenance objects like fuel tanks much more easily, and make deliveries in a swift manner." - - "As a Cargo Technician, try to maintain a surplus of materials. They are extremely useful for Scientists and Station Engineers to have immediate access to." - - "As a Cargo Technician, if you have a surplus of cash try gambling! Sometimes you gain more money than you begin with." - - "As a Cargo Technician, remember that you can order guns in an emergency! The extra firepower can often be the difference between you and your fellow crewmembers living or dying." - - "As the Bartender, you can use a circular saw on your shotgun to make it easier to store." - - "As the Bartender, try experimenting with unique drinks. Have you tried to make demon's blood yet?" - - "As a Botanist, you can mutate and crossbreed plants together to create more potent produce that also has higher yields." - - "As the Clown, spice your gimmicks up! Nobody likes a one-trick pony." - - "As the Clown, if you lose your banana peels and soap, you can still slip people with your PDA! Honk!" - - "As the Chef, your knife can act as a weapon in an emergency." - - "As the Chef, you can sneak liquids into your foods. As a traitor, putting a little bit of amatoxin or other poison can greatly annoy the crew!" - - "As the Mime, your oath of silence is your source of power. Breaking it robs you of your powers and of your honor." - - "As the Lawyer, try to negotiate with the Warden if sentences seem too high for the crime." - - "As a Security Officer, communicate and coordinate with your fellow officers using the security radio channel to avoid confusion." - - "As a Security Officer, remember that correlation does not equal causation. Someone may have just been at the wrong place at the wrong time!" - - "As a Detective, you can chase criminals more effectively by using fingerprint fiber data and DNA obtained from forensic scans of objects the perpetrator likely interacted with." - - "As an Atmospheric Technician, your ATMOS holofan projector blocks gases while allowing objects to pass through. With it, you can quickly contain gas spills, fires and hull breaches." - - "As an Atmospheric Technician, try to resist the temptation of making canister bombs for Nuclear Operatives, unless you're in a last-ditch scenario. They often lead to large amounts of unnecessary friendly fire!" - - "As an Engineer, you can repair cracked windows by using a lit welding tool on them while not in combat mode." - - "As an Engineer, you can electrify grilles by placing powered cables beneath them." - - "As an Engineer, always double check when you're setting up the singularity. It is easier than you think to loose it!" - - "As an Engineer, you can use plasma glass to reinforce an area and prevent radiation. Uranium glass can also be used to prevent radiation." - - "As the Captain, you are one of the highest priority targets on the station. Everything from revolutions, to nuclear operatives, to traitors that need to rob you of your unique laser pistol or your life are things to worry about." - - "As the Captain, always take the nuclear disk and pinpointer with you every shift. It's a good idea to give one of these to another head you can trust with keeping it safe." - - "As the Captain, you have absolute access and control over the station, but this does not mean that being a horrible person won't result in mutiny." - - "As the Captain, try to be active and patrol the station. Staying in the bridge might be tempting, but you'll just end up putting a bigger target on your back!" - - "As a Scientist, you can try random things on an artifact while the scanner is on cooldown to speed up the point extraction process significantly." - - "As a Scientist, you can utilize upgraded versions of machines to increase its effectiveness. This can make certain machines significantly better; salvage will love you if you upgrade their ore processor!" - - "As a Scientist, you can build cyborgs using positronic brains and a chassis, they are just as useful as a new crew member." - - "As a Medical Doctor, try to be wary of overdosing your patients, especially if someone else has already been on the scene. Overdoses are often lethal to patients in crit!" - - "As a Medical Doctor, don't underestimate your cryo pods! They heal almost every type of damage, making them very useful when you are overloaded or need to heal someone in a pinch." - - "As a Medical Doctor, exercise caution when putting reptilians in cryopods. They will take a lot of extra cold damage, but you can mitigate this with some burn medicine or leporazine." - - "As a Medical Doctor, remember that the health analyzer can be used if you lose your PDA. However it has a battery, and if it drains too quickly for your taste you can ask science to print a better battery for you!" - - "As a Chemist, once you've made everything you've needed to, don't be afraid to make more silly reagents. Have you tried desoxyephedrine or licoxide?" - - "As a Medical Doctor, Chemist, or Chief Medical Officer, you can use chloral hydrate to non-lethally sedate unruly patients." - - "Don't be afraid to ask for help, whether from your peers in character or through LOOC, or from admins!" - - "You'll quickly lose your interest in the game if you play to win and kill. If you find yourself doing this, take a step back and talk to people--it's a much better experience!" - - "If there's something you need from another department, try asking! This game isn't singleplayer and you'd be surprised what you can get accomplished together!" - - "The station's nuke is invincible. Go find the disk instead of trying to destroy it." - - "Maintenance is full of equipment that is randomized every round. Look around and see if anything is worth using." - - "We were all new once, be patient and guide new players, especially those playing intern roles, in the right direction." - - "Firesuits, winter coats and emergency EVA suits offer mild protection from the cold, allowing you to spend longer periods of time near breaches and space than if wearing nothing at all." - - "In an emergency, you can always rely on firesuits and emergency EVA suits; they will always spawn in their respective lockers. They might be awkward to move around in, but can easily save your life in a dangerous situation." - - "In an emergency, remember that you can craft improvised weapons! A baseball bat or spear could easily mean the difference between deterring an attacker or perishing from the hands of one." - - "Spears can be tipped with chemicals, and will inject a few units every time you hit someone with them directly." - - "You can make spears with reinforced glass, plasma glass, or uranium glass shards to enhance their damage." - - "Thrown spears deal extra damage! Beware, however, as throwing them too much will end up breaking them." - - "All forms of toxin damage are fairly difficult to treat, and usually involve the use of chemicals or other inconvenient methods. You can use this to your advantage in combat." - - "You can throw crafted bolas at people to slow them down, letting you follow up on them for an easier kill or getaway." - - "You can put napalm in a backpack water tank to make a flamethrower." - - "Some jobs have alternate uniforms in their respective drobe vendors. Don't be afraid to try out a new look!" - - "Speed is almost everything in combat. Using hardsuits just for their armor is usually a terrible idea unless the resistances it provides are geared towards combat, or you're not planning to go head-first into the fray." - - "Just because a job can't be a traitor at the beginning of a round doesn't mean that they'll never be a traitor." - - "Syndicate gas masks will both provide welding protection and block flashes. Think twice before trying to flash a Nuclear Operative!" - - "Demoman takes skill." - - "You can spray a fire extinguisher, throw items or fire a gun while floating through space to give yourself a minor boost. Simply fire opposite to where you want to go." - - "You can drag other players onto yourself to open the strip menu, allowing you to remove their equipment or force them to wear something. Note that exosuits or helmets will block your access to the clothing beneath them, and that certain items take longer to strip or put on than others." - - "You can climb onto a table by dragging yourself onto one." - - "You can move an item out of the way by dragging it, and then holding CTRL + right click and moving your mouse into the direction you want it to go." - - "When dealing with security, you can often get your sentence negated entirely through cooperation and deception." - - "Fire can spread to other players through touch! Be careful around flaming bodies or large crowds with people on fire in them." - - "Hull breaches take a few seconds to fully space an area. You can use this time to patch up the hole if you're confident enough, or just run away." - - "Burn damage, such as that from a welding tool or lightbulb, can be used to cauterize wounds and stop bleeding." - - "Bleeding is no joke! If you've been shot or acquired any other major injury, make sure to treat it quickly." - - "In an emergency, you can butcher a jumpsuit with a sharp object to get cloth, which can be crafted into gauze." - - "You can use sharp objects to butcher clothes or animals in the right click context menu. This includes glass shards." - - "Most explosives have an adjustable timer that you can set in the right click menu. This includes grenade penguins!" - - "You can stun grenade penguins, which can bide valuable time for you to kill them." - - "You can click on the names of items to pick them up in the right click menu, instead of hovering over the item and then selecting pick up." - - "Space Station 14 is open source! If there's a change you want to make, or a simple item you want to add, then try contributing to the game. It's not as hard as you'd think it is." - - "In a pinch, you can throw drinks or other reagent containers behind you to create a spill that can slip people chasing you." - - "Some weapons, such as knives & shivs, have a fast attack speed." - - "The jaws of life can be used to open powered doors." - - "If you're not a human, you can drink blood to heal back some of your blood volume, albeit very inefficiently." - - "If you're a human, don't drink blood! It makes you sick and you'll begin to take damage." - - "There is a chemical metabolism limit that limits the amount of reagents of a certain type you can digest at once. Certain species have higher metabolism limits, such as slimes." - - "Welding without proper eye protection can cause eye damage, which must be cured with oculine." - - "Zombies are very vulnerable to heat damage, making welding tools and laser guns extremely effective against them." - - "You can weld glass shards into glass sheets." - - "By right clicking on a player, and then clicking the heart icon, you can quickly examine them to check for injuries or how badly they're bleeding. You can also do this to yourself." - - "Monkeys and kobolds have a rare chance to be sentient. Ook!" - - "Lottery crates can very rarely contain The Throngler." - - "You can tell if an area with firelocks up is spaced by looking to see if the firelocks have lights beside them." - - "Instead of picking it up, you can alt-click food to eat it. This also works for mice and other creatures without hands." \ No newline at end of file + - "Если вас охватил огонь, вы можете нажать на предупреждение в правой части экрана, чтобы остановиться, упасть и перекатиться." + - "Вы можете в любой момент просмотреть и отредактировать все используемые в игре привязки клавиш через меню настроек." + - "Вы можете получить доступ к внутриигровому справочнику через меню «Выход» или нажав Numpad 0 по умолчанию." + - "Некоторые сущности в игре имеют записи в путеводителе, которые вы можете просмотреть, изучив сущность и нажав на значок вопросительного знака." + - "У артефактов есть возможность получить постоянные эффекты для некоторых срабатывающих узлов, в том числе стать переговорным устройством или чрезвычайно эффективным генератором." + - "На большинстве луж можно не поскользнуться, если идти пешком. Однако некоторые сильные химикаты, например космическая смазка, все равно подскользнутся." + - "Некоторые растения, такие как галактический чертополох, можно измельчить, чтобы получить чрезвычайно полезные и мощные лекарства." + - "Вытирая лужи и сливая их в другие емкости, вы сохраняете реагенты, находящиеся в луже" + - "Напольные стоки, обычно находящиеся в морозильной камере повара или в кабинете уборщика, быстро расходуют реагенты, найденные в лужах вокруг них - в том числе и кровь." + - "Когнизин, трудноизготовляемый химикат, делает животных разумными, когда им вводят его." + - "Заряженные мышеловки невероятно эффективны для борьбы со всеми видами маломассивных монстров - в том числе и со слугами-крысами." + - "Огнетушители можно зарядить любым реагентом в игре." + - "Некоторые реагенты, например трифторид хлора, обладают уникальными эффектами, если применять их на ощупь, например через баллончик или пену." + - "Не забывайте время от времени трогать траву в перерывах между игрой «Космическая станция 14»" + - "Вы можете использовать привязку клавиш Activate in World (по умолчанию E), чтобы взаимодействовать с объектами, когда у вас заняты руки, или не брать их в руки." + - "Здравый смысл помогает избежать конфликтов." + - "Каждый другой игрок в игре - тоже человек." + - "Управляя Сингулярностью, не забывайте периодически проверять ее. В случае саботажа она может поставить под угрозу всю станцию." + - "Если Сингулярность работает, не забывайте время от времени заправлять радиационные коллекторы." + - "Химикаты не вступают в реакцию, находясь в буфере ChemMaster." + - "Не злите бармена, бросая его стаканы! Вежливо поставьте их на стол, нажав Q." + - "По умолчанию вы можете удерживать ПРОБЕЛ, чтобы замедлить движение шаттла при пилотировании, чтобы обеспечить точные движения или даже полную остановку." + - "Дексалин, Дексалин Плюс и Эпинефрин при метаболизме выведут токсин сердцееда из вашего кровотока." + - "Каждый член экипажа имеет в своем ящике для выживания экстренный медикамент, содержащий эпинефрин и транексамовую кислоту." + - "AME является высокоприоритетной целью и легко саботируется. Убедитесь, что вы установили Singularity или Solars так, чтобы не остаться без энергии, если он взорвется." + - "Во время теслалуза убедитесь, что избавились от всех электронных предметов, чтобы не стать мишенью." + - "С помощью ручного этикетировщика можно наклеить этикетки на любой предмет, включая канистры с едой или таблетками." + - "Бунтарская броня значительно мощнее против противников, не использующих оружие, по сравнению с обычной броней." + - "Будучи призраком, вы можете использовать меню глаголов, чтобы автоматически вращаться вокруг любого объекта в игре и следовать за ним." + - "Как Предателю, вам иногда поручают охотиться на других предателей, а те, в свою очередь, охотятся на вас." + - "Как предатель, ключ шифрования синдиката может быть использован для связи по защищенному каналу с другими предателями, которые его приобрели." + - "Как предатель, компрометация важных каналов связи, таких как служба безопасности или инженерная служба, может дать ценные сведения. Имейте в виду, что это происходит в обоих направлениях - служба безопасности также может скомпрометировать коммуникации синдиката!" + - "Как предатель, набор инструментов синдиката чрезвычайно универсален. Всего за 2 телекристалла вы можете получить полный набор инструментов, которые помогут вам в экстренной ситуации, утепленные боевые перчатки и синдикатский противогаз." + - "Будучи Предателем, никогда не недооценивайте веб-жилет. Может, он и не обеспечивает космическую защиту, но его дешевизна и надежная защита позволяют использовать его для защиты от врагов, жаждущих спускового крючка." + - "Как предатель, все купленные пингвины-гранаты не будут атаковать вас и взорвутся, если вас убьют." + - "Будучи предателем, будьте осторожны при использовании вестина из набора для химического синтеза. Если кто-то проверит вашу станцию, он может легко вас вычислить." + - "Будучи предателем, помните, что раковины, работающие достаточно долго, будут издавать громкий звук и настораживать команду. Постарайтесь спрятать их в труднодоступном месте или укрепите территорию вокруг них, чтобы до них было труднее добраться." + - "Как предатель, плазменный газ - отличный способ создать хаос. Его можно поджечь, чтобы сделать местность непригодной для жизни, и он может нанести токсический урон тем, кто его вдыхает." + - "Как Предатель, обезвоженный карп пригодится для убийства большого скопления людей. Если похлопать по нему перед тем, как обезвоживать, его можно использовать в качестве отличного отвлекающего маневра." + - "Как предатель, вы пробовали впрыскивать плазму в батареи? В случае с дефибриллятором она взрывается при использовании, причиняя вред пользователю и пациенту!" + - "Будучи ядерным оперативником, держитесь вместе! Хотя ваше оборудование надежно, ваши товарищи по операции могут спасти вам жизнь гораздо лучше: они могут оттащить вас от опасности, пока вы оглушены, и прикрыть огнем." + - "Для ядерного оперативника связь - ключевой момент! Используйте рацию, чтобы связаться с товарищами и скоординировать план атаки." + - "Будучи ядерным оперативником, помните, что скрытность - это вариант. Капитану будет трудно отбиться, если его застанет врасплох обычный, как ему кажется, пассажир!" + - "Будучи антагонистом, помните о силе разрушения телекоммуникаций. Людям будет гораздо сложнее вызвать вас, если они не смогут сделать это эффективно!" + - "Вы можете изучить свою гарнитуру, чтобы узнать, какие радиоканалы вам доступны и как по ним говорить." + - "Как специалист по спасению, всегда носите с собой GPS и записывайте координаты станции на случай, если ваше спасение будет потеряно в космосе." + - "Как специалист по спасению, вы можете использовать протокинетический ускоритель для перемещения в пространстве в случае крайней необходимости. Только учтите, что он не очень эффективен." + - "Будучи специалистом по спасению, никогда не забывайте добывать руду! Руду можно продать грузовому транспорту за немалые деньги, использовать для строительства, а также применять ученым для создания причудливых технологий." + - "Будучи специалистом по спасению, попробуйте выпросить у науки тетергун. С его помощью можно очень эффективно захватывать предметы с затонувших кораблей!" + - "Как специалист по спасению, попробуйте выпросить у науки грейферный крюк. С его помощью можно забираться на обломки кораблей, а если вы застряли в космосе, вам не придется полагаться на протокинетический ускоритель." + - "Совет №51 не существует и никогда не существовал. Игнорируйте все слухи об обратном" + - "Будучи грузовым техником, попросите у науки APLU Рипли. В паре с гидравлическим зажимом вы сможете легче захватывать такие ценные объекты обслуживания, как топливные баки, и быстро осуществлять доставку." + - "Будучи грузовым техником, старайтесь поддерживать избыток материалов. Они очень полезны для ученых и инженеров станции, чтобы иметь к ним немедленный доступ." + - "Как Грузовой техник, если у вас есть избыток денег, попробуйте сыграть в азартные игры! Иногда вы получаете больше денег, чем в начале игры." + - "Будучи грузовым техником, помните, что в случае необходимости вы можете заказать оружие! Дополнительная огневая мощь часто может стать разницей между жизнью или смертью вас и ваших товарищей по экипажу." + - "Как бармен, вы можете использовать циркулярную пилу на своем дробовике, чтобы облегчить его хранение." + - "Будучи барменом, попробуйте поэкспериментировать с уникальными напитками. Вы уже пробовали приготовить кровь демона?" + - "Как ботаник, вы можете мутировать и скрещивать растения между собой, чтобы создать более мощный продукт, который к тому же будет более урожайным." + - "Как клоун, приправьте свои трюки! Никто не любит пони с одним трюком." + - "Как клоун, если вы потеряли банановую кожуру и мыло, вы все равно можете подсунуть людям свой КПК! Гудок!" + - "Как шеф-повар, ваш нож может служить оружием в чрезвычайных ситуациях." + - "Как шеф-повар, вы можете подмешивать жидкости в еду. Как предатель, подмешав немного аматоксина или другого яда, вы можете сильно разозлить экипаж!" + - "Как мим, ваша клятва молчания - источник вашей силы. Нарушив ее, вы лишаете себя сил и чести." + - "Как Адвкоат, попытайтесь договориться с начальником тюрьмы, если приговор кажется слишком большим для преступления." + - "Будучи сотрудником службы безопасности, общайтесь и координируйте свои действия с коллегами по службе, используя радиоканал службы безопасности, чтобы избежать путаницы." + - "Будучи сотрудником службы безопасности, помните, что корреляция не равна причинно-следственной связи. Возможно, кто-то просто оказался не в том месте и не в то время!" + - "Как детектив, вы можете более эффективно преследовать преступников, используя данные о волокнах отпечатков пальцев и ДНК, полученные в результате криминалистического сканирования предметов, с которыми преступник, вероятно, взаимодействовал." + - "Как техник-атмосферник, ваш голофан-проектор ATMOS блокирует газы, пропуская через себя предметы. С его помощью вы можете быстро локализовать утечки газа, пожары и пробоины в корпусе корабля." + - "Будучи техником-атмосферником, старайтесь не поддаваться искушению делать канистровые бомбы для ядерных оперативников, если только вы не действуете по сценарию последнего шанса. Они часто приводят к большому количеству ненужного дружественного огня!" + - "Будучи инженером, вы можете отремонтировать треснувшие окна, используя для этого сварочный инструмент, не находясь в боевом режиме." + - "Как инженер, вы можете электрифицировать решетки, проложив под ними питающие кабели." + - "Будучи инженером, всегда перепроверяйте, когда устанавливаете сингулярность. Потерять ее проще, чем вы думаете!" + - "Будучи инженером, вы можете использовать плазменное стекло, чтобы укрепить область и предотвратить радиацию. Урановое стекло также может быть использовано для защиты от радиации." + - "Как капитан, вы являетесь одной из самых приоритетных целей на станции. Все - от революций, ядерных боевиков до предателей, которые хотят лишить вас уникального лазерного пистолета или жизни, - вот о чем стоит беспокоиться." + - "Как капитан, всегда берите с собой на смену ядерный диск и пинпоинтер. Неплохо отдать один из них другому главе, которому вы можете доверить их сохранность." + - "Как капитан, вы имеете абсолютный доступ и контроль над станцией, но это не значит, что если вы будете ужасным человеком, это не приведет к мятежу." + - "Как капитан, старайтесь быть активным и патрулировать станцию. Оставаться на мостике может быть заманчиво, но в итоге вы только создадите себе еще большую мишень на спине!" + - "Как ученый, вы можете попробовать случайные вещи на артефакте, пока сканер находится в режиме простоя, чтобы значительно ускорить процесс извлечения точек." + - "Как ученый, вы можете использовать улучшенные версии машин, чтобы повысить их эффективность. Это может сделать некоторые машины значительно лучше; спасатели будут в восторге, если вы улучшите их рудный процессор!" + - "Как ученый, вы можете создавать киборгов, используя позитронные мозги и шасси, они так же полезны, как и новый член экипажа." + - "Будучи врачом, старайтесь остерегаться передозировки, особенно если на место происшествия уже прибыл кто-то другой. Передозировка часто смертельна для пациентов в критическом состоянии!" + - "Будучи врачом, не стоит недооценивать криокапсулы! Они исцеляют почти все виды повреждений, что делает их очень полезными, когда вы перегружены или вам нужно срочно кого-то вылечить." + - "Как врач, будьте осторожны, помещая рептилий в криокапсулы. Они получат много дополнительного урона от холода, но это можно смягчить с помощью лекарства от ожогов или лепоразина." + - "Как врач, помните, что анализатор здоровья можно использовать, если вы потеряете КПК. Однако у него есть батарея, и если она разряжается слишком быстро на ваш вкус, вы можете попросить науку напечатать для вас батарею получше!" + - "Как химик, сделав все необходимое, не бойтесь делать более глупые реактивы. Пробовали ли вы дезоксиэфедрин или лизоксид?" + - "Будучи врачом, химиком или главным врачом, вы можете использовать хлоралгидрат для нелетального усыпления непокорных пациентов." + - "Не бойтесь просить помощи, как у своих коллег по игре, так и через LOOC или у администраторов!" + - "Вы быстро потеряете интерес к игре, если будете играть, чтобы побеждать и убивать. Если вы поймали себя на этом, сделайте шаг назад и поговорите с людьми - это гораздо лучше!" + - "Если вам что-то нужно от другого отдела, попробуйте попросить! Эта игра не одиночная, и вы будете удивлены, чего можно добиться вместе!" + - "Ядерная бомба на станции неуязвима. Вместо того чтобы пытаться уничтожить ее, найдите диск." + - "В техническом отделе полно оборудования, которое рандомизируется каждый раунд. Осмотритесь и посмотрите, стоит ли что-нибудь использовать." + - "Все мы когда-то были новичками, будьте терпеливы и направляйте новых игроков, особенно тех, кто играет роли стажеров, в нужное русло." + - "Огнекостюмы, зимние куртки и аварийные костюмы EVA обеспечивают слабую защиту от холода, позволяя вам проводить больше времени вблизи проломов и в космосе, чем если бы вы вообще ничего не носили." + - "В экстренной ситуации вы всегда можете рассчитывать на брандспойты и аварийные костюмы EVA; они всегда спаунятся в соответствующих шкафчиках. В них, возможно, неудобно передвигаться, но они могут легко спасти вам жизнь в опасной ситуации." + - "В экстренных ситуациях помните, что вы можете изготовить импровизированное оружие! Бейсбольная бита или копье могут стать решающим фактором между тем, чтобы отпугнуть нападающего или погибнуть от его рук." + - "Копья могут быть покрыты химикатами, и они будут впрыскивать несколько единиц каждый раз, когда вы ударите кого-то ими напрямую." + - "Вы можете сделать копья с усиленным стеклом, плазменным стеклом или осколками уранового стекла, чтобы усилить их урон." + - "Брошенные копья наносят дополнительный урон! Однако будьте осторожны: если бросать их слишком сильно, они могут сломаться." + - "Все формы повреждения токсинами довольно трудно поддаются лечению и обычно связаны с использованием химикатов или других неудобных методов. Вы можете использовать это в своих интересах в бою." + - "Вы можете бросать в людей искусственные болы, чтобы замедлить их движение и дать вам возможность преследовать их, чтобы легче убить или скрыться." + - "Вы можете поместить напалм в резервуар для воды в рюкзаке, чтобы сделать огнемет." + - "У некоторых профессий есть альтернативная униформа в соответствующих дробовых магазинах. Не бойтесь попробовать себя в новом образе!" + - "Скорость - это почти все в бою. Использовать костюм только из-за его брони - обычно плохая идея, если только сопротивления, которые он дает, не направлены на бой, или если вы не планируете с головой уйти в бой." + - "Если вы не можете стать предателем в начале раунда, это не значит, что вы никогда им не станете." + - "Противогазы Синдиката обеспечивают защиту от сварки и блокируют вспышки. Подумайте дважды, прежде чем пытаться запустить вспышку в ядерного оперативника!" + - "Почему ты хороший подрывник?" + - "Вы можете распылять огнетушитель, бросать предметы или стрелять из пистолета, паря в пространстве, чтобы придать себе небольшое ускорение. Просто стреляйте в сторону, противоположную той, куда вы хотите попасть." + - "Вы можете перетащить других игроков на себя, чтобы открыть меню раздевания, позволяющее снять с них экипировку или заставить их надеть что-то. Обратите внимание, что экзокостюмы или шлемы закроют вам доступ к одежде под ними, а также что некоторые предметы снимаются или надеваются дольше, чем другие." + - "Вы можете забраться на стол, перетащив себя на него." + - "Вы можете убрать предмет с дороги, перетащив его, а затем, удерживая CTRL + правый клик, переместите мышь в нужное вам направление." + - "При общении со службой безопасности часто можно полностью отменить приговор благодаря сотрудничеству и обману." + - "Огонь может распространяться на других игроков через прикосновение! Будьте осторожны рядом с пылающими телами или большими толпами, в которых есть горящие люди." + - "Пробоины в корпусе занимают несколько секунд, чтобы полностью заполнить пространство. Вы можете использовать это время, чтобы залатать пробоину, если вы достаточно уверены в себе, или просто убежать." + - "Урон от ожогов, например от сварочного инструмента или лампочки, можно использовать для прижигания ран и остановки кровотечения." + - "Кровотечение - это не шутка! Если в вас стреляли или вы получили другое серьезное ранение, позаботьтесь о том, чтобы быстро вылечить его." + - "В экстренной ситуации вы можете разрезать комбинезон острым предметом, чтобы получить ткань, из которой можно сделать марлю." + - "В контекстном меню правой кнопки мыши вы можете использовать острые предметы для разрубания одежды или животных. Это касается и осколков стекла." + - "У большинства взрывчатых веществ есть регулируемый таймер, который можно установить в меню правой кнопки мыши. Это касается и пингвинов с гранатами!" + - "Вы можете оглушить пингвинов гранатой, что позволит вам выиграть время для их убийства." + - "Вы можете нажимать на названия предметов, чтобы взять их в меню правой кнопкой мыши, вместо того чтобы наводить курсор на предмет и выбирать «взять»." + - "Space Station 14 - это игра с открытым исходным кодом! Если вы хотите что-то изменить или добавить простой предмет, попробуйте внести свой вклад в игру. Это не так сложно, как вам кажется." + - "В крайнем случае, вы можете бросить за спину напитки или другие емкости с реагентами, чтобы создать разлив, который может подбросить преследующих вас людей." + - "Некоторые виды оружия, например ножи и заточки, имеют высокую скорость атаки." + - "Челюсти жизни можно использовать для открытия дверей с электроприводом." + - "Если вы не человек, вы можете пить кровь, чтобы восстановить часть своего объема крови, хотя и очень неэффективно." + - "Если вы человек, не пейте кровь! От этого вам станет плохо, и вы начнете получать урон." + - "Существует предел химического метаболизма, который ограничивает количество реагентов определенного типа, которые вы можете переварить за один раз. Некоторые виды имеют более высокий предел метаболизма, например слизи." + - "Сварка без надлежащей защиты глаз может привести к повреждению глаз, которое необходимо лечить с помощью окулина." + - "Зомби очень уязвимы к тепловому повреждению, поэтому сварочные инструменты и лазерные пушки чрезвычайно эффективны против них." + - "Вы можете сваривать осколки стекла в стеклянные листы." + - "Щелкнув правой кнопкой мыши на игроке, а затем нажав на значок сердца, вы можете быстро осмотреть его, чтобы проверить, нет ли у него травм или насколько сильно он истекает кровью. Вы также можете сделать это с собой." + - "Обезьяны и кобольды имеют редкий шанс стать разумными. Оок!" + - "Когда-то и где-то вы можете найти Громовержец, но где - я не скажу." + - "Вы можете определить, что область с огненными замками находится на расстоянии друг от друга, посмотрев, есть ли у огненных замков огоньки рядом с ними." + - "Вместо того чтобы подбирать еду, вы можете нажать alt-click, чтобы съесть ее. Это также работает для мышей и других существ без рук." + # Nyanotrasen - Specific tips below + - "Псионическая защита предотвращает любое псионическое воздействие на вас али от вас. Ищите фальгу!" + - "Грибное масло от оракла может сильно вас одурманить, но это один из самых надёжных источников псионики." + - "Отключайте исследователи мерцания при достяжении им опасного уровня." + - "Исследователи мерцания запитывают сами себя при переполнении." + - "Онироваги имеют естественную псионическую невидимость. Псионическая изоляция позволит вам их видеть." + - "Если видете свою копию - Это может быть либо парадокс, либо волноваться вам об этом уже поздно." + - "Крысиные короли могут приказать своим слугам атаковать кого-то, указав на них." + - "Встречаются и мирные крысиные короли. И подобные могут быть здоровской помощью станции." + - "Реверс-машина весьма эффективнее работает от мех-деталей." + - "Реверс-машина может разобрать кроваво-красные шлемы." + # - "You can perform CPR by using an empty hand on someone in critical condition." + - "Шанс реинкорнировать в гуманоида у метафизической машины гарантирован в соответствии с кол-вом её сканов." + - "Мерцающие духи будут атаковать тебя только, если заметят в тебе псионику, ты их атакуешь или начнёшь утягивать тело, истощаемое ими." + - "Библия, святая вода и ритуальный нож наносят заметный урон некоторым существам." + - "Эктоплазма используется для создания нормализующих кристалов." + # DeltaV - Specific tips below + - "Как офицер СБ, если вы не можете разъяснить приступление - наплюйте, вы тут закон." diff --git a/Resources/Prototypes/Entities/Clothing/Head/hardsuit-helmets.yml b/Resources/Prototypes/Entities/Clothing/Head/hardsuit-helmets.yml index 6985fe7ec3..0ff87f3e73 100644 --- a/Resources/Prototypes/Entities/Clothing/Head/hardsuit-helmets.yml +++ b/Resources/Prototypes/Entities/Clothing/Head/hardsuit-helmets.yml @@ -31,28 +31,8 @@ - type: BreathMask - type: Sprite sprite: Clothing/Head/Hardsuits/atmospherics.rsi - layers: - - state: icon - - state: icon-unshaded - shader: unshaded - - state: light-overlay - visible: false - shader: unshaded - map: [ "light" ] - - type: HandheldLight - addPrefix: false - - type: ToggleableLightVisuals - spriteLayer: light - clothingVisuals: - head: - - state: equipped-head-light - shader: unshaded - type: Clothing - clothingVisuals: - head: - - state: equipped-head - - state: equipped-head-unshaded - shader: unshaded + sprite: Clothing/Head/Hardsuits/atmospherics.rsi - type: PointLight color: "#adffe6" - type: PressureProtection diff --git a/Resources/Prototypes/Entities/Objects/Shields/shields.yml b/Resources/Prototypes/Entities/Objects/Shields/shields.yml index b794e42ff7..cf7215841b 100644 --- a/Resources/Prototypes/Entities/Objects/Shields/shields.yml +++ b/Resources/Prototypes/Entities/Objects/Shields/shields.yml @@ -36,13 +36,13 @@ thresholds: - trigger: !type:DamageTrigger - damage: 80 + damage: 160 behaviors: - !type:DoActsBehavior acts: [ "Destruction" ] - trigger: !type:DamageTrigger - damage: 40 #This is probably enough damage before it breaks + damage: 80 #This is probably enough damage before it breaks behaviors: - !type:DoActsBehavior acts: [ "Destruction" ] @@ -150,13 +150,13 @@ thresholds: - trigger: !type:DamageTrigger - damage: 60 + damage: 120 behaviors: - !type:DoActsBehavior acts: [ "Destruction" ] - trigger: !type:DamageTrigger - damage: 30 #Weaker shield + damage: 60 #Weaker shield behaviors: - !type:DoActsBehavior acts: [ "Destruction" ] @@ -206,13 +206,13 @@ thresholds: - trigger: !type:DamageTrigger - damage: 40 + damage: 80 behaviors: - !type:DoActsBehavior acts: [ "Destruction" ] - trigger: !type:DamageTrigger - damage: 20 #Very weak shield + damage: 40 #Very weak shield behaviors: - !type:DoActsBehavior acts: [ "Destruction" ] @@ -259,13 +259,13 @@ thresholds: - trigger: !type:DamageTrigger - damage: 40 + damage: 80 behaviors: - !type:DoActsBehavior acts: [ "Destruction" ] - trigger: !type:DamageTrigger - damage: 20 + damage: 40 behaviors: - !type:DoActsBehavior acts: [ "Destruction" ] @@ -344,7 +344,7 @@ thresholds: - trigger: !type:DamageTrigger - damage: 40 + damage: 80 behaviors: - !type:DoActsBehavior acts: [ "Destruction" ] @@ -433,13 +433,13 @@ thresholds: - trigger: !type:DamageTrigger - damage: 180 + damage: 360 behaviors: - !type:DoActsBehavior acts: [ "Destruction" ] - trigger: !type:DamageTrigger - damage: 100 + damage: 200 behaviors: - !type:DoActsBehavior acts: [ "Destruction" ] @@ -512,13 +512,13 @@ thresholds: - trigger: !type:DamageTrigger - damage: 100 + damage: 200 behaviors: - !type:DoActsBehavior acts: [ "Destruction" ] - trigger: !type:DamageTrigger - damage: 70 + damage: 140 behaviors: - !type:DoActsBehavior acts: [ "Destruction" ] diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/antimateriel.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/antimateriel.yml index 31d7b65fe8..11c5aed0a9 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/antimateriel.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/antimateriel.yml @@ -7,7 +7,7 @@ - type: Projectile damage: types: - Piercing: 40 - Structural: 30 + Piercing: 50 + Structural: 50 - type: StaminaDamageOnCollide - damage: 35 + damage: 40 diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml index 55e09014ec..6f02b9bafc 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml @@ -414,11 +414,11 @@ impactEffect: BulletImpactEffectKinetic damage: types: - Blunt: 25 - Structural: 30 + Blunt: 17 + Structural: 45 # Short lifespan - type: TimedDespawn - lifetime: 0.4 + lifetime: 0.5 - type: entity id: BulletKineticShuttle @@ -1041,3 +1041,134 @@ Heat: 20 # Slightly more damage than the 17heat from the Captain's Hitscan lasgun soundHit: collection: MeatLaserImpact + +#---------------------LPP-------------------------- + +- type: entity + id: BulletCutter + name: Cutter bolt + parent: BaseBullet + nospawn: true + description: Not too bad, but you still don't want to get hit by it. + components: + - type: Reflective + reflective: + - NonEnergy + - type: Sprite + noRot: false + sprite: Objects/Weapons/Guns/Projectiles/projectiles.rsi + layers: + - state: scatterlaser + shader: unshaded + - type: GatheringProjectile + - type: Projectile + DeleteOnCollide: false + damage: + types: + Blunt: 0.5 + # Короткий срок пули + - type: TimedDespawn + lifetime: 0.2 + +- type: entity + name : Cutter bolt + id: BulletCutter2 + parent: BaseBullet + nospawn: true + components: + - type: Reflective + reflective: + - Energy + - type: FlyBySound + sound: + collection: EnergyMiss + params: + volume: 5 + - type: Sprite + noRot: false + sprite: Objects/Weapons/Guns/Projectiles/projectiles.rsi + layers: + - state: scatterlaser + shader: unshaded + - type: Physics + - type: Fixtures + fixtures: + projectile: + shape: + !type:PhysShapeAabb + bounds: "-0.15,-0.3,0.15,0.3" + hard: false + mask: + - Impassable + - BulletImpassable + fly-by: *flybyfixture + - type: Ammo + - type: StaminaDamageOnCollide + damage: 13 + - type: Projectile + impactEffect: BulletImpactEffectDisabler + DeleteOnCollide: false + damage: + types: + Heat: 5 + Slash: 9 + soundHit: + path: "/Audio/LPP/Weapons/Guns/Gunshots/ion/ion_hit_1.ogg" + soundForce: true + - type: TimedDespawn + lifetime: 0.4 + - type: GatheringProjectile + +- type: entity + name : battlecutter1 + id: battlecuttershot + parent: BaseBullet + nospawn: true + components: + - type: Reflective + reflective: + - Energy + - type: FlyBySound + sound: + collection: EnergyMiss + params: + volume: 5 + - type: Sprite + sprite: _LostParadise/Objects/Weapons/Guns/Projectiles/battlecutter.rsi + layers: + - state: ion + shader: unshaded + - type: Physics + - type: Fixtures + fixtures: + projectile: + shape: + !type:PhysShapeAabb + bounds: "-0.15,-0.3,0.15,0.3" + hard: false + mask: + - Impassable + - BulletImpassable + fly-by: *flybyfixture + - type: Ammo + - type: Projectile + impactEffect: BulletImpactEffectDisabler + damage: + types: + Blunt: 5 + Slash: 10 + +- type: hitscan + id: RedAILaser + damage: + types: + Heat: 1 + muzzleFlash: + sprite: _LostParadise/Objects/Weapons/Guns/projectiles/ailaser.rsi + state: AILaser_3 + travelFlash: + sprite: _LostParadise/Objects/Weapons/Guns/projectiles/ailaser.rsi + state: AILaser_2 + impactFlash: + sprite: _LostParadise/Objects/Weapons/Guns/projectiles/ailaser.rsi + state: AILaser_1 diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Snipers/snipers.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Snipers/snipers.yml index adb8e323f4..2ab67f44bc 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Snipers/snipers.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Snipers/snipers.yml @@ -71,6 +71,7 @@ - CartridgeAntiMateriel capacity: 5 proto: CartridgeAntiMateriel + - type: MultiHandedItem - type: entity name: musket diff --git a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml index 7143f0428b..71bda7976c 100644 --- a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml +++ b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml @@ -244,6 +244,7 @@ parent: BaseLathe name: protolathe description: Converts raw materials into useful objects. + noSpawn: false components: - type: Sprite sprite: Structures/Machines/protolathe.rsi @@ -1418,4 +1419,4 @@ - type: MaterialStorage whitelist: tags: - - PrizeTicket \ No newline at end of file + - PrizeTicket diff --git a/Resources/Prototypes/_LostParadise/Action/ai.yml b/Resources/Prototypes/_LostParadise/Action/ai.yml index 96456b370f..1c799e680d 100644 --- a/Resources/Prototypes/_LostParadise/Action/ai.yml +++ b/Resources/Prototypes/_LostParadise/Action/ai.yml @@ -2,6 +2,7 @@ id: AIEyeCamShootAction name: stun shot description: destabilizing shot in some point + noSpawn: true components: - type: WorldTargetAction icon: _LostParadise/Actions/AI/camerashoot.png @@ -15,6 +16,7 @@ id: AIEyeCamAction name: AI cameras description: Can jump on target cameras. + noSpawn: true components: - type: InstantAction icon: _LostParadise/Actions/AI/camera.png @@ -27,6 +29,7 @@ id: AIEyeAction name: AI Eye description: Puts you in to the AI Eye form, allowing you to float about the station's cameras. + noSpawn: true components: - type: InstantAction icon: _LostParadise/Actions/AI/eye.png @@ -39,6 +42,7 @@ id: AIEyeReturnAction name: AI Eye Return description: Return view to AI Core + noSpawn: true components: - type: InstantAction icon: _LostParadise/Actions/AI/core.png @@ -51,6 +55,7 @@ id: AIToggleArmNuke name: Nuke Arm/Disarm description: Toggles the AI's nuke. + noSpawn: true components: - type: InstantAction icon: @@ -66,6 +71,7 @@ id: ActionAIShowCommunications name: Communications Interface description: View a communications interface. + noSpawn: true components: - type: InstantAction icon: _LostParadise/Actions/AI/announcement.png @@ -76,6 +82,7 @@ id: ActionAiShowCriminalRecords name: Criminal Records Interface description: View a criminal records interface. + noSpawn: true components: - type: InstantAction icon: Corvax/Interface/AdminActions/monitoring.png # Corvax-Resprite @@ -88,6 +95,7 @@ - type: entity id: ActionOpenCloseRemote name: Open targeted door + noSpawn: true components: - type: EntityTargetAction icon: _LostParadise/Actions/AI/door.png @@ -100,6 +108,7 @@ - type: entity id: ActionToggleBolts name: Toggle bolts on door + noSpawn: true components: - type: EntityTargetAction icon: _LostParadise/Actions/AI/door_bolt.png @@ -112,6 +121,7 @@ - type: entity id: ActionToggleEmergencyAccess name: Toggle emergency on door + noSpawn: true components: - type: EntityTargetAction icon: _LostParadise/Actions/AI/door_emergency.png diff --git a/Resources/Prototypes/_LostParadise/Announcers/_LostParadise.yml b/Resources/Prototypes/_LostParadise/Announcers/_LostParadise.yml new file mode 100644 index 0000000000..8b5abffc0b --- /dev/null +++ b/Resources/Prototypes/_LostParadise/Announcers/_LostParadise.yml @@ -0,0 +1,134 @@ +- type: announcer + id: NTH # Localized as "announcer--name" in chat + basePath: /Audio/Announcers/_LostParadise # Where to start looking for audio files + baseAudioParams: # Default audio parameters for all announcements, all options explained in the template announcement + volume: -7 # If this announcer is really loud, lower it to match the others' volume #? Default is 3 + announcements: # List of all announcements this announcer has audio for #! Comment out unused announcements, don't remove them + # Communications + - id: announce # Communications console + path: comms/announce.ogg + - id: attention # Generic alert sound # Should be different from fallback but it's very similar + path: comms/attention.ogg + - id: commandReport # Station goal, Central Command messages, etc + path: comms/command_report.ogg +# - id: spawnAnnounce # Captain join # TODO That system is annoyingly not modular +# path: comms/spawn_announce.ogg + - id: war # Nuclear Operative declaration of war + path: comms/war.ogg +# - id: nukeCodes # The station has been send nuclear activation codes +# path: comms/nuke_codes.ogg # Or command_report.ogg if you want +# - id: nukeArm # The nuke is active and ticking +# path: comms/nuke_arm.ogg +# - id: nukeDisarm # The nuke has been disarmed +# path: comms/nuke_disarm.ogg + - id: welcome # The shift has started + collection: NTHWelcome + + # Alert levels + - id: alertGreen # Everything is fine + path: alerts/green.ogg + - id: alertBlue # Something is amiss + path: alerts/blue.ogg + - id: alertViolet # Viral infection or misc medical emergencies, listen to Medical + path: alerts/violet.ogg + - id: alertWhite # Glimmer is too high, listen to Epistemics + path: alerts/white.ogg + - id: alertYellow # The station is being largely damaged, listen to Engineering + path: alerts/yellow.ogg + - id: alertRed # Generic many things are bad, listen to Security + path: alerts/red.ogg + - id: alertGamma # There is a massive immediate threat to the station, listen to Central Command + path: alerts/gamma.ogg + - id: alertDelta # The station is being or about to be massively destroyed, run for your life + path: alerts/delta.ogg + - id: alertEpsilon # The station has been terminated, good luck survivors! + path: alerts/epsilon.ogg + + # Events + ## Wizard's Den + ### Mid-Round Antagonists +# - id: ninjaHacking # A Ninja is hacking something +# path: comms/ninja_hacking.ogg +# - id: powersinkExplosion # A power sink is about to overcharge and explode +# path: comms/powersink_explosion.ogg + ### Events + - id: anomalySpawn # An anomaly has spawned in a random place + path: events/anomaly.ogg + - id: bluespaceArtifact # An artifact has spawned in a random place + path: events/bluespace_artifact.ogg +# - id: bluespaceLocker # Two random lockers now share inventories +# path: events/bluespace_locker.ogg + - id: breakerFlip # A few random APCs have been disabled, ask Engineering to fix them + path: events/breaker_flip.ogg + - id: bureaucraticError # Random jobs have been added, removed, or made infinite + path: events/bureaucratic_error.ogg + - id: clericalError # Random crew are removed from the manifest + path: events/clerical_error.ogg +# - id: carpRift # A dragon's carp rift is active +# path: events/carp_rift.ogg +# - id: revenantSpawn # A revenant has spawned (by a prober?) +# path: events/revenant_spawn.ogg + - id: gasLeak # A random gas is coming out of a random vent + path: events/gas_leak.ogg + - id: gasLeakComplete # Gas has stopped coming out of a vent + path: events/gas_leak-complete.ogg + - id: kudzuGrowth # Kudzu is growing in a random place + path: events/kudzu_growth.ogg + - id: meteorSwarm # Meteors are flying at the station, stay away from windows + path: events/meteors.ogg + - id: meteorSwarmComplete # Meteors have stopped flying at the station + path: events/meteors-complete.ogg + - id: mouseMigration # Several mice have appeared in a random place + path: events/mouse_migration.ogg + - id: cockroachMigration # Several cockroaches have appeared in a random place + path: events/cockroach_migration.ogg + - id: powerGridCheck # The station's power is offline for some moments + path: events/power_grid_check.ogg + - id: powerGridCheckComplete # The station's power is online again + path: events/power_grid_check-complete.ogg +# - id: randomSentience # A random few animals have become sentient +# path: events/random_sentience.ogg + - id: solarFlare # A solar flare is nearby, may mess with comms and electronics + path: events/solar_flare.ogg + - id: solarFlareComplete # The solar flare has passed + path: events/solar_flare-complete.ogg + - id: ventClog # A random reagent is coming out of a scrubber + path: events/vent_clog.ogg +# - id: slimesSpawn # Some simple slimes are appearing in vents +# path: events/slimes_spawn.ogg +# - id: spiderSpawn # Some simple spiders are appearing in vents +# path: events/spider_spawn.ogg + - id: immovableRodSpawn # The station is moving into an immovable rod, don't die or something, ask Engineering for help repairing it + path: events/immovable_rod_spawn.ogg + - id: ionStorm # AI-controlled equipment are now weird, check their laws + path: events/ion_storm.ogg + ## Delta-V + - id: xenoVents # Xenomorphs are coming out of vents + path: events/aliens.ogg +# ## NyanoTrasen +# - id: noosphericStorm # A large amount of glimmer has joined the station and made people psionic +# path: events/noospheric_storm.ogg + + # Shuttle + - id: shuttleCalled # The shuttle is on its way + path: shuttle/called.ogg + - id: shuttleRecalled # The shuttle is going back to Central Command + path: shuttle/recalled.ogg + - id: shuttleDock # The shuttle has arrived at the station + path: shuttle/dock.ogg +# - id: shuttleNearby # The shuttle couldn't dock, it's at a specified location +# path: shuttle/nearby.ogg +# - id: shuttleGoodLuck # The shuttle could not find its way to the station, good luck crew +# path: shuttle/good_luck.ogg +# - id: shuttleAuthAdded # One of few have added their acceptance to early launching +# path: shuttle/auth_added.ogg +# - id: shuttleAuthRevoked # One of few have revoked their acceptance to early launching +# path: shuttle/auth_revoked.ogg +# - id: shuttleAlmostLaunching # The shuttle will leave to FTL in 10 seconds +# path: shuttle/almost_launching.ogg + - id: shuttleLeft # The shuttle has left the station + path: shuttle/left.ogg + + # Fallback # REQUIRED + - id: fallback # Any announcement sent without a valid announcement on this announcer will use this + path: fallback.ogg diff --git a/Resources/Prototypes/_LostParadise/Catalog/VendingMachines/Inventories/ERPMachine.yml b/Resources/Prototypes/_LostParadise/Catalog/VendingMachines/Inventories/ERPMachine.yml index 0d840d25e0..b2e265ed1a 100644 --- a/Resources/Prototypes/_LostParadise/Catalog/VendingMachines/Inventories/ERPMachine.yml +++ b/Resources/Prototypes/_LostParadise/Catalog/VendingMachines/Inventories/ERPMachine.yml @@ -64,3 +64,5 @@ LPPClothingNeckCollarSpiked: 3 LPPClothingMaskKinkyMuzzle: 3 LPPClothingUniformboobasuit: 3 + LPPClothingHeadHatMaid: 3 + LPPOuterClothingGarfield: 1 \ No newline at end of file diff --git a/Resources/Prototypes/_LostParadise/Entities/Clothing/Head/hardsuit-helmet-eva.yml b/Resources/Prototypes/_LostParadise/Entities/Clothing/Head/hardsuit-helmet-eva.yml index e502e66bf6..0bb8e265ab 100644 --- a/Resources/Prototypes/_LostParadise/Entities/Clothing/Head/hardsuit-helmet-eva.yml +++ b/Resources/Prototypes/_LostParadise/Entities/Clothing/Head/hardsuit-helmet-eva.yml @@ -10,6 +10,7 @@ - type: Clothing sprite: _LostParadise/Clothing/Head/Helmets/acienthelmsyndieeva.rsi - type: BreathMask + - type: EyeProtection - type: PointLight color: "green" - type: PressureProtection @@ -33,7 +34,7 @@ id: LPPClothingHeadHelmetHunter noSpawn: true name: шлем древнего скафандра Охотника (защитный) - description: Крайне комфорнтый шлем, что позволяет вам защититься от морозной погоды. он в защитном. + description: Крайне комфорнтый шлем, что позволяет вам защититься от морозной погоды. он в защитном режиме. components: - type: Sprite sprite: _LostParadise/Clothing/Head/Helmets/winterhardsuithelm.rsi @@ -88,3 +89,31 @@ Radiation: 0.8 - type: TemperatureProtection coefficient: 0.005 + +- type: entity + parent: ClothingHeadHardsuitBase + id: LPPClothingHeadHelmetScienceNPZ + noSpawn: true + name: шлем научного скафандра НПЗ + description: Шлем от скафандра, довольно полезен и имеет встроенный функционал, по типу определения жидкостей и защиту от сварки. + components: + - type: Sprite + sprite: _LostParadise/Clothing/Hardsuits/NPZsciense/head.rsi + - type: Clothing + sprite: _LostParadise/Clothing/Hardsuits/NPZsciense/head.rsi + - type: BreathMask + - type: EyeProtection + - type: SolutionScanner + - type: PressureProtection + highPressureMultiplier: 0.08 + lowPressureMultiplier: 10000 + - type: Armor + modifiers: + coefficients: + Blunt: 0.95 + Slash: 0.95 + Piercing: 0.95 + Heat: 0.95 + Radiation: 0.3 + - type: TemperatureProtection + coefficient: 0.005 \ No newline at end of file diff --git a/Resources/Prototypes/_LostParadise/Entities/Clothing/Head/hats.yml b/Resources/Prototypes/_LostParadise/Entities/Clothing/Head/hats.yml index fda4b27339..2b7f65fd18 100644 --- a/Resources/Prototypes/_LostParadise/Entities/Clothing/Head/hats.yml +++ b/Resources/Prototypes/_LostParadise/Entities/Clothing/Head/hats.yml @@ -100,7 +100,7 @@ - type: entity parent: ClothingHeadBase id: LPPClothingHeadHatMaid - name: ободок горничной + name: чепчик горничной description: Элемент одежды, который является неотъемлимой частью любой элитной горничной. components: - type: Sprite diff --git a/Resources/Prototypes/_LostParadise/Entities/Clothing/Head/helmet.yml b/Resources/Prototypes/_LostParadise/Entities/Clothing/Head/helmet.yml index c52bf8cf4e..262d78b1c9 100644 --- a/Resources/Prototypes/_LostParadise/Entities/Clothing/Head/helmet.yml +++ b/Resources/Prototypes/_LostParadise/Entities/Clothing/Head/helmet.yml @@ -109,3 +109,20 @@ Slash: 0.6 Piercing: 0.6 Heat: 0.8 + +- type: entity + parent: ClothingHeadBase + id: LPPClothingHeadHelmetNPZ + name: шлем НПЗ + description: Крепкий шлем из кевлара и пластали, защитит от мелкокалиберной пули, а так же шрапнели. + components: + - type: Sprite + sprite: _LostParadise/Clothing/Head/Helmets/NPZ/NPZhelm.rsi + - type: Clothing + sprite: _LostParadise/Clothing/Head/Helmets/NPZ/NPZhelm.rsi + - type: Armor + modifiers: + coefficients: + Blunt: 0.85 + Slash: 0.85 + Piercing: 0.85 \ No newline at end of file diff --git a/Resources/Prototypes/_LostParadise/Entities/Clothing/Mask/hardsuit-mask.yml b/Resources/Prototypes/_LostParadise/Entities/Clothing/Mask/hardsuit-mask.yml index 20a4dab291..62de6d5cbf 100644 --- a/Resources/Prototypes/_LostParadise/Entities/Clothing/Mask/hardsuit-mask.yml +++ b/Resources/Prototypes/_LostParadise/Entities/Clothing/Mask/hardsuit-mask.yml @@ -11,6 +11,7 @@ sprite: _LostParadise/Clothing/Mask/acienthelmsyndiebattle.rsi equipSound: /Audio/Mecha/mechmove03.ogg unequipSound: /Audio/Mecha/mechmove03.ogg + - type: FlashImmunity - type: Armor modifiers: coefficients: @@ -29,7 +30,7 @@ id: LPPClothingMaskHunter noSpawn: true name: шлем скафандра охотника (походный) - description: Крайне комфорнтый шлем, что позволяет вам защититься от морозной погоды. Он в походном режиме + description: Крайне комфорнтый шлем, что позволяет вам защититься от морозной погоды. Он в походном режиме. components: - type: Sprite sprite: _LostParadise/Clothing/Mask/winterhuntermask.rsi diff --git a/Resources/Prototypes/_LostParadise/Entities/Clothing/Mask/mask.yml b/Resources/Prototypes/_LostParadise/Entities/Clothing/Mask/mask.yml index 7513e50965..d3a6b834b8 100644 --- a/Resources/Prototypes/_LostParadise/Entities/Clothing/Mask/mask.yml +++ b/Resources/Prototypes/_LostParadise/Entities/Clothing/Mask/mask.yml @@ -340,3 +340,21 @@ - type: Construction graph: Muzzle node: muzzle + +- type: entity + parent: ClothingMaskGas + id: LPPClothingBalaclavawide + name: балаклава с широким вырезом для глаз + description: Почувствуйте себя крайне тактикульным с этой кевларовой балаклавой, что защитит всё ваше лицо, кроме глаз, так что рекомендуется испоьзовать очки для защиты глаз от страйкбольных шариков (От реальных пуль вряд ли спасёт). + components: + - type: Sprite + sprite: _LostParadise/Clothing/Mask/widebalaclava.rsi + - type: Clothing + sprite: _LostParadise/Clothing/Mask/widebalaclava.rsi + - type: Armor + modifiers: + coefficients: + Blunt: 0.95 + Slash: 0.95 + Piercing: 0.95 + Heat: 0.95 \ No newline at end of file diff --git a/Resources/Prototypes/_LostParadise/Entities/Clothing/Neck/cloaks.yml b/Resources/Prototypes/_LostParadise/Entities/Clothing/Neck/cloaks.yml index b60f7d9023..023a088a91 100644 --- a/Resources/Prototypes/_LostParadise/Entities/Clothing/Neck/cloaks.yml +++ b/Resources/Prototypes/_LostParadise/Entities/Clothing/Neck/cloaks.yml @@ -204,4 +204,14 @@ description: Плащ для пафосного скидывания, чтобы показать всем ваши медали и ордена! components: - type: Sprite - sprite: _LostParadise/Clothing/Neck/NPZ/upgneckadmiral.rsi \ No newline at end of file + sprite: _LostParadise/Clothing/Neck/NPZ/upgneckadmiral.rsi + +- type: entity + parent: ClothingNeckBase + id: LPPCloakJapaneese + suffix: СПОНСОР + name: накидка в японском стиле + description: Kore yon deru hito wa bakadayo. + components: + - type: Sprite + sprite: _LostParadise/Clothing/Neck/Cloaks/Monorich.rsi \ No newline at end of file diff --git a/Resources/Prototypes/_LostParadise/Entities/Clothing/Neck/scarf.yml b/Resources/Prototypes/_LostParadise/Entities/Clothing/Neck/scarf.yml index 24f9930675..2e604a99ce 100644 --- a/Resources/Prototypes/_LostParadise/Entities/Clothing/Neck/scarf.yml +++ b/Resources/Prototypes/_LostParadise/Entities/Clothing/Neck/scarf.yml @@ -2,6 +2,7 @@ parent: ClothingNeckBase id: LPPClothingWindyScarf name: windy scarf + suffix: СПОНСОР description: Cool scarf for cool people components: - type: Sprite diff --git a/Resources/Prototypes/_LostParadise/Entities/Clothing/Neck/shemags.yml b/Resources/Prototypes/_LostParadise/Entities/Clothing/Neck/shemags.yml new file mode 100644 index 0000000000..5262c47da3 --- /dev/null +++ b/Resources/Prototypes/_LostParadise/Entities/Clothing/Neck/shemags.yml @@ -0,0 +1,135 @@ +- type: entity + parent: ClothingNeckBase + id: LPPClothingNeckShemagGreen + name: зелёный шемаг + description: тёплая шёлковая ткань, защищающая от пыли и холода, а так же придающая брутальности и тактикульности носителю. + components: + - type: Sprite + sprite: _LostParadise/Clothing/Neck/shemags/greendown.rsi + - type: Clothing + sprite: _LostParadise/Clothing/Neck/shemags/greendown.rsi + - type: ToggleableClothing + clothingPrototype: LPPClothingMaskShemagGreen + requiredSlot: + - neck + slot: mask + +- type: entity + parent: ClothingMaskBase + id: LPPClothingMaskShemagGreen + categories: [ HideSpawnMenu ] + name: зелёный шемаг + components: + - type: Sprite + sprite: _LostParadise/Clothing/Neck/shemags/greenup.rsi + - type: Clothing + sprite: _LostParadise/Clothing/Neck/shemags/greenup.rsi + +- type: entity + parent: ClothingNeckBase + id: LPPClothingNeckShemagRed + name: красный шемаг + description: тёплая шёлковая ткань, защищающая от пыли и холода, а так же придающая брутальности и тактикульности носителю. + components: + - type: Sprite + sprite: _LostParadise/Clothing/Neck/shemags/reddown.rsi + - type: Clothing + sprite: _LostParadise/Clothing/Neck/shemags/reddown.rsi + - type: ToggleableClothing + clothingPrototype: LPPClothingMaskShemagRed + requiredSlot: + - neck + slot: mask + +- type: entity + parent: ClothingMaskBase + id: LPPClothingMaskShemagRed + categories: [ HideSpawnMenu ] + name: красный шемаг + components: + - type: Sprite + sprite: _LostParadise/Clothing/Neck/shemags/redup.rsi + - type: Clothing + sprite: _LostParadise/Clothing/Neck/shemags/redup.rsi + +- type: entity + parent: ClothingNeckBase + id: LPPClothingNeckShemagBlue + name: синий шемаг + description: тёплая шёлковая ткань, защищающая от пыли и холода, а так же придающая брутальности и тактикульности носителю. + components: + - type: Sprite + sprite: _LostParadise/Clothing/Neck/shemags/bluedown.rsi + - type: Clothing + sprite: _LostParadise/Clothing/Neck/shemags/bluedown.rsi + - type: ToggleableClothing + clothingPrototype: LPPClothingMaskShemagBlue + requiredSlot: + - neck + slot: mask + +- type: entity + parent: ClothingMaskBase + id: LPPClothingMaskShemagBlue + categories: [ HideSpawnMenu ] + name: синий шемаг + components: + - type: Sprite + sprite: _LostParadise/Clothing/Neck/shemags/blueup.rsi + - type: Clothing + sprite: _LostParadise/Clothing/Neck/shemags/blueup.rsi + +- type: entity + parent: ClothingNeckBase + id: LPPClothingNeckShemagBrown + name: коричневый шемаг + description: тёплая шёлковая ткань, защищающая от пыли и холода, а так же придающая брутальности и тактикульности носителю. + components: + - type: Sprite + sprite: _LostParadise/Clothing/Neck/shemags/browndown.rsi + - type: Clothing + sprite: _LostParadise/Clothing/Neck/shemags/browndown.rsi + - type: ToggleableClothing + clothingPrototype: LPPClothingMaskShemagBrown + requiredSlot: + - neck + slot: mask + +- type: entity + parent: ClothingMaskBase + id: LPPClothingMaskShemagBrown + categories: [ HideSpawnMenu ] + name: коричневый шемаг + components: + - type: Sprite + sprite: _LostParadise/Clothing/Neck/shemags/brownup.rsi + - type: Clothing + sprite: _LostParadise/Clothing/Neck/shemags/brownup.rsi + +- type: entity + parent: ClothingNeckBase + id: LPPClothingNeckShemagPurple + name: фиолетовый шемаг + description: тёплая шёлковая ткань, защищающая от пыли и холода, а так же придающая брутальности и тактикульности носителю. + components: + - type: Sprite + sprite: _LostParadise/Clothing/Neck/shemags/purpledown.rsi + - type: Clothing + sprite: _LostParadise/Clothing/Neck/shemags/purpledown.rsi + - type: ToggleableClothing + clothingPrototype: LPPClothingMaskShemagPurple + requiredSlot: + - neck + slot: mask + +- type: entity + parent: ClothingMaskBase + id: LPPClothingMaskShemagPurple + categories: [ HideSpawnMenu ] + name: фиолетовый шемаг + components: + - type: Sprite + sprite: _LostParadise/Clothing/Neck/shemags/purpleup.rsi + - type: Clothing + sprite: _LostParadise/Clothing/Neck/shemags/purpleup.rsi + diff --git a/Resources/Prototypes/_LostParadise/Entities/Clothing/OuterClothing/NPZ.yml b/Resources/Prototypes/_LostParadise/Entities/Clothing/OuterClothing/NPZ.yml new file mode 100644 index 0000000000..6017f8d695 --- /dev/null +++ b/Resources/Prototypes/_LostParadise/Entities/Clothing/OuterClothing/NPZ.yml @@ -0,0 +1,246 @@ +- type: entity + parent: ClothingOuterHardsuitBase + id: LPPClothingOuterHardsuitLeaderNFSD + name: элитный скафандр НПЗ + description: Прототип новой линейки скафандров НПЗ. Мобильность, отражение пуль, защита от крайне высокого давления и всё это в ВАШИХ руках. Ксенофобия идёт в комплекте. + components: + - type: Sprite + sprite: _LostParadise/Clothing/OuterClothing/Hardsuits/upgradednfsd/upgrlead.rsi + - type: Clothing + sprite: _LostParadise/Clothing/OuterClothing/Hardsuits/upgradednfsd/upgrlead.rsi + - type: Item + size: Huge + - type: PressureProtection + highPressureMultiplier: 0.02 + lowPressureMultiplier: 1000 + - type: ExplosionResistance + damageCoefficient: 0.2 + - type: Armor + modifiers: + coefficients: + Blunt: 0.35 + Slash: 0.35 + Piercing: 0.4 + Caustic: 0.2 + Heat: 0.5 + Radiation: 0.2 + - type: Reflect + enabled: true + reflectProb: 0.15 + spread: 100 + - type: ClothingSpeedModifier + walkModifier: 0.85 + sprintModifier: 0.85 + - type: HeldSpeedModifier + - type: ToggleableClothing + clothingPrototype: LPPClothingOuterHardsuitHelmetLeaderNFSD + - type: StaticPrice + price: 350 + +- type: entity + parent: ClothingHeadHardsuitWithLightBase + id: LPPClothingOuterHardsuitHelmetLeaderNFSD + name: шлем элитного скафандра шерифа + description: Пархай как бабочка, жаль, что ты уже мёртв, жалкий ксенос! + categories: [ HideSpawnMenu ] + components: + - type: BreathMask + - type: Sprite + sprite: _LostParadise/Clothing/OuterClothing/Hardsuits/upgradednfsd/upgrleadhelmet.rsi + - type: Clothing + sprite: _LostParadise/Clothing/OuterClothing/Hardsuits/upgradednfsd/upgrleadhelmet.rsi + - type: PointLight + color: white + - type: PressureProtection + highPressureMultiplier: 0.05 + lowPressureMultiplier: 1000 + - type: Armor + modifiers: + coefficients: + Blunt: 0.9 + Slash: 0.9 + Piercing: 0.9 + Heat: 0.9 + Radiation: 0.8 + +- type: entity + parent: ClothingOuterArmorBasic + id: LPPClothingOuterArmoradvancedNPZ + name: комплект защиты НПЗ + description: Комплект из бронеэлементов, защищающие жизненно важные органы, а так же конечности носителя. + components: + - type: Sprite + sprite: _LostParadise/Clothing/OuterClothing/Armor/upgbulletproof.rsi + - type: Clothing + sprite: _LostParadise/Clothing/OuterClothing/Armor/upgbulletproof.rsi + - type: Armor + modifiers: + coefficients: + Blunt: 0.55 + Slash: 0.55 + Piercing: 0.4 + Heat: 0.9 + - type: ExplosionResistance + damageCoefficient: 0.8 + +- type: entity + parent: ClothingOuterHardsuitBase + id: LPPClothingOuterHardsuitNPZ + name: скафандр НПЗ + description: Стандартный скафандр войск Нового Правительства Земли, удобен и надёжен. + components: + - type: Sprite + sprite: _LostParadise/Clothing/OuterClothing/Hardsuits/NPZtrooper/hard.rsi + - type: Clothing + sprite: _LostParadise/Clothing/OuterClothing/Hardsuits/NPZtrooper/hard.rsi + - type: Item + size: Huge + - type: PressureProtection + highPressureMultiplier: 0.02 + lowPressureMultiplier: 1000 + - type: ExplosionResistance + damageCoefficient: 0.2 + - type: Armor + modifiers: + coefficients: + Blunt: 0.5 + Slash: 0.5 + Piercing: 0.5 + Caustic: 0.5 + Heat: 0.55 + Radiation: 0.2 + - type: ClothingSpeedModifier + walkModifier: 0.9 + sprintModifier: 0.9 + - type: HeldSpeedModifier + - type: ToggleableClothing + clothingPrototype: LPPClothingOuterHardsuitHelmetNPZ + - type: StaticPrice + price: 350 + +- type: entity + parent: ClothingHeadHardsuitWithLightBase + id: LPPClothingOuterHardsuitHelmetNPZ + name: шлем скафандра НПЗ + description: Пархай как бабочка, жаль, что ты уже мёртв, жалкий ксенос! + categories: [ HideSpawnMenu ] + components: + - type: BreathMask + - type: Sprite + sprite: _LostParadise/Clothing/OuterClothing/Hardsuits/NPZtrooper/helm.rsi + - type: Clothing + sprite: _LostParadise/Clothing/OuterClothing/Hardsuits/NPZtrooper/helm.rsi + - type: PointLight + color: white + - type: PressureProtection + highPressureMultiplier: 0.05 + lowPressureMultiplier: 1000 + - type: Armor + modifiers: + coefficients: + Blunt: 0.9 + Slash: 0.9 + Piercing: 0.9 + Heat: 0.9 + Radiation: 0.8 + +- type: entity + parent: ClothingOuterHardsuitBase + id: LPPClothingOuterHardsuitSpecopsNPZ + name: скафандр спецподразделения НПЗ + description: Модифицированный вариант стандартного скафандра НПЗ, предоставляет мобильность, крепкость, а так же хорошую защиту от всевозможных видов урона. + components: + - type: Sprite + sprite: _LostParadise/Clothing/OuterClothing/Hardsuits/NPZspecops/hard.rsi + - type: Clothing + sprite: _LostParadise/Clothing/OuterClothing/Hardsuits/NPZspecops/hard.rsi + - type: Item + size: Huge + - type: PressureProtection + highPressureMultiplier: 0.02 + lowPressureMultiplier: 1000 + - type: ExplosionResistance + damageCoefficient: 0.2 + - type: Armor + modifiers: + coefficients: + Blunt: 0.65 + Slash: 0.65 + Piercing: 0.35 + Caustic: 0.2 + Heat: 0.4 + Radiation: 0.2 + - type: Reflect + enabled: true + reflectProb: 0.1 + spread: 100 + - type: ClothingSpeedModifier + walkModifier: 1.1 + sprintModifier: 1.05 + - type: HeldSpeedModifier + - type: ToggleableClothing + clothingPrototype: LPPClothingOuterHardsuitHelmetSpecopsNPZ + - type: StaticPrice + price: 350 + +- type: entity + parent: ClothingHeadHardsuitWithLightBase + id: LPPClothingOuterHardsuitHelmetSpecopsNPZ + name: шлем спецподразделения НПЗ + description: Пархай как бабочка, жаль, что ты уже мёртв, жалкий ксенос! + categories: [ HideSpawnMenu ] + components: + - type: BreathMask + - type: Sprite + sprite: _LostParadise/Clothing/OuterClothing/Hardsuits/NPZspecops/helm.rsi + - type: Clothing + sprite: _LostParadise/Clothing/OuterClothing/Hardsuits/NPZspecops/helm.rsi + - type: PointLight + color: white + - type: PressureProtection + highPressureMultiplier: 0.05 + lowPressureMultiplier: 1000 + - type: Armor + modifiers: + coefficients: + Blunt: 0.9 + Slash: 0.9 + Piercing: 0.9 + Heat: 0.8 + Radiation: 0.6 + +- type: entity + parent: ClothingOuterStorageBase + id: LPPClothingOuterCoatNPZ + name: куртка с символикой НПЗ + description: Лёгкая нейлоновая куртка с яркими неоновыми полосками и принтом на спине, а так же карманами. + components: + - type: Sprite + sprite: _LostParadise/Clothing/OuterClothing/Coats/NPZcoat.rsi + - type: Clothing + sprite: _LostParadise/Clothing/OuterClothing/Coats/NPZcoat.rsi + - type: Armor + modifiers: + coefficients: + Blunt: 0.95 + Slash: 0.95 + +- type: entity + parent: ClothingOuterArmorBasic + id: LPPClothingOuterArmorNPZ + name: бронежилет с символикой НПЗ + description: Бронежилет с опознавательными элементами НПЗ. + components: + - type: Sprite + sprite: _LostParadise/Clothing/OuterClothing/Armor/NPZarmorvest.rsi + - type: Clothing + sprite: _LostParadise/Clothing/OuterClothing/Armor/NPZarmorvest.rsi + - type: Armor + modifiers: + coefficients: + Blunt: 0.65 + Slash: 0.65 + Piercing: 0.65 + Heat: 0.65 + - type: ExplosionResistance + damageCoefficient: 0.7 \ No newline at end of file diff --git a/Resources/Prototypes/_LostParadise/Entities/Clothing/OuterClothing/hardsuits.yml b/Resources/Prototypes/_LostParadise/Entities/Clothing/OuterClothing/hardsuits.yml index 642c4384aa..53a2849012 100644 --- a/Resources/Prototypes/_LostParadise/Entities/Clothing/OuterClothing/hardsuits.yml +++ b/Resources/Prototypes/_LostParadise/Entities/Clothing/OuterClothing/hardsuits.yml @@ -54,6 +54,10 @@ Caustic: 0.1 Shock: 0.1 Cold: 0.1 + - type: TemperatureProtection + coefficient: 0.5 + - type: ExplosionResistance + damageCoefficient: 0.2 - type: ToggleableClothing clothingPrototype: LPPClothingHeadHelmetHardsuitIIC @@ -101,8 +105,8 @@ highPressureMultiplier: 0.525 lowPressureMultiplier: 10000 - type: ClothingSpeedModifier - walkModifier: 0.6 - sprintModifier: 0.55 + walkModifier: 0.85 + sprintModifier: 0.7 - type: Armor modifiers: coefficients: @@ -131,8 +135,8 @@ highPressureMultiplier: 0.525 lowPressureMultiplier: 10000 - type: ClothingSpeedModifier - walkModifier: 1. - sprintModifier: 1. + walkModifier: 1.0 + sprintModifier: 1.0 - type: Armor modifiers: coefficients: @@ -388,8 +392,10 @@ Caustic: 0.1 Shock: 0.1 Cold: 0.1 + - type: TemperatureProtection + coefficient: 0.5 - type: ExplosionResistance - damageCoefficient: 0.15 + damageCoefficient: 0.2 - type: ToggleableClothing clothingPrototype: LPPClothingHeadHelmetHardsuitIICPyrotech - type: BiocodedClothing @@ -421,6 +427,10 @@ Caustic: 0.1 Shock: 0.1 Cold: 0.1 + - type: TemperatureProtection + coefficient: 0.5 + - type: ExplosionResistance + damageCoefficient: 0.2 - type: ToggleableClothing clothingPrototype: LPPClothingHeadHelmetHardsuitIICMedic - type: BiocodedClothing @@ -452,6 +462,10 @@ Caustic: 0.1 Shock: 0.1 Cold: 0.1 + - type: TemperatureProtection + coefficient: 0.5 + - type: ExplosionResistance + damageCoefficient: 0.2 - type: ToggleableClothing clothingPrototype: LPPClothingHeadHelmetHardsuitIICCommand - type: BiocodedClothing @@ -483,6 +497,10 @@ Caustic: 0.1 Shock: 0.1 Cold: 0.1 + - type: TemperatureProtection + coefficient: 0.5 + - type: ExplosionResistance + damageCoefficient: 0.2 - type: ToggleableClothing clothingPrototype: LPPClothingHeadHelmetHardsuitIICEngineer - type: BiocodedClothing @@ -512,9 +530,45 @@ Radiation: 0.25 Shock: 0.5 Cold: 0.5 + - type: TemperatureProtection + coefficient: 0.5 - type: ClothingSpeedModifier walkModifier: 0.8 sprintModifier: 0.8 - type: HeldSpeedModifier - type: ToggleableClothing clothingPrototype: LPPClothingHeadHelmetRND + +- type: entity + parent: ClothingOuterHardsuitBase + id: LPPClothingOuterHardsuitScienceNPZ + name: "НИС" НПЗ + description: Научно исследовательский скафандр, разработанный для работы учёных НПЗ, а так же техников в открытом космосе и тяжёлых условиях планет. + components: + - type: Sprite + sprite: _LostParadise/Clothing/Hardsuits/NPZsciense/body.rsi + - type: Clothing + sprite: _LostParadise/Clothing/Hardsuits/NPZsciense/body.rsi + - type: PressureProtection + highPressureMultiplier: 0.1 + lowPressureMultiplier: 1000 + - type: Armor + modifiers: + coefficients: + Blunt: 0.9 + Slash: 0.9 + Caustic: 0.2 + Heat: 0.7 + Radiation: 0.1 + Shock: 0.5 + Cold: 0.5 + - type: TemperatureProtection + coefficient: 0.5 + - type: ExplosionResistance + damageCoefficient: 0.2 + - type: ClothingSpeedModifier + walkModifier: 0.8 + sprintModifier: 0.8 + - type: HeldSpeedModifier + - type: ToggleableClothing + clothingPrototype: LPPClothingHeadHelmetScienceNPZ \ No newline at end of file diff --git a/Resources/Prototypes/_LostParadise/Entities/Clothing/OuterClothing/miksuitjugger.yml b/Resources/Prototypes/_LostParadise/Entities/Clothing/OuterClothing/miksuitjugger.yml index 3a5f53c8fc..1bb4f42a49 100644 --- a/Resources/Prototypes/_LostParadise/Entities/Clothing/OuterClothing/miksuitjugger.yml +++ b/Resources/Prototypes/_LostParadise/Entities/Clothing/OuterClothing/miksuitjugger.yml @@ -2,7 +2,7 @@ parent: ClothingOuterHardsuitBase id: LPPClothingOuterHardsuitMiksuitJugger name: обесцвеченный скафандр "Панцирь" - description: Отреставрированный скафаднр старых моделей джагернаутов синдиката, слегка видоизменённый под хотелки нынешнего владельца. + description: Отреставрированный скафандр старых моделей джаггернаутов Киберсана, видоизменённый под хотелки нынешнего владельца. components: - type: Sprite sprite: _LostParadise/Clothing/OuterClothing/Hardsuits/miksuitjugger.rsi diff --git a/Resources/Prototypes/_LostParadise/Entities/Clothing/OuterClothing/upgradedleaderNFSD.yml b/Resources/Prototypes/_LostParadise/Entities/Clothing/OuterClothing/upgradedleaderNFSD.yml deleted file mode 100644 index 00bda2f859..0000000000 --- a/Resources/Prototypes/_LostParadise/Entities/Clothing/OuterClothing/upgradedleaderNFSD.yml +++ /dev/null @@ -1,84 +0,0 @@ -- type: entity - parent: ClothingOuterHardsuitBase - id: LPPClothingOuterHardsuitLeaderNFSD - name: элитный скафандр НПЗ - description: Прототип новой линейки скафандров НПЗ. Мобильность, отражение пуль, защита от крайне высокого давления и всё это в ВАШИХ руках. Ксенофобия идёт в комплекте. - components: - - type: Sprite - sprite: _LostParadise/Clothing/OuterClothing/Hardsuits/upgradednfsd/upgrlead.rsi - - type: Clothing - sprite: _LostParadise/Clothing/OuterClothing/Hardsuits/upgradednfsd/upgrlead.rsi - - type: Item - size: Huge - - type: PressureProtection - highPressureMultiplier: 0.02 - lowPressureMultiplier: 1000 - - type: ExplosionResistance - damageCoefficient: 0.2 - - type: Armor - modifiers: - coefficients: - Blunt: 0.4 - Slash: 0.75 - Piercing: 0.2 - Caustic: 0.2 - Heat: 0.3 - Radiation: 0.2 - - type: Reflect - enabled: true - reflectProb: 0.15 - spread: 100 - - type: ClothingSpeedModifier - walkModifier: 0.95 - sprintModifier: 0.95 - - type: HeldSpeedModifier - - type: ToggleableClothing - clothingPrototype: LPPClothingOuterHardsuitHelmetLeaderNFSD - - type: StaticPrice - price: 350 - -- type: entity - parent: ClothingHeadHardsuitWithLightBase - id: LPPClothingOuterHardsuitHelmetLeaderNFSD - name: шлем элитного скафандра шерифа - description: Пархай как бабочка, жаль, что ты уже мёртв, жалкий ксенос! - noSpawn: true - components: - - type: BreathMask - - type: Sprite - sprite: _LostParadise/Clothing/OuterClothing/Hardsuits/upgradednfsd/upgrleadhelmet.rsi - - type: Clothing - sprite: _LostParadise/Clothing/OuterClothing/Hardsuits/upgradednfsd/upgrleadhelmet.rsi - - type: PointLight - color: white - - type: PressureProtection - highPressureMultiplier: 0.05 - lowPressureMultiplier: 1000 - - type: Armor - modifiers: - coefficients: - Blunt: 0.9 - Slash: 0.9 - Piercing: 0.9 - Heat: 0.9 - Radiation: 0.8 - -- type: entity - parent: ClothingOuterArmorBasic - id: LPPClothingOuterArmoradvancedNPZ - name: комплект защиты НПЗ - description: Комплект из бронеэлементов, защищающие жизненно важные органы, а так же конечности носителя. - components: - - type: Sprite - sprite: _LostParadise/Clothing/OuterClothing/Armor/upgbulletproof.rsi - - type: Clothing - sprite: _LostParadise/Clothing/OuterClothing/Armor/upgbulletproof.rsi - - type: Armor - modifiers: - coefficients: - Blunt: 0.55 - Slash: 0.55 - Piercing: 0.4 - Heat: 0.9 - - type: ExplosionResistance - damageCoefficient: 0.8 diff --git a/Resources/Prototypes/_LostParadise/Entities/Clothing/Shoes/boots.yml b/Resources/Prototypes/_LostParadise/Entities/Clothing/Shoes/boots.yml index aa5350796d..6363fd601c 100644 --- a/Resources/Prototypes/_LostParadise/Entities/Clothing/Shoes/boots.yml +++ b/Resources/Prototypes/_LostParadise/Entities/Clothing/Shoes/boots.yml @@ -98,7 +98,3 @@ sprite: _LostParadise/Clothing/Shoes/Boots/upgjackboots.rsi - type: Clothing sprite: _LostParadise/Clothing/Shoes/Boots/upgjackboots.rsi - - type: Storage - whitelist: - tags: - - Knife diff --git a/Resources/Prototypes/_LostParadise/Entities/Clothing/Uniforms/jumpsuitsnpz.yml b/Resources/Prototypes/_LostParadise/Entities/Clothing/Uniforms/jumpsuitsnpz.yml index 289d5fe810..4a57754eb2 100644 --- a/Resources/Prototypes/_LostParadise/Entities/Clothing/Uniforms/jumpsuitsnpz.yml +++ b/Resources/Prototypes/_LostParadise/Entities/Clothing/Uniforms/jumpsuitsnpz.yml @@ -27,3 +27,17 @@ modifiers: coefficients: Piercing: 0.95 + +- type: entity + parent: ClothingUniformBase + id: LPPClothingUniformJumpsuitOverallsNPZ + name: комбинезон техника НПЗ + description: Свитер и брюки на лямках с небольшими кармашками для ваших инструментов, не испачкайте рубашку! + components: + - type: Sprite + sprite: _LostParadise/Clothing/Uniforms/NPZ/NPZoverall.rsi + - type: Clothing + sprite: _LostParadise/Clothing/Uniforms/NPZ/NPZoverall.rsi + - type: Storage + grid: + - 0,0,1,2 \ No newline at end of file diff --git a/Resources/Prototypes/_LostParadise/Entities/Objects/Devices/machineboard.yml b/Resources/Prototypes/_LostParadise/Entities/Objects/Devices/machineboard.yml index 276588ca14..c30578236a 100644 --- a/Resources/Prototypes/_LostParadise/Entities/Objects/Devices/machineboard.yml +++ b/Resources/Prototypes/_LostParadise/Entities/Objects/Devices/machineboard.yml @@ -1,165 +1,165 @@ -- type: entity - id: LPPProtolatheENGMachineCircuitboard - parent: BaseMachineCircuitboard - name: инженерный протолат (машинная плата) - description: Плата для создания инженерного протолата. - components: - - type: MachineBoard - prototype: LPPprotolatheENG - stackRequirements: - MatterBin: 2 - Manipulator: 2 - tagRequirements: - GlassBeaker: - amount: 2 - defaultPrototype: Beaker - -- type: entity - id: LPPProtolatheRnDMachineCircuitboard - parent: BaseMachineCircuitboard - name: научный протолат (машинная плата) - description: Плата для создания научного протолата. - components: - - type: MachineBoard - prototype: LPPprotolatheRnD - stackRequirements: - MatterBin: 2 - Manipulator: 2 - tagRequirements: - GlassBeaker: - amount: 2 - defaultPrototype: Beaker - -- type: entity - id: LPPProtolatheSUPMachineCircuitboard - parent: BaseMachineCircuitboard - name: протолат снабжения (машинная плата) - description: Плата для создания протолата снабжения. - components: - - type: MachineBoard - prototype: LPPSupProtolathe - stackRequirements: - MatterBin: 2 - Manipulator: 2 - tagRequirements: - GlassBeaker: - amount: 2 - defaultPrototype: Beaker - -- type: entity - id: LPPProtolatheServiceMachineCircuitboard - parent: BaseMachineCircuitboard - name: сервисный протолат (машинная плата) - description: Плата для создания сервисного протолата. - components: - - type: MachineBoard - prototype: LPPServiceProtolathe - stackRequirements: - MatterBin: 2 - Manipulator: 2 - tagRequirements: - GlassBeaker: - amount: 2 - defaultPrototype: Beaker - -- type: entity - id: LPPSpaceForgeBoard - parent: BaseMachineCircuitboard - name: космическая кузница (машинная плата) - description: Плата для создания космической кузницы. - components: - - type: Tag - tags: - - HighRiskItem - - type: StealTarget - stealGroup: LPPSpaceForgeBoard - - type: MachineBoard - prototype: LPPthespaceforge - stackRequirements: - MatterBin: 8 - Manipulator: 6 - Glass: 10 - Steel: 5 - tagRequirements: - GlassBeaker: - amount: 2 - defaultPrototype: Beaker - examineName: Glass Beaker - -- type: entity - id: LPPUniformPrinterMachineCircuitboard - parent: BaseMachineCircuitboard - name: принтер униформы 2.0 (машинная плата) - description: Плата для создания принтера униформы 2.0. - components: - - type: MachineBoard - prototype: LPPUniformPrinter - stackRequirements: - MatterBin: 2 - Manipulator: 2 - -- type: entity - id: LPPCECommsComputerCircuitboard - parent: BaseMachineCircuitboard - name: chief engineer communications computer board - description: ent-BaseComputerCircuitboard.desc - components: - - type: Sprite - state: cpu_command - - type: MachineBoard - prototype: LPPCEComputerComms - -- type: entity - id: LPPCapCommsComputerCircuitboard - parent: BaseMachineCircuitboard - name: captain communications computer board - description: ent-BaseComputerCircuitboard.desc - components: - - type: Sprite - state: cpu_command - - type: MachineBoard - prototype: LPPCapComputerComms - -- type: entity - id: LPPHopCommsComputerCircuitboard - parent: BaseMachineCircuitboard - name: head of personnel communications computer board - description: ent-BaseComputerCircuitboard.desc - components: - - type: Sprite - state: cpu_command - - type: MachineBoard - prototype: LPPHopComputerComms - -- type: entity - id: LPPHosCommsComputerCircuitboard - parent: BaseMachineCircuitboard - name: head of security communications computer board - description: ent-BaseComputerCircuitboard.desc - components: - - type: Sprite - state: cpu_command - - type: MachineBoard - prototype: LPPHosComputerComms - -- type: entity - id: LPPRDCommsComputerCircuitboard - parent: BaseMachineCircuitboard - name: research director communications computer board - description: ent-BaseComputerCircuitboard.desc - components: - - type: Sprite - state: cpu_command - - type: MachineBoard - prototype: LPPRDComputerComms - -- type: entity - id: LPPCmoCommsComputerCircuitboard - parent: BaseMachineCircuitboard - name: chief medical officer communications computer board - description: ent-BaseComputerCircuitboard.desc - components: - - type: Sprite - state: cpu_command - - type: MachineBoard - prototype: LPPCmoComputerComms +# - type: entity +# id: LPPProtolatheENGMachineCircuitboard +# parent: BaseMachineCircuitboard +# name: инженерный протолат (машинная плата) +# description: Плата для создания инженерного протолата. +# components: +# - type: MachineBoard +# prototype: LPPprotolatheENG +# stackRequirements: +# MatterBin: 2 +# Manipulator: 2 +# tagRequirements: +# GlassBeaker: +# amount: 2 +# defaultPrototype: Beaker +# +# - type: entity +# id: LPPProtolatheRnDMachineCircuitboard +# parent: BaseMachineCircuitboard +# name: научный протолат (машинная плата) +# description: Плата для создания научного протолата. +# components: +# - type: MachineBoard +# prototype: LPPprotolatheRnD +# stackRequirements: +# MatterBin: 2 +# Manipulator: 2 +# tagRequirements: +# GlassBeaker: +# amount: 2 +# defaultPrototype: Beaker +# +# - type: entity +# id: LPPProtolatheSUPMachineCircuitboard +# parent: BaseMachineCircuitboard +# name: протолат снабжения (машинная плата) +# description: Плата для создания протолата снабжения. +# components: +# - type: MachineBoard +# prototype: LPPSupProtolathe +# stackRequirements: +# MatterBin: 2 +# Manipulator: 2 +# tagRequirements: +# GlassBeaker: +# amount: 2 +# defaultPrototype: Beaker +# +# - type: entity +# id: LPPProtolatheServiceMachineCircuitboard +# parent: BaseMachineCircuitboard +# name: сервисный протолат (машинная плата) +# description: Плата для создания сервисного протолата. +# components: +# - type: MachineBoard +# prototype: LPPServiceProtolathe +# stackRequirements: +# MatterBin: 2 +# Manipulator: 2 +# tagRequirements: +# GlassBeaker: +# amount: 2 +# defaultPrototype: Beaker +# +#- type: entity +# id: LPPSpaceForgeBoard +# parent: BaseMachineCircuitboard +# name: космическая кузница (машинная плата) +# description: Плата для создания космической кузницы. +# components: +# - type: Tag +# tags: +# - HighRiskItem +# - type: StealTarget +# stealGroup: LPPSpaceForgeBoard +# - type: MachineBoard +# prototype: LPPthespaceforge +# stackRequirements: +# MatterBin: 8 +# Manipulator: 6 +# Glass: 10 +# Steel: 5 +# tagRequirements: +# GlassBeaker: +# amount: 2 +# defaultPrototype: Beaker +# examineName: Glass Beaker +# +#- type: entity +# id: LPPUniformPrinterMachineCircuitboard +# parent: BaseMachineCircuitboard +# name: принтер униформы 2.0 (машинная плата) +# description: Плата для создания принтера униформы 2.0. +# components: +# - type: MachineBoard +# prototype: LPPUniformPrinter +# stackRequirements: +# MatterBin: 2 +# Manipulator: 2 +# +#- type: entity +# id: LPPCECommsComputerCircuitboard +# parent: BaseMachineCircuitboard +# name: chief engineer communications computer board +# description: ent-BaseComputerCircuitboard.desc +# components: +# - type: Sprite +# state: cpu_command +# - type: MachineBoard +# prototype: LPPCEComputerComms +# +#- type: entity +# id: LPPCapCommsComputerCircuitboard +# parent: BaseMachineCircuitboard +# name: captain communications computer board +# description: ent-BaseComputerCircuitboard.desc +# components: +# - type: Sprite +# state: cpu_command +# - type: MachineBoard +# prototype: LPPCapComputerComms +# +#- type: entity +# id: LPPHopCommsComputerCircuitboard +# parent: BaseMachineCircuitboard +# name: head of personnel communications computer board +# description: ent-BaseComputerCircuitboard.desc +# components: +# - type: Sprite +# state: cpu_command +# - type: MachineBoard +# prototype: LPPHopComputerComms +# +#- type: entity +# id: LPPHosCommsComputerCircuitboard +# parent: BaseMachineCircuitboard +# name: head of security communications computer board +# description: ent-BaseComputerCircuitboard.desc +# components: +# - type: Sprite +# state: cpu_command +# - type: MachineBoard +# prototype: LPPHosComputerComms +# +#- type: entity +# id: LPPRDCommsComputerCircuitboard +# parent: BaseMachineCircuitboard +# name: research director communications computer board +# description: ent-BaseComputerCircuitboard.desc +# components: +# - type: Sprite +# state: cpu_command +# - type: MachineBoard +# prototype: LPPRDComputerComms +# +#- type: entity +# id: LPPCmoCommsComputerCircuitboard +# parent: BaseMachineCircuitboard +# name: chief medical officer communications computer board +# description: ent-BaseComputerCircuitboard.desc +# components: +# - type: Sprite +# state: cpu_command +# - type: MachineBoard +# prototype: LPPCmoComputerComms diff --git a/Resources/Prototypes/_LostParadise/Entities/Objects/Fun/ERP/buttplug.yml b/Resources/Prototypes/_LostParadise/Entities/Objects/Fun/ERP/buttplug.yml index 353dd73318..b0e12276cb 100644 --- a/Resources/Prototypes/_LostParadise/Entities/Objects/Fun/ERP/buttplug.yml +++ b/Resources/Prototypes/_LostParadise/Entities/Objects/Fun/ERP/buttplug.yml @@ -133,13 +133,6 @@ components: - type: Sprite sprite: _LostParadise/Clothing/Underwear/buttplugtail/big.rsi - scale: 1.0, 1.0 - layers: - - state: equipped-NECK - - type: Clothing - sprite: _LostParadise/Clothing/Underwear/buttplugtail/big.rsi - - type: Item - size: Tiny - type: entity name: Medium tail buttplug @@ -149,13 +142,6 @@ components: - type: Sprite sprite: _LostParadise/Clothing/Underwear/buttplugtail/medium.rsi - scale: 1.0, 1.0 - layers: - - state: equipped-NECK - - type: Clothing - sprite: _LostParadise/Clothing/Underwear/buttplugtail/medium.rsi - - type: Item - size: Tiny - type: entity name: Small tail buttplug @@ -165,13 +151,6 @@ components: - type: Sprite sprite: _LostParadise/Clothing/Underwear/buttplugtail/small.rsi - scale: 1.0, 1.0 - layers: - - state: equipped-NECK - - type: Clothing - sprite: _LostParadise/Clothing/Underwear/buttplugtail/small.rsi - - type: Item - size: Tiny - type: entity name: big teal buttplug diff --git a/Resources/Prototypes/_LostParadise/Entities/Objects/Misc/identification_cards.yml b/Resources/Prototypes/_LostParadise/Entities/Objects/Misc/identification_cards.yml index 1813c5255b..88a0abfb2a 100644 --- a/Resources/Prototypes/_LostParadise/Entities/Objects/Misc/identification_cards.yml +++ b/Resources/Prototypes/_LostParadise/Entities/Objects/Misc/identification_cards.yml @@ -151,21 +151,21 @@ - type: PresetIdCard job: LPPAdjutant -- type: entity - parent: IDCardStandard - id: LPPBrigmedicIDCard - name: brigmedic ID card - components: - - type: Sprite - layers: - - state: default - - state: department - color: "#5B97BC" - - state: subdepartment - color: "#5B97BC" - - state: idbrigmedic - - type: PresetIdCard - job: LPPBrigmedic +#- type: entity +# parent: IDCardStandard +# id: LPPBrigmedicIDCard +# name: brigmedic ID card +# components: +# - type: Sprite +# layers: +# - state: default +# - state: department +# color: "#5B97BC" +# - state: subdepartment +# color: "#5B97BC" +# - state: idbrigmedic +# - type: PresetIdCard +# job: LPPBrigmedic #- type: entity # parent: IDCardStandard diff --git a/Resources/Prototypes/_LostParadise/Entities/Objects/Weapons/Guns/Ammunition/Projectile/LPPBullets.yml b/Resources/Prototypes/_LostParadise/Entities/Objects/Weapons/Guns/Ammunition/Projectile/LPPBullets.yml index 9953a5ae0d..3108217c15 100644 --- a/Resources/Prototypes/_LostParadise/Entities/Objects/Weapons/Guns/Ammunition/Projectile/LPPBullets.yml +++ b/Resources/Prototypes/_LostParadise/Entities/Objects/Weapons/Guns/Ammunition/Projectile/LPPBullets.yml @@ -109,3 +109,15 @@ types: Blunt: 3 Heat: 15 + +- type: entity + id: LPPBulletLightRifleHunting + name: Huntingbullet (.30 rifle) + parent: BaseBullet + categories: [ HideSpawnMenu ] + components: + - type: Projectile + damage: + types: + Piercing: 16 + Blunt: 7 diff --git a/Resources/Prototypes/_LostParadise/Entities/Objects/Weapons/Guns/Rifles/sawn_pka.yml b/Resources/Prototypes/_LostParadise/Entities/Objects/Weapons/Guns/Rifles/sawn_pka.yml deleted file mode 100644 index 65c9061781..0000000000 --- a/Resources/Prototypes/_LostParadise/Entities/Objects/Weapons/Guns/Rifles/sawn_pka.yml +++ /dev/null @@ -1,53 +0,0 @@ -- type: entity - name: обрез протокинетического ускорителя - id: LPPWeaponProtoKineticAcceleratorSawn - parent: BaseItem - description: Без лишних вопросов. - components: - - type: Sprite - sprite: _LostParadise/Objects/Weapons/Guns/Basic/sawn_kinetic_accelerator.rsi - layers: - - state: icon - - type: Item - sprite: _LostParadise/Objects/Weapons/Guns/Basic/sawn_kinetic_accelerator.rsi - size: Small - shape: - - 0,0,2,0 - - type: Gun - fireRate: 8 - selectedMode: FullAuto - angleDecay: 15 - minAngle: 35 - maxAngle: 70 - availableModes: - - FullAuto - soundGunshot: - path: /Audio/Weapons/Guns/Gunshots/kinetic_accel.ogg - - type: AmmoCounter - - type: Appearance - - type: GenericVisualizer - visuals: - enum.AmmoVisuals.HasAmmo: - empty-icon: - True: { visible: False } - False: { visible: True } - - type: RechargeBasicEntityAmmo - rechargeCooldown: 0.65 - rechargeSound: - path: /Audio/Weapons/Guns/MagIn/kinetic_reload.ogg - - type: BasicEntityAmmoProvider - proto: BulletKinetic - capacity: 1 - count: 1 - - type: Clothing - sprite: _LostParadise/Objects/Weapons/Guns/Basic/sawn_kinetic_accelerator.rsi - quickEquip: false - slots: - - Belt - - suitStorage - - type: UseDelay - delay: 1 - - type: Construction - graph: ProtoKineticAcceleratorSawn - node: pkasawn - deconstructionTarget: null diff --git a/Resources/Prototypes/_LostParadise/Entities/Objects/Weapons/Melee/128x128.yml b/Resources/Prototypes/_LostParadise/Entities/Objects/Weapons/Melee/128x128.yml index eaafee7456..3cb46fe578 100644 --- a/Resources/Prototypes/_LostParadise/Entities/Objects/Weapons/Melee/128x128.yml +++ b/Resources/Prototypes/_LostParadise/Entities/Objects/Weapons/Melee/128x128.yml @@ -1,19 +1,19 @@ -- type: entity - name: Snowy katana - parent: CaptainSabre - id: LPPSnowyKatana - description: An ancient war blade. - components: - - type: Sprite - sprite: _LostParadise/Objects/Weapons/Melee/128x128/Snowy-katana.rsi - state: icon - scale: 0.25, 0.25 - - type: MeleeWeapon - attackRate: 0.90 - damage: - types: - Slash: 17 - - type: Item - size: Normal - sprite: _LostParadise/Objects/Weapons/Melee/128x128/Snowy-katana.rsi - - type: DisarmMalus +#- type: entity +# name: Snowy katana +# parent: CaptainSabre +# id: LPPSnowyKatana +# description: An ancient war blade. +# components: +# - type: Sprite +# sprite: _LostParadise/Objects/Weapons/Melee/128x128/Snowy-katana.rsi +# state: icon +# scale: 0.25, 0.25 +# - type: MeleeWeapon +# attackRate: 0.90 +# damage: +# types: +# Slash: 17 +# - type: Item +# size: Normal +# sprite: _LostParadise/Objects/Weapons/Melee/128x128/Snowy-katana.rsi +# - type: DisarmMalus diff --git a/Resources/Prototypes/_LostParadise/Entities/Structures/Machines/lathe.yml b/Resources/Prototypes/_LostParadise/Entities/Structures/Machines/lathe.yml index 9d5170a075..db6ac9895f 100644 --- a/Resources/Prototypes/_LostParadise/Entities/Structures/Machines/lathe.yml +++ b/Resources/Prototypes/_LostParadise/Entities/Structures/Machines/lathe.yml @@ -1,619 +1,619 @@ -- type: entity - abstract: true - parent: BaseLathe - id: BaseLatheLube - components: - # - type: ReagentSpeed - # solution: lube - # modifiers: - # SpaceLube: 0.25 - # SpaceGlue: 5 - - type: SolutionContainerManager - solutions: - lube: - maxVol: 250 - - type: Spillable - solution: lube - - type: RefillableSolution - solution: lube - - type: ExaminableSolution - solution: lube - -- type: entity - id: LPPprotolatheENG - parent: BaseLathe - name: инженерный протолат - description: Удивительный прибор. Каким-то образом печатает инструменты для инженеров из разных материалов, однако только создатели данного протолата знают секреты этой техники... - components: - - type: Sprite - sprite: _LostParadise/Structures/Machines/protolatheENG.rsi - snapCardinals: true - layers: - - state: icon - map: ["enum.LatheVisualLayers.IsRunning"] - - state: unlit - shader: unshaded - map: ["enum.PowerDeviceVisualLayers.Powered"] - - state: inserting - map: ["enum.MaterialStorageVisualLayers.Inserting"] - - state: panel - map: ["enum.WiresVisualLayers.MaintenancePanel"] - - type: MaterialStorage - whitelist: - tags: - - Sheet - - RawMaterial - - Ingot - - type: Lathe - idleState: icon - runningState: building - staticRecipes: - - Wirecutter - - Screwdriver - - Welder - - Wrench - - Crowbar - - Multitool - - NetworkConfigurator - - SprayPainter - - FlashlightLantern - - CableStack - - CableMVStack - - CableHVStack - - HandheldGPSBasic - - TRayScanner - - AirTank - - GasAnalyzer - - UtilityBelt - - ModularReceiver - - AppraisalTool - - SheetRGlass - - LightTube - - LedLightTube - - SodiumLightTube - - ExteriorLightTube - - LightBulb - - LedLightBulb - - PowerCellSmall - - PowerCellMedium - - MicroManipulatorStockPart - - MatterBinStockPart - - CapacitorStockPart - - IntercomElectronics - - FirelockElectronics - - DoorElectronics - - AirAlarmElectronics - - StationMapElectronics - - FireAlarmElectronics - - MailingUnitElectronics - - SignalTimerElectronics - - APCElectronics - - HandheldStationMap - - ClothingHeadHatWelding - dynamicRecipes: - - LPPRCDFAPDevice - - LPPRCDFAPAmmo - # - LPPMesonNVG - # - LPPTricorder - - PowerDrill - - WeaponParticleDecelerator - - HoloprojectorField - - Signaller - - SignallerAdvanced - - Igniter - - HandHeldMassScanner - - PowerCellMicroreactor - - PowerCellHigh - - ClothingShoesBootsMagSci - - ClothingShoesBootsSpeed - - HolofanProjector - - WeaponGrapplingGun - - ClothingBackpackHolding - - ClothingBackpackSatchelHolding - - ClothingBackpackDuffelHolding - - WelderExperimental - - JawsOfLife - - FauxTileAstroGrass - - FauxTileMowedAstroGrass - - FauxTileJungleAstroGrass - - FauxTileAstroIce - - FauxTileAstroSnow - - FloorGreenCircuit - - FloorBlueCircuit - - SolarTrackerElectronics - - WallmountGeneratorElectronics - - WallmountGeneratorAPUElectronics - - WallmountSubstationElectronics - - type: EmagLatheRecipes - emagDynamicRecipes: - - ExplosivePayload - - WeaponLaserCarbine - - WeaponAdvancedLaser - - WeaponLaserCannon - - WeaponXrayCannon - -- type: entity - id: LPPprotolatheRnD - parent: BaseLathe - name: научный протолат - description: Прибор который позволяет печатать научные платы и оборудование для учёных из разных материалов, удивительно что ещё никто не узнал из персонала как этот прибор печатает предметы лучшего качества... - components: - - type: Sprite - sprite: _LostParadise/Structures/Machines/protolatheRnD.rsi - snapCardinals: true - layers: - - state: icon - map: ["enum.LatheVisualLayers.IsRunning"] - - state: unlit - shader: unshaded - map: ["enum.PowerDeviceVisualLayers.Powered"] - - state: inserting - map: ["enum.MaterialStorageVisualLayers.Inserting"] - - state: panel - map: ["enum.WiresVisualLayers.MaintenancePanel"] - - type: MaterialStorage - whitelist: - tags: - - Sheet - - RawMaterial - - Ingot - - type: Machine - board: LPPProtolatheRnDMachineCircuitboard - - type: Lathe - idleState: icon - runningState: building - staticRecipes: - - ClothingOuterHardsuitRND - - Wirecutter - - Screwdriver - - Welder - - Wrench - - Crowbar - - NetworkConfigurator - - SprayPainter - - FlashlightLantern - - CableStack - - CableMVStack - - CableHVStack - - HandheldGPSBasic - - TRayScanner - - AirTank - - GasAnalyzer - - UtilityBelt - - ModularReceiver - - AppraisalTool - - SheetRGlass - - Beaker - - Syringe - - LightTube - - LedLightTube - - SodiumLightTube - - ExteriorLightTube - - LightBulb - - LedLightBulb - - PowerCellSmall - - PowerCellMedium - - MicroManipulatorStockPart - - MatterBinStockPart - - CapacitorStockPart - - HandheldStationMap - - ClothingHeadHatWelding - dynamicRecipes: - - LPPRoboHud - # - LPPNVG - # - LPPDiagnosticNVG - - PowerDrill - - WelderExperimental - - JawsOfLife - # - LPPTricorder - - PowerDrill - - AnomalyScanner - - AnomalyLocator - - AnomalyLocatorWide - - TimerTrigger - - ChemicalPayload - - FlashPayload - - Signaller - - SignallerAdvanced - - SignalTrigger - - VoiceTrigger - - Igniter - - PowerCellMicroreactor - - PowerCellHigh - - WeaponPistolCHIMP - - WeaponGauntletGorilla - - SynthesizerInstrument - - ClothingShoesBootsMagSci - - ClothingShoesBootsSpeed - - NodeScanner - - ClothingBackpackHolding - - ClothingBackpackSatchelHolding - - ClothingBackpackDuffelHolding - - FauxTileAstroGrass - - FauxTileMowedAstroGrass - - FauxTileJungleAstroGrass - - FauxTileAstroIce - - FauxTileAstroSnow - - DeviceQuantumSpinInverter - - RipleyCentralElectronics - - RipleyPeripheralsElectronics - - HonkerCentralElectronics - - HonkerPeripheralsElectronics - - HonkerTargetingElectronics - - HamtrCentralElectronics - - HamtrPeripheralsElectronics - - type: EmagLatheRecipes - emagDynamicRecipes: - - ExplosivePayload - - WeaponLaserCarbine - - WeaponAdvancedLaser - - WeaponLaserCannon - - WeaponXrayCannon - -- type: entity - id: LPPSupProtolathe - parent: BaseLathe - name: протолат снабжения - description: Данный прибор позволяет печатать оборудование для более удобной и быстрой утилизации обломков, копания руды в осколках метеоритов и возможно что то ещё полезное для экспедиций, даже сами поставщики были удивлены инновационной технологией данных машин. - components: - - type: Sprite - sprite: _LostParadise/Structures/Machines/protolatheCargo.rsi - snapCardinals: true - layers: - - state: icon - map: ["enum.LatheVisualLayers.IsRunning"] - - state: unlit - shader: unshaded - map: ["enum.PowerDeviceVisualLayers.Powered"] - - state: inserting - map: ["enum.MaterialStorageVisualLayers.Inserting"] - - state: panel - map: ["enum.WiresVisualLayers.MaintenancePanel"] - - type: MaterialStorage - whitelist: - tags: - - Sheet - - RawMaterial - - Ingot - - type: Machine - board: LPPProtolatheSUPMachineCircuitboard - - type: Lathe - idleState: icon - runningState: building - staticRecipes: - - Wirecutter - - Screwdriver - - Welder - - Wrench - - Crowbar - - NetworkConfigurator - - SprayPainter - - FlashlightLantern - - HandheldGPSBasic - - AirTank - - UtilityBelt - - Fulton - - FultonBeacon - - Pickaxe - - AppraisalTool - - HandLabeler - - LightTube - - LedLightTube - - SodiumLightTube - - ExteriorLightTube - - LightBulb - - LedLightBulb - - PowerCellSmall - - PowerCellMedium - - EmergencyRollerBedSpawnFolded - - HandheldStationMap - - ConveyorBeltAssembly - dynamicRecipes: - # - LPPMesonNVG - # - LPPNVG - - MiningDrill - - Signaller - - SignallerAdvanced - - HandHeldMassScanner - - PowerCellMicroreactor - - PowerCellHigh - - WeaponForceGun - - WeaponLaserSvalinn - - WeaponProtoKineticAccelerator - - WeaponTetherGun - - WeaponGrapplingGun - - WeaponCutter - - OreBagBluespace - - WeaponCutterAdv - - ClothingBackpackHolding - - ClothingBackpackSatchelHolding - - ClothingBackpackDuffelHolding - - OreBagOfHolding - - type: EmagLatheRecipes - emagDynamicRecipes: - - ExplosivePayload - - WeaponLaserCarbine - - WeaponAdvancedLaser - - WeaponLaserCannon - - WeaponXrayCannon - -- type: entity - id: LPPServiceProtolathe - parent: BaseLatheLube - name: сервисный протолат - description: Машина, которая печатает посуду и другое сервисное оборудование для сервисного персонала. Всё ещё поразительно, что весь серви́с имеет такую же прочность, как и сделаное своими руками. - components: - - type: Sprite - sprite: _LostParadise/Structures/Machines/protolatheService.rsi - snapCardinals: true - layers: - - state: icon - map: ["enum.LatheVisualLayers.IsRunning"] - - state: unlit - shader: unshaded - map: ["enum.PowerDeviceVisualLayers.Powered"] - - state: inserting - map: ["enum.MaterialStorageVisualLayers.Inserting"] - - state: panel - map: ["enum.WiresVisualLayers.MaintenancePanel"] - - type: Machine - board: LPPProtolatheServiceMachineCircuitboard - - type: MaterialStorage - whitelist: - tags: - - Sheet - - RawMaterial - - Ingot - - type: Lathe - idleState: icon - runningState: building - staticRecipes: - - LargeBeaker - - Dropper - - ClothingEyesGlassesChemical - - Wirecutter - - Screwdriver - - Welder - - Wrench - - Crowbar - - NetworkConfigurator - - SprayPainter - - FlashlightLantern - - HandheldGPSBasic - - AirTank - - UtilityBelt - - Beaker - - Syringe - - LightTube - - LedLightTube - - SodiumLightTube - - ExteriorLightTube - - LightBulb - - LedLightBulb - - Bucket - - DrinkMug - - DrinkMugMetal - - DrinkGlass - - DrinkShotGlass - - DrinkGlassCoupeShaped - - FoodPlate - - FoodPlateSmall - - FoodPlatePlastic - - FoodPlateSmallPlastic - - FoodBowlBig - - FoodPlateTin - - FoodKebabSkewer - - SprayBottle - - MopItem - - Holoprojector - - Mousetrap - - LightReplacer - - TrashBag - - PowerCellSmall - - PowerCellMedium - - HandheldStationMap - dynamicRecipes: - - LPPBarHud - # - LPPNVG - - CryostasisBeaker - - SyringeCryostasis - - Syringe - - WeaponSprayNozzle - - ClothingBackpackWaterTank - - MegaSprayBottle - - AdvMopItem - - Signaller - - SignallerAdvanced - - PowerCellHigh - - SynthesizerInstrument - - ClothingShoesBootsSpeed - - BluespaceBeaker - - SyringeBluespace - - BluespacePlantBag - - AdvWateringCan - - type: EmagLatheRecipes - emagDynamicRecipes: - - ExplosivePayload - - WeaponLaserCarbine - - WeaponAdvancedLaser - - WeaponLaserCannon - - WeaponXrayCannon - -- type: entity - parent: BaseLathe - id: LPPUniformPrinter - name: принтер униформы 2.0 - description: Печатает великолепную одежду для прекрасного экипажа! - components: - - type: Transform - noRot: false - - type: Sprite - sprite: _LostParadise/Structures/Machines/LPPUniformPrinter.rsi - snapCardinals: true - layers: - - state: icon - map: ["enum.LatheVisualLayers.IsRunning"] - - type: Machine - board: LPPUniformPrinterMachineCircuitboard - - type: Lathe - producingSound: /Audio/Machines/uniformprinter.ogg - idleState: icon - runningState: building - staticRecipes: - - LPPClothingHeadHatBandage - - LPPClothingEyesEyepatchBandage - - LPPClothingHeadHatCapBlack - - LPPClothingUniformBlackBeachSkirt - - LPPClothingUniformBlackTracksuit - - LPPClothingUniformGreenTracksuit - - ClothingUniformJumpskirtAdjutant - - LPPCargoBlackSkirt - - LPPSkirtleneckCargo - - LPPSkirtleneckQMCargo - - LPPAtmosBlackSkirt - - LPPSkirtleneckAtmos - - LPPSkirtleneckQMAtmos - - LPPSupplyChiefSkirtAtmos - - LPPEngiBlackSkirt - - LPPSkirtleneckEngi - - LPPSkirtleneckQMEngi - - LPPClothingUniformJumpSkirtSecEngineer - - LPPSupplyChiefSkirtEngi - - LPPMedicBlackSkirt - - LPPSkirtleneckMedic - - LPPSkirtleneckQMMedic - - LPPSupplyChiefSkirtMedic - - LPPSkirtleneckVirology - - LPPSkirtleneckVirologyQM - - LPPSupplyChiefSkirtVirology - - LPPVirologyBlackSkirt - - LPPMedicBlackSkirt2 - - LPPRndBlackSkirt - - LPPSkirtleneckRnd - - LPPSkirtleneckQMRnd - - LPPSupplyChiefSkirtRnd - - LPPSecBlackSkirt - - LPPSkirtleneckQMSec - - LPPSupplyChiefSkirtSec - - ClothingUniformJumpsuitAdjutant - - LPPCargotechjean - - LPPGorkaCargo - - LPPGorkaCargoVarg - - LPPQmcCargo - - LPPSupplyChiefCargo - - LPPQmsyndCargo - - LPPTurtleneckQmCargo - - LPPUtilCargo - - LPPClothingUniformJumpsuitGreenClown - - LPPClothingUniformJumpsuitBlueClown - - LPPClothingUniformJumpsuitOrangeClown - - LPPClothingUniformJumpsuitPurpleClown - - LPPClothingUniformJumpsuitRainbowClown - - LPPClothingUniformJumpsuitYellowClown - - LPPAtmostechjean - - LPPGorkaAtmos - - LPPGorkaWithReflectorsAtmos - - LPPQmcAtmos - - LPPQmsyndAtmos - - LPPSupplyChiefAtmos - - LPPTurtleneckQmAtmos - - LPPUtilAtmos - - LPPEngiTechjean - - LPPGorkaEngi - - LPPGorkaWithReflectorsEngi - - LPPQmcEngi - - LPPQmsyndEngi - - LPPSupplyChiefEngi - - LPPTurtleneckQmEngi - - LPPUtilEngi - - LPPBlackFlannelJumpsuit - - LPPGreenFlannelJumpsuit - - LPPOrangeFlannelJumpsuit - - ClothingUniformJumpsuitFluppi - - LPPClothingUniformJumpsuitSecEngineer - - LPPMedictechjean - - LPPGorkaMedic - - LPPGorkaMedicVarg - - LPPQmcMedic - - LPPQmsyndMedic - - LPPSupplyChiefMedic - - LPPTurtleneckQmMedic - - LPPUtilMedic - - LPPGorkaVirology - - LPPGorkaVirologyVarg - - LPPQmcVirology - - LPPQmcSyndVirology - - LPPSupplyChiefVirology - - LPPTurtleneckQM - - LPPUtilVirology - - LPPVirologyTechjean - - LPPRndtechjean - - LPPGorkaRnd - - LPPGorkaRndVarg - - LPPQmcRnd - - LPPQmsyndRnd - - LPPSupplyChiefRnd - - LPPTurtleneckQmRnd - - LPPUtilRnd - - LPPSectechjean - - LPPGorkaSec - - LPPGorkaSecVarg - - LPPQmcSec - - LPPQmsyndSec - - LPPSupplyChiefSec - - LPPTurtleneckQmSec - - LPPUtilSec - - LPPTacticoolSec - - LPPClothingUniformWhiteBeachSkirt - - LPPClothingUniformRedTracksuit - - LPPMaid - - LPPSchoolgirl - -- type: entity - id: LPPthespaceforge - parent: BaseLathe - name: космическая кузница - description: Данный купол машины предназначен для печатания скафандров чтобы персонал мог спокойно выйти в космос, не боясь задохнуться. К слову, все характеристики схожи и с другими протолатами, однако его строение и сборка выглядит по-другому. - components: - - type: Sprite - sprite: _LostParadise/Structures/Machines/spaceForge.rsi - snapCardinals: true - layers: - - state: icon - map: ["enum.LatheVisualLayers.IsRunning"] - - state: inserting - map: ["enum.MaterialStorageVisualLayers.Inserting"] - - state: panel - map: ["enum.WiresVisualLayers.MaintenancePanel"] - - type: MaterialStorage - whitelist: - tags: - - Sheet - - RawMaterial - - Ingot - - type: Machine - board: LPPSpaceForgeBoard - - type: Lathe - producingSound: /Audio/Machines/circuitprinter.ogg - idleState: icon - runningState: building - staticRecipes: - - ClothingOuterHardsuitBasic - - ClothingOuterHardsuitAtmos - - ClothingOuterHardsuitEngineering - - ClothingOuterHardsuitSpatio - - ClothingOuterHardsuitSalvage - - ClothingOuterHardsuitMaxim - - ClothingOuterHardsuitLuxury - - ClothingOuterHardsuitEngineeringWhite - - ClothingOuterHardsuitBrigmedic - - ClothingOuterHardsuitSecurity - - riotsuppressionsuit - - securityhardsuit - - pilotsecurityhardsuit - - LPPClothingOuterHardsuitMiksuit - - ClothingOuterHardsuitMedical - - type: EmagLatheRecipes - emagStaticRecipes: - - ClothingOuterHardsuitSyndie - - ClothingOuterHardsuitSyndieMedic +#- type: entity +# abstract: true +# parent: BaseLathe +# id: BaseLatheLube +# components: +# - type: ReagentSpeed +# solution: lube +# modifiers: +# SpaceLube: 0.25 +# SpaceGlue: 5 +# - type: SolutionContainerManager +# solutions: +# lube: +# maxVol: 250 +# - type: Spillable +# solution: lube +# - type: RefillableSolution +# solution: lube +# - type: ExaminableSolution +# solution: lube +# +#- type: entity +# id: LPPprotolatheENG +# parent: BaseLathe +# name: инженерный протолат +# description: Удивительный прибор. Каким-то образом печатает инструменты для инженеров из разных материалов, однако только создатели данного протолата знают секреты этой техники... +# components: +# - type: Sprite +# sprite: _LostParadise/Structures/Machines/protolatheENG.rsi +# snapCardinals: true +# layers: +# - state: icon +# map: ["enum.LatheVisualLayers.IsRunning"] +# - state: unlit +# shader: unshaded +# map: ["enum.PowerDeviceVisualLayers.Powered"] +# - state: inserting +# map: ["enum.MaterialStorageVisualLayers.Inserting"] +# - state: panel +# map: ["enum.WiresVisualLayers.MaintenancePanel"] +# - type: MaterialStorage +# whitelist: +# tags: +# - Sheet +# - RawMaterial +# - Ingot +# - type: Lathe +# idleState: icon +# runningState: building +# staticRecipes: +# - Wirecutter +# - Screwdriver +# - Welder +# - Wrench +# - Crowbar +# - Multitool +# - NetworkConfigurator +# - SprayPainter +# - FlashlightLantern +# - CableStack +# - CableMVStack +# - CableHVStack +# - HandheldGPSBasic +# - TRayScanner +# - AirTank +# - GasAnalyzer +# - UtilityBelt +# - ModularReceiver +# - AppraisalTool +# - SheetRGlass +# - LightTube +# - LedLightTube +# - SodiumLightTube +# - ExteriorLightTube +# - LightBulb +# - LedLightBulb +# - PowerCellSmall +# - PowerCellMedium +# - MicroManipulatorStockPart +# - MatterBinStockPart +# - CapacitorStockPart +# - IntercomElectronics +# - FirelockElectronics +# - DoorElectronics +# - AirAlarmElectronics +# - StationMapElectronics +# - FireAlarmElectronics +# - MailingUnitElectronics +# - SignalTimerElectronics +# - APCElectronics +# - HandheldStationMap +# - ClothingHeadHatWelding +# dynamicRecipes: +# - LPPRCDFAPDevice +# - LPPRCDFAPAmmo +# # - LPPMesonNVG +# # - LPPTricorder +# - PowerDrill +# - WeaponParticleDecelerator +# - HoloprojectorField +# - Signaller +# - SignallerAdvanced +# - Igniter +# - HandHeldMassScanner +# - PowerCellMicroreactor +# - PowerCellHigh +# - ClothingShoesBootsMagSci +# - ClothingShoesBootsSpeed +# - HolofanProjector +# - WeaponGrapplingGun +# - ClothingBackpackHolding +# - ClothingBackpackSatchelHolding +# - ClothingBackpackDuffelHolding +# - WelderExperimental +# - JawsOfLife +# - FauxTileAstroGrass +# - FauxTileMowedAstroGrass +# - FauxTileJungleAstroGrass +# - FauxTileAstroIce +# - FauxTileAstroSnow +# - FloorGreenCircuit +# - FloorBlueCircuit +# - SolarTrackerElectronics +# - WallmountGeneratorElectronics +# - WallmountGeneratorAPUElectronics +# - WallmountSubstationElectronics +# - type: EmagLatheRecipes +# emagDynamicRecipes: +# - ExplosivePayload +# - WeaponLaserCarbine +# - WeaponAdvancedLaser +# - WeaponLaserCannon +# - WeaponXrayCannon +# +#- type: entity +# id: LPPprotolatheRnD +# parent: BaseLathe +# name: научный протолат +# description: Прибор который позволяет печатать научные платы и оборудование для учёных из разных материалов, удивительно что ещё никто не узнал из персонала как этот прибор печатает предметы лучшего качества... +# components: +# - type: Sprite +# sprite: _LostParadise/Structures/Machines/protolatheRnD.rsi +# snapCardinals: true +# layers: +# - state: icon +# map: ["enum.LatheVisualLayers.IsRunning"] +# - state: unlit +# shader: unshaded +# map: ["enum.PowerDeviceVisualLayers.Powered"] +# - state: inserting +# map: ["enum.MaterialStorageVisualLayers.Inserting"] +# - state: panel +# map: ["enum.WiresVisualLayers.MaintenancePanel"] +# - type: MaterialStorage +# whitelist: +# tags: +# - Sheet +# - RawMaterial +# - Ingot +# - type: Machine +# board: LPPProtolatheRnDMachineCircuitboard +# - type: Lathe +# idleState: icon +# runningState: building +# staticRecipes: +# - ClothingOuterHardsuitRND +# - Wirecutter +# - Screwdriver +# - Welder +# - Wrench +# - Crowbar +# - NetworkConfigurator +# - SprayPainter +# - FlashlightLantern +# - CableStack +# - CableMVStack +# - CableHVStack +# - HandheldGPSBasic +# - TRayScanner +# - AirTank +# - GasAnalyzer +# - UtilityBelt +# - ModularReceiver +# - AppraisalTool +# - SheetRGlass +# - Beaker +# - Syringe +# - LightTube +# - LedLightTube +# - SodiumLightTube +# - ExteriorLightTube +# - LightBulb +# - LedLightBulb +# - PowerCellSmall +# - PowerCellMedium +# - MicroManipulatorStockPart +# - MatterBinStockPart +# - CapacitorStockPart +# - HandheldStationMap +# - ClothingHeadHatWelding +# dynamicRecipes: +# - LPPRoboHud +# # - LPPNVG +# # - LPPDiagnosticNVG +# - PowerDrill +# - WelderExperimental +# - JawsOfLife +# # - LPPTricorder +# - PowerDrill +# - AnomalyScanner +# - AnomalyLocator +# - AnomalyLocatorWide +# - TimerTrigger +# - ChemicalPayload +# - FlashPayload +# - Signaller +# - SignallerAdvanced +# - SignalTrigger +# - VoiceTrigger +# - Igniter +# - PowerCellMicroreactor +# - PowerCellHigh +# - WeaponPistolCHIMP +# - WeaponGauntletGorilla +# - SynthesizerInstrument +# - ClothingShoesBootsMagSci +# - ClothingShoesBootsSpeed +# - NodeScanner +# - ClothingBackpackHolding +# - ClothingBackpackSatchelHolding +# - ClothingBackpackDuffelHolding +# - FauxTileAstroGrass +# - FauxTileMowedAstroGrass +# - FauxTileJungleAstroGrass +# - FauxTileAstroIce +# - FauxTileAstroSnow +# - DeviceQuantumSpinInverter +# - RipleyCentralElectronics +# - RipleyPeripheralsElectronics +# - HonkerCentralElectronics +# - HonkerPeripheralsElectronics +# - HonkerTargetingElectronics +# - HamtrCentralElectronics +# - HamtrPeripheralsElectronics +# - type: EmagLatheRecipes +# emagDynamicRecipes: +# - ExplosivePayload +# - WeaponLaserCarbine +# - WeaponAdvancedLaser +# - WeaponLaserCannon +# - WeaponXrayCannon +# +#- type: entity +# id: LPPSupProtolathe +# parent: BaseLathe +# name: протолат снабжения +# description: Данный прибор позволяет печатать оборудование для более удобной и быстрой утилизации обломков, копания руды в осколках метеоритов и возможно что то ещё полезное для экспедиций, даже сами поставщики были удивлены инновационной технологией данных машин. +# components: +# - type: Sprite +# sprite: _LostParadise/Structures/Machines/protolatheCargo.rsi +# snapCardinals: true +# layers: +# - state: icon +# map: ["enum.LatheVisualLayers.IsRunning"] +# - state: unlit +# shader: unshaded +# map: ["enum.PowerDeviceVisualLayers.Powered"] +# - state: inserting +# map: ["enum.MaterialStorageVisualLayers.Inserting"] +# - state: panel +# map: ["enum.WiresVisualLayers.MaintenancePanel"] +# - type: MaterialStorage +# whitelist: +# tags: +# - Sheet +# - RawMaterial +# - Ingot +# - type: Machine +# board: LPPProtolatheSUPMachineCircuitboard +# - type: Lathe +# idleState: icon +# runningState: building +# staticRecipes: +# - Wirecutter +# - Screwdriver +# - Welder +# - Wrench +# - Crowbar +# - NetworkConfigurator +# - SprayPainter +# - FlashlightLantern +# - HandheldGPSBasic +# - AirTank +# - UtilityBelt +# - Fulton +# - FultonBeacon +# - Pickaxe +# - AppraisalTool +# - HandLabeler +# - LightTube +# - LedLightTube +# - SodiumLightTube +# - ExteriorLightTube +# - LightBulb +# - LedLightBulb +# - PowerCellSmall +# - PowerCellMedium +# - EmergencyRollerBedSpawnFolded +# - HandheldStationMap +# - ConveyorBeltAssembly +# dynamicRecipes: +# # - LPPMesonNVG +# # - LPPNVG +# - MiningDrill +# - Signaller +# - SignallerAdvanced +# - HandHeldMassScanner +# - PowerCellMicroreactor +# - PowerCellHigh +# - WeaponForceGun +# - WeaponLaserSvalinn +# - WeaponProtoKineticAccelerator +# - WeaponTetherGun +# - WeaponGrapplingGun +# - WeaponCutter +# - OreBagBluespace +# - WeaponCutterAdv +# - ClothingBackpackHolding +# - ClothingBackpackSatchelHolding +# - ClothingBackpackDuffelHolding +# - OreBagOfHolding +# - type: EmagLatheRecipes +# emagDynamicRecipes: +# - ExplosivePayload +# - WeaponLaserCarbine +# - WeaponAdvancedLaser +# - WeaponLaserCannon +# - WeaponXrayCannon +# +#- type: entity +# id: LPPServiceProtolathe +# parent: BaseLatheLube +# name: сервисный протолат +# description: Машина, которая печатает посуду и другое сервисное оборудование для сервисного персонала. Всё ещё поразительно, что весь серви́с имеет такую же прочность, как и сделаное своими руками. +# components: +# - type: Sprite +# sprite: _LostParadise/Structures/Machines/protolatheService.rsi +# snapCardinals: true +# layers: +# - state: icon +# map: ["enum.LatheVisualLayers.IsRunning"] +# - state: unlit +# shader: unshaded +# map: ["enum.PowerDeviceVisualLayers.Powered"] +# - state: inserting +# map: ["enum.MaterialStorageVisualLayers.Inserting"] +# - state: panel +# map: ["enum.WiresVisualLayers.MaintenancePanel"] +# - type: Machine +# board: LPPProtolatheServiceMachineCircuitboard +# - type: MaterialStorage +# whitelist: +# tags: +# - Sheet +# - RawMaterial +# - Ingot +# - type: Lathe +# idleState: icon +# runningState: building +# staticRecipes: +# - LargeBeaker +# - Dropper +# - ClothingEyesGlassesChemical +# - Wirecutter +# - Screwdriver +# - Welder +# - Wrench +# - Crowbar +# - NetworkConfigurator +# - SprayPainter +# - FlashlightLantern +# - HandheldGPSBasic +# - AirTank +# - UtilityBelt +# - Beaker +# - Syringe +# - LightTube +# - LedLightTube +# - SodiumLightTube +# - ExteriorLightTube +# - LightBulb +# - LedLightBulb +# - Bucket +# - DrinkMug +# - DrinkMugMetal +# - DrinkGlass +# - DrinkShotGlass +# - DrinkGlassCoupeShaped +# - FoodPlate +# - FoodPlateSmall +# - FoodPlatePlastic +# - FoodPlateSmallPlastic +# - FoodBowlBig +# - FoodPlateTin +# - FoodKebabSkewer +# - SprayBottle +# - MopItem +# - Holoprojector +# - Mousetrap +# - LightReplacer +# - TrashBag +# - PowerCellSmall +# - PowerCellMedium +# - HandheldStationMap +# dynamicRecipes: +# - LPPBarHud +# # - LPPNVG +# - CryostasisBeaker +# - SyringeCryostasis +# - Syringe +# - WeaponSprayNozzle +# - ClothingBackpackWaterTank +# - MegaSprayBottle +# - AdvMopItem +# - Signaller +# - SignallerAdvanced +# - PowerCellHigh +# - SynthesizerInstrument +# - ClothingShoesBootsSpeed +# - BluespaceBeaker +# - SyringeBluespace +# - BluespacePlantBag +# - AdvWateringCan +# - type: EmagLatheRecipes +# emagDynamicRecipes: +# - ExplosivePayload +# - WeaponLaserCarbine +# - WeaponAdvancedLaser +# - WeaponLaserCannon +# - WeaponXrayCannon +# +#- type: entity +# parent: BaseLathe +# id: LPPUniformPrinter +# name: принтер униформы 2.0 +# description: Печатает великолепную одежду для прекрасного экипажа! +# components: +# - type: Transform +# noRot: false +# - type: Sprite +# sprite: _LostParadise/Structures/Machines/LPPUniformPrinter.rsi +# snapCardinals: true +# layers: +# - state: icon +# map: ["enum.LatheVisualLayers.IsRunning"] +# - type: Machine +# board: LPPUniformPrinterMachineCircuitboard +# - type: Lathe +# producingSound: /Audio/Machines/uniformprinter.ogg +# idleState: icon +# runningState: building +# staticRecipes: +# - LPPClothingHeadHatBandage +# - LPPClothingEyesEyepatchBandage +# - LPPClothingHeadHatCapBlack +# - LPPClothingUniformBlackBeachSkirt +# - LPPClothingUniformBlackTracksuit +# - LPPClothingUniformGreenTracksuit +# - ClothingUniformJumpskirtAdjutant +# - LPPCargoBlackSkirt +# - LPPSkirtleneckCargo +# - LPPSkirtleneckQMCargo +# - LPPAtmosBlackSkirt +# - LPPSkirtleneckAtmos +# - LPPSkirtleneckQMAtmos +# - LPPSupplyChiefSkirtAtmos +# - LPPEngiBlackSkirt +# - LPPSkirtleneckEngi +# - LPPSkirtleneckQMEngi +# - LPPClothingUniformJumpSkirtSecEngineer +# - LPPSupplyChiefSkirtEngi +# - LPPMedicBlackSkirt +# - LPPSkirtleneckMedic +# - LPPSkirtleneckQMMedic +# - LPPSupplyChiefSkirtMedic +# - LPPSkirtleneckVirology +# - LPPSkirtleneckVirologyQM +# - LPPSupplyChiefSkirtVirology +# - LPPVirologyBlackSkirt +# - LPPMedicBlackSkirt2 +# - LPPRndBlackSkirt +# - LPPSkirtleneckRnd +# - LPPSkirtleneckQMRnd +# - LPPSupplyChiefSkirtRnd +# - LPPSecBlackSkirt +# - LPPSkirtleneckQMSec +# - LPPSupplyChiefSkirtSec +# - ClothingUniformJumpsuitAdjutant +# - LPPCargotechjean +# - LPPGorkaCargo +# - LPPGorkaCargoVarg +# - LPPQmcCargo +# - LPPSupplyChiefCargo +# - LPPQmsyndCargo +# - LPPTurtleneckQmCargo +# - LPPUtilCargo +# - LPPClothingUniformJumpsuitGreenClown +# - LPPClothingUniformJumpsuitBlueClown +# - LPPClothingUniformJumpsuitOrangeClown +# - LPPClothingUniformJumpsuitPurpleClown +# - LPPClothingUniformJumpsuitRainbowClown +# - LPPClothingUniformJumpsuitYellowClown +# - LPPAtmostechjean +# - LPPGorkaAtmos +# - LPPGorkaWithReflectorsAtmos +# - LPPQmcAtmos +# - LPPQmsyndAtmos +# - LPPSupplyChiefAtmos +# - LPPTurtleneckQmAtmos +# - LPPUtilAtmos +# - LPPEngiTechjean +# - LPPGorkaEngi +# - LPPGorkaWithReflectorsEngi +# - LPPQmcEngi +# - LPPQmsyndEngi +# - LPPSupplyChiefEngi +# - LPPTurtleneckQmEngi +# - LPPUtilEngi +# - LPPBlackFlannelJumpsuit +# - LPPGreenFlannelJumpsuit +# - LPPOrangeFlannelJumpsuit +# - ClothingUniformJumpsuitFluppi +# - LPPClothingUniformJumpsuitSecEngineer +# - LPPMedictechjean +# - LPPGorkaMedic +# - LPPGorkaMedicVarg +# - LPPQmcMedic +# - LPPQmsyndMedic +# - LPPSupplyChiefMedic +# - LPPTurtleneckQmMedic +# - LPPUtilMedic +# - LPPGorkaVirology +# - LPPGorkaVirologyVarg +# - LPPQmcVirology +# - LPPQmcSyndVirology +# - LPPSupplyChiefVirology +# - LPPTurtleneckQM +# - LPPUtilVirology +# - LPPVirologyTechjean +# - LPPRndtechjean +# - LPPGorkaRnd +# - LPPGorkaRndVarg +# - LPPQmcRnd +# - LPPQmsyndRnd +# - LPPSupplyChiefRnd +# - LPPTurtleneckQmRnd +# - LPPUtilRnd +# - LPPSectechjean +# - LPPGorkaSec +# - LPPGorkaSecVarg +# - LPPQmcSec +# - LPPQmsyndSec +# - LPPSupplyChiefSec +# - LPPTurtleneckQmSec +# - LPPUtilSec +# - LPPTacticoolSec +# - LPPClothingUniformWhiteBeachSkirt +# - LPPClothingUniformRedTracksuit +# - LPPMaid +# - LPPSchoolgirl +# +#- type: entity +# id: LPPthespaceforge +# parent: BaseLathe +# name: космическая кузница +# description: Данный купол машины предназначен для печатания скафандров чтобы персонал мог спокойно выйти в космос, не боясь задохнуться. К слову, все характеристики схожи и с другими протолатами, однако его строение и сборка выглядит по-другому. +# components: +# - type: Sprite +# sprite: _LostParadise/Structures/Machines/spaceForge.rsi +# snapCardinals: true +# layers: +# - state: icon +# map: ["enum.LatheVisualLayers.IsRunning"] +# - state: inserting +# map: ["enum.MaterialStorageVisualLayers.Inserting"] +# - state: panel +# map: ["enum.WiresVisualLayers.MaintenancePanel"] +# - type: MaterialStorage +# whitelist: +# tags: +# - Sheet +# - RawMaterial +# - Ingot +# - type: Machine +# board: LPPSpaceForgeBoard +# - type: Lathe +# producingSound: /Audio/Machines/circuitprinter.ogg +# idleState: icon +# runningState: building +# staticRecipes: +# - ClothingOuterHardsuitBasic +# - ClothingOuterHardsuitAtmos +# - ClothingOuterHardsuitEngineering +# - ClothingOuterHardsuitSpatio +# - ClothingOuterHardsuitSalvage +# - ClothingOuterHardsuitMaxim +# - ClothingOuterHardsuitLuxury +# - ClothingOuterHardsuitEngineeringWhite +# - ClothingOuterHardsuitBrigmedic +# - ClothingOuterHardsuitSecurity +# - riotsuppressionsuit +# - securityhardsuit +# - pilotsecurityhardsuit +# - LPPClothingOuterHardsuitMiksuit +# - ClothingOuterHardsuitMedical +# - type: EmagLatheRecipes +# emagStaticRecipes: +# - ClothingOuterHardsuitSyndie +# - ClothingOuterHardsuitSyndieMedic diff --git a/Resources/Prototypes/_LostParadise/Entities/Structures/Specific/Supermatter/supermatter.yml b/Resources/Prototypes/_LostParadise/Entities/Structures/Specific/Supermatter/supermatter.yml deleted file mode 100644 index a7d87cb4ce..0000000000 --- a/Resources/Prototypes/_LostParadise/Entities/Structures/Specific/Supermatter/supermatter.yml +++ /dev/null @@ -1,64 +0,0 @@ -- type: entity - id: LPPSupermatter - name: суперматерия - description: Странно прозрачный и переливающийся кристалл. Кристаллическая гиперструктура. - placement: - mode: SnapgridCenter - components: - - type: Sprite - drawdepth: WallMountedItems - sprite: _LostParadise/Supermatter/supermatter.rsi - state: supermatter - - type: Icon - sprite: _LostParadise/Supermatter/supermatter.rsi - state: supermatter - - type: Clickable - - type: InteractionOutline - - type: Transform - anchored: true - noRot: true - - type: Fixtures - fixtures: - fix1: - shape: - !type:PhysShapeAabb - bounds: "-0.25,-0.25,0.25,0.25" - density: 600 - mask: - - FullTileMask - layer: - - WallLayer - - type: Physics - bodyType: Dynamic - - type: Explosive - explosionType: Supermatter - maxIntensity: 10000 - intensitySlope: 10 - totalIntensity: 10000 - - type: PointLight - enabled: true - radius: 10 - energy: 5 - color: "#d9ce00" - - type: Supermatter - whitelist: - tags: - - EmitterBolt - components: - - Body - - Item - - type: AmbientSound - range: 5 - volume: -5 - sound: - path: /Audio/_LostParadise/Supermatter/calm.ogg - - type: Speech - speechVerb: Robotic - - type: CollisionWake - enabled: false - - type: WarpPoint - follow: true - location: Supermatter - - type: Appearance - - type: RadiationSource - intensity: 2 diff --git a/Resources/Prototypes/_LostParadise/Recipes/Lathes/hardsuitsrecipe.yml b/Resources/Prototypes/_LostParadise/Recipes/Lathes/hardsuitsrecipe.yml index 5758ff1000..22668bca76 100644 --- a/Resources/Prototypes/_LostParadise/Recipes/Lathes/hardsuitsrecipe.yml +++ b/Resources/Prototypes/_LostParadise/Recipes/Lathes/hardsuitsrecipe.yml @@ -131,18 +131,18 @@ Silver: 1020 Gold: 425 -- type: latheRecipe - id: ClothingOuterHardsuitBrigmedic - result: ClothingOuterHardsuitBrigmedic - category: hardsuit - completetime: 32 - materials: - Steel: 1275 - Plasteel: 1190 - Silver: 1190 - Gold: 1105 - Plasma: 680 - Uranium: 170 +#- type: latheRecipe +# id: ClothingOuterHardsuitBrigmedic +# result: ClothingOuterHardsuitBrigmedic +# category: hardsuit +# completetime: 32 +# materials: +# Steel: 1275 +# Plasteel: 1190 +# Silver: 1190 +# Gold: 1105 +# Plasma: 680 +# Uranium: 170 - type: latheRecipe id: ClothingOuterHardsuitEngineeringWhite diff --git a/Resources/Prototypes/_LostParadise/Roles/Jobs/Security/lppbrigmedic.yml b/Resources/Prototypes/_LostParadise/Roles/Jobs/Security/lppbrigmedic.yml index a79847a066..536b781550 100644 --- a/Resources/Prototypes/_LostParadise/Roles/Jobs/Security/lppbrigmedic.yml +++ b/Resources/Prototypes/_LostParadise/Roles/Jobs/Security/lppbrigmedic.yml @@ -1,45 +1,45 @@ -- type: job - id: LPPBrigmedic - name: job-name-brigmedic - description: job-description-brigmedic - playTimeTracker: JobLPPBrigmedic - requirements: - - !type:CharacterDepartmentTimeRequirement - department: Medical - time: 18000 - - !type:CharacterDepartmentTimeRequirement - department: Security - time: 18000 - startingGear: BrigmedicGear - icon: "JobIconBrigmedic" - supervisors: job-supervisors-hos - canBeAntag: false - access: - - Medical - - Security - - Brig - - Maintenance - - External - special: - - !type:AddImplantSpecial - implants: [ MindShieldImplant ] - -- type: startingGear - id: BrigmedicGear - equipment: - jumpsuit: ClothingUniformJumpsuitBrigmedic - outerClothing: ClothingOuterCoatAMG - back: ClothingBackpackBrigmedic - shoes: ClothingShoesColorRed - gloves: ClothingHandsGlovesNitrile - eyes: LPPBlueHudGlasses - head: ClothingHeadHatBeretBrigmedic - id: BrigmedicPDA - ears: ClothingHeadsetBrigmedic - mask: ClothingMaskBreathMedicalSecurity - belt: ClothingBeltMedicalFilled - pocket1: WeaponPistolMk58 - pocket2: MagazinePistol - innerClothingSkirt: ClothingUniformJumpskirtBrigmedic - satchel: ClothingBackpackSatchelBrigmedicFilled - duffelbag: ClothingBackpackDuffelBrigmedicFilled \ No newline at end of file +#- type: job +# id: LPPBrigmedic +# name: job-name-brigmedic +# description: job-description-brigmedic +# playTimeTracker: JobLPPBrigmedic +# requirements: +# - !type:CharacterDepartmentTimeRequirement +# department: Medical +# time: 18000 +# - !type:CharacterDepartmentTimeRequirement +# department: Security +# time: 18000 +# startingGear: BrigmedicGear +# icon: "JobIconBrigmedic" +# supervisors: job-supervisors-hos +# canBeAntag: false +# access: +# - Medical +# - Security +# - Brig +# - Maintenance +# - External +# special: +# - !type:AddImplantSpecial +# implants: [ MindShieldImplant ] +# +#- type: startingGear +# id: BrigmedicGear +# equipment: +# jumpsuit: ClothingUniformJumpsuitBrigmedic +# outerClothing: ClothingOuterCoatAMG +# back: ClothingBackpackBrigmedic +# shoes: ClothingShoesColorRed +# gloves: ClothingHandsGlovesNitrile +# eyes: LPPBlueHudGlasses +# head: ClothingHeadHatBeretBrigmedic +# id: BrigmedicPDA +# ears: ClothingHeadsetBrigmedic +# mask: ClothingMaskBreathMedicalSecurity +# belt: ClothingBeltMedicalFilled +# pocket1: WeaponPistolMk58 +# pocket2: MagazinePistol +# innerClothingSkirt: ClothingUniformJumpskirtBrigmedic +# satchel: ClothingBackpackSatchelBrigmedicFilled +# duffelbag: ClothingBackpackDuffelBrigmedicFilled diff --git a/Resources/Prototypes/_LostParadise/Roles/Jobs/play_time_trackers.yml b/Resources/Prototypes/_LostParadise/Roles/Jobs/play_time_trackers.yml index 95f6ce951c..3c497c23cd 100644 --- a/Resources/Prototypes/_LostParadise/Roles/Jobs/play_time_trackers.yml +++ b/Resources/Prototypes/_LostParadise/Roles/Jobs/play_time_trackers.yml @@ -13,8 +13,8 @@ - type: playTimeTracker id: LPPCentralCommandRepresentative -- type: playTimeTracker - id: JobLPPBrigmedic +#- type: playTimeTracker +# id: JobLPPBrigmedic - type: playTimeTracker id: JobRoboticist diff --git a/Resources/Prototypes/_LostParadise/SoundCollections/Announcers.yml b/Resources/Prototypes/_LostParadise/SoundCollections/Announcers.yml new file mode 100644 index 0000000000..933fa65059 --- /dev/null +++ b/Resources/Prototypes/_LostParadise/SoundCollections/Announcers.yml @@ -0,0 +1,5 @@ +- type: soundCollection + id: NTHWelcome + files: + - /Audio/Announcers/_LostParadise/comms/welcome1.ogg + - /Audio/Announcers/_LostParadise/comms/welcome2.ogg diff --git a/Resources/Prototypes/_LostParadise/SoundCollections/ipc.yml b/Resources/Prototypes/_LostParadise/SoundCollections/ipc.yml deleted file mode 100644 index fe570b702c..0000000000 --- a/Resources/Prototypes/_LostParadise/SoundCollections/ipc.yml +++ /dev/null @@ -1,24 +0,0 @@ -- type: soundCollection - id: LPPSynthYes - files: - - /Audio/_LostParadise/IPC/synth_yes.ogg - -- type: soundCollection - id: LPPSynthNo - files: - - /Audio/_LostParadise/IPC/synth_no.ogg - -- type: soundCollection - id: LPPPing - files: - - /Audio/_LostParadise/IPC/ping.ogg - -- type: soundCollection - id: LPPBuzz - files: - - /Audio/_LostParadise/IPC/buzz-sigh.ogg - -- type: soundCollection - id: LPPSighBuzz - files: - - /Audio/ADT/IPC/buzz-two.ogg diff --git a/Resources/Prototypes/_LostParadise/Wires/layouts.yml b/Resources/Prototypes/_LostParadise/Wires/layouts.yml deleted file mode 100644 index 96e24a245a..0000000000 --- a/Resources/Prototypes/_LostParadise/Wires/layouts.yml +++ /dev/null @@ -1,2 +0,0 @@ -- type: wireLayout - id: IPC \ No newline at end of file diff --git a/Resources/Textures/Clothing/Back/Backpacks/atmospherics.rsi/equipped-BACKPACK.png b/Resources/Textures/Clothing/Back/Backpacks/atmospherics.rsi/equipped-BACKPACK.png index 503d6be951..3d605026b0 100644 Binary files a/Resources/Textures/Clothing/Back/Backpacks/atmospherics.rsi/equipped-BACKPACK.png and b/Resources/Textures/Clothing/Back/Backpacks/atmospherics.rsi/equipped-BACKPACK.png differ diff --git a/Resources/Textures/Clothing/Back/Backpacks/atmospherics.rsi/icon.png b/Resources/Textures/Clothing/Back/Backpacks/atmospherics.rsi/icon.png index 400cc41545..6a73fdca24 100644 Binary files a/Resources/Textures/Clothing/Back/Backpacks/atmospherics.rsi/icon.png and b/Resources/Textures/Clothing/Back/Backpacks/atmospherics.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Back/Backpacks/atmospherics.rsi/inhand-left.png b/Resources/Textures/Clothing/Back/Backpacks/atmospherics.rsi/inhand-left.png index 0be36bc309..95b29936b4 100644 Binary files a/Resources/Textures/Clothing/Back/Backpacks/atmospherics.rsi/inhand-left.png and b/Resources/Textures/Clothing/Back/Backpacks/atmospherics.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/Back/Backpacks/atmospherics.rsi/inhand-right.png b/Resources/Textures/Clothing/Back/Backpacks/atmospherics.rsi/inhand-right.png index 3fb9fad6d7..70648c897d 100644 Binary files a/Resources/Textures/Clothing/Back/Backpacks/atmospherics.rsi/inhand-right.png and b/Resources/Textures/Clothing/Back/Backpacks/atmospherics.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/Back/Backpacks/atmospherics.rsi/meta.json b/Resources/Textures/Clothing/Back/Backpacks/atmospherics.rsi/meta.json index ed91c56e31..819e5c0d2b 100644 --- a/Resources/Textures/Clothing/Back/Backpacks/atmospherics.rsi/meta.json +++ b/Resources/Textures/Clothing/Back/Backpacks/atmospherics.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Modified from tgstation at commit https://github.com/tgstation/tgstation/commit/547852588166c8e091b441e4e67169e156bb09c1 by KingFroozy (Github) for SS14", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/2e24b7af2221928e4b844a29408e821b60a5fe29, modified by linkblyat (Discord)", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/Clothing/Back/Backpacks/backpack.rsi/equipped-BACKPACK.png b/Resources/Textures/Clothing/Back/Backpacks/backpack.rsi/equipped-BACKPACK.png index b4f0155515..f5f32aa348 100644 Binary files a/Resources/Textures/Clothing/Back/Backpacks/backpack.rsi/equipped-BACKPACK.png and b/Resources/Textures/Clothing/Back/Backpacks/backpack.rsi/equipped-BACKPACK.png differ diff --git a/Resources/Textures/Clothing/Back/Backpacks/backpack.rsi/icon.png b/Resources/Textures/Clothing/Back/Backpacks/backpack.rsi/icon.png index d61d4eeb83..22f7831b46 100644 Binary files a/Resources/Textures/Clothing/Back/Backpacks/backpack.rsi/icon.png and b/Resources/Textures/Clothing/Back/Backpacks/backpack.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Back/Backpacks/backpack.rsi/meta.json b/Resources/Textures/Clothing/Back/Backpacks/backpack.rsi/meta.json index fce8c90ce8..c166df646b 100644 --- a/Resources/Textures/Clothing/Back/Backpacks/backpack.rsi/meta.json +++ b/Resources/Textures/Clothing/Back/Backpacks/backpack.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/547852588166c8e091b441e4e67169e156bb09c1", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/2e24b7af2221928e4b844a29408e821b60a5fe29", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/Clothing/Back/Backpacks/captain.rsi/equipped-BACKPACK.png b/Resources/Textures/Clothing/Back/Backpacks/captain.rsi/equipped-BACKPACK.png index aa9b9fa096..f7a081d0da 100644 Binary files a/Resources/Textures/Clothing/Back/Backpacks/captain.rsi/equipped-BACKPACK.png and b/Resources/Textures/Clothing/Back/Backpacks/captain.rsi/equipped-BACKPACK.png differ diff --git a/Resources/Textures/Clothing/Back/Backpacks/captain.rsi/icon.png b/Resources/Textures/Clothing/Back/Backpacks/captain.rsi/icon.png index 93c823ce08..80584201ed 100644 Binary files a/Resources/Textures/Clothing/Back/Backpacks/captain.rsi/icon.png and b/Resources/Textures/Clothing/Back/Backpacks/captain.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Back/Backpacks/captain.rsi/inhand-left.png b/Resources/Textures/Clothing/Back/Backpacks/captain.rsi/inhand-left.png index 432b2bb5a5..f773b553f4 100644 Binary files a/Resources/Textures/Clothing/Back/Backpacks/captain.rsi/inhand-left.png and b/Resources/Textures/Clothing/Back/Backpacks/captain.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/Back/Backpacks/captain.rsi/inhand-right.png b/Resources/Textures/Clothing/Back/Backpacks/captain.rsi/inhand-right.png index ceb964c958..fa2b79bf69 100644 Binary files a/Resources/Textures/Clothing/Back/Backpacks/captain.rsi/inhand-right.png and b/Resources/Textures/Clothing/Back/Backpacks/captain.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/Back/Backpacks/captain.rsi/meta.json b/Resources/Textures/Clothing/Back/Backpacks/captain.rsi/meta.json index fce8c90ce8..c166df646b 100644 --- a/Resources/Textures/Clothing/Back/Backpacks/captain.rsi/meta.json +++ b/Resources/Textures/Clothing/Back/Backpacks/captain.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/547852588166c8e091b441e4e67169e156bb09c1", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/2e24b7af2221928e4b844a29408e821b60a5fe29", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/Clothing/Back/Backpacks/cargo.rsi/equipped-BACKPACK.png b/Resources/Textures/Clothing/Back/Backpacks/cargo.rsi/equipped-BACKPACK.png index 10030cdfc3..bae326ef05 100644 Binary files a/Resources/Textures/Clothing/Back/Backpacks/cargo.rsi/equipped-BACKPACK.png and b/Resources/Textures/Clothing/Back/Backpacks/cargo.rsi/equipped-BACKPACK.png differ diff --git a/Resources/Textures/Clothing/Back/Backpacks/cargo.rsi/icon.png b/Resources/Textures/Clothing/Back/Backpacks/cargo.rsi/icon.png index 2461338959..c9a4e9a41c 100644 Binary files a/Resources/Textures/Clothing/Back/Backpacks/cargo.rsi/icon.png and b/Resources/Textures/Clothing/Back/Backpacks/cargo.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Back/Backpacks/cargo.rsi/inhand-left.png b/Resources/Textures/Clothing/Back/Backpacks/cargo.rsi/inhand-left.png index aa67ac1a01..4c1fd1472d 100644 Binary files a/Resources/Textures/Clothing/Back/Backpacks/cargo.rsi/inhand-left.png and b/Resources/Textures/Clothing/Back/Backpacks/cargo.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/Back/Backpacks/cargo.rsi/inhand-right.png b/Resources/Textures/Clothing/Back/Backpacks/cargo.rsi/inhand-right.png index 0f4e901040..56cd95e74f 100644 Binary files a/Resources/Textures/Clothing/Back/Backpacks/cargo.rsi/inhand-right.png and b/Resources/Textures/Clothing/Back/Backpacks/cargo.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/Back/Backpacks/cargo.rsi/meta.json b/Resources/Textures/Clothing/Back/Backpacks/cargo.rsi/meta.json index 5ce2c3cf97..8e0d473c71 100644 --- a/Resources/Textures/Clothing/Back/Backpacks/cargo.rsi/meta.json +++ b/Resources/Textures/Clothing/Back/Backpacks/cargo.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Modified from tgstation at commit https://github.com/tgstation/tgstation/commit/547852588166c8e091b441e4e67169e156bb09c1 by potato1234x (Github) for SS14", + "copyright": "Modified from tgstation at commit https://github.com/tgstation/tgstation/commit/547852588166c8e091b441e4e67169e156bb09c1 by potato1234x (Github) for SS14, resprite by mureixlol", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/Clothing/Back/Backpacks/chemistry.rsi/equipped-BACKPACK.png b/Resources/Textures/Clothing/Back/Backpacks/chemistry.rsi/equipped-BACKPACK.png index 9f10db67a9..5f22d5a11d 100644 Binary files a/Resources/Textures/Clothing/Back/Backpacks/chemistry.rsi/equipped-BACKPACK.png and b/Resources/Textures/Clothing/Back/Backpacks/chemistry.rsi/equipped-BACKPACK.png differ diff --git a/Resources/Textures/Clothing/Back/Backpacks/chemistry.rsi/icon.png b/Resources/Textures/Clothing/Back/Backpacks/chemistry.rsi/icon.png index 9112452d20..528364ad49 100644 Binary files a/Resources/Textures/Clothing/Back/Backpacks/chemistry.rsi/icon.png and b/Resources/Textures/Clothing/Back/Backpacks/chemistry.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Back/Backpacks/chemistry.rsi/meta.json b/Resources/Textures/Clothing/Back/Backpacks/chemistry.rsi/meta.json index fce8c90ce8..c166df646b 100644 --- a/Resources/Textures/Clothing/Back/Backpacks/chemistry.rsi/meta.json +++ b/Resources/Textures/Clothing/Back/Backpacks/chemistry.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/547852588166c8e091b441e4e67169e156bb09c1", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/2e24b7af2221928e4b844a29408e821b60a5fe29", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/Clothing/Back/Backpacks/engineering.rsi/equipped-BACKPACK.png b/Resources/Textures/Clothing/Back/Backpacks/engineering.rsi/equipped-BACKPACK.png index ee34a4a9c2..cd4dce8756 100644 Binary files a/Resources/Textures/Clothing/Back/Backpacks/engineering.rsi/equipped-BACKPACK.png and b/Resources/Textures/Clothing/Back/Backpacks/engineering.rsi/equipped-BACKPACK.png differ diff --git a/Resources/Textures/Clothing/Back/Backpacks/engineering.rsi/icon.png b/Resources/Textures/Clothing/Back/Backpacks/engineering.rsi/icon.png index 20df264c06..6918decb91 100644 Binary files a/Resources/Textures/Clothing/Back/Backpacks/engineering.rsi/icon.png and b/Resources/Textures/Clothing/Back/Backpacks/engineering.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Back/Backpacks/engineering.rsi/meta.json b/Resources/Textures/Clothing/Back/Backpacks/engineering.rsi/meta.json index fce8c90ce8..c166df646b 100644 --- a/Resources/Textures/Clothing/Back/Backpacks/engineering.rsi/meta.json +++ b/Resources/Textures/Clothing/Back/Backpacks/engineering.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/547852588166c8e091b441e4e67169e156bb09c1", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/2e24b7af2221928e4b844a29408e821b60a5fe29", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/Clothing/Back/Backpacks/hydroponics.rsi/equipped-BACKPACK.png b/Resources/Textures/Clothing/Back/Backpacks/hydroponics.rsi/equipped-BACKPACK.png index 0f412e2338..6174410417 100644 Binary files a/Resources/Textures/Clothing/Back/Backpacks/hydroponics.rsi/equipped-BACKPACK.png and b/Resources/Textures/Clothing/Back/Backpacks/hydroponics.rsi/equipped-BACKPACK.png differ diff --git a/Resources/Textures/Clothing/Back/Backpacks/hydroponics.rsi/icon.png b/Resources/Textures/Clothing/Back/Backpacks/hydroponics.rsi/icon.png index 669c5bc3e7..b79c807ae6 100644 Binary files a/Resources/Textures/Clothing/Back/Backpacks/hydroponics.rsi/icon.png and b/Resources/Textures/Clothing/Back/Backpacks/hydroponics.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Back/Backpacks/hydroponics.rsi/meta.json b/Resources/Textures/Clothing/Back/Backpacks/hydroponics.rsi/meta.json index fce8c90ce8..c166df646b 100644 --- a/Resources/Textures/Clothing/Back/Backpacks/hydroponics.rsi/meta.json +++ b/Resources/Textures/Clothing/Back/Backpacks/hydroponics.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/547852588166c8e091b441e4e67169e156bb09c1", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/2e24b7af2221928e4b844a29408e821b60a5fe29", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/Clothing/Back/Backpacks/medical.rsi/equipped-BACKPACK.png b/Resources/Textures/Clothing/Back/Backpacks/medical.rsi/equipped-BACKPACK.png index af6478d1fa..8d3834833b 100644 Binary files a/Resources/Textures/Clothing/Back/Backpacks/medical.rsi/equipped-BACKPACK.png and b/Resources/Textures/Clothing/Back/Backpacks/medical.rsi/equipped-BACKPACK.png differ diff --git a/Resources/Textures/Clothing/Back/Backpacks/medical.rsi/icon.png b/Resources/Textures/Clothing/Back/Backpacks/medical.rsi/icon.png index ec7d022940..99af2a17c7 100644 Binary files a/Resources/Textures/Clothing/Back/Backpacks/medical.rsi/icon.png and b/Resources/Textures/Clothing/Back/Backpacks/medical.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Back/Backpacks/medical.rsi/meta.json b/Resources/Textures/Clothing/Back/Backpacks/medical.rsi/meta.json index fce8c90ce8..c166df646b 100644 --- a/Resources/Textures/Clothing/Back/Backpacks/medical.rsi/meta.json +++ b/Resources/Textures/Clothing/Back/Backpacks/medical.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/547852588166c8e091b441e4e67169e156bb09c1", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/2e24b7af2221928e4b844a29408e821b60a5fe29", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/Clothing/Back/Backpacks/mime.rsi/equipped-BACKPACK.png b/Resources/Textures/Clothing/Back/Backpacks/mime.rsi/equipped-BACKPACK.png index bfe4179307..dc8cdbcf31 100644 Binary files a/Resources/Textures/Clothing/Back/Backpacks/mime.rsi/equipped-BACKPACK.png and b/Resources/Textures/Clothing/Back/Backpacks/mime.rsi/equipped-BACKPACK.png differ diff --git a/Resources/Textures/Clothing/Back/Backpacks/mime.rsi/meta.json b/Resources/Textures/Clothing/Back/Backpacks/mime.rsi/meta.json index fce8c90ce8..c166df646b 100644 --- a/Resources/Textures/Clothing/Back/Backpacks/mime.rsi/meta.json +++ b/Resources/Textures/Clothing/Back/Backpacks/mime.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/547852588166c8e091b441e4e67169e156bb09c1", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/2e24b7af2221928e4b844a29408e821b60a5fe29", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/Clothing/Back/Backpacks/science.rsi/equipped-BACKPACK.png b/Resources/Textures/Clothing/Back/Backpacks/science.rsi/equipped-BACKPACK.png index 9c7b04a38b..23afd82caf 100644 Binary files a/Resources/Textures/Clothing/Back/Backpacks/science.rsi/equipped-BACKPACK.png and b/Resources/Textures/Clothing/Back/Backpacks/science.rsi/equipped-BACKPACK.png differ diff --git a/Resources/Textures/Clothing/Back/Backpacks/science.rsi/icon.png b/Resources/Textures/Clothing/Back/Backpacks/science.rsi/icon.png index d1cf3b1540..bc9cca02f3 100644 Binary files a/Resources/Textures/Clothing/Back/Backpacks/science.rsi/icon.png and b/Resources/Textures/Clothing/Back/Backpacks/science.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Back/Backpacks/science.rsi/meta.json b/Resources/Textures/Clothing/Back/Backpacks/science.rsi/meta.json index fce8c90ce8..c166df646b 100644 --- a/Resources/Textures/Clothing/Back/Backpacks/science.rsi/meta.json +++ b/Resources/Textures/Clothing/Back/Backpacks/science.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/547852588166c8e091b441e4e67169e156bb09c1", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/2e24b7af2221928e4b844a29408e821b60a5fe29", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/Clothing/Back/Backpacks/security.rsi/equipped-BACKPACK.png b/Resources/Textures/Clothing/Back/Backpacks/security.rsi/equipped-BACKPACK.png index c9e4989cd5..ed381a51f3 100644 Binary files a/Resources/Textures/Clothing/Back/Backpacks/security.rsi/equipped-BACKPACK.png and b/Resources/Textures/Clothing/Back/Backpacks/security.rsi/equipped-BACKPACK.png differ diff --git a/Resources/Textures/Clothing/Back/Backpacks/security.rsi/icon.png b/Resources/Textures/Clothing/Back/Backpacks/security.rsi/icon.png index 47613295e4..e55a5ea62e 100644 Binary files a/Resources/Textures/Clothing/Back/Backpacks/security.rsi/icon.png and b/Resources/Textures/Clothing/Back/Backpacks/security.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Back/Backpacks/security.rsi/inhand-left.png b/Resources/Textures/Clothing/Back/Backpacks/security.rsi/inhand-left.png index 9fe676d2ff..86ce445c4b 100644 Binary files a/Resources/Textures/Clothing/Back/Backpacks/security.rsi/inhand-left.png and b/Resources/Textures/Clothing/Back/Backpacks/security.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/Back/Backpacks/security.rsi/inhand-right.png b/Resources/Textures/Clothing/Back/Backpacks/security.rsi/inhand-right.png index c3e3536c6e..d5000c9d27 100644 Binary files a/Resources/Textures/Clothing/Back/Backpacks/security.rsi/inhand-right.png and b/Resources/Textures/Clothing/Back/Backpacks/security.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/Back/Backpacks/security.rsi/meta.json b/Resources/Textures/Clothing/Back/Backpacks/security.rsi/meta.json index aa3381b0eb..2880cc53ed 100644 --- a/Resources/Textures/Clothing/Back/Backpacks/security.rsi/meta.json +++ b/Resources/Textures/Clothing/Back/Backpacks/security.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/6665eec76c98a4f3f89bebcd10b34b47dcc0b8ae", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/2e24b7af2221928e4b844a29408e821b60a5fe29, tweak by @mureixlol", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/Clothing/Back/Backpacks/virology.rsi/equipped-BACKPACK.png b/Resources/Textures/Clothing/Back/Backpacks/virology.rsi/equipped-BACKPACK.png index fc977d86e7..21003e9eef 100644 Binary files a/Resources/Textures/Clothing/Back/Backpacks/virology.rsi/equipped-BACKPACK.png and b/Resources/Textures/Clothing/Back/Backpacks/virology.rsi/equipped-BACKPACK.png differ diff --git a/Resources/Textures/Clothing/Back/Backpacks/virology.rsi/icon.png b/Resources/Textures/Clothing/Back/Backpacks/virology.rsi/icon.png index a366d48aa5..ab4b059df1 100644 Binary files a/Resources/Textures/Clothing/Back/Backpacks/virology.rsi/icon.png and b/Resources/Textures/Clothing/Back/Backpacks/virology.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Back/Backpacks/virology.rsi/meta.json b/Resources/Textures/Clothing/Back/Backpacks/virology.rsi/meta.json index fce8c90ce8..c166df646b 100644 --- a/Resources/Textures/Clothing/Back/Backpacks/virology.rsi/meta.json +++ b/Resources/Textures/Clothing/Back/Backpacks/virology.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/547852588166c8e091b441e4e67169e156bb09c1", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/2e24b7af2221928e4b844a29408e821b60a5fe29", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/Clothing/Back/Duffels/atmospherics.rsi/equipped-BACKPACK.png b/Resources/Textures/Clothing/Back/Duffels/atmospherics.rsi/equipped-BACKPACK.png index a15cccaf32..f927e6b97b 100644 Binary files a/Resources/Textures/Clothing/Back/Duffels/atmospherics.rsi/equipped-BACKPACK.png and b/Resources/Textures/Clothing/Back/Duffels/atmospherics.rsi/equipped-BACKPACK.png differ diff --git a/Resources/Textures/Clothing/Back/Duffels/atmospherics.rsi/icon.png b/Resources/Textures/Clothing/Back/Duffels/atmospherics.rsi/icon.png index 35e6f81552..311f033913 100644 Binary files a/Resources/Textures/Clothing/Back/Duffels/atmospherics.rsi/icon.png and b/Resources/Textures/Clothing/Back/Duffels/atmospherics.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Back/Duffels/atmospherics.rsi/inhand-left.png b/Resources/Textures/Clothing/Back/Duffels/atmospherics.rsi/inhand-left.png index c164dba6fd..b3665cdb86 100644 Binary files a/Resources/Textures/Clothing/Back/Duffels/atmospherics.rsi/inhand-left.png and b/Resources/Textures/Clothing/Back/Duffels/atmospherics.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/Back/Duffels/atmospherics.rsi/inhand-right.png b/Resources/Textures/Clothing/Back/Duffels/atmospherics.rsi/inhand-right.png index af9d3e6b03..f594f9cc2d 100644 Binary files a/Resources/Textures/Clothing/Back/Duffels/atmospherics.rsi/inhand-right.png and b/Resources/Textures/Clothing/Back/Duffels/atmospherics.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/Back/Duffels/atmospherics.rsi/meta.json b/Resources/Textures/Clothing/Back/Duffels/atmospherics.rsi/meta.json index ed91c56e31..2e99af940c 100644 --- a/Resources/Textures/Clothing/Back/Duffels/atmospherics.rsi/meta.json +++ b/Resources/Textures/Clothing/Back/Duffels/atmospherics.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Modified from tgstation at commit https://github.com/tgstation/tgstation/commit/547852588166c8e091b441e4e67169e156bb09c1 by KingFroozy (Github) for SS14", + "copyright": "Modified from tgstation at commit https://github.com/tgstation/tgstation/commit/547852588166c8e091b441e4e67169e156bb09c1 by KingFroozy (Github) for SS14, and modified for corvax by linkblyat (Discord)", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/Clothing/Back/Duffels/captain.rsi/equipped-BACKPACK.png b/Resources/Textures/Clothing/Back/Duffels/captain.rsi/equipped-BACKPACK.png index bbdf579a94..077efa1718 100644 Binary files a/Resources/Textures/Clothing/Back/Duffels/captain.rsi/equipped-BACKPACK.png and b/Resources/Textures/Clothing/Back/Duffels/captain.rsi/equipped-BACKPACK.png differ diff --git a/Resources/Textures/Clothing/Back/Duffels/captain.rsi/icon.png b/Resources/Textures/Clothing/Back/Duffels/captain.rsi/icon.png index a3a5b515aa..220fce37b4 100644 Binary files a/Resources/Textures/Clothing/Back/Duffels/captain.rsi/icon.png and b/Resources/Textures/Clothing/Back/Duffels/captain.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Back/Duffels/captain.rsi/inhand-left.png b/Resources/Textures/Clothing/Back/Duffels/captain.rsi/inhand-left.png index b723b23bce..c49423cbf0 100644 Binary files a/Resources/Textures/Clothing/Back/Duffels/captain.rsi/inhand-left.png and b/Resources/Textures/Clothing/Back/Duffels/captain.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/Back/Duffels/captain.rsi/inhand-right.png b/Resources/Textures/Clothing/Back/Duffels/captain.rsi/inhand-right.png index 912d2a7bb3..72644265c5 100644 Binary files a/Resources/Textures/Clothing/Back/Duffels/captain.rsi/inhand-right.png and b/Resources/Textures/Clothing/Back/Duffels/captain.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/Back/Duffels/cargo.rsi/equipped-BACKPACK.png b/Resources/Textures/Clothing/Back/Duffels/cargo.rsi/equipped-BACKPACK.png index 1c888ace63..3cb8fdbf8b 100644 Binary files a/Resources/Textures/Clothing/Back/Duffels/cargo.rsi/equipped-BACKPACK.png and b/Resources/Textures/Clothing/Back/Duffels/cargo.rsi/equipped-BACKPACK.png differ diff --git a/Resources/Textures/Clothing/Back/Duffels/cargo.rsi/icon.png b/Resources/Textures/Clothing/Back/Duffels/cargo.rsi/icon.png index a296739d8d..69e1f3085b 100644 Binary files a/Resources/Textures/Clothing/Back/Duffels/cargo.rsi/icon.png and b/Resources/Textures/Clothing/Back/Duffels/cargo.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Back/Duffels/cargo.rsi/inhand-left.png b/Resources/Textures/Clothing/Back/Duffels/cargo.rsi/inhand-left.png index 54d3af0227..8cbfa79a54 100644 Binary files a/Resources/Textures/Clothing/Back/Duffels/cargo.rsi/inhand-left.png and b/Resources/Textures/Clothing/Back/Duffels/cargo.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/Back/Duffels/cargo.rsi/inhand-right.png b/Resources/Textures/Clothing/Back/Duffels/cargo.rsi/inhand-right.png index 7aec3db48e..8c4f58337c 100644 Binary files a/Resources/Textures/Clothing/Back/Duffels/cargo.rsi/inhand-right.png and b/Resources/Textures/Clothing/Back/Duffels/cargo.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/Back/Duffels/cargo.rsi/meta.json b/Resources/Textures/Clothing/Back/Duffels/cargo.rsi/meta.json index 5ce2c3cf97..8e0d473c71 100644 --- a/Resources/Textures/Clothing/Back/Duffels/cargo.rsi/meta.json +++ b/Resources/Textures/Clothing/Back/Duffels/cargo.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Modified from tgstation at commit https://github.com/tgstation/tgstation/commit/547852588166c8e091b441e4e67169e156bb09c1 by potato1234x (Github) for SS14", + "copyright": "Modified from tgstation at commit https://github.com/tgstation/tgstation/commit/547852588166c8e091b441e4e67169e156bb09c1 by potato1234x (Github) for SS14, resprite by mureixlol", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/Clothing/Back/Duffels/chemistry.rsi/icon.png b/Resources/Textures/Clothing/Back/Duffels/chemistry.rsi/icon.png index ec4cf4ab8e..ce67965c1e 100644 Binary files a/Resources/Textures/Clothing/Back/Duffels/chemistry.rsi/icon.png and b/Resources/Textures/Clothing/Back/Duffels/chemistry.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Back/Duffels/chemistry.rsi/meta.json b/Resources/Textures/Clothing/Back/Duffels/chemistry.rsi/meta.json index 89236692cc..d3f32cd8f0 100644 --- a/Resources/Textures/Clothing/Back/Duffels/chemistry.rsi/meta.json +++ b/Resources/Textures/Clothing/Back/Duffels/chemistry.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/547852588166c8e091b441e4e67169e156bb09c1", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/2e24b7af2221928e4b844a29408e821b60a5fe29", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/Clothing/Back/Duffels/genetics.rsi/equipped-BACKPACK.png b/Resources/Textures/Clothing/Back/Duffels/genetics.rsi/equipped-BACKPACK.png index bb274bec3e..d8e10580ec 100644 Binary files a/Resources/Textures/Clothing/Back/Duffels/genetics.rsi/equipped-BACKPACK.png and b/Resources/Textures/Clothing/Back/Duffels/genetics.rsi/equipped-BACKPACK.png differ diff --git a/Resources/Textures/Clothing/Back/Duffels/genetics.rsi/icon.png b/Resources/Textures/Clothing/Back/Duffels/genetics.rsi/icon.png index b48c8f590a..f016402d95 100644 Binary files a/Resources/Textures/Clothing/Back/Duffels/genetics.rsi/icon.png and b/Resources/Textures/Clothing/Back/Duffels/genetics.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Back/Duffels/genetics.rsi/inhand-left.png b/Resources/Textures/Clothing/Back/Duffels/genetics.rsi/inhand-left.png index e0dab47ddf..b2c3e395c7 100644 Binary files a/Resources/Textures/Clothing/Back/Duffels/genetics.rsi/inhand-left.png and b/Resources/Textures/Clothing/Back/Duffels/genetics.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/Back/Duffels/genetics.rsi/inhand-right.png b/Resources/Textures/Clothing/Back/Duffels/genetics.rsi/inhand-right.png index 39db3d7260..9619231171 100644 Binary files a/Resources/Textures/Clothing/Back/Duffels/genetics.rsi/inhand-right.png and b/Resources/Textures/Clothing/Back/Duffels/genetics.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/Back/Duffels/genetics.rsi/meta.json b/Resources/Textures/Clothing/Back/Duffels/genetics.rsi/meta.json index ac5b546341..745e688f84 100644 --- a/Resources/Textures/Clothing/Back/Duffels/genetics.rsi/meta.json +++ b/Resources/Textures/Clothing/Back/Duffels/genetics.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/15c87fd15fe205e4fc71997e48311e06ff02a1d4", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/15c87fd15fe205e4fc71997e48311e06ff02a1d4, Resprited by Mureixlol", "size": { "x": 32, "y": 32 @@ -24,4 +24,4 @@ "directions": 4 } ] -} \ No newline at end of file +} diff --git a/Resources/Textures/Clothing/Back/Duffels/hell-bag.rsi/equipped-BACKPACK.png b/Resources/Textures/Clothing/Back/Duffels/hell-bag.rsi/equipped-BACKPACK.png new file mode 100644 index 0000000000..73a64f4a1b Binary files /dev/null and b/Resources/Textures/Clothing/Back/Duffels/hell-bag.rsi/equipped-BACKPACK.png differ diff --git a/Resources/Textures/Clothing/Back/Duffels/hell-bag.rsi/icon.png b/Resources/Textures/Clothing/Back/Duffels/hell-bag.rsi/icon.png new file mode 100644 index 0000000000..68180cb6c8 Binary files /dev/null and b/Resources/Textures/Clothing/Back/Duffels/hell-bag.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Back/Duffels/hell-bag.rsi/inhand-left.png b/Resources/Textures/Clothing/Back/Duffels/hell-bag.rsi/inhand-left.png new file mode 100644 index 0000000000..a6704108c3 Binary files /dev/null and b/Resources/Textures/Clothing/Back/Duffels/hell-bag.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/Back/Duffels/hell-bag.rsi/inhand-right.png b/Resources/Textures/Clothing/Back/Duffels/hell-bag.rsi/inhand-right.png new file mode 100644 index 0000000000..d7e2ba29f6 Binary files /dev/null and b/Resources/Textures/Clothing/Back/Duffels/hell-bag.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/Back/Duffels/hell-bag.rsi/meta.json b/Resources/Textures/Clothing/Back/Duffels/hell-bag.rsi/meta.json new file mode 100644 index 0000000000..fce8c90ce8 --- /dev/null +++ b/Resources/Textures/Clothing/Back/Duffels/hell-bag.rsi/meta.json @@ -0,0 +1,26 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/547852588166c8e091b441e4e67169e156bb09c1", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-BACKPACK", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/Clothing/Back/Duffels/science.rsi/icon.png b/Resources/Textures/Clothing/Back/Duffels/science.rsi/icon.png index 709e67d3a4..6655fbb71b 100644 Binary files a/Resources/Textures/Clothing/Back/Duffels/science.rsi/icon.png and b/Resources/Textures/Clothing/Back/Duffels/science.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Back/Duffels/science.rsi/meta.json b/Resources/Textures/Clothing/Back/Duffels/science.rsi/meta.json index 89236692cc..d3f32cd8f0 100644 --- a/Resources/Textures/Clothing/Back/Duffels/science.rsi/meta.json +++ b/Resources/Textures/Clothing/Back/Duffels/science.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/547852588166c8e091b441e4e67169e156bb09c1", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/2e24b7af2221928e4b844a29408e821b60a5fe29", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/Clothing/Back/Duffels/security.rsi/equipped-BACKPACK.png b/Resources/Textures/Clothing/Back/Duffels/security.rsi/equipped-BACKPACK.png index 4a667e3a90..a17ceacb60 100644 Binary files a/Resources/Textures/Clothing/Back/Duffels/security.rsi/equipped-BACKPACK.png and b/Resources/Textures/Clothing/Back/Duffels/security.rsi/equipped-BACKPACK.png differ diff --git a/Resources/Textures/Clothing/Back/Duffels/security.rsi/icon.png b/Resources/Textures/Clothing/Back/Duffels/security.rsi/icon.png index 85111f98c3..c86b365acb 100644 Binary files a/Resources/Textures/Clothing/Back/Duffels/security.rsi/icon.png and b/Resources/Textures/Clothing/Back/Duffels/security.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Back/Duffels/security.rsi/inhand-left.png b/Resources/Textures/Clothing/Back/Duffels/security.rsi/inhand-left.png index 7f7462feaf..34b8a79802 100644 Binary files a/Resources/Textures/Clothing/Back/Duffels/security.rsi/inhand-left.png and b/Resources/Textures/Clothing/Back/Duffels/security.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/Back/Duffels/security.rsi/inhand-right.png b/Resources/Textures/Clothing/Back/Duffels/security.rsi/inhand-right.png index 3d4e3bb716..86906792ce 100644 Binary files a/Resources/Textures/Clothing/Back/Duffels/security.rsi/inhand-right.png and b/Resources/Textures/Clothing/Back/Duffels/security.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/Back/Duffels/security.rsi/meta.json b/Resources/Textures/Clothing/Back/Duffels/security.rsi/meta.json index fce8c90ce8..4798572002 100644 --- a/Resources/Textures/Clothing/Back/Duffels/security.rsi/meta.json +++ b/Resources/Textures/Clothing/Back/Duffels/security.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/547852588166c8e091b441e4e67169e156bb09c1", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/547852588166c8e091b441e4e67169e156bb09c1, tweak by @mureixlol", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/Clothing/Back/Duffels/virology.rsi/equipped-BACKPACK.png b/Resources/Textures/Clothing/Back/Duffels/virology.rsi/equipped-BACKPACK.png index c86cf500e9..e4de4de1b2 100644 Binary files a/Resources/Textures/Clothing/Back/Duffels/virology.rsi/equipped-BACKPACK.png and b/Resources/Textures/Clothing/Back/Duffels/virology.rsi/equipped-BACKPACK.png differ diff --git a/Resources/Textures/Clothing/Back/Duffels/virology.rsi/icon.png b/Resources/Textures/Clothing/Back/Duffels/virology.rsi/icon.png index c3a5469919..2f3eb62475 100644 Binary files a/Resources/Textures/Clothing/Back/Duffels/virology.rsi/icon.png and b/Resources/Textures/Clothing/Back/Duffels/virology.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Back/Duffels/virology.rsi/inhand-left.png b/Resources/Textures/Clothing/Back/Duffels/virology.rsi/inhand-left.png index 5a0a228b0d..f060c5b7f0 100644 Binary files a/Resources/Textures/Clothing/Back/Duffels/virology.rsi/inhand-left.png and b/Resources/Textures/Clothing/Back/Duffels/virology.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/Back/Duffels/virology.rsi/inhand-right.png b/Resources/Textures/Clothing/Back/Duffels/virology.rsi/inhand-right.png index 72fbcbfebe..d1f0c2cc45 100644 Binary files a/Resources/Textures/Clothing/Back/Duffels/virology.rsi/inhand-right.png and b/Resources/Textures/Clothing/Back/Duffels/virology.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/Back/Duffels/virology.rsi/meta.json b/Resources/Textures/Clothing/Back/Duffels/virology.rsi/meta.json index ac5b546341..745e688f84 100644 --- a/Resources/Textures/Clothing/Back/Duffels/virology.rsi/meta.json +++ b/Resources/Textures/Clothing/Back/Duffels/virology.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/15c87fd15fe205e4fc71997e48311e06ff02a1d4", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/15c87fd15fe205e4fc71997e48311e06ff02a1d4, Resprited by Mureixlol", "size": { "x": 32, "y": 32 @@ -24,4 +24,4 @@ "directions": 4 } ] -} \ No newline at end of file +} diff --git a/Resources/Textures/Clothing/Back/Satchels/atmospherics.rsi/equipped-BACKPACK.png b/Resources/Textures/Clothing/Back/Satchels/atmospherics.rsi/equipped-BACKPACK.png index ecdbbe04e5..1a1b368f05 100644 Binary files a/Resources/Textures/Clothing/Back/Satchels/atmospherics.rsi/equipped-BACKPACK.png and b/Resources/Textures/Clothing/Back/Satchels/atmospherics.rsi/equipped-BACKPACK.png differ diff --git a/Resources/Textures/Clothing/Back/Satchels/atmospherics.rsi/icon.png b/Resources/Textures/Clothing/Back/Satchels/atmospherics.rsi/icon.png index c6b6edcf86..ff7fccd9ce 100644 Binary files a/Resources/Textures/Clothing/Back/Satchels/atmospherics.rsi/icon.png and b/Resources/Textures/Clothing/Back/Satchels/atmospherics.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Back/Satchels/atmospherics.rsi/inhand-left.png b/Resources/Textures/Clothing/Back/Satchels/atmospherics.rsi/inhand-left.png index 77bdd89c57..06aa5931dc 100644 Binary files a/Resources/Textures/Clothing/Back/Satchels/atmospherics.rsi/inhand-left.png and b/Resources/Textures/Clothing/Back/Satchels/atmospherics.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/Back/Satchels/atmospherics.rsi/inhand-right.png b/Resources/Textures/Clothing/Back/Satchels/atmospherics.rsi/inhand-right.png index 4811e50a91..5641007594 100644 Binary files a/Resources/Textures/Clothing/Back/Satchels/atmospherics.rsi/inhand-right.png and b/Resources/Textures/Clothing/Back/Satchels/atmospherics.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/Back/Satchels/atmospherics.rsi/meta.json b/Resources/Textures/Clothing/Back/Satchels/atmospherics.rsi/meta.json index ed91c56e31..819e5c0d2b 100644 --- a/Resources/Textures/Clothing/Back/Satchels/atmospherics.rsi/meta.json +++ b/Resources/Textures/Clothing/Back/Satchels/atmospherics.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Modified from tgstation at commit https://github.com/tgstation/tgstation/commit/547852588166c8e091b441e4e67169e156bb09c1 by KingFroozy (Github) for SS14", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/2e24b7af2221928e4b844a29408e821b60a5fe29, modified by linkblyat (Discord)", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/Clothing/Back/Satchels/captain.rsi/equipped-BACKPACK.png b/Resources/Textures/Clothing/Back/Satchels/captain.rsi/equipped-BACKPACK.png index 8332a0c0a9..f8558b6a99 100644 Binary files a/Resources/Textures/Clothing/Back/Satchels/captain.rsi/equipped-BACKPACK.png and b/Resources/Textures/Clothing/Back/Satchels/captain.rsi/equipped-BACKPACK.png differ diff --git a/Resources/Textures/Clothing/Back/Satchels/captain.rsi/icon.png b/Resources/Textures/Clothing/Back/Satchels/captain.rsi/icon.png index a89cee8d79..9a80715e5f 100644 Binary files a/Resources/Textures/Clothing/Back/Satchels/captain.rsi/icon.png and b/Resources/Textures/Clothing/Back/Satchels/captain.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Back/Satchels/captain.rsi/inhand-left.png b/Resources/Textures/Clothing/Back/Satchels/captain.rsi/inhand-left.png index 32cc456a07..af5386cfe9 100644 Binary files a/Resources/Textures/Clothing/Back/Satchels/captain.rsi/inhand-left.png and b/Resources/Textures/Clothing/Back/Satchels/captain.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/Back/Satchels/captain.rsi/inhand-right.png b/Resources/Textures/Clothing/Back/Satchels/captain.rsi/inhand-right.png index 0df9cc21c1..69c8424bee 100644 Binary files a/Resources/Textures/Clothing/Back/Satchels/captain.rsi/inhand-right.png and b/Resources/Textures/Clothing/Back/Satchels/captain.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/Back/Satchels/captain.rsi/meta.json b/Resources/Textures/Clothing/Back/Satchels/captain.rsi/meta.json index fce8c90ce8..c166df646b 100644 --- a/Resources/Textures/Clothing/Back/Satchels/captain.rsi/meta.json +++ b/Resources/Textures/Clothing/Back/Satchels/captain.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/547852588166c8e091b441e4e67169e156bb09c1", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/2e24b7af2221928e4b844a29408e821b60a5fe29", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/Clothing/Back/Satchels/cargo.rsi/equipped-BACKPACK.png b/Resources/Textures/Clothing/Back/Satchels/cargo.rsi/equipped-BACKPACK.png index 7dfb99ea3e..4ff5c55468 100644 Binary files a/Resources/Textures/Clothing/Back/Satchels/cargo.rsi/equipped-BACKPACK.png and b/Resources/Textures/Clothing/Back/Satchels/cargo.rsi/equipped-BACKPACK.png differ diff --git a/Resources/Textures/Clothing/Back/Satchels/cargo.rsi/icon.png b/Resources/Textures/Clothing/Back/Satchels/cargo.rsi/icon.png index f85e084338..d5ff90fac6 100644 Binary files a/Resources/Textures/Clothing/Back/Satchels/cargo.rsi/icon.png and b/Resources/Textures/Clothing/Back/Satchels/cargo.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Back/Satchels/cargo.rsi/inhand-left.png b/Resources/Textures/Clothing/Back/Satchels/cargo.rsi/inhand-left.png index bb2b3e163f..c43fd0ea10 100644 Binary files a/Resources/Textures/Clothing/Back/Satchels/cargo.rsi/inhand-left.png and b/Resources/Textures/Clothing/Back/Satchels/cargo.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/Back/Satchels/cargo.rsi/inhand-right.png b/Resources/Textures/Clothing/Back/Satchels/cargo.rsi/inhand-right.png index fe3aaec78b..2a5a28c108 100644 Binary files a/Resources/Textures/Clothing/Back/Satchels/cargo.rsi/inhand-right.png and b/Resources/Textures/Clothing/Back/Satchels/cargo.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/Back/Satchels/cargo.rsi/meta.json b/Resources/Textures/Clothing/Back/Satchels/cargo.rsi/meta.json index 5ce2c3cf97..8e0d473c71 100644 --- a/Resources/Textures/Clothing/Back/Satchels/cargo.rsi/meta.json +++ b/Resources/Textures/Clothing/Back/Satchels/cargo.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Modified from tgstation at commit https://github.com/tgstation/tgstation/commit/547852588166c8e091b441e4e67169e156bb09c1 by potato1234x (Github) for SS14", + "copyright": "Modified from tgstation at commit https://github.com/tgstation/tgstation/commit/547852588166c8e091b441e4e67169e156bb09c1 by potato1234x (Github) for SS14, resprite by mureixlol", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/Clothing/Back/Satchels/chemistry.rsi/equipped-BACKPACK.png b/Resources/Textures/Clothing/Back/Satchels/chemistry.rsi/equipped-BACKPACK.png index d9b5d89404..365e30b686 100644 Binary files a/Resources/Textures/Clothing/Back/Satchels/chemistry.rsi/equipped-BACKPACK.png and b/Resources/Textures/Clothing/Back/Satchels/chemistry.rsi/equipped-BACKPACK.png differ diff --git a/Resources/Textures/Clothing/Back/Satchels/chemistry.rsi/icon.png b/Resources/Textures/Clothing/Back/Satchels/chemistry.rsi/icon.png index ea5838f139..8feb895010 100644 Binary files a/Resources/Textures/Clothing/Back/Satchels/chemistry.rsi/icon.png and b/Resources/Textures/Clothing/Back/Satchels/chemistry.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Back/Satchels/chemistry.rsi/meta.json b/Resources/Textures/Clothing/Back/Satchels/chemistry.rsi/meta.json index fce8c90ce8..c166df646b 100644 --- a/Resources/Textures/Clothing/Back/Satchels/chemistry.rsi/meta.json +++ b/Resources/Textures/Clothing/Back/Satchels/chemistry.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/547852588166c8e091b441e4e67169e156bb09c1", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/2e24b7af2221928e4b844a29408e821b60a5fe29", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/Clothing/Back/Satchels/engineering.rsi/equipped-BACKPACK.png b/Resources/Textures/Clothing/Back/Satchels/engineering.rsi/equipped-BACKPACK.png index d5dbd754d5..7a84e0c0e3 100644 Binary files a/Resources/Textures/Clothing/Back/Satchels/engineering.rsi/equipped-BACKPACK.png and b/Resources/Textures/Clothing/Back/Satchels/engineering.rsi/equipped-BACKPACK.png differ diff --git a/Resources/Textures/Clothing/Back/Satchels/engineering.rsi/icon.png b/Resources/Textures/Clothing/Back/Satchels/engineering.rsi/icon.png index ec5b0363cb..e4b9442f02 100644 Binary files a/Resources/Textures/Clothing/Back/Satchels/engineering.rsi/icon.png and b/Resources/Textures/Clothing/Back/Satchels/engineering.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Back/Satchels/engineering.rsi/meta.json b/Resources/Textures/Clothing/Back/Satchels/engineering.rsi/meta.json index fce8c90ce8..c166df646b 100644 --- a/Resources/Textures/Clothing/Back/Satchels/engineering.rsi/meta.json +++ b/Resources/Textures/Clothing/Back/Satchels/engineering.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/547852588166c8e091b441e4e67169e156bb09c1", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/2e24b7af2221928e4b844a29408e821b60a5fe29", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/Clothing/Back/Satchels/genetics.rsi/equipped-BACKPACK.png b/Resources/Textures/Clothing/Back/Satchels/genetics.rsi/equipped-BACKPACK.png index 20f7eb80d8..0ea59fc827 100644 Binary files a/Resources/Textures/Clothing/Back/Satchels/genetics.rsi/equipped-BACKPACK.png and b/Resources/Textures/Clothing/Back/Satchels/genetics.rsi/equipped-BACKPACK.png differ diff --git a/Resources/Textures/Clothing/Back/Satchels/genetics.rsi/icon.png b/Resources/Textures/Clothing/Back/Satchels/genetics.rsi/icon.png index 02abe49825..dc781ce817 100644 Binary files a/Resources/Textures/Clothing/Back/Satchels/genetics.rsi/icon.png and b/Resources/Textures/Clothing/Back/Satchels/genetics.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Back/Satchels/genetics.rsi/inhand-left.png b/Resources/Textures/Clothing/Back/Satchels/genetics.rsi/inhand-left.png index 68eaa7cf44..b8ee121cef 100644 Binary files a/Resources/Textures/Clothing/Back/Satchels/genetics.rsi/inhand-left.png and b/Resources/Textures/Clothing/Back/Satchels/genetics.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/Back/Satchels/genetics.rsi/inhand-right.png b/Resources/Textures/Clothing/Back/Satchels/genetics.rsi/inhand-right.png index 717957515b..b80cb1bfd6 100644 Binary files a/Resources/Textures/Clothing/Back/Satchels/genetics.rsi/inhand-right.png and b/Resources/Textures/Clothing/Back/Satchels/genetics.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/Back/Satchels/genetics.rsi/meta.json b/Resources/Textures/Clothing/Back/Satchels/genetics.rsi/meta.json index 5377347324..42591f4c4e 100644 --- a/Resources/Textures/Clothing/Back/Satchels/genetics.rsi/meta.json +++ b/Resources/Textures/Clothing/Back/Satchels/genetics.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Modified from tgstation at commit https://github.com/tgstation/tgstation/commit/15c87fd15fe205e4fc71997e48311e06ff02a1d4", + "copyright": "Modified from tgstation at commit https://github.com/tgstation/tgstation/commit/15c87fd15fe205e4fc71997e48311e06ff02a1d4, Resprited by Mureixlol", "size": { "x": 32, "y": 32 @@ -23,4 +23,4 @@ "directions": 4 } ] -} \ No newline at end of file +} diff --git a/Resources/Textures/Clothing/Back/Satchels/hydroponics.rsi/equipped-BACKPACK.png b/Resources/Textures/Clothing/Back/Satchels/hydroponics.rsi/equipped-BACKPACK.png index fc4a93d812..9ae968c9d0 100644 Binary files a/Resources/Textures/Clothing/Back/Satchels/hydroponics.rsi/equipped-BACKPACK.png and b/Resources/Textures/Clothing/Back/Satchels/hydroponics.rsi/equipped-BACKPACK.png differ diff --git a/Resources/Textures/Clothing/Back/Satchels/hydroponics.rsi/icon.png b/Resources/Textures/Clothing/Back/Satchels/hydroponics.rsi/icon.png index 2a5ea97c42..684aab50d7 100644 Binary files a/Resources/Textures/Clothing/Back/Satchels/hydroponics.rsi/icon.png and b/Resources/Textures/Clothing/Back/Satchels/hydroponics.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Back/Satchels/hydroponics.rsi/meta.json b/Resources/Textures/Clothing/Back/Satchels/hydroponics.rsi/meta.json index fce8c90ce8..c166df646b 100644 --- a/Resources/Textures/Clothing/Back/Satchels/hydroponics.rsi/meta.json +++ b/Resources/Textures/Clothing/Back/Satchels/hydroponics.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/547852588166c8e091b441e4e67169e156bb09c1", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/2e24b7af2221928e4b844a29408e821b60a5fe29", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/Clothing/Back/Satchels/leather.rsi/equipped-BACKPACK.png b/Resources/Textures/Clothing/Back/Satchels/leather.rsi/equipped-BACKPACK.png index 020b47f2c5..c4145619b8 100644 Binary files a/Resources/Textures/Clothing/Back/Satchels/leather.rsi/equipped-BACKPACK.png and b/Resources/Textures/Clothing/Back/Satchels/leather.rsi/equipped-BACKPACK.png differ diff --git a/Resources/Textures/Clothing/Back/Satchels/leather.rsi/icon.png b/Resources/Textures/Clothing/Back/Satchels/leather.rsi/icon.png index b9d7145998..107880f219 100644 Binary files a/Resources/Textures/Clothing/Back/Satchels/leather.rsi/icon.png and b/Resources/Textures/Clothing/Back/Satchels/leather.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Back/Satchels/leather.rsi/inhand-left.png b/Resources/Textures/Clothing/Back/Satchels/leather.rsi/inhand-left.png index 4a4ada4c87..f706fbeaf2 100644 Binary files a/Resources/Textures/Clothing/Back/Satchels/leather.rsi/inhand-left.png and b/Resources/Textures/Clothing/Back/Satchels/leather.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/Back/Satchels/leather.rsi/inhand-right.png b/Resources/Textures/Clothing/Back/Satchels/leather.rsi/inhand-right.png index 581a87f0e8..7af216fe96 100644 Binary files a/Resources/Textures/Clothing/Back/Satchels/leather.rsi/inhand-right.png and b/Resources/Textures/Clothing/Back/Satchels/leather.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/Back/Satchels/medical.rsi/equipped-BACKPACK.png b/Resources/Textures/Clothing/Back/Satchels/medical.rsi/equipped-BACKPACK.png index f80b1f2e6e..8e2fc11935 100644 Binary files a/Resources/Textures/Clothing/Back/Satchels/medical.rsi/equipped-BACKPACK.png and b/Resources/Textures/Clothing/Back/Satchels/medical.rsi/equipped-BACKPACK.png differ diff --git a/Resources/Textures/Clothing/Back/Satchels/medical.rsi/icon.png b/Resources/Textures/Clothing/Back/Satchels/medical.rsi/icon.png index 450a24e818..b6840d14b7 100644 Binary files a/Resources/Textures/Clothing/Back/Satchels/medical.rsi/icon.png and b/Resources/Textures/Clothing/Back/Satchels/medical.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Back/Satchels/medical.rsi/meta.json b/Resources/Textures/Clothing/Back/Satchels/medical.rsi/meta.json index fce8c90ce8..c166df646b 100644 --- a/Resources/Textures/Clothing/Back/Satchels/medical.rsi/meta.json +++ b/Resources/Textures/Clothing/Back/Satchels/medical.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/547852588166c8e091b441e4e67169e156bb09c1", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/2e24b7af2221928e4b844a29408e821b60a5fe29", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/Clothing/Back/Satchels/satchel.rsi/equipped-BACKPACK.png b/Resources/Textures/Clothing/Back/Satchels/satchel.rsi/equipped-BACKPACK.png index c24f815bc1..34e981394a 100644 Binary files a/Resources/Textures/Clothing/Back/Satchels/satchel.rsi/equipped-BACKPACK.png and b/Resources/Textures/Clothing/Back/Satchels/satchel.rsi/equipped-BACKPACK.png differ diff --git a/Resources/Textures/Clothing/Back/Satchels/satchel.rsi/icon.png b/Resources/Textures/Clothing/Back/Satchels/satchel.rsi/icon.png index d390ee7c98..9e72773f76 100644 Binary files a/Resources/Textures/Clothing/Back/Satchels/satchel.rsi/icon.png and b/Resources/Textures/Clothing/Back/Satchels/satchel.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Back/Satchels/satchel.rsi/meta.json b/Resources/Textures/Clothing/Back/Satchels/satchel.rsi/meta.json index fce8c90ce8..c166df646b 100644 --- a/Resources/Textures/Clothing/Back/Satchels/satchel.rsi/meta.json +++ b/Resources/Textures/Clothing/Back/Satchels/satchel.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/547852588166c8e091b441e4e67169e156bb09c1", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/2e24b7af2221928e4b844a29408e821b60a5fe29", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/Clothing/Back/Satchels/science.rsi/equipped-BACKPACK.png b/Resources/Textures/Clothing/Back/Satchels/science.rsi/equipped-BACKPACK.png index 2661a05b4c..7c1da2349b 100644 Binary files a/Resources/Textures/Clothing/Back/Satchels/science.rsi/equipped-BACKPACK.png and b/Resources/Textures/Clothing/Back/Satchels/science.rsi/equipped-BACKPACK.png differ diff --git a/Resources/Textures/Clothing/Back/Satchels/science.rsi/icon.png b/Resources/Textures/Clothing/Back/Satchels/science.rsi/icon.png index 53d96698ae..1b1c1e0ebf 100644 Binary files a/Resources/Textures/Clothing/Back/Satchels/science.rsi/icon.png and b/Resources/Textures/Clothing/Back/Satchels/science.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Back/Satchels/science.rsi/meta.json b/Resources/Textures/Clothing/Back/Satchels/science.rsi/meta.json index fce8c90ce8..c166df646b 100644 --- a/Resources/Textures/Clothing/Back/Satchels/science.rsi/meta.json +++ b/Resources/Textures/Clothing/Back/Satchels/science.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/547852588166c8e091b441e4e67169e156bb09c1", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/2e24b7af2221928e4b844a29408e821b60a5fe29", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/Clothing/Back/Satchels/security.rsi/equipped-BACKPACK.png b/Resources/Textures/Clothing/Back/Satchels/security.rsi/equipped-BACKPACK.png index c33aec6307..a0c2034491 100644 Binary files a/Resources/Textures/Clothing/Back/Satchels/security.rsi/equipped-BACKPACK.png and b/Resources/Textures/Clothing/Back/Satchels/security.rsi/equipped-BACKPACK.png differ diff --git a/Resources/Textures/Clothing/Back/Satchels/security.rsi/icon.png b/Resources/Textures/Clothing/Back/Satchels/security.rsi/icon.png index 7f100adff6..217d746bb4 100644 Binary files a/Resources/Textures/Clothing/Back/Satchels/security.rsi/icon.png and b/Resources/Textures/Clothing/Back/Satchels/security.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Back/Satchels/security.rsi/inhand-left.png b/Resources/Textures/Clothing/Back/Satchels/security.rsi/inhand-left.png index 2311df1b11..66dc3fb1a1 100644 Binary files a/Resources/Textures/Clothing/Back/Satchels/security.rsi/inhand-left.png and b/Resources/Textures/Clothing/Back/Satchels/security.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/Back/Satchels/security.rsi/inhand-right.png b/Resources/Textures/Clothing/Back/Satchels/security.rsi/inhand-right.png index 6219205405..071bb888c7 100644 Binary files a/Resources/Textures/Clothing/Back/Satchels/security.rsi/inhand-right.png and b/Resources/Textures/Clothing/Back/Satchels/security.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/Back/Satchels/security.rsi/meta.json b/Resources/Textures/Clothing/Back/Satchels/security.rsi/meta.json index fce8c90ce8..2880cc53ed 100644 --- a/Resources/Textures/Clothing/Back/Satchels/security.rsi/meta.json +++ b/Resources/Textures/Clothing/Back/Satchels/security.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/547852588166c8e091b441e4e67169e156bb09c1", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/2e24b7af2221928e4b844a29408e821b60a5fe29, tweak by @mureixlol", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/Clothing/Back/Satchels/virology.rsi/equipped-BACKPACK.png b/Resources/Textures/Clothing/Back/Satchels/virology.rsi/equipped-BACKPACK.png index 220ea76ea6..c9666f474b 100644 Binary files a/Resources/Textures/Clothing/Back/Satchels/virology.rsi/equipped-BACKPACK.png and b/Resources/Textures/Clothing/Back/Satchels/virology.rsi/equipped-BACKPACK.png differ diff --git a/Resources/Textures/Clothing/Back/Satchels/virology.rsi/icon.png b/Resources/Textures/Clothing/Back/Satchels/virology.rsi/icon.png index a77ff33ca5..e55cd46ec5 100644 Binary files a/Resources/Textures/Clothing/Back/Satchels/virology.rsi/icon.png and b/Resources/Textures/Clothing/Back/Satchels/virology.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Back/Satchels/virology.rsi/inhand-left.png b/Resources/Textures/Clothing/Back/Satchels/virology.rsi/inhand-left.png index 9d6050ca16..67db987c12 100644 Binary files a/Resources/Textures/Clothing/Back/Satchels/virology.rsi/inhand-left.png and b/Resources/Textures/Clothing/Back/Satchels/virology.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/Back/Satchels/virology.rsi/inhand-right.png b/Resources/Textures/Clothing/Back/Satchels/virology.rsi/inhand-right.png index b6d9aba43f..a52bc6b262 100644 Binary files a/Resources/Textures/Clothing/Back/Satchels/virology.rsi/inhand-right.png and b/Resources/Textures/Clothing/Back/Satchels/virology.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/Back/Satchels/virology.rsi/meta.json b/Resources/Textures/Clothing/Back/Satchels/virology.rsi/meta.json index f9b3615d28..2ac6d2ecce 100644 --- a/Resources/Textures/Clothing/Back/Satchels/virology.rsi/meta.json +++ b/Resources/Textures/Clothing/Back/Satchels/virology.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Modified from tgstation at commit https://github.com/tgstation/tgstation/commit/547852588166c8e091b441e4e67169e156bb09c1", + "copyright": "Modified from tgstation at commit https://github.com/tgstation/tgstation/commit/547852588166c8e091b441e4e67169e156bb09c1, Resprited by Mureixlol", "size": { "x": 32, "y": 32 @@ -23,4 +23,4 @@ "directions": 4 } ] -} \ No newline at end of file +} diff --git a/Resources/Textures/Clothing/Belt/assault.rsi/equipped-BELT.png b/Resources/Textures/Clothing/Belt/assault.rsi/equipped-BELT.png index 77a7c17193..4ef70d0751 100644 Binary files a/Resources/Textures/Clothing/Belt/assault.rsi/equipped-BELT.png and b/Resources/Textures/Clothing/Belt/assault.rsi/equipped-BELT.png differ diff --git a/Resources/Textures/Clothing/Belt/assault.rsi/icon.png b/Resources/Textures/Clothing/Belt/assault.rsi/icon.png index 18047a5740..0ba4fb5030 100644 Binary files a/Resources/Textures/Clothing/Belt/assault.rsi/icon.png and b/Resources/Textures/Clothing/Belt/assault.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Belt/ce.rsi/equipped-BELT.png b/Resources/Textures/Clothing/Belt/ce.rsi/equipped-BELT.png index e5bacdb467..8893c0ccf1 100644 Binary files a/Resources/Textures/Clothing/Belt/ce.rsi/equipped-BELT.png and b/Resources/Textures/Clothing/Belt/ce.rsi/equipped-BELT.png differ diff --git a/Resources/Textures/Clothing/Belt/ce.rsi/icon.png b/Resources/Textures/Clothing/Belt/ce.rsi/icon.png index e759e11492..f346b7e3e2 100644 Binary files a/Resources/Textures/Clothing/Belt/ce.rsi/icon.png and b/Resources/Textures/Clothing/Belt/ce.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Belt/holster.rsi/equipped-NECK.png b/Resources/Textures/Clothing/Belt/holster.rsi/equipped-NECK.png new file mode 100644 index 0000000000..95e9e5713c Binary files /dev/null and b/Resources/Textures/Clothing/Belt/holster.rsi/equipped-NECK.png differ diff --git a/Resources/Textures/Clothing/Belt/holster.rsi/icon.png b/Resources/Textures/Clothing/Belt/holster.rsi/icon.png index d77d1088c9..48ff8f2bbc 100644 Binary files a/Resources/Textures/Clothing/Belt/holster.rsi/icon.png and b/Resources/Textures/Clothing/Belt/holster.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Belt/janitor.rsi/equipped-BELT.png b/Resources/Textures/Clothing/Belt/janitor.rsi/equipped-BELT.png index 7ce0f6c5db..b5074aaf02 100644 Binary files a/Resources/Textures/Clothing/Belt/janitor.rsi/equipped-BELT.png and b/Resources/Textures/Clothing/Belt/janitor.rsi/equipped-BELT.png differ diff --git a/Resources/Textures/Clothing/Belt/janitor.rsi/icon.png b/Resources/Textures/Clothing/Belt/janitor.rsi/icon.png index 94cb6d9532..061404491c 100644 Binary files a/Resources/Textures/Clothing/Belt/janitor.rsi/icon.png and b/Resources/Textures/Clothing/Belt/janitor.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Belt/medical.rsi/equipped-BELT.png b/Resources/Textures/Clothing/Belt/medical.rsi/equipped-BELT.png index 4da4f1e6b2..3a49cd78b3 100644 Binary files a/Resources/Textures/Clothing/Belt/medical.rsi/equipped-BELT.png and b/Resources/Textures/Clothing/Belt/medical.rsi/equipped-BELT.png differ diff --git a/Resources/Textures/Clothing/Belt/medical.rsi/icon.png b/Resources/Textures/Clothing/Belt/medical.rsi/icon.png index 9b0c385509..a2254ea1f3 100644 Binary files a/Resources/Textures/Clothing/Belt/medical.rsi/icon.png and b/Resources/Textures/Clothing/Belt/medical.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Belt/plant.rsi/equipped-BELT.png b/Resources/Textures/Clothing/Belt/plant.rsi/equipped-BELT.png index fef3d8dd0c..83d47cdc37 100644 Binary files a/Resources/Textures/Clothing/Belt/plant.rsi/equipped-BELT.png and b/Resources/Textures/Clothing/Belt/plant.rsi/equipped-BELT.png differ diff --git a/Resources/Textures/Clothing/Belt/plant.rsi/icon.png b/Resources/Textures/Clothing/Belt/plant.rsi/icon.png index 3bf8ef0e3c..c2178c4654 100644 Binary files a/Resources/Textures/Clothing/Belt/plant.rsi/icon.png and b/Resources/Textures/Clothing/Belt/plant.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Belt/plant.rsi/inhand-left.png b/Resources/Textures/Clothing/Belt/plant.rsi/inhand-left.png index cee67a711c..bdc7837a66 100644 Binary files a/Resources/Textures/Clothing/Belt/plant.rsi/inhand-left.png and b/Resources/Textures/Clothing/Belt/plant.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/Belt/plant.rsi/inhand-right.png b/Resources/Textures/Clothing/Belt/plant.rsi/inhand-right.png index 9397945917..c901d645a5 100644 Binary files a/Resources/Textures/Clothing/Belt/plant.rsi/inhand-right.png and b/Resources/Textures/Clothing/Belt/plant.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/Belt/security.rsi/equipped-BELT.png b/Resources/Textures/Clothing/Belt/security.rsi/equipped-BELT.png index b04e3d4b7b..e60459548c 100644 Binary files a/Resources/Textures/Clothing/Belt/security.rsi/equipped-BELT.png and b/Resources/Textures/Clothing/Belt/security.rsi/equipped-BELT.png differ diff --git a/Resources/Textures/Clothing/Belt/security.rsi/icon.png b/Resources/Textures/Clothing/Belt/security.rsi/icon.png index 3b17da538d..b0ef5ae1db 100644 Binary files a/Resources/Textures/Clothing/Belt/security.rsi/icon.png and b/Resources/Textures/Clothing/Belt/security.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Belt/security.rsi/inhand-left.png b/Resources/Textures/Clothing/Belt/security.rsi/inhand-left.png index 9edac4c151..65ce8e03ef 100644 Binary files a/Resources/Textures/Clothing/Belt/security.rsi/inhand-left.png and b/Resources/Textures/Clothing/Belt/security.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/Belt/security.rsi/inhand-right.png b/Resources/Textures/Clothing/Belt/security.rsi/inhand-right.png index 2489dcd7ec..3ca683db7b 100644 Binary files a/Resources/Textures/Clothing/Belt/security.rsi/inhand-right.png and b/Resources/Textures/Clothing/Belt/security.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/Belt/security.rsi/meta.json b/Resources/Textures/Clothing/Belt/security.rsi/meta.json index a01a9c6cb9..7adb92f093 100644 --- a/Resources/Textures/Clothing/Belt/security.rsi/meta.json +++ b/Resources/Textures/Clothing/Belt/security.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c838ba21dae97db345e0113f99596decd1d66039", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/2fea0a59470c476cf3f927833d3918d89cbe6af8 & equipped taken at commit https://github.com/tgstation/tgstation/commit/d1582bf1b41a0e24fd7a18124c6ff46b86b393f9, tweak by @mureixlol", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/Clothing/Belt/securitywebbing.rsi/equipped-BELT.png b/Resources/Textures/Clothing/Belt/securitywebbing.rsi/equipped-BELT.png index 42d3c6a629..1bdd112752 100644 Binary files a/Resources/Textures/Clothing/Belt/securitywebbing.rsi/equipped-BELT.png and b/Resources/Textures/Clothing/Belt/securitywebbing.rsi/equipped-BELT.png differ diff --git a/Resources/Textures/Clothing/Belt/securitywebbing.rsi/icon.png b/Resources/Textures/Clothing/Belt/securitywebbing.rsi/icon.png index 6a4bbd21bc..a14dcf6f9c 100644 Binary files a/Resources/Textures/Clothing/Belt/securitywebbing.rsi/icon.png and b/Resources/Textures/Clothing/Belt/securitywebbing.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Belt/securitywebbing.rsi/inhand-left.png b/Resources/Textures/Clothing/Belt/securitywebbing.rsi/inhand-left.png index dbce144c60..971635c5cb 100644 Binary files a/Resources/Textures/Clothing/Belt/securitywebbing.rsi/inhand-left.png and b/Resources/Textures/Clothing/Belt/securitywebbing.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/Belt/securitywebbing.rsi/inhand-right.png b/Resources/Textures/Clothing/Belt/securitywebbing.rsi/inhand-right.png index 8280138ae7..810ed252a9 100644 Binary files a/Resources/Textures/Clothing/Belt/securitywebbing.rsi/inhand-right.png and b/Resources/Textures/Clothing/Belt/securitywebbing.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/Belt/securitywebbing.rsi/meta.json b/Resources/Textures/Clothing/Belt/securitywebbing.rsi/meta.json index a01a9c6cb9..fead05bd2f 100644 --- a/Resources/Textures/Clothing/Belt/securitywebbing.rsi/meta.json +++ b/Resources/Textures/Clothing/Belt/securitywebbing.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c838ba21dae97db345e0113f99596decd1d66039", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c838ba21dae97db345e0113f99596decd1d66039 and modified by DieselMohawk for SS14", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/Clothing/Belt/syndieholster.rsi/equipped-BELT.png b/Resources/Textures/Clothing/Belt/syndieholster.rsi/equipped-BELT.png index 372ce46fe7..1d96e5f747 100644 Binary files a/Resources/Textures/Clothing/Belt/syndieholster.rsi/equipped-BELT.png and b/Resources/Textures/Clothing/Belt/syndieholster.rsi/equipped-BELT.png differ diff --git a/Resources/Textures/Clothing/Belt/syndieholster.rsi/icon.png b/Resources/Textures/Clothing/Belt/syndieholster.rsi/icon.png index c38f59b4a4..9fa8ced02e 100644 Binary files a/Resources/Textures/Clothing/Belt/syndieholster.rsi/icon.png and b/Resources/Textures/Clothing/Belt/syndieholster.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Belt/utility.rsi/equipped-BELT.png b/Resources/Textures/Clothing/Belt/utility.rsi/equipped-BELT.png index 88351c9e8d..99c652d9fb 100644 Binary files a/Resources/Textures/Clothing/Belt/utility.rsi/equipped-BELT.png and b/Resources/Textures/Clothing/Belt/utility.rsi/equipped-BELT.png differ diff --git a/Resources/Textures/Clothing/Belt/utility.rsi/icon.png b/Resources/Textures/Clothing/Belt/utility.rsi/icon.png index 56a15f3483..38e713e210 100644 Binary files a/Resources/Textures/Clothing/Belt/utility.rsi/icon.png and b/Resources/Textures/Clothing/Belt/utility.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Belt/waistbag_leather.rsi/icon.png b/Resources/Textures/Clothing/Belt/waistbag_leather.rsi/icon.png index b2f00967f3..3847a34f42 100644 Binary files a/Resources/Textures/Clothing/Belt/waistbag_leather.rsi/icon.png and b/Resources/Textures/Clothing/Belt/waistbag_leather.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Belt/wand.rsi/equipped-BELT.png b/Resources/Textures/Clothing/Belt/wand.rsi/equipped-BELT.png index e1b3cdc622..d0e8f24ad9 100644 Binary files a/Resources/Textures/Clothing/Belt/wand.rsi/equipped-BELT.png and b/Resources/Textures/Clothing/Belt/wand.rsi/equipped-BELT.png differ diff --git a/Resources/Textures/Clothing/Belt/wand.rsi/icon.png b/Resources/Textures/Clothing/Belt/wand.rsi/icon.png index 94f6318948..4159b48c86 100644 Binary files a/Resources/Textures/Clothing/Belt/wand.rsi/icon.png and b/Resources/Textures/Clothing/Belt/wand.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Head/Bandanas/black.rsi/equipped-HELMET-vox.png b/Resources/Textures/Clothing/Head/Bandanas/black.rsi/equipped-HELMET-vox.png new file mode 100644 index 0000000000..b74049130c Binary files /dev/null and b/Resources/Textures/Clothing/Head/Bandanas/black.rsi/equipped-HELMET-vox.png differ diff --git a/Resources/Textures/Clothing/Head/Bandanas/black.rsi/equipped-MASK-vox.png b/Resources/Textures/Clothing/Head/Bandanas/black.rsi/equipped-MASK-vox.png new file mode 100644 index 0000000000..a3def50f88 Binary files /dev/null and b/Resources/Textures/Clothing/Head/Bandanas/black.rsi/equipped-MASK-vox.png differ diff --git a/Resources/Textures/Clothing/Head/Bandanas/black.rsi/meta.json b/Resources/Textures/Clothing/Head/Bandanas/black.rsi/meta.json index a555369032..a39a46ac81 100644 --- a/Resources/Textures/Clothing/Head/Bandanas/black.rsi/meta.json +++ b/Resources/Textures/Clothing/Head/Bandanas/black.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e. equipped-MASK-vox & equipped-HELMET-vox states taken from Paradise at https://github.com/ParadiseSS13/Paradise/blob/bc095ad398790a2b718b2bab4f2157cdd80a51da/icons/mob/clothing/species/vox/mask.dmi", "size": { "x": 32, "y": 32 @@ -17,10 +17,18 @@ "name": "equipped-HELMET", "directions": 4 }, + { + "name": "equipped-HELMET-vox", + "directions": 4 + }, { "name": "equipped-MASK", "directions": 4 }, + { + "name": "equipped-MASK-vox", + "directions": 4 + }, { "name": "inhand-left", "directions": 4 diff --git a/Resources/Textures/Clothing/Head/Bandanas/blue.rsi/equipped-HELMET-vox.png b/Resources/Textures/Clothing/Head/Bandanas/blue.rsi/equipped-HELMET-vox.png new file mode 100644 index 0000000000..7266432372 Binary files /dev/null and b/Resources/Textures/Clothing/Head/Bandanas/blue.rsi/equipped-HELMET-vox.png differ diff --git a/Resources/Textures/Clothing/Head/Bandanas/blue.rsi/equipped-MASK-vox.png b/Resources/Textures/Clothing/Head/Bandanas/blue.rsi/equipped-MASK-vox.png new file mode 100644 index 0000000000..6bc5266367 Binary files /dev/null and b/Resources/Textures/Clothing/Head/Bandanas/blue.rsi/equipped-MASK-vox.png differ diff --git a/Resources/Textures/Clothing/Head/Bandanas/blue.rsi/meta.json b/Resources/Textures/Clothing/Head/Bandanas/blue.rsi/meta.json index a555369032..a39a46ac81 100644 --- a/Resources/Textures/Clothing/Head/Bandanas/blue.rsi/meta.json +++ b/Resources/Textures/Clothing/Head/Bandanas/blue.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e. equipped-MASK-vox & equipped-HELMET-vox states taken from Paradise at https://github.com/ParadiseSS13/Paradise/blob/bc095ad398790a2b718b2bab4f2157cdd80a51da/icons/mob/clothing/species/vox/mask.dmi", "size": { "x": 32, "y": 32 @@ -17,10 +17,18 @@ "name": "equipped-HELMET", "directions": 4 }, + { + "name": "equipped-HELMET-vox", + "directions": 4 + }, { "name": "equipped-MASK", "directions": 4 }, + { + "name": "equipped-MASK-vox", + "directions": 4 + }, { "name": "inhand-left", "directions": 4 diff --git a/Resources/Textures/Clothing/Head/Bandanas/botany.rsi/equipped-HELMET-vox.png b/Resources/Textures/Clothing/Head/Bandanas/botany.rsi/equipped-HELMET-vox.png new file mode 100644 index 0000000000..c576b30f47 Binary files /dev/null and b/Resources/Textures/Clothing/Head/Bandanas/botany.rsi/equipped-HELMET-vox.png differ diff --git a/Resources/Textures/Clothing/Head/Bandanas/botany.rsi/equipped-MASK-vox.png b/Resources/Textures/Clothing/Head/Bandanas/botany.rsi/equipped-MASK-vox.png new file mode 100644 index 0000000000..378a1a3c19 Binary files /dev/null and b/Resources/Textures/Clothing/Head/Bandanas/botany.rsi/equipped-MASK-vox.png differ diff --git a/Resources/Textures/Clothing/Head/Bandanas/botany.rsi/meta.json b/Resources/Textures/Clothing/Head/Bandanas/botany.rsi/meta.json index a9b3b1556d..a39a46ac81 100644 --- a/Resources/Textures/Clothing/Head/Bandanas/botany.rsi/meta.json +++ b/Resources/Textures/Clothing/Head/Bandanas/botany.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e. equipped-MASK-vox & equipped-HELMET-vox states taken from Paradise at https://github.com/ParadiseSS13/Paradise/blob/bc095ad398790a2b718b2bab4f2157cdd80a51da/icons/mob/clothing/species/vox/mask.dmi", "size": { "x": 32, "y": 32 @@ -18,13 +18,17 @@ "directions": 4 }, { - "name": "equipped-HELMET-hamster", + "name": "equipped-HELMET-vox", "directions": 4 }, { "name": "equipped-MASK", "directions": 4 }, + { + "name": "equipped-MASK-vox", + "directions": 4 + }, { "name": "inhand-left", "directions": 4 diff --git a/Resources/Textures/Clothing/Head/Bandanas/brown.rsi/meta.json b/Resources/Textures/Clothing/Head/Bandanas/brown.rsi/meta.json index ae74562560..a555369032 100644 --- a/Resources/Textures/Clothing/Head/Bandanas/brown.rsi/meta.json +++ b/Resources/Textures/Clothing/Head/Bandanas/brown.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e, modified by лазік#7305", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/Clothing/Head/Bandanas/gold.rsi/equipped-HELMET-vox.png b/Resources/Textures/Clothing/Head/Bandanas/gold.rsi/equipped-HELMET-vox.png new file mode 100644 index 0000000000..5189f62e25 Binary files /dev/null and b/Resources/Textures/Clothing/Head/Bandanas/gold.rsi/equipped-HELMET-vox.png differ diff --git a/Resources/Textures/Clothing/Head/Bandanas/gold.rsi/equipped-MASK-vox.png b/Resources/Textures/Clothing/Head/Bandanas/gold.rsi/equipped-MASK-vox.png new file mode 100644 index 0000000000..616bb8eeb3 Binary files /dev/null and b/Resources/Textures/Clothing/Head/Bandanas/gold.rsi/equipped-MASK-vox.png differ diff --git a/Resources/Textures/Clothing/Head/Bandanas/gold.rsi/meta.json b/Resources/Textures/Clothing/Head/Bandanas/gold.rsi/meta.json index a555369032..a39a46ac81 100644 --- a/Resources/Textures/Clothing/Head/Bandanas/gold.rsi/meta.json +++ b/Resources/Textures/Clothing/Head/Bandanas/gold.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e. equipped-MASK-vox & equipped-HELMET-vox states taken from Paradise at https://github.com/ParadiseSS13/Paradise/blob/bc095ad398790a2b718b2bab4f2157cdd80a51da/icons/mob/clothing/species/vox/mask.dmi", "size": { "x": 32, "y": 32 @@ -17,10 +17,18 @@ "name": "equipped-HELMET", "directions": 4 }, + { + "name": "equipped-HELMET-vox", + "directions": 4 + }, { "name": "equipped-MASK", "directions": 4 }, + { + "name": "equipped-MASK-vox", + "directions": 4 + }, { "name": "inhand-left", "directions": 4 diff --git a/Resources/Textures/Clothing/Head/Bandanas/green.rsi/equipped-HELMET-vox.png b/Resources/Textures/Clothing/Head/Bandanas/green.rsi/equipped-HELMET-vox.png new file mode 100644 index 0000000000..ed4c08a325 Binary files /dev/null and b/Resources/Textures/Clothing/Head/Bandanas/green.rsi/equipped-HELMET-vox.png differ diff --git a/Resources/Textures/Clothing/Head/Bandanas/green.rsi/equipped-MASK-vox.png b/Resources/Textures/Clothing/Head/Bandanas/green.rsi/equipped-MASK-vox.png new file mode 100644 index 0000000000..958bcdf0ea Binary files /dev/null and b/Resources/Textures/Clothing/Head/Bandanas/green.rsi/equipped-MASK-vox.png differ diff --git a/Resources/Textures/Clothing/Head/Bandanas/green.rsi/meta.json b/Resources/Textures/Clothing/Head/Bandanas/green.rsi/meta.json index a555369032..ef97b40b36 100644 --- a/Resources/Textures/Clothing/Head/Bandanas/green.rsi/meta.json +++ b/Resources/Textures/Clothing/Head/Bandanas/green.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e. equipped-MASK-vox & equipped-HELMET-vox states taken from Paradise at https://github.com/ParadiseSS13/Paradise/blob/bc095ad398790a2b718b2bab4f2157cdd80a51da/icons/mob/clothing/species/vox/mask.dmi", "size": { "x": 32, "y": 32 @@ -21,6 +21,14 @@ "name": "equipped-MASK", "directions": 4 }, + { + "name": "equipped-HELMET-vox", + "directions": 4 + }, + { + "name": "equipped-MASK-vox", + "directions": 4 + }, { "name": "inhand-left", "directions": 4 diff --git a/Resources/Textures/Clothing/Head/Bandanas/grey.rsi/equipped-HELMET-vox.png b/Resources/Textures/Clothing/Head/Bandanas/grey.rsi/equipped-HELMET-vox.png new file mode 100644 index 0000000000..92f305f183 Binary files /dev/null and b/Resources/Textures/Clothing/Head/Bandanas/grey.rsi/equipped-HELMET-vox.png differ diff --git a/Resources/Textures/Clothing/Head/Bandanas/grey.rsi/equipped-MASK-vox.png b/Resources/Textures/Clothing/Head/Bandanas/grey.rsi/equipped-MASK-vox.png new file mode 100644 index 0000000000..5d2af65f4b Binary files /dev/null and b/Resources/Textures/Clothing/Head/Bandanas/grey.rsi/equipped-MASK-vox.png differ diff --git a/Resources/Textures/Clothing/Head/Bandanas/grey.rsi/meta.json b/Resources/Textures/Clothing/Head/Bandanas/grey.rsi/meta.json index a555369032..a39a46ac81 100644 --- a/Resources/Textures/Clothing/Head/Bandanas/grey.rsi/meta.json +++ b/Resources/Textures/Clothing/Head/Bandanas/grey.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e. equipped-MASK-vox & equipped-HELMET-vox states taken from Paradise at https://github.com/ParadiseSS13/Paradise/blob/bc095ad398790a2b718b2bab4f2157cdd80a51da/icons/mob/clothing/species/vox/mask.dmi", "size": { "x": 32, "y": 32 @@ -17,10 +17,18 @@ "name": "equipped-HELMET", "directions": 4 }, + { + "name": "equipped-HELMET-vox", + "directions": 4 + }, { "name": "equipped-MASK", "directions": 4 }, + { + "name": "equipped-MASK-vox", + "directions": 4 + }, { "name": "inhand-left", "directions": 4 diff --git a/Resources/Textures/Clothing/Head/Bandanas/red.rsi/equipped-HELMET-vox.png b/Resources/Textures/Clothing/Head/Bandanas/red.rsi/equipped-HELMET-vox.png new file mode 100644 index 0000000000..22df7888e7 Binary files /dev/null and b/Resources/Textures/Clothing/Head/Bandanas/red.rsi/equipped-HELMET-vox.png differ diff --git a/Resources/Textures/Clothing/Head/Bandanas/red.rsi/equipped-HELMET.png b/Resources/Textures/Clothing/Head/Bandanas/red.rsi/equipped-HELMET.png index 95cd09ebcd..5527245a5d 100644 Binary files a/Resources/Textures/Clothing/Head/Bandanas/red.rsi/equipped-HELMET.png and b/Resources/Textures/Clothing/Head/Bandanas/red.rsi/equipped-HELMET.png differ diff --git a/Resources/Textures/Clothing/Head/Bandanas/red.rsi/equipped-MASK-vox.png b/Resources/Textures/Clothing/Head/Bandanas/red.rsi/equipped-MASK-vox.png new file mode 100644 index 0000000000..7cea36d539 Binary files /dev/null and b/Resources/Textures/Clothing/Head/Bandanas/red.rsi/equipped-MASK-vox.png differ diff --git a/Resources/Textures/Clothing/Head/Bandanas/red.rsi/equipped-MASK.png b/Resources/Textures/Clothing/Head/Bandanas/red.rsi/equipped-MASK.png index d7df1b210a..e34e0a29d5 100644 Binary files a/Resources/Textures/Clothing/Head/Bandanas/red.rsi/equipped-MASK.png and b/Resources/Textures/Clothing/Head/Bandanas/red.rsi/equipped-MASK.png differ diff --git a/Resources/Textures/Clothing/Head/Bandanas/red.rsi/icon.png b/Resources/Textures/Clothing/Head/Bandanas/red.rsi/icon.png index fae8dd3647..c1499de1e7 100644 Binary files a/Resources/Textures/Clothing/Head/Bandanas/red.rsi/icon.png and b/Resources/Textures/Clothing/Head/Bandanas/red.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Head/Bandanas/red.rsi/icon_mask.png b/Resources/Textures/Clothing/Head/Bandanas/red.rsi/icon_mask.png index c8e5917c27..10a476f207 100644 Binary files a/Resources/Textures/Clothing/Head/Bandanas/red.rsi/icon_mask.png and b/Resources/Textures/Clothing/Head/Bandanas/red.rsi/icon_mask.png differ diff --git a/Resources/Textures/Clothing/Head/Bandanas/red.rsi/inhand-left.png b/Resources/Textures/Clothing/Head/Bandanas/red.rsi/inhand-left.png index 2b2dedec43..32d9efb757 100644 Binary files a/Resources/Textures/Clothing/Head/Bandanas/red.rsi/inhand-left.png and b/Resources/Textures/Clothing/Head/Bandanas/red.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/Head/Bandanas/red.rsi/inhand-right.png b/Resources/Textures/Clothing/Head/Bandanas/red.rsi/inhand-right.png index bc344c512b..094831eadb 100644 Binary files a/Resources/Textures/Clothing/Head/Bandanas/red.rsi/inhand-right.png and b/Resources/Textures/Clothing/Head/Bandanas/red.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/Head/Bandanas/red.rsi/meta.json b/Resources/Textures/Clothing/Head/Bandanas/red.rsi/meta.json index a555369032..362e8bc75a 100644 --- a/Resources/Textures/Clothing/Head/Bandanas/red.rsi/meta.json +++ b/Resources/Textures/Clothing/Head/Bandanas/red.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e, tweak by @mureixlol", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/Clothing/Head/Bandanas/skull.rsi/equipped-HELMET-vox.png b/Resources/Textures/Clothing/Head/Bandanas/skull.rsi/equipped-HELMET-vox.png new file mode 100644 index 0000000000..99ed4f9cc2 Binary files /dev/null and b/Resources/Textures/Clothing/Head/Bandanas/skull.rsi/equipped-HELMET-vox.png differ diff --git a/Resources/Textures/Clothing/Head/Bandanas/skull.rsi/equipped-MASK-vox.png b/Resources/Textures/Clothing/Head/Bandanas/skull.rsi/equipped-MASK-vox.png new file mode 100644 index 0000000000..a5fdbe4aac Binary files /dev/null and b/Resources/Textures/Clothing/Head/Bandanas/skull.rsi/equipped-MASK-vox.png differ diff --git a/Resources/Textures/Clothing/Head/Bandanas/skull.rsi/meta.json b/Resources/Textures/Clothing/Head/Bandanas/skull.rsi/meta.json index a555369032..96c7993dd3 100644 --- a/Resources/Textures/Clothing/Head/Bandanas/skull.rsi/meta.json +++ b/Resources/Textures/Clothing/Head/Bandanas/skull.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e. equipped-MASK-vox & equipped-HELMET-vox states taken from Paradise at https://github.com/ParadiseSS13/Paradise/blob/bc095ad398790a2b718b2bab4f2157cdd80a51da/icons/mob/clothing/species/vox/mask.dmi and modified by Flareguy", "size": { "x": 32, "y": 32 @@ -17,10 +17,18 @@ "name": "equipped-HELMET", "directions": 4 }, + { + "name": "equipped-HELMET-vox", + "directions": 4 + }, { "name": "equipped-MASK", "directions": 4 }, + { + "name": "equipped-MASK-vox", + "directions": 4 + }, { "name": "inhand-left", "directions": 4 diff --git a/Resources/Textures/Clothing/Head/Hardhats/blue.rsi/icon.png b/Resources/Textures/Clothing/Head/Hardhats/blue.rsi/icon.png index fee14e7a8c..e1ec5ac8f9 100644 Binary files a/Resources/Textures/Clothing/Head/Hardhats/blue.rsi/icon.png and b/Resources/Textures/Clothing/Head/Hardhats/blue.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Head/Hardhats/blue.rsi/light-icon.png b/Resources/Textures/Clothing/Head/Hardhats/blue.rsi/light-icon.png index 3a850ef0d8..1a9ff4b6b0 100644 Binary files a/Resources/Textures/Clothing/Head/Hardhats/blue.rsi/light-icon.png and b/Resources/Textures/Clothing/Head/Hardhats/blue.rsi/light-icon.png differ diff --git a/Resources/Textures/Clothing/Head/Hardhats/blue.rsi/meta.json b/Resources/Textures/Clothing/Head/Hardhats/blue.rsi/meta.json index 02f235207e..ec84571e00 100644 --- a/Resources/Textures/Clothing/Head/Hardhats/blue.rsi/meta.json +++ b/Resources/Textures/Clothing/Head/Hardhats/blue.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/2fea0a59470c476cf3f927833d3918d89cbe6af8", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/Clothing/Head/Hardhats/blue.rsi/off-equipped-HELMET.png b/Resources/Textures/Clothing/Head/Hardhats/blue.rsi/off-equipped-HELMET.png index 31760fce4e..1298a3a0c7 100644 Binary files a/Resources/Textures/Clothing/Head/Hardhats/blue.rsi/off-equipped-HELMET.png and b/Resources/Textures/Clothing/Head/Hardhats/blue.rsi/off-equipped-HELMET.png differ diff --git a/Resources/Textures/Clothing/Head/Hardhats/blue.rsi/off-inhand-left.png b/Resources/Textures/Clothing/Head/Hardhats/blue.rsi/off-inhand-left.png index 5c130ddc0d..be162bd0a0 100644 Binary files a/Resources/Textures/Clothing/Head/Hardhats/blue.rsi/off-inhand-left.png and b/Resources/Textures/Clothing/Head/Hardhats/blue.rsi/off-inhand-left.png differ diff --git a/Resources/Textures/Clothing/Head/Hardhats/blue.rsi/off-inhand-right.png b/Resources/Textures/Clothing/Head/Hardhats/blue.rsi/off-inhand-right.png index 1d83642a05..ac2d1f67fa 100644 Binary files a/Resources/Textures/Clothing/Head/Hardhats/blue.rsi/off-inhand-right.png and b/Resources/Textures/Clothing/Head/Hardhats/blue.rsi/off-inhand-right.png differ diff --git a/Resources/Textures/Clothing/Head/Hardhats/blue.rsi/on-equipped-HELMET.png b/Resources/Textures/Clothing/Head/Hardhats/blue.rsi/on-equipped-HELMET.png index 54e729e107..8099ff7682 100644 Binary files a/Resources/Textures/Clothing/Head/Hardhats/blue.rsi/on-equipped-HELMET.png and b/Resources/Textures/Clothing/Head/Hardhats/blue.rsi/on-equipped-HELMET.png differ diff --git a/Resources/Textures/Clothing/Head/Hardhats/blue.rsi/on-inhand-left.png b/Resources/Textures/Clothing/Head/Hardhats/blue.rsi/on-inhand-left.png index aeee8b15a7..80c17d64ae 100644 Binary files a/Resources/Textures/Clothing/Head/Hardhats/blue.rsi/on-inhand-left.png and b/Resources/Textures/Clothing/Head/Hardhats/blue.rsi/on-inhand-left.png differ diff --git a/Resources/Textures/Clothing/Head/Hardhats/blue.rsi/on-inhand-right.png b/Resources/Textures/Clothing/Head/Hardhats/blue.rsi/on-inhand-right.png index 7bb8429146..1f069dec79 100644 Binary files a/Resources/Textures/Clothing/Head/Hardhats/blue.rsi/on-inhand-right.png and b/Resources/Textures/Clothing/Head/Hardhats/blue.rsi/on-inhand-right.png differ diff --git a/Resources/Textures/Clothing/Head/Hardhats/dark_yellow.rsi/icon.png b/Resources/Textures/Clothing/Head/Hardhats/dark_yellow.rsi/icon.png index 3d3aa75958..fd0b023a90 100644 Binary files a/Resources/Textures/Clothing/Head/Hardhats/dark_yellow.rsi/icon.png and b/Resources/Textures/Clothing/Head/Hardhats/dark_yellow.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Head/Hardhats/dark_yellow.rsi/light-icon.png b/Resources/Textures/Clothing/Head/Hardhats/dark_yellow.rsi/light-icon.png index 3a850ef0d8..1a9ff4b6b0 100644 Binary files a/Resources/Textures/Clothing/Head/Hardhats/dark_yellow.rsi/light-icon.png and b/Resources/Textures/Clothing/Head/Hardhats/dark_yellow.rsi/light-icon.png differ diff --git a/Resources/Textures/Clothing/Head/Hardhats/dark_yellow.rsi/off-equipped-HELMET.png b/Resources/Textures/Clothing/Head/Hardhats/dark_yellow.rsi/off-equipped-HELMET.png index 6e4ed70e68..062f925277 100644 Binary files a/Resources/Textures/Clothing/Head/Hardhats/dark_yellow.rsi/off-equipped-HELMET.png and b/Resources/Textures/Clothing/Head/Hardhats/dark_yellow.rsi/off-equipped-HELMET.png differ diff --git a/Resources/Textures/Clothing/Head/Hardhats/dark_yellow.rsi/on-equipped-HELMET.png b/Resources/Textures/Clothing/Head/Hardhats/dark_yellow.rsi/on-equipped-HELMET.png index 36f4d3c06e..a8b63917c1 100644 Binary files a/Resources/Textures/Clothing/Head/Hardhats/dark_yellow.rsi/on-equipped-HELMET.png and b/Resources/Textures/Clothing/Head/Hardhats/dark_yellow.rsi/on-equipped-HELMET.png differ diff --git a/Resources/Textures/Clothing/Head/Hardhats/orange.rsi/icon.png b/Resources/Textures/Clothing/Head/Hardhats/orange.rsi/icon.png index ba88c23f72..e05aea22cd 100644 Binary files a/Resources/Textures/Clothing/Head/Hardhats/orange.rsi/icon.png and b/Resources/Textures/Clothing/Head/Hardhats/orange.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Head/Hardhats/orange.rsi/light-icon.png b/Resources/Textures/Clothing/Head/Hardhats/orange.rsi/light-icon.png index 316cf7a9bc..1a9ff4b6b0 100644 Binary files a/Resources/Textures/Clothing/Head/Hardhats/orange.rsi/light-icon.png and b/Resources/Textures/Clothing/Head/Hardhats/orange.rsi/light-icon.png differ diff --git a/Resources/Textures/Clothing/Head/Hardhats/orange.rsi/meta.json b/Resources/Textures/Clothing/Head/Hardhats/orange.rsi/meta.json index 02f235207e..ec84571e00 100644 --- a/Resources/Textures/Clothing/Head/Hardhats/orange.rsi/meta.json +++ b/Resources/Textures/Clothing/Head/Hardhats/orange.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/2fea0a59470c476cf3f927833d3918d89cbe6af8", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/Clothing/Head/Hardhats/orange.rsi/off-equipped-HELMET.png b/Resources/Textures/Clothing/Head/Hardhats/orange.rsi/off-equipped-HELMET.png index ff4a3732bb..5604ddb0cf 100644 Binary files a/Resources/Textures/Clothing/Head/Hardhats/orange.rsi/off-equipped-HELMET.png and b/Resources/Textures/Clothing/Head/Hardhats/orange.rsi/off-equipped-HELMET.png differ diff --git a/Resources/Textures/Clothing/Head/Hardhats/orange.rsi/off-inhand-left.png b/Resources/Textures/Clothing/Head/Hardhats/orange.rsi/off-inhand-left.png index 1d3e030449..4e2955903b 100644 Binary files a/Resources/Textures/Clothing/Head/Hardhats/orange.rsi/off-inhand-left.png and b/Resources/Textures/Clothing/Head/Hardhats/orange.rsi/off-inhand-left.png differ diff --git a/Resources/Textures/Clothing/Head/Hardhats/orange.rsi/off-inhand-right.png b/Resources/Textures/Clothing/Head/Hardhats/orange.rsi/off-inhand-right.png index 2900754a94..7c83a07d5e 100644 Binary files a/Resources/Textures/Clothing/Head/Hardhats/orange.rsi/off-inhand-right.png and b/Resources/Textures/Clothing/Head/Hardhats/orange.rsi/off-inhand-right.png differ diff --git a/Resources/Textures/Clothing/Head/Hardhats/orange.rsi/on-equipped-HELMET.png b/Resources/Textures/Clothing/Head/Hardhats/orange.rsi/on-equipped-HELMET.png index 5686662f41..8a06fdef56 100644 Binary files a/Resources/Textures/Clothing/Head/Hardhats/orange.rsi/on-equipped-HELMET.png and b/Resources/Textures/Clothing/Head/Hardhats/orange.rsi/on-equipped-HELMET.png differ diff --git a/Resources/Textures/Clothing/Head/Hardhats/orange.rsi/on-inhand-left.png b/Resources/Textures/Clothing/Head/Hardhats/orange.rsi/on-inhand-left.png index 61e9fd17dd..d3f7cdaf4c 100644 Binary files a/Resources/Textures/Clothing/Head/Hardhats/orange.rsi/on-inhand-left.png and b/Resources/Textures/Clothing/Head/Hardhats/orange.rsi/on-inhand-left.png differ diff --git a/Resources/Textures/Clothing/Head/Hardhats/orange.rsi/on-inhand-right.png b/Resources/Textures/Clothing/Head/Hardhats/orange.rsi/on-inhand-right.png index 877bafcc6a..4e48d3745c 100644 Binary files a/Resources/Textures/Clothing/Head/Hardhats/orange.rsi/on-inhand-right.png and b/Resources/Textures/Clothing/Head/Hardhats/orange.rsi/on-inhand-right.png differ diff --git a/Resources/Textures/Clothing/Head/Hardhats/red.rsi/icon.png b/Resources/Textures/Clothing/Head/Hardhats/red.rsi/icon.png index 011962037d..33adb838c7 100644 Binary files a/Resources/Textures/Clothing/Head/Hardhats/red.rsi/icon.png and b/Resources/Textures/Clothing/Head/Hardhats/red.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Head/Hardhats/red.rsi/light-icon.png b/Resources/Textures/Clothing/Head/Hardhats/red.rsi/light-icon.png index 3a850ef0d8..1a9ff4b6b0 100644 Binary files a/Resources/Textures/Clothing/Head/Hardhats/red.rsi/light-icon.png and b/Resources/Textures/Clothing/Head/Hardhats/red.rsi/light-icon.png differ diff --git a/Resources/Textures/Clothing/Head/Hardhats/red.rsi/meta.json b/Resources/Textures/Clothing/Head/Hardhats/red.rsi/meta.json index 02f235207e..ec84571e00 100644 --- a/Resources/Textures/Clothing/Head/Hardhats/red.rsi/meta.json +++ b/Resources/Textures/Clothing/Head/Hardhats/red.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/2fea0a59470c476cf3f927833d3918d89cbe6af8", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/Clothing/Head/Hardhats/red.rsi/off-equipped-HELMET.png b/Resources/Textures/Clothing/Head/Hardhats/red.rsi/off-equipped-HELMET.png index 8a4c544352..fb177baf64 100644 Binary files a/Resources/Textures/Clothing/Head/Hardhats/red.rsi/off-equipped-HELMET.png and b/Resources/Textures/Clothing/Head/Hardhats/red.rsi/off-equipped-HELMET.png differ diff --git a/Resources/Textures/Clothing/Head/Hardhats/red.rsi/off-inhand-left.png b/Resources/Textures/Clothing/Head/Hardhats/red.rsi/off-inhand-left.png index 6d4ac23678..515cab6b2f 100644 Binary files a/Resources/Textures/Clothing/Head/Hardhats/red.rsi/off-inhand-left.png and b/Resources/Textures/Clothing/Head/Hardhats/red.rsi/off-inhand-left.png differ diff --git a/Resources/Textures/Clothing/Head/Hardhats/red.rsi/off-inhand-right.png b/Resources/Textures/Clothing/Head/Hardhats/red.rsi/off-inhand-right.png index a76b8fc02e..10a5a6809c 100644 Binary files a/Resources/Textures/Clothing/Head/Hardhats/red.rsi/off-inhand-right.png and b/Resources/Textures/Clothing/Head/Hardhats/red.rsi/off-inhand-right.png differ diff --git a/Resources/Textures/Clothing/Head/Hardhats/red.rsi/on-equipped-HELMET.png b/Resources/Textures/Clothing/Head/Hardhats/red.rsi/on-equipped-HELMET.png index bfb5f6e1fc..ff24e329b9 100644 Binary files a/Resources/Textures/Clothing/Head/Hardhats/red.rsi/on-equipped-HELMET.png and b/Resources/Textures/Clothing/Head/Hardhats/red.rsi/on-equipped-HELMET.png differ diff --git a/Resources/Textures/Clothing/Head/Hardhats/red.rsi/on-inhand-left.png b/Resources/Textures/Clothing/Head/Hardhats/red.rsi/on-inhand-left.png index f8b08eeda0..6b1f9ab92b 100644 Binary files a/Resources/Textures/Clothing/Head/Hardhats/red.rsi/on-inhand-left.png and b/Resources/Textures/Clothing/Head/Hardhats/red.rsi/on-inhand-left.png differ diff --git a/Resources/Textures/Clothing/Head/Hardhats/red.rsi/on-inhand-right.png b/Resources/Textures/Clothing/Head/Hardhats/red.rsi/on-inhand-right.png index b1f55babdd..a39346c8d2 100644 Binary files a/Resources/Textures/Clothing/Head/Hardhats/red.rsi/on-inhand-right.png and b/Resources/Textures/Clothing/Head/Hardhats/red.rsi/on-inhand-right.png differ diff --git a/Resources/Textures/Clothing/Head/Hardhats/white.rsi/icon.png b/Resources/Textures/Clothing/Head/Hardhats/white.rsi/icon.png index 2a5093d619..7294ed2ecf 100644 Binary files a/Resources/Textures/Clothing/Head/Hardhats/white.rsi/icon.png and b/Resources/Textures/Clothing/Head/Hardhats/white.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Head/Hardhats/white.rsi/light-icon.png b/Resources/Textures/Clothing/Head/Hardhats/white.rsi/light-icon.png index 316cf7a9bc..1a9ff4b6b0 100644 Binary files a/Resources/Textures/Clothing/Head/Hardhats/white.rsi/light-icon.png and b/Resources/Textures/Clothing/Head/Hardhats/white.rsi/light-icon.png differ diff --git a/Resources/Textures/Clothing/Head/Hardhats/white.rsi/meta.json b/Resources/Textures/Clothing/Head/Hardhats/white.rsi/meta.json index 02f235207e..ec84571e00 100644 --- a/Resources/Textures/Clothing/Head/Hardhats/white.rsi/meta.json +++ b/Resources/Textures/Clothing/Head/Hardhats/white.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/2fea0a59470c476cf3f927833d3918d89cbe6af8", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/Clothing/Head/Hardhats/white.rsi/off-equipped-HELMET.png b/Resources/Textures/Clothing/Head/Hardhats/white.rsi/off-equipped-HELMET.png index 7adb94de92..3263b3e078 100644 Binary files a/Resources/Textures/Clothing/Head/Hardhats/white.rsi/off-equipped-HELMET.png and b/Resources/Textures/Clothing/Head/Hardhats/white.rsi/off-equipped-HELMET.png differ diff --git a/Resources/Textures/Clothing/Head/Hardhats/white.rsi/off-inhand-left.png b/Resources/Textures/Clothing/Head/Hardhats/white.rsi/off-inhand-left.png index 5693510c94..cb68e36e28 100644 Binary files a/Resources/Textures/Clothing/Head/Hardhats/white.rsi/off-inhand-left.png and b/Resources/Textures/Clothing/Head/Hardhats/white.rsi/off-inhand-left.png differ diff --git a/Resources/Textures/Clothing/Head/Hardhats/white.rsi/off-inhand-right.png b/Resources/Textures/Clothing/Head/Hardhats/white.rsi/off-inhand-right.png index b9118b3740..e5a082c2ac 100644 Binary files a/Resources/Textures/Clothing/Head/Hardhats/white.rsi/off-inhand-right.png and b/Resources/Textures/Clothing/Head/Hardhats/white.rsi/off-inhand-right.png differ diff --git a/Resources/Textures/Clothing/Head/Hardhats/white.rsi/on-equipped-HELMET.png b/Resources/Textures/Clothing/Head/Hardhats/white.rsi/on-equipped-HELMET.png index daa76611f2..ff9e53fa3b 100644 Binary files a/Resources/Textures/Clothing/Head/Hardhats/white.rsi/on-equipped-HELMET.png and b/Resources/Textures/Clothing/Head/Hardhats/white.rsi/on-equipped-HELMET.png differ diff --git a/Resources/Textures/Clothing/Head/Hardhats/white.rsi/on-inhand-left.png b/Resources/Textures/Clothing/Head/Hardhats/white.rsi/on-inhand-left.png index 4328ca313a..e5a2d0db24 100644 Binary files a/Resources/Textures/Clothing/Head/Hardhats/white.rsi/on-inhand-left.png and b/Resources/Textures/Clothing/Head/Hardhats/white.rsi/on-inhand-left.png differ diff --git a/Resources/Textures/Clothing/Head/Hardhats/white.rsi/on-inhand-right.png b/Resources/Textures/Clothing/Head/Hardhats/white.rsi/on-inhand-right.png index f5bc8e9427..87610635e8 100644 Binary files a/Resources/Textures/Clothing/Head/Hardhats/white.rsi/on-inhand-right.png and b/Resources/Textures/Clothing/Head/Hardhats/white.rsi/on-inhand-right.png differ diff --git a/Resources/Textures/Clothing/Head/Hardhats/yellow.rsi/icon.png b/Resources/Textures/Clothing/Head/Hardhats/yellow.rsi/icon.png index 1a3f49cc1b..95de46ac0b 100644 Binary files a/Resources/Textures/Clothing/Head/Hardhats/yellow.rsi/icon.png and b/Resources/Textures/Clothing/Head/Hardhats/yellow.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Head/Hardhats/yellow.rsi/light-icon.png b/Resources/Textures/Clothing/Head/Hardhats/yellow.rsi/light-icon.png index 3a850ef0d8..1a9ff4b6b0 100644 Binary files a/Resources/Textures/Clothing/Head/Hardhats/yellow.rsi/light-icon.png and b/Resources/Textures/Clothing/Head/Hardhats/yellow.rsi/light-icon.png differ diff --git a/Resources/Textures/Clothing/Head/Hardhats/yellow.rsi/meta.json b/Resources/Textures/Clothing/Head/Hardhats/yellow.rsi/meta.json index 02f235207e..ec84571e00 100644 --- a/Resources/Textures/Clothing/Head/Hardhats/yellow.rsi/meta.json +++ b/Resources/Textures/Clothing/Head/Hardhats/yellow.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/2fea0a59470c476cf3f927833d3918d89cbe6af8", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/Clothing/Head/Hardhats/yellow.rsi/off-equipped-HELMET.png b/Resources/Textures/Clothing/Head/Hardhats/yellow.rsi/off-equipped-HELMET.png index 3184781883..8c6ef2b3eb 100644 Binary files a/Resources/Textures/Clothing/Head/Hardhats/yellow.rsi/off-equipped-HELMET.png and b/Resources/Textures/Clothing/Head/Hardhats/yellow.rsi/off-equipped-HELMET.png differ diff --git a/Resources/Textures/Clothing/Head/Hardhats/yellow.rsi/off-inhand-left.png b/Resources/Textures/Clothing/Head/Hardhats/yellow.rsi/off-inhand-left.png index 200cced5f8..73797bda24 100644 Binary files a/Resources/Textures/Clothing/Head/Hardhats/yellow.rsi/off-inhand-left.png and b/Resources/Textures/Clothing/Head/Hardhats/yellow.rsi/off-inhand-left.png differ diff --git a/Resources/Textures/Clothing/Head/Hardhats/yellow.rsi/off-inhand-right.png b/Resources/Textures/Clothing/Head/Hardhats/yellow.rsi/off-inhand-right.png index 1d47eeb0c8..7514ad28a3 100644 Binary files a/Resources/Textures/Clothing/Head/Hardhats/yellow.rsi/off-inhand-right.png and b/Resources/Textures/Clothing/Head/Hardhats/yellow.rsi/off-inhand-right.png differ diff --git a/Resources/Textures/Clothing/Head/Hardhats/yellow.rsi/on-equipped-HELMET.png b/Resources/Textures/Clothing/Head/Hardhats/yellow.rsi/on-equipped-HELMET.png index bea2ece2a3..8bf4543d1a 100644 Binary files a/Resources/Textures/Clothing/Head/Hardhats/yellow.rsi/on-equipped-HELMET.png and b/Resources/Textures/Clothing/Head/Hardhats/yellow.rsi/on-equipped-HELMET.png differ diff --git a/Resources/Textures/Clothing/Head/Hardhats/yellow.rsi/on-inhand-left.png b/Resources/Textures/Clothing/Head/Hardhats/yellow.rsi/on-inhand-left.png index fdafcd1a54..819e0d36b1 100644 Binary files a/Resources/Textures/Clothing/Head/Hardhats/yellow.rsi/on-inhand-left.png and b/Resources/Textures/Clothing/Head/Hardhats/yellow.rsi/on-inhand-left.png differ diff --git a/Resources/Textures/Clothing/Head/Hardhats/yellow.rsi/on-inhand-right.png b/Resources/Textures/Clothing/Head/Hardhats/yellow.rsi/on-inhand-right.png index 6ad388244c..5407da7f80 100644 Binary files a/Resources/Textures/Clothing/Head/Hardhats/yellow.rsi/on-inhand-right.png and b/Resources/Textures/Clothing/Head/Hardhats/yellow.rsi/on-inhand-right.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertchaplain.rsi/icon-flash.png b/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertchaplain.rsi/icon-flash.png index 7eaaa91e72..1de3861769 100644 Binary files a/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertchaplain.rsi/icon-flash.png and b/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertchaplain.rsi/icon-flash.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertchaplain.rsi/icon.png b/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertchaplain.rsi/icon.png index 32457b1916..7f8761f9a0 100644 Binary files a/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertchaplain.rsi/icon.png and b/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertchaplain.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertchaplain.rsi/off-equipped-HELMET.png b/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertchaplain.rsi/off-equipped-HELMET.png index 67b29508a9..1a1268ae69 100644 Binary files a/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertchaplain.rsi/off-equipped-HELMET.png and b/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertchaplain.rsi/off-equipped-HELMET.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertchaplain.rsi/on-equipped-HELMET.png b/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertchaplain.rsi/on-equipped-HELMET.png index c626307585..17bca1780f 100644 Binary files a/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertchaplain.rsi/on-equipped-HELMET.png and b/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertchaplain.rsi/on-equipped-HELMET.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertengineer.rsi/icon-flash.png b/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertengineer.rsi/icon-flash.png index 2e9de69958..fa70a3067e 100644 Binary files a/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertengineer.rsi/icon-flash.png and b/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertengineer.rsi/icon-flash.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertengineer.rsi/icon.png b/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertengineer.rsi/icon.png index e158cc68ee..1c27feec5a 100644 Binary files a/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertengineer.rsi/icon.png and b/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertengineer.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertengineer.rsi/meta.json b/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertengineer.rsi/meta.json index fe9f38cad4..2c29e1db67 100644 --- a/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertengineer.rsi/meta.json +++ b/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertengineer.rsi/meta.json @@ -36,14 +36,6 @@ { "name": "on-inhand-right", "directions": 4 - }, - { - "name": "off-equipped-HELMET-vulpkanin", - "directions": 4 - }, - { - "name": "on-equipped-HELMET-vulpkanin", - "directions": 4 } ] } diff --git a/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertengineer.rsi/off-equipped-HELMET-vox.png b/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertengineer.rsi/off-equipped-HELMET-vox.png new file mode 100644 index 0000000000..e24011cc92 Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertengineer.rsi/off-equipped-HELMET-vox.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertengineer.rsi/off-equipped-HELMET.png b/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertengineer.rsi/off-equipped-HELMET.png index da83451329..772670446b 100644 Binary files a/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertengineer.rsi/off-equipped-HELMET.png and b/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertengineer.rsi/off-equipped-HELMET.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertengineer.rsi/off-inhand-left.png b/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertengineer.rsi/off-inhand-left.png index 8617b5a239..2a62c7ba90 100644 Binary files a/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertengineer.rsi/off-inhand-left.png and b/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertengineer.rsi/off-inhand-left.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertengineer.rsi/off-inhand-right.png b/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertengineer.rsi/off-inhand-right.png index d205602ccf..0d5c4a4535 100644 Binary files a/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertengineer.rsi/off-inhand-right.png and b/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertengineer.rsi/off-inhand-right.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertengineer.rsi/on-equipped-HELMET-vox.png b/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertengineer.rsi/on-equipped-HELMET-vox.png new file mode 100644 index 0000000000..5ad3f9c79a Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertengineer.rsi/on-equipped-HELMET-vox.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertengineer.rsi/on-equipped-HELMET.png b/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertengineer.rsi/on-equipped-HELMET.png index 176eb22cf2..ef32c38de8 100644 Binary files a/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertengineer.rsi/on-equipped-HELMET.png and b/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertengineer.rsi/on-equipped-HELMET.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertengineer.rsi/on-inhand-left.png b/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertengineer.rsi/on-inhand-left.png index 22a6c42d8f..0e13f885e0 100644 Binary files a/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertengineer.rsi/on-inhand-left.png and b/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertengineer.rsi/on-inhand-left.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertengineer.rsi/on-inhand-right.png b/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertengineer.rsi/on-inhand-right.png index a204bb0a78..a54afbca83 100644 Binary files a/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertengineer.rsi/on-inhand-right.png and b/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertengineer.rsi/on-inhand-right.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertjanitor.rsi/icon-flash.png b/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertjanitor.rsi/icon-flash.png index be3cd97eb7..f73f5a98fc 100644 Binary files a/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertjanitor.rsi/icon-flash.png and b/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertjanitor.rsi/icon-flash.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertjanitor.rsi/icon.png b/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertjanitor.rsi/icon.png index 2e6cd06a07..1cb0ad002f 100644 Binary files a/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertjanitor.rsi/icon.png and b/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertjanitor.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertjanitor.rsi/meta.json b/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertjanitor.rsi/meta.json index fe9f38cad4..2c29e1db67 100644 --- a/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertjanitor.rsi/meta.json +++ b/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertjanitor.rsi/meta.json @@ -36,14 +36,6 @@ { "name": "on-inhand-right", "directions": 4 - }, - { - "name": "off-equipped-HELMET-vulpkanin", - "directions": 4 - }, - { - "name": "on-equipped-HELMET-vulpkanin", - "directions": 4 } ] } diff --git a/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertjanitor.rsi/off-equipped-HELMET-vox.png b/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertjanitor.rsi/off-equipped-HELMET-vox.png new file mode 100644 index 0000000000..34d61a07ca Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertjanitor.rsi/off-equipped-HELMET-vox.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertjanitor.rsi/off-equipped-HELMET.png b/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertjanitor.rsi/off-equipped-HELMET.png index 6348ab2c96..80919be0e7 100644 Binary files a/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertjanitor.rsi/off-equipped-HELMET.png and b/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertjanitor.rsi/off-equipped-HELMET.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertjanitor.rsi/off-inhand-left.png b/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertjanitor.rsi/off-inhand-left.png index 8de0449073..77a50aab33 100644 Binary files a/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertjanitor.rsi/off-inhand-left.png and b/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertjanitor.rsi/off-inhand-left.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertjanitor.rsi/off-inhand-right.png b/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertjanitor.rsi/off-inhand-right.png index 7a96aed731..f9b1cf00c4 100644 Binary files a/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertjanitor.rsi/off-inhand-right.png and b/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertjanitor.rsi/off-inhand-right.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertjanitor.rsi/on-equipped-HELMET-vox.png b/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertjanitor.rsi/on-equipped-HELMET-vox.png new file mode 100644 index 0000000000..99955187a8 Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertjanitor.rsi/on-equipped-HELMET-vox.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertjanitor.rsi/on-equipped-HELMET.png b/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertjanitor.rsi/on-equipped-HELMET.png index 6ef7808069..d99b5b4cf6 100644 Binary files a/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertjanitor.rsi/on-equipped-HELMET.png and b/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertjanitor.rsi/on-equipped-HELMET.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertjanitor.rsi/on-inhand-left.png b/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertjanitor.rsi/on-inhand-left.png index 030472239b..c6cc14cf04 100644 Binary files a/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertjanitor.rsi/on-inhand-left.png and b/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertjanitor.rsi/on-inhand-left.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertjanitor.rsi/on-inhand-right.png b/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertjanitor.rsi/on-inhand-right.png index 270a9249db..c2653772c8 100644 Binary files a/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertjanitor.rsi/on-inhand-right.png and b/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertjanitor.rsi/on-inhand-right.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertleader.rsi/icon-flash.png b/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertleader.rsi/icon-flash.png index 8b5eec131c..b79b46ab70 100644 Binary files a/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertleader.rsi/icon-flash.png and b/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertleader.rsi/icon-flash.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertleader.rsi/icon.png b/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertleader.rsi/icon.png index c76d801bf7..49a78caa43 100644 Binary files a/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertleader.rsi/icon.png and b/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertleader.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertleader.rsi/meta.json b/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertleader.rsi/meta.json index fe9f38cad4..2c29e1db67 100644 --- a/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertleader.rsi/meta.json +++ b/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertleader.rsi/meta.json @@ -36,14 +36,6 @@ { "name": "on-inhand-right", "directions": 4 - }, - { - "name": "off-equipped-HELMET-vulpkanin", - "directions": 4 - }, - { - "name": "on-equipped-HELMET-vulpkanin", - "directions": 4 } ] } diff --git a/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertleader.rsi/off-equipped-HELMET-vox.png b/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertleader.rsi/off-equipped-HELMET-vox.png new file mode 100644 index 0000000000..f79fe95b57 Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertleader.rsi/off-equipped-HELMET-vox.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertleader.rsi/off-equipped-HELMET.png b/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertleader.rsi/off-equipped-HELMET.png index 8ec84341db..d534389208 100644 Binary files a/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertleader.rsi/off-equipped-HELMET.png and b/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertleader.rsi/off-equipped-HELMET.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertleader.rsi/off-inhand-left.png b/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertleader.rsi/off-inhand-left.png index b53973feec..2d28ec4821 100644 Binary files a/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertleader.rsi/off-inhand-left.png and b/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertleader.rsi/off-inhand-left.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertleader.rsi/off-inhand-right.png b/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertleader.rsi/off-inhand-right.png index 0f534f88b1..762fa0b146 100644 Binary files a/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertleader.rsi/off-inhand-right.png and b/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertleader.rsi/off-inhand-right.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertleader.rsi/on-equipped-HELMET-vox.png b/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertleader.rsi/on-equipped-HELMET-vox.png new file mode 100644 index 0000000000..f94eecb411 Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertleader.rsi/on-equipped-HELMET-vox.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertleader.rsi/on-equipped-HELMET.png b/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertleader.rsi/on-equipped-HELMET.png index 0c9bbec52b..5243cd4e1f 100644 Binary files a/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertleader.rsi/on-equipped-HELMET.png and b/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertleader.rsi/on-equipped-HELMET.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertleader.rsi/on-inhand-left.png b/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertleader.rsi/on-inhand-left.png index 819ca15f44..81079512e5 100644 Binary files a/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertleader.rsi/on-inhand-left.png and b/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertleader.rsi/on-inhand-left.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertleader.rsi/on-inhand-right.png b/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertleader.rsi/on-inhand-right.png index 848bfcfe88..be5d900cf3 100644 Binary files a/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertleader.rsi/on-inhand-right.png and b/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertleader.rsi/on-inhand-right.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertmedical.rsi/icon-flash.png b/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertmedical.rsi/icon-flash.png index 32fbcecddd..cd99e942df 100644 Binary files a/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertmedical.rsi/icon-flash.png and b/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertmedical.rsi/icon-flash.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertmedical.rsi/icon.png b/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertmedical.rsi/icon.png index e6d9f8d51a..e3e7b919f9 100644 Binary files a/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertmedical.rsi/icon.png and b/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertmedical.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertmedical.rsi/meta.json b/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertmedical.rsi/meta.json index fe9f38cad4..2c29e1db67 100644 --- a/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertmedical.rsi/meta.json +++ b/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertmedical.rsi/meta.json @@ -36,14 +36,6 @@ { "name": "on-inhand-right", "directions": 4 - }, - { - "name": "off-equipped-HELMET-vulpkanin", - "directions": 4 - }, - { - "name": "on-equipped-HELMET-vulpkanin", - "directions": 4 } ] } diff --git a/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertmedical.rsi/off-equipped-HELMET-vox.png b/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertmedical.rsi/off-equipped-HELMET-vox.png new file mode 100644 index 0000000000..17790bee54 Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertmedical.rsi/off-equipped-HELMET-vox.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertmedical.rsi/off-equipped-HELMET.png b/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertmedical.rsi/off-equipped-HELMET.png index d6982ce20f..25b4a0bc06 100644 Binary files a/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertmedical.rsi/off-equipped-HELMET.png and b/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertmedical.rsi/off-equipped-HELMET.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertmedical.rsi/off-inhand-left.png b/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertmedical.rsi/off-inhand-left.png index 7d3ce26157..26a2b33412 100644 Binary files a/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertmedical.rsi/off-inhand-left.png and b/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertmedical.rsi/off-inhand-left.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertmedical.rsi/off-inhand-right.png b/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertmedical.rsi/off-inhand-right.png index 67f7494249..b41b50142f 100644 Binary files a/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertmedical.rsi/off-inhand-right.png and b/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertmedical.rsi/off-inhand-right.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertmedical.rsi/on-equipped-HELMET-vox.png b/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertmedical.rsi/on-equipped-HELMET-vox.png new file mode 100644 index 0000000000..d25030e13a Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertmedical.rsi/on-equipped-HELMET-vox.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertmedical.rsi/on-equipped-HELMET.png b/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertmedical.rsi/on-equipped-HELMET.png index 8f01538a7a..1c060907d5 100644 Binary files a/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertmedical.rsi/on-equipped-HELMET.png and b/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertmedical.rsi/on-equipped-HELMET.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertmedical.rsi/on-inhand-left.png b/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertmedical.rsi/on-inhand-left.png index 4eaae604cd..33df74fcd3 100644 Binary files a/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertmedical.rsi/on-inhand-left.png and b/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertmedical.rsi/on-inhand-left.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertmedical.rsi/on-inhand-right.png b/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertmedical.rsi/on-inhand-right.png index f5f2f5c6f7..fd1b64277f 100644 Binary files a/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertmedical.rsi/on-inhand-right.png and b/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertmedical.rsi/on-inhand-right.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertsecurity.rsi/icon-flash.png b/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertsecurity.rsi/icon-flash.png index 8049a11c7c..01c63612c8 100644 Binary files a/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertsecurity.rsi/icon-flash.png and b/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertsecurity.rsi/icon-flash.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertsecurity.rsi/icon.png b/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertsecurity.rsi/icon.png index a3c39c5acc..7cdce2c2bf 100644 Binary files a/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertsecurity.rsi/icon.png and b/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertsecurity.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertsecurity.rsi/meta.json b/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertsecurity.rsi/meta.json index fe9f38cad4..2c29e1db67 100644 --- a/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertsecurity.rsi/meta.json +++ b/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertsecurity.rsi/meta.json @@ -36,14 +36,6 @@ { "name": "on-inhand-right", "directions": 4 - }, - { - "name": "off-equipped-HELMET-vulpkanin", - "directions": 4 - }, - { - "name": "on-equipped-HELMET-vulpkanin", - "directions": 4 } ] } diff --git a/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertsecurity.rsi/off-equipped-HELMET-vox.png b/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertsecurity.rsi/off-equipped-HELMET-vox.png new file mode 100644 index 0000000000..d300533c20 Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertsecurity.rsi/off-equipped-HELMET-vox.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertsecurity.rsi/off-equipped-HELMET.png b/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertsecurity.rsi/off-equipped-HELMET.png index b6479ec04e..91dc31d92b 100644 Binary files a/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertsecurity.rsi/off-equipped-HELMET.png and b/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertsecurity.rsi/off-equipped-HELMET.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertsecurity.rsi/off-inhand-left.png b/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertsecurity.rsi/off-inhand-left.png index c7b53126d4..db54087c52 100644 Binary files a/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertsecurity.rsi/off-inhand-left.png and b/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertsecurity.rsi/off-inhand-left.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertsecurity.rsi/off-inhand-right.png b/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertsecurity.rsi/off-inhand-right.png index b6be1feebb..8a90de99b7 100644 Binary files a/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertsecurity.rsi/off-inhand-right.png and b/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertsecurity.rsi/off-inhand-right.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertsecurity.rsi/on-equipped-HELMET-vox.png b/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertsecurity.rsi/on-equipped-HELMET-vox.png new file mode 100644 index 0000000000..a9b1843872 Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertsecurity.rsi/on-equipped-HELMET-vox.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertsecurity.rsi/on-equipped-HELMET.png b/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertsecurity.rsi/on-equipped-HELMET.png index b521190ff1..757c2a4ce1 100644 Binary files a/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertsecurity.rsi/on-equipped-HELMET.png and b/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertsecurity.rsi/on-equipped-HELMET.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertsecurity.rsi/on-inhand-left.png b/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertsecurity.rsi/on-inhand-left.png index 946a56c89a..04be4c7711 100644 Binary files a/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertsecurity.rsi/on-inhand-left.png and b/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertsecurity.rsi/on-inhand-left.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertsecurity.rsi/on-inhand-right.png b/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertsecurity.rsi/on-inhand-right.png index e490de88da..d920d60a77 100644 Binary files a/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertsecurity.rsi/on-inhand-right.png and b/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertsecurity.rsi/on-inhand-right.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/atmospherics.rsi/equipped-head-light-vox.png b/Resources/Textures/Clothing/Head/Hardsuits/atmospherics.rsi/equipped-head-light-vox.png new file mode 100644 index 0000000000..879ce40a74 Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hardsuits/atmospherics.rsi/equipped-head-light-vox.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/atmospherics.rsi/equipped-head-light.png b/Resources/Textures/Clothing/Head/Hardsuits/atmospherics.rsi/equipped-head-light.png index 9f75f28c05..058dc8a0e6 100644 Binary files a/Resources/Textures/Clothing/Head/Hardsuits/atmospherics.rsi/equipped-head-light.png and b/Resources/Textures/Clothing/Head/Hardsuits/atmospherics.rsi/equipped-head-light.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/atmospherics.rsi/equipped-head-unshaded-vox.png b/Resources/Textures/Clothing/Head/Hardsuits/atmospherics.rsi/equipped-head-unshaded-vox.png new file mode 100644 index 0000000000..40f2eca45a Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hardsuits/atmospherics.rsi/equipped-head-unshaded-vox.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/atmospherics.rsi/equipped-head-unshaded.png b/Resources/Textures/Clothing/Head/Hardsuits/atmospherics.rsi/equipped-head-unshaded.png index 4ba7fc7b74..c107e174a5 100644 Binary files a/Resources/Textures/Clothing/Head/Hardsuits/atmospherics.rsi/equipped-head-unshaded.png and b/Resources/Textures/Clothing/Head/Hardsuits/atmospherics.rsi/equipped-head-unshaded.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/atmospherics.rsi/equipped-head-vox.png b/Resources/Textures/Clothing/Head/Hardsuits/atmospherics.rsi/equipped-head-vox.png new file mode 100644 index 0000000000..f61a157050 Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hardsuits/atmospherics.rsi/equipped-head-vox.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/atmospherics.rsi/icon-unshaded.png b/Resources/Textures/Clothing/Head/Hardsuits/atmospherics.rsi/icon-unshaded.png index 4723be70cb..b249bec8dc 100644 Binary files a/Resources/Textures/Clothing/Head/Hardsuits/atmospherics.rsi/icon-unshaded.png and b/Resources/Textures/Clothing/Head/Hardsuits/atmospherics.rsi/icon-unshaded.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/atmospherics.rsi/inhand-left-light.png b/Resources/Textures/Clothing/Head/Hardsuits/atmospherics.rsi/inhand-left-light.png index 9ee768d5ee..b8ab172934 100644 Binary files a/Resources/Textures/Clothing/Head/Hardsuits/atmospherics.rsi/inhand-left-light.png and b/Resources/Textures/Clothing/Head/Hardsuits/atmospherics.rsi/inhand-left-light.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/atmospherics.rsi/inhand-left-unshaded.png b/Resources/Textures/Clothing/Head/Hardsuits/atmospherics.rsi/inhand-left-unshaded.png index 8a7835b20d..e315b2ba66 100644 Binary files a/Resources/Textures/Clothing/Head/Hardsuits/atmospherics.rsi/inhand-left-unshaded.png and b/Resources/Textures/Clothing/Head/Hardsuits/atmospherics.rsi/inhand-left-unshaded.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/atmospherics.rsi/inhand-left.png b/Resources/Textures/Clothing/Head/Hardsuits/atmospherics.rsi/inhand-left.png index e9ba55de1e..56dd973dc2 100644 Binary files a/Resources/Textures/Clothing/Head/Hardsuits/atmospherics.rsi/inhand-left.png and b/Resources/Textures/Clothing/Head/Hardsuits/atmospherics.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/atmospherics.rsi/inhand-right-light.png b/Resources/Textures/Clothing/Head/Hardsuits/atmospherics.rsi/inhand-right-light.png index 2990605237..4e69fec7f0 100644 Binary files a/Resources/Textures/Clothing/Head/Hardsuits/atmospherics.rsi/inhand-right-light.png and b/Resources/Textures/Clothing/Head/Hardsuits/atmospherics.rsi/inhand-right-light.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/atmospherics.rsi/inhand-right-unshaded.png b/Resources/Textures/Clothing/Head/Hardsuits/atmospherics.rsi/inhand-right-unshaded.png index 6c80725c0a..61d8843f40 100644 Binary files a/Resources/Textures/Clothing/Head/Hardsuits/atmospherics.rsi/inhand-right-unshaded.png and b/Resources/Textures/Clothing/Head/Hardsuits/atmospherics.rsi/inhand-right-unshaded.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/atmospherics.rsi/inhand-right.png b/Resources/Textures/Clothing/Head/Hardsuits/atmospherics.rsi/inhand-right.png index 45d73f73df..031abbeb5e 100644 Binary files a/Resources/Textures/Clothing/Head/Hardsuits/atmospherics.rsi/inhand-right.png and b/Resources/Textures/Clothing/Head/Hardsuits/atmospherics.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/atmospherics.rsi/meta.json b/Resources/Textures/Clothing/Head/Hardsuits/atmospherics.rsi/meta.json index 93d9fece1d..fe13676420 100644 --- a/Resources/Textures/Clothing/Head/Hardsuits/atmospherics.rsi/meta.json +++ b/Resources/Textures/Clothing/Head/Hardsuits/atmospherics.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e | vulpkanin version taken from Paradise station at https://github.com/ParadiseSS13/Paradise/commit/f0fa4e1fd809482fbc104a310aa34cebf7df157d", + "copyright": "Based on tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e, modified by EmoGarbage404 (github)", "size": { "x": 32, "y": 32 @@ -11,56 +11,76 @@ "name": "icon" }, { - "name": "icon-unshaded" + "name": "icon-flash" }, { - "name": "icon-flash" + "name": "icon-unshaded" }, { "name": "light-overlay" }, { - "name": "equipped-head", + "name": "on-inhand-left", + "directions": 4 + }, + { + "name": "off-inhand-left", + "directions": 4 + }, + { + "name": "on-inhand-right", + "directions": 4 + }, + { + "name": "off-inhand-right", + "directions": 4 + }, + { + "name": "off-equipped-HELMET", + "directions": 4 + }, + { + "name": "off-equipped-HELMET-reptilian", "directions": 4 }, { - "name": "equipped-head-light", + "name": "off-equipped-HELMET-shark", "directions": 4 }, { - "name": "equipped-head-unshaded", + "name": "off-equipped-HELMET-tajaran", "directions": 4 }, { - "name": "inhand-left", + "name": "off-equipped-HELMET-vulpkanin", "directions": 4 }, { - "name": "inhand-left-unshaded", + "name": "off-equipped-HELMET-harpy", "directions": 4 }, { - "name": "inhand-left-light", + "name": "on-equipped-HELMET", "directions": 4 }, { - "name": "inhand-right", + "name": "on-equipped-HELMET-reptilian", "directions": 4 }, { - "name": "inhand-right-unshaded", + "name": "on-equipped-HELMET-shark", "directions": 4 }, { - "name": "inhand-right-light", + "name": "on-equipped-HELMET-tajaran", "directions": 4 }, { - "name": "equipped-head-vulpkanin", + "name": "on-equipped-HELMET-vulpkanin", "directions": 4 }, { - "name": "equipped-head-harpy", + "name": "on-equipped-HELMET-harpy", "directions": 4 } ] diff --git a/Resources/Textures/Clothing/Head/Hardsuits/atmospherics.rsi/equipped-head-harpy.png b/Resources/Textures/Clothing/Head/Hardsuits/atmospherics.rsi/off-equipped-HELMET-harpy.png similarity index 100% rename from Resources/Textures/Clothing/Head/Hardsuits/atmospherics.rsi/equipped-head-harpy.png rename to Resources/Textures/Clothing/Head/Hardsuits/atmospherics.rsi/off-equipped-HELMET-harpy.png diff --git a/Resources/Textures/Clothing/Head/Hardsuits/atmospherics.rsi/off-equipped-HELMET-reptilian.png b/Resources/Textures/Clothing/Head/Hardsuits/atmospherics.rsi/off-equipped-HELMET-reptilian.png new file mode 100644 index 0000000000..a72d4b31ab Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hardsuits/atmospherics.rsi/off-equipped-HELMET-reptilian.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/atmospherics.rsi/off-equipped-HELMET-shark.png b/Resources/Textures/Clothing/Head/Hardsuits/atmospherics.rsi/off-equipped-HELMET-shark.png new file mode 100644 index 0000000000..a72d4b31ab Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hardsuits/atmospherics.rsi/off-equipped-HELMET-shark.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/atmospherics.rsi/off-equipped-HELMET-tajaran.png b/Resources/Textures/Clothing/Head/Hardsuits/atmospherics.rsi/off-equipped-HELMET-tajaran.png new file mode 100644 index 0000000000..0b2a33e8f7 Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hardsuits/atmospherics.rsi/off-equipped-HELMET-tajaran.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/atmospherics.rsi/off-equipped-HELMET-vulpkanin.png b/Resources/Textures/Clothing/Head/Hardsuits/atmospherics.rsi/off-equipped-HELMET-vulpkanin.png new file mode 100644 index 0000000000..0b2a33e8f7 Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hardsuits/atmospherics.rsi/off-equipped-HELMET-vulpkanin.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/atmospherics.rsi/off-equipped-HELMET.png b/Resources/Textures/Clothing/Head/Hardsuits/atmospherics.rsi/off-equipped-HELMET.png new file mode 100644 index 0000000000..f0a064cde4 Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hardsuits/atmospherics.rsi/off-equipped-HELMET.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/atmospherics.rsi/off-inhand-left.png b/Resources/Textures/Clothing/Head/Hardsuits/atmospherics.rsi/off-inhand-left.png new file mode 100644 index 0000000000..e9ba55de1e Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hardsuits/atmospherics.rsi/off-inhand-left.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/atmospherics.rsi/off-inhand-right.png b/Resources/Textures/Clothing/Head/Hardsuits/atmospherics.rsi/off-inhand-right.png new file mode 100644 index 0000000000..45d73f73df Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hardsuits/atmospherics.rsi/off-inhand-right.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/atmospherics.rsi/on-equipped-HELMET-harpy.png b/Resources/Textures/Clothing/Head/Hardsuits/atmospherics.rsi/on-equipped-HELMET-harpy.png new file mode 100644 index 0000000000..8be453ab87 Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hardsuits/atmospherics.rsi/on-equipped-HELMET-harpy.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/atmospherics.rsi/on-equipped-HELMET-reptilian.png b/Resources/Textures/Clothing/Head/Hardsuits/atmospherics.rsi/on-equipped-HELMET-reptilian.png new file mode 100644 index 0000000000..0d1b5048ef Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hardsuits/atmospherics.rsi/on-equipped-HELMET-reptilian.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/atmospherics.rsi/on-equipped-HELMET-shark.png b/Resources/Textures/Clothing/Head/Hardsuits/atmospherics.rsi/on-equipped-HELMET-shark.png new file mode 100644 index 0000000000..0d1b5048ef Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hardsuits/atmospherics.rsi/on-equipped-HELMET-shark.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/atmospherics.rsi/on-equipped-HELMET-tajaran.png b/Resources/Textures/Clothing/Head/Hardsuits/atmospherics.rsi/on-equipped-HELMET-tajaran.png new file mode 100644 index 0000000000..2dadd61426 Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hardsuits/atmospherics.rsi/on-equipped-HELMET-tajaran.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/atmospherics.rsi/on-equipped-HELMET-vulpkanin.png b/Resources/Textures/Clothing/Head/Hardsuits/atmospherics.rsi/on-equipped-HELMET-vulpkanin.png new file mode 100644 index 0000000000..2dadd61426 Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hardsuits/atmospherics.rsi/on-equipped-HELMET-vulpkanin.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/atmospherics.rsi/on-equipped-HELMET.png b/Resources/Textures/Clothing/Head/Hardsuits/atmospherics.rsi/on-equipped-HELMET.png new file mode 100644 index 0000000000..4618c2327a Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hardsuits/atmospherics.rsi/on-equipped-HELMET.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/atmospherics.rsi/on-inhand-left.png b/Resources/Textures/Clothing/Head/Hardsuits/atmospherics.rsi/on-inhand-left.png new file mode 100644 index 0000000000..e9ba55de1e Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hardsuits/atmospherics.rsi/on-inhand-left.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/atmospherics.rsi/on-inhand-right.png b/Resources/Textures/Clothing/Head/Hardsuits/atmospherics.rsi/on-inhand-right.png new file mode 100644 index 0000000000..45d73f73df Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hardsuits/atmospherics.rsi/on-inhand-right.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/basic.rsi/equipped-HELMET-reptilian.png b/Resources/Textures/Clothing/Head/Hardsuits/basic.rsi/equipped-HELMET-reptilian.png new file mode 100644 index 0000000000..1cb8c4b2ef Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hardsuits/basic.rsi/equipped-HELMET-reptilian.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/basic.rsi/equipped-HELMET-shark.png b/Resources/Textures/Clothing/Head/Hardsuits/basic.rsi/equipped-HELMET-shark.png new file mode 100644 index 0000000000..e69466ba5c Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hardsuits/basic.rsi/equipped-HELMET-shark.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/basic.rsi/equipped-HELMET-tajaran.png b/Resources/Textures/Clothing/Head/Hardsuits/basic.rsi/equipped-HELMET-tajaran.png new file mode 100644 index 0000000000..0d99a77d0a Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hardsuits/basic.rsi/equipped-HELMET-tajaran.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/basic.rsi/equipped-HELMET-vulpkanin.png b/Resources/Textures/Clothing/Head/Hardsuits/basic.rsi/equipped-HELMET-vulpkanin.png index a00e2ce75f..0d99a77d0a 100644 Binary files a/Resources/Textures/Clothing/Head/Hardsuits/basic.rsi/equipped-HELMET-vulpkanin.png and b/Resources/Textures/Clothing/Head/Hardsuits/basic.rsi/equipped-HELMET-vulpkanin.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/basic.rsi/equipped-HELMET.png b/Resources/Textures/Clothing/Head/Hardsuits/basic.rsi/equipped-HELMET.png index 53982cb335..ebcafdeb3a 100644 Binary files a/Resources/Textures/Clothing/Head/Hardsuits/basic.rsi/equipped-HELMET.png and b/Resources/Textures/Clothing/Head/Hardsuits/basic.rsi/equipped-HELMET.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/basic.rsi/icon.png b/Resources/Textures/Clothing/Head/Hardsuits/basic.rsi/icon.png index 5751b4bea2..414fb799ba 100644 Binary files a/Resources/Textures/Clothing/Head/Hardsuits/basic.rsi/icon.png and b/Resources/Textures/Clothing/Head/Hardsuits/basic.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/basic.rsi/meta.json b/Resources/Textures/Clothing/Head/Hardsuits/basic.rsi/meta.json index 8762076627..339a383d4c 100644 --- a/Resources/Textures/Clothing/Head/Hardsuits/basic.rsi/meta.json +++ b/Resources/Textures/Clothing/Head/Hardsuits/basic.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/40d89d11ea4a5cb81d61dc1018b46f4e7d32c62a | vulpkanin version taken from Paradise station at https://github.com/ParadiseSS13/Paradise/commit/f0fa4e1fd809482fbc104a310aa34cebf7df157d", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/40d89d11ea4a5cb81d61dc1018b46f4e7d32c62a", "size": { "x": 32, "y": 32 @@ -15,15 +15,27 @@ "directions": 4 }, { - "name": "inhand-left", + "name": "equipped-HELMET-vulpkanin", "directions": 4 }, { - "name": "inhand-right", + "name": "equipped-HELMET-tajaran", "directions": 4 }, { - "name": "equipped-HELMET-vulpkanin", + "name": "equipped-HELMET-shark", + "directions": 4 + }, + { + "name": "equipped-HELMET-reptilian", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", "directions": 4 } ] diff --git a/Resources/Textures/Clothing/Head/Hardsuits/brigmedic.rsi/meta.json b/Resources/Textures/Clothing/Head/Hardsuits/brigmedic.rsi/meta.json index e4a3096a67..c6851bed7f 100644 --- a/Resources/Textures/Clothing/Head/Hardsuits/brigmedic.rsi/meta.json +++ b/Resources/Textures/Clothing/Head/Hardsuits/brigmedic.rsi/meta.json @@ -17,6 +17,22 @@ "name": "off-equipped-HELMET", "directions": 4 }, + { + "name": "off-equipped-HELMET-vulpkanin", + "directions": 4 + }, + { + "name": "off-equipped-HELMET-tajaran", + "directions": 4 + }, + { + "name": "off-equipped-HELMET-shark", + "directions": 4 + }, + { + "name": "off-equipped-HELMET-reptilian", + "directions": 4 + }, { "name": "off-inhand-left", "directions": 4 @@ -29,6 +45,22 @@ "name": "on-equipped-HELMET", "directions": 4 }, + { + "name": "on-equipped-HELMET-vulpkanin", + "directions": 4 + }, + { + "name": "on-equipped-HELMET-tajaran", + "directions": 4 + }, + { + "name": "on-equipped-HELMET-shark", + "directions": 4 + }, + { + "name": "on-equipped-HELMET-reptilian", + "directions": 4 + }, { "name": "on-inhand-left", "directions": 4 diff --git a/Resources/Textures/Clothing/Head/Hardsuits/brigmedic.rsi/off-equipped-HELMET-reptilian.png b/Resources/Textures/Clothing/Head/Hardsuits/brigmedic.rsi/off-equipped-HELMET-reptilian.png new file mode 100644 index 0000000000..b257f4d288 Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hardsuits/brigmedic.rsi/off-equipped-HELMET-reptilian.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/brigmedic.rsi/off-equipped-HELMET-shark.png b/Resources/Textures/Clothing/Head/Hardsuits/brigmedic.rsi/off-equipped-HELMET-shark.png new file mode 100644 index 0000000000..b257f4d288 Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hardsuits/brigmedic.rsi/off-equipped-HELMET-shark.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/brigmedic.rsi/off-equipped-HELMET-tajaran.png b/Resources/Textures/Clothing/Head/Hardsuits/brigmedic.rsi/off-equipped-HELMET-tajaran.png new file mode 100644 index 0000000000..d1cc621955 Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hardsuits/brigmedic.rsi/off-equipped-HELMET-tajaran.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/brigmedic.rsi/off-equipped-HELMET-vulpkanin.png b/Resources/Textures/Clothing/Head/Hardsuits/brigmedic.rsi/off-equipped-HELMET-vulpkanin.png new file mode 100644 index 0000000000..d1cc621955 Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hardsuits/brigmedic.rsi/off-equipped-HELMET-vulpkanin.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/brigmedic.rsi/on-equipped-HELMET-reptilian.png b/Resources/Textures/Clothing/Head/Hardsuits/brigmedic.rsi/on-equipped-HELMET-reptilian.png new file mode 100644 index 0000000000..eaf8076e8c Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hardsuits/brigmedic.rsi/on-equipped-HELMET-reptilian.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/brigmedic.rsi/on-equipped-HELMET-shark.png b/Resources/Textures/Clothing/Head/Hardsuits/brigmedic.rsi/on-equipped-HELMET-shark.png new file mode 100644 index 0000000000..eaf8076e8c Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hardsuits/brigmedic.rsi/on-equipped-HELMET-shark.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/brigmedic.rsi/on-equipped-HELMET-tajaran.png b/Resources/Textures/Clothing/Head/Hardsuits/brigmedic.rsi/on-equipped-HELMET-tajaran.png new file mode 100644 index 0000000000..e434c4e764 Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hardsuits/brigmedic.rsi/on-equipped-HELMET-tajaran.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/brigmedic.rsi/on-equipped-HELMET-vulpkanin.png b/Resources/Textures/Clothing/Head/Hardsuits/brigmedic.rsi/on-equipped-HELMET-vulpkanin.png new file mode 100644 index 0000000000..e434c4e764 Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hardsuits/brigmedic.rsi/on-equipped-HELMET-vulpkanin.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/capspace.rsi/equipped-HELMET-reptilian.png b/Resources/Textures/Clothing/Head/Hardsuits/capspace.rsi/equipped-HELMET-reptilian.png new file mode 100644 index 0000000000..630f4902a1 Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hardsuits/capspace.rsi/equipped-HELMET-reptilian.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/capspace.rsi/equipped-HELMET-shark.png b/Resources/Textures/Clothing/Head/Hardsuits/capspace.rsi/equipped-HELMET-shark.png new file mode 100644 index 0000000000..630f4902a1 Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hardsuits/capspace.rsi/equipped-HELMET-shark.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/capspace.rsi/equipped-HELMET-tajaran.png b/Resources/Textures/Clothing/Head/Hardsuits/capspace.rsi/equipped-HELMET-tajaran.png new file mode 100644 index 0000000000..2164a6881b Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hardsuits/capspace.rsi/equipped-HELMET-tajaran.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/capspace.rsi/equipped-HELMET-vulpkanin.png b/Resources/Textures/Clothing/Head/Hardsuits/capspace.rsi/equipped-HELMET-vulpkanin.png new file mode 100644 index 0000000000..2164a6881b Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hardsuits/capspace.rsi/equipped-HELMET-vulpkanin.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/capspace.rsi/equipped-HELMET.png b/Resources/Textures/Clothing/Head/Hardsuits/capspace.rsi/equipped-HELMET.png new file mode 100644 index 0000000000..a8f16b478b Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hardsuits/capspace.rsi/equipped-HELMET.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/capspace.rsi/equipped-HELMET_XENO_LEEP.png b/Resources/Textures/Clothing/Head/Hardsuits/capspace.rsi/equipped-HELMET_XENO_LEEP.png new file mode 100644 index 0000000000..c6c429696a Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hardsuits/capspace.rsi/equipped-HELMET_XENO_LEEP.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/capspace.rsi/icon.png b/Resources/Textures/Clothing/Head/Hardsuits/capspace.rsi/icon.png index cee0d6f029..d9174fb915 100644 Binary files a/Resources/Textures/Clothing/Head/Hardsuits/capspace.rsi/icon.png and b/Resources/Textures/Clothing/Head/Hardsuits/capspace.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/capspace.rsi/inhand-left.png b/Resources/Textures/Clothing/Head/Hardsuits/capspace.rsi/inhand-left.png new file mode 100644 index 0000000000..7ea48a71d9 Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hardsuits/capspace.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/capspace.rsi/inhand-right.png b/Resources/Textures/Clothing/Head/Hardsuits/capspace.rsi/inhand-right.png new file mode 100644 index 0000000000..d969912c51 Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hardsuits/capspace.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/capspace.rsi/meta.json b/Resources/Textures/Clothing/Head/Hardsuits/capspace.rsi/meta.json index cc8edd3819..20037d2116 100644 --- a/Resources/Textures/Clothing/Head/Hardsuits/capspace.rsi/meta.json +++ b/Resources/Textures/Clothing/Head/Hardsuits/capspace.rsi/meta.json @@ -14,35 +14,31 @@ "name": "icon-flash" }, { - "name": "off-equipped-HELMET", + "name": "equipped-HELMET", "directions": 4 }, { - "name": "off-inhand-left", + "name": "equipped-HELMET-vulpkanin", "directions": 4 }, { - "name": "off-inhand-right", + "name": "equipped-HELMET-tajaran", "directions": 4 }, { - "name": "on-equipped-HELMET", + "name": "equipped-HELMET-shark", "directions": 4 }, { - "name": "on-inhand-left", + "name": "equipped-HELMET-reptilian", "directions": 4 }, { - "name": "on-inhand-right", + "name": "inhand-left", "directions": 4 }, { - "name": "off-equipped-HELMET-harpy", - "directions": 4 - }, - { - "name": "on-equipped-HELMET-harpy", + "name": "inhand-right", "directions": 4 } ] diff --git a/Resources/Textures/Clothing/Head/Hardsuits/capspace.rsi/off-equipped-HELMET-vox.png b/Resources/Textures/Clothing/Head/Hardsuits/capspace.rsi/off-equipped-HELMET-vox.png new file mode 100644 index 0000000000..f02e33c658 Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hardsuits/capspace.rsi/off-equipped-HELMET-vox.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/capspace.rsi/on-equipped-HELMET-vox.png b/Resources/Textures/Clothing/Head/Hardsuits/capspace.rsi/on-equipped-HELMET-vox.png new file mode 100644 index 0000000000..9a0101f09a Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hardsuits/capspace.rsi/on-equipped-HELMET-vox.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/cburn.rsi/equipped-head-reptilian.png b/Resources/Textures/Clothing/Head/Hardsuits/cburn.rsi/equipped-head-reptilian.png new file mode 100644 index 0000000000..494761713d Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hardsuits/cburn.rsi/equipped-head-reptilian.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/cburn.rsi/equipped-head-shark.png b/Resources/Textures/Clothing/Head/Hardsuits/cburn.rsi/equipped-head-shark.png new file mode 100644 index 0000000000..494761713d Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hardsuits/cburn.rsi/equipped-head-shark.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/cburn.rsi/equipped-head-tajaran.png b/Resources/Textures/Clothing/Head/Hardsuits/cburn.rsi/equipped-head-tajaran.png new file mode 100644 index 0000000000..d19bc13af7 Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hardsuits/cburn.rsi/equipped-head-tajaran.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/cburn.rsi/equipped-head-unshaded-reptilian.png b/Resources/Textures/Clothing/Head/Hardsuits/cburn.rsi/equipped-head-unshaded-reptilian.png new file mode 100644 index 0000000000..5792c023d3 Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hardsuits/cburn.rsi/equipped-head-unshaded-reptilian.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/cburn.rsi/equipped-head-unshaded-shark.png b/Resources/Textures/Clothing/Head/Hardsuits/cburn.rsi/equipped-head-unshaded-shark.png new file mode 100644 index 0000000000..5792c023d3 Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hardsuits/cburn.rsi/equipped-head-unshaded-shark.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/cburn.rsi/equipped-head-unshaded-tajaran.png b/Resources/Textures/Clothing/Head/Hardsuits/cburn.rsi/equipped-head-unshaded-tajaran.png new file mode 100644 index 0000000000..5792c023d3 Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hardsuits/cburn.rsi/equipped-head-unshaded-tajaran.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/cburn.rsi/equipped-head-unshaded-vox.png b/Resources/Textures/Clothing/Head/Hardsuits/cburn.rsi/equipped-head-unshaded-vox.png new file mode 100644 index 0000000000..40d1f9a0c6 Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hardsuits/cburn.rsi/equipped-head-unshaded-vox.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/cburn.rsi/equipped-head-unshaded-vulpkanin.png b/Resources/Textures/Clothing/Head/Hardsuits/cburn.rsi/equipped-head-unshaded-vulpkanin.png new file mode 100644 index 0000000000..5792c023d3 Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hardsuits/cburn.rsi/equipped-head-unshaded-vulpkanin.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/cburn.rsi/equipped-head-unshaded.png b/Resources/Textures/Clothing/Head/Hardsuits/cburn.rsi/equipped-head-unshaded.png index 7fd9a0b229..8341273a2c 100644 Binary files a/Resources/Textures/Clothing/Head/Hardsuits/cburn.rsi/equipped-head-unshaded.png and b/Resources/Textures/Clothing/Head/Hardsuits/cburn.rsi/equipped-head-unshaded.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/cburn.rsi/equipped-head-vox.png b/Resources/Textures/Clothing/Head/Hardsuits/cburn.rsi/equipped-head-vox.png new file mode 100644 index 0000000000..cc2fa16917 Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hardsuits/cburn.rsi/equipped-head-vox.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/cburn.rsi/equipped-head-vulpkanin.png b/Resources/Textures/Clothing/Head/Hardsuits/cburn.rsi/equipped-head-vulpkanin.png new file mode 100644 index 0000000000..d19bc13af7 Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hardsuits/cburn.rsi/equipped-head-vulpkanin.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/cburn.rsi/equipped-head.png b/Resources/Textures/Clothing/Head/Hardsuits/cburn.rsi/equipped-head.png index 98b9db4665..48160451fb 100644 Binary files a/Resources/Textures/Clothing/Head/Hardsuits/cburn.rsi/equipped-head.png and b/Resources/Textures/Clothing/Head/Hardsuits/cburn.rsi/equipped-head.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/cburn.rsi/icon-flash.png b/Resources/Textures/Clothing/Head/Hardsuits/cburn.rsi/icon-flash.png index d37c1afe3e..7be8b07a32 100644 Binary files a/Resources/Textures/Clothing/Head/Hardsuits/cburn.rsi/icon-flash.png and b/Resources/Textures/Clothing/Head/Hardsuits/cburn.rsi/icon-flash.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/cburn.rsi/icon-unshaded.png b/Resources/Textures/Clothing/Head/Hardsuits/cburn.rsi/icon-unshaded.png index 9da6cf4b4a..b399e29666 100644 Binary files a/Resources/Textures/Clothing/Head/Hardsuits/cburn.rsi/icon-unshaded.png and b/Resources/Textures/Clothing/Head/Hardsuits/cburn.rsi/icon-unshaded.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/cburn.rsi/icon.png b/Resources/Textures/Clothing/Head/Hardsuits/cburn.rsi/icon.png index adfb7557f7..d451beea47 100644 Binary files a/Resources/Textures/Clothing/Head/Hardsuits/cburn.rsi/icon.png and b/Resources/Textures/Clothing/Head/Hardsuits/cburn.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/cburn.rsi/inhand-left-unshaded.png b/Resources/Textures/Clothing/Head/Hardsuits/cburn.rsi/inhand-left-unshaded.png index 60ca0efa13..d22c22bd23 100644 Binary files a/Resources/Textures/Clothing/Head/Hardsuits/cburn.rsi/inhand-left-unshaded.png and b/Resources/Textures/Clothing/Head/Hardsuits/cburn.rsi/inhand-left-unshaded.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/cburn.rsi/inhand-left.png b/Resources/Textures/Clothing/Head/Hardsuits/cburn.rsi/inhand-left.png index 43f27a890f..82beabfb5e 100644 Binary files a/Resources/Textures/Clothing/Head/Hardsuits/cburn.rsi/inhand-left.png and b/Resources/Textures/Clothing/Head/Hardsuits/cburn.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/cburn.rsi/inhand-right-unshaded.png b/Resources/Textures/Clothing/Head/Hardsuits/cburn.rsi/inhand-right-unshaded.png index 118914c8d3..5d9bf288fb 100644 Binary files a/Resources/Textures/Clothing/Head/Hardsuits/cburn.rsi/inhand-right-unshaded.png and b/Resources/Textures/Clothing/Head/Hardsuits/cburn.rsi/inhand-right-unshaded.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/cburn.rsi/inhand-right.png b/Resources/Textures/Clothing/Head/Hardsuits/cburn.rsi/inhand-right.png index 602020b276..a47807518b 100644 Binary files a/Resources/Textures/Clothing/Head/Hardsuits/cburn.rsi/inhand-right.png and b/Resources/Textures/Clothing/Head/Hardsuits/cburn.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/cburn.rsi/light-overlay.png b/Resources/Textures/Clothing/Head/Hardsuits/cburn.rsi/light-overlay.png index ff7347fe6e..2787963454 100644 Binary files a/Resources/Textures/Clothing/Head/Hardsuits/cburn.rsi/light-overlay.png and b/Resources/Textures/Clothing/Head/Hardsuits/cburn.rsi/light-overlay.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/cburn.rsi/meta.json b/Resources/Textures/Clothing/Head/Hardsuits/cburn.rsi/meta.json index 16f509fa99..f750ffffc4 100644 --- a/Resources/Textures/Clothing/Head/Hardsuits/cburn.rsi/meta.json +++ b/Resources/Textures/Clothing/Head/Hardsuits/cburn.rsi/meta.json @@ -24,9 +24,41 @@ "directions": 4 }, { + "name": "equipped-head-vulpkanin", + "directions": 4 + }, + { + "name": "equipped-head-tajaran", + "directions": 4 + }, + { + "name": "equipped-head-shark", + "directions": 4 + }, + { + "name": "equipped-head-reptilian", + "directions": 4 + }, + { "name": "equipped-head-unshaded", "directions": 4 }, + { + "name": "equipped-head-unshaded-vulpkanin", + "directions": 4 + }, + { + "name": "equipped-head-unshaded-tajaran", + "directions": 4 + }, + { + "name": "equipped-head-unshaded-shark", + "directions": 4 + }, + { + "name": "equipped-head-unshaded-reptilian", + "directions": 4 + }, { "name": "inhand-left", "directions": 4 diff --git a/Resources/Textures/Clothing/Head/Hardsuits/clown.rsi/meta.json b/Resources/Textures/Clothing/Head/Hardsuits/clown.rsi/meta.json index 5a77b01e50..18630bb9fe 100644 --- a/Resources/Textures/Clothing/Head/Hardsuits/clown.rsi/meta.json +++ b/Resources/Textures/Clothing/Head/Hardsuits/clown.rsi/meta.json @@ -17,9 +17,41 @@ "name": "off-equipped-HELMET", "directions": 4 }, + { + "name": "off-equipped-HELMET-vulpkanin", + "directions": 4 + }, + { + "name": "off-equipped-HELMET-tajaran", + "directions": 4 + }, + { + "name": "off-equipped-HELMET-shark", + "directions": 4 + }, + { + "name": "off-equipped-HELMET-reptilian", + "directions": 4 + }, { "name": "on-equipped-HELMET", "directions": 4 + }, + { + "name": "on-equipped-HELMET-vulpkanin", + "directions": 4 + }, + { + "name": "on-equipped-HELMET-tajaran", + "directions": 4 + }, + { + "name": "on-equipped-HELMET-shark", + "directions": 4 + }, + { + "name": "on-equipped-HELMET-reptilian", + "directions": 4 } ] } diff --git a/Resources/Textures/Clothing/Head/Hardsuits/clown.rsi/off-equipped-HELMET-reptilian.png b/Resources/Textures/Clothing/Head/Hardsuits/clown.rsi/off-equipped-HELMET-reptilian.png new file mode 100644 index 0000000000..f9e260e93c Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hardsuits/clown.rsi/off-equipped-HELMET-reptilian.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/clown.rsi/off-equipped-HELMET-shark.png b/Resources/Textures/Clothing/Head/Hardsuits/clown.rsi/off-equipped-HELMET-shark.png new file mode 100644 index 0000000000..8d99c6e12c Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hardsuits/clown.rsi/off-equipped-HELMET-shark.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/clown.rsi/off-equipped-HELMET-tajaran.png b/Resources/Textures/Clothing/Head/Hardsuits/clown.rsi/off-equipped-HELMET-tajaran.png new file mode 100644 index 0000000000..3a9c6cde80 Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hardsuits/clown.rsi/off-equipped-HELMET-tajaran.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/clown.rsi/off-equipped-HELMET-vulpkanin.png b/Resources/Textures/Clothing/Head/Hardsuits/clown.rsi/off-equipped-HELMET-vulpkanin.png new file mode 100644 index 0000000000..3a9c6cde80 Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hardsuits/clown.rsi/off-equipped-HELMET-vulpkanin.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/clown.rsi/on-equipped-HELMET-reptilian.png b/Resources/Textures/Clothing/Head/Hardsuits/clown.rsi/on-equipped-HELMET-reptilian.png new file mode 100644 index 0000000000..da0b936a66 Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hardsuits/clown.rsi/on-equipped-HELMET-reptilian.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/clown.rsi/on-equipped-HELMET-shark.png b/Resources/Textures/Clothing/Head/Hardsuits/clown.rsi/on-equipped-HELMET-shark.png new file mode 100644 index 0000000000..b5edbbe413 Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hardsuits/clown.rsi/on-equipped-HELMET-shark.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/clown.rsi/on-equipped-HELMET-tajaran.png b/Resources/Textures/Clothing/Head/Hardsuits/clown.rsi/on-equipped-HELMET-tajaran.png new file mode 100644 index 0000000000..07942bd9da Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hardsuits/clown.rsi/on-equipped-HELMET-tajaran.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/clown.rsi/on-equipped-HELMET-vulpkanin.png b/Resources/Textures/Clothing/Head/Hardsuits/clown.rsi/on-equipped-HELMET-vulpkanin.png new file mode 100644 index 0000000000..07942bd9da Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hardsuits/clown.rsi/on-equipped-HELMET-vulpkanin.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/cybersun.rsi/equipped-HELMET-vox.png b/Resources/Textures/Clothing/Head/Hardsuits/cybersun.rsi/equipped-HELMET-vox.png new file mode 100644 index 0000000000..02363a7faa Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hardsuits/cybersun.rsi/equipped-HELMET-vox.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/cybersun.rsi/icon-flash.png b/Resources/Textures/Clothing/Head/Hardsuits/cybersun.rsi/icon-flash.png new file mode 100644 index 0000000000..3d11a7cf87 Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hardsuits/cybersun.rsi/icon-flash.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/cybersun.rsi/icon.png b/Resources/Textures/Clothing/Head/Hardsuits/cybersun.rsi/icon.png index 5cfffd9203..8070f6af3a 100644 Binary files a/Resources/Textures/Clothing/Head/Hardsuits/cybersun.rsi/icon.png and b/Resources/Textures/Clothing/Head/Hardsuits/cybersun.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/cybersun.rsi/meta.json b/Resources/Textures/Clothing/Head/Hardsuits/cybersun.rsi/meta.json index f6b8613891..4d70e07565 100644 --- a/Resources/Textures/Clothing/Head/Hardsuits/cybersun.rsi/meta.json +++ b/Resources/Textures/Clothing/Head/Hardsuits/cybersun.rsi/meta.json @@ -6,25 +6,60 @@ "x": 32, "y": 32 }, - "states": [ - { - "name": "icon" - }, - { - "name": "equipped-HELMET", - "directions": 4 - }, - { - "name": "inhand-left", - "directions": 4 - }, - { - "name": "inhand-right", - "directions": 4 - }, - { - "name": "equipped-HELMET-harpy", - "directions": 4 - } - ] -} + "states": [ + { + "name": "icon" + }, + { + "name": "icon-flash" + }, + { + "name": "off-equipped-HELMET", + "directions": 4 + }, + { + "name": "off-equipped-HELMET-vulpkanin", + "directions": 4 + }, + { + "name": "off-equipped-HELMET-tajaran", + "directions": 4 + }, + { + "name": "off-equipped-HELMET-shark", + "directions": 4 + }, + { + "name": "off-equipped-HELMET-reptilian", + "directions": 4 + }, + { + "name": "off-equipped-HELMET-harpy", + "directions": 4 + }, + { + "name": "on-equipped-HELMET", + "directions": 4 + }, + { + "name": "on-equipped-HELMET-vulpkanin", + "directions": 4 + }, + { + "name": "on-equipped-HELMET-tajaran", + "directions": 4 + }, + { + "name": "on-equipped-HELMET-shark", + "directions": 4 + }, + { + "name": "on-equipped-HELMET-reptilian", + "directions": 4 + }, + { + "name": "on-equipped-HELMET-harpy", + "directions": 4 + } + ] +} \ No newline at end of file diff --git a/Resources/Textures/Clothing/Head/Hardsuits/cybersun.rsi/equipped-HELMET-harpy.png b/Resources/Textures/Clothing/Head/Hardsuits/cybersun.rsi/off-equipped-HELMET-harpy.png similarity index 100% rename from Resources/Textures/Clothing/Head/Hardsuits/cybersun.rsi/equipped-HELMET-harpy.png rename to Resources/Textures/Clothing/Head/Hardsuits/cybersun.rsi/off-equipped-HELMET-harpy.png diff --git a/Resources/Textures/Clothing/Head/Hardsuits/cybersun.rsi/off-equipped-HELMET-reptilian.png b/Resources/Textures/Clothing/Head/Hardsuits/cybersun.rsi/off-equipped-HELMET-reptilian.png new file mode 100644 index 0000000000..c3defbcec9 Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hardsuits/cybersun.rsi/off-equipped-HELMET-reptilian.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/cybersun.rsi/off-equipped-HELMET-shark.png b/Resources/Textures/Clothing/Head/Hardsuits/cybersun.rsi/off-equipped-HELMET-shark.png new file mode 100644 index 0000000000..641c7921d2 Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hardsuits/cybersun.rsi/off-equipped-HELMET-shark.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/cybersun.rsi/off-equipped-HELMET-tajaran.png b/Resources/Textures/Clothing/Head/Hardsuits/cybersun.rsi/off-equipped-HELMET-tajaran.png new file mode 100644 index 0000000000..f79a1113af Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hardsuits/cybersun.rsi/off-equipped-HELMET-tajaran.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/cybersun.rsi/off-equipped-HELMET-vulpkanin.png b/Resources/Textures/Clothing/Head/Hardsuits/cybersun.rsi/off-equipped-HELMET-vulpkanin.png new file mode 100644 index 0000000000..56765d3023 Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hardsuits/cybersun.rsi/off-equipped-HELMET-vulpkanin.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/cybersun.rsi/off-equipped-HELMET.png b/Resources/Textures/Clothing/Head/Hardsuits/cybersun.rsi/off-equipped-HELMET.png new file mode 100644 index 0000000000..b6d4b82b04 Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hardsuits/cybersun.rsi/off-equipped-HELMET.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/cybersun.rsi/off-inhand-left.png b/Resources/Textures/Clothing/Head/Hardsuits/cybersun.rsi/off-inhand-left.png new file mode 100644 index 0000000000..f4bf83f773 Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hardsuits/cybersun.rsi/off-inhand-left.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/cybersun.rsi/off-inhand-right.png b/Resources/Textures/Clothing/Head/Hardsuits/cybersun.rsi/off-inhand-right.png new file mode 100644 index 0000000000..b28a23b1ba Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hardsuits/cybersun.rsi/off-inhand-right.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/cybersun.rsi/on-equipped-HELMET-harpy.png b/Resources/Textures/Clothing/Head/Hardsuits/cybersun.rsi/on-equipped-HELMET-harpy.png new file mode 100644 index 0000000000..95b5e1fd7f Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hardsuits/cybersun.rsi/on-equipped-HELMET-harpy.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/cybersun.rsi/on-equipped-HELMET-reptilian.png b/Resources/Textures/Clothing/Head/Hardsuits/cybersun.rsi/on-equipped-HELMET-reptilian.png new file mode 100644 index 0000000000..e2bee655e1 Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hardsuits/cybersun.rsi/on-equipped-HELMET-reptilian.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/cybersun.rsi/on-equipped-HELMET-shark.png b/Resources/Textures/Clothing/Head/Hardsuits/cybersun.rsi/on-equipped-HELMET-shark.png new file mode 100644 index 0000000000..37656076fa Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hardsuits/cybersun.rsi/on-equipped-HELMET-shark.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/cybersun.rsi/on-equipped-HELMET-tajaran.png b/Resources/Textures/Clothing/Head/Hardsuits/cybersun.rsi/on-equipped-HELMET-tajaran.png new file mode 100644 index 0000000000..bc52b7f985 Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hardsuits/cybersun.rsi/on-equipped-HELMET-tajaran.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/cybersun.rsi/on-equipped-HELMET-vulpkanin.png b/Resources/Textures/Clothing/Head/Hardsuits/cybersun.rsi/on-equipped-HELMET-vulpkanin.png new file mode 100644 index 0000000000..cd6f495657 Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hardsuits/cybersun.rsi/on-equipped-HELMET-vulpkanin.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/cybersun.rsi/on-equipped-HELMET.png b/Resources/Textures/Clothing/Head/Hardsuits/cybersun.rsi/on-equipped-HELMET.png new file mode 100644 index 0000000000..4535302995 Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hardsuits/cybersun.rsi/on-equipped-HELMET.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/cybersun.rsi/on-inhand-left.png b/Resources/Textures/Clothing/Head/Hardsuits/cybersun.rsi/on-inhand-left.png new file mode 100644 index 0000000000..8c580107d4 Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hardsuits/cybersun.rsi/on-inhand-left.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/cybersun.rsi/on-inhand-right.png b/Resources/Textures/Clothing/Head/Hardsuits/cybersun.rsi/on-inhand-right.png new file mode 100644 index 0000000000..cb61ff035a Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hardsuits/cybersun.rsi/on-inhand-right.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/deathsquad.rsi/equipped-HELMET-vox.png b/Resources/Textures/Clothing/Head/Hardsuits/deathsquad.rsi/equipped-HELMET-vox.png new file mode 100644 index 0000000000..1a7ed3b866 Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hardsuits/deathsquad.rsi/equipped-HELMET-vox.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/deathsquad.rsi/icon-flash.png b/Resources/Textures/Clothing/Head/Hardsuits/deathsquad.rsi/icon-flash.png new file mode 100644 index 0000000000..a483554a59 Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hardsuits/deathsquad.rsi/icon-flash.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/deathsquad.rsi/icon.png b/Resources/Textures/Clothing/Head/Hardsuits/deathsquad.rsi/icon.png index 1b712fe674..8c7b3235d6 100644 Binary files a/Resources/Textures/Clothing/Head/Hardsuits/deathsquad.rsi/icon.png and b/Resources/Textures/Clothing/Head/Hardsuits/deathsquad.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/deathsquad.rsi/meta.json b/Resources/Textures/Clothing/Head/Hardsuits/deathsquad.rsi/meta.json index 83e8e1a788..26240703e8 100644 --- a/Resources/Textures/Clothing/Head/Hardsuits/deathsquad.rsi/meta.json +++ b/Resources/Textures/Clothing/Head/Hardsuits/deathsquad.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e | vulpkanin versions taken from https://github.com/SPLURT-Station/S.P.L.U.R.T-Station-13/commit/091d9ec00f186052b87bd65125e896f78faefe38 and edited by Floofers", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e", "size": { "x": 32, "y": 32 @@ -11,19 +11,30 @@ "name": "icon" }, { - "name": "equipped-HELMET", + "name": "icon-flash" + }, + { + "name": "off-equipped-HELMET", + "directions": 4 + }, + { + "name": "on-equipped-HELMET", + "directions": 4 + }, + { + "name": "off-inhand-left", "directions": 4 }, { - "name": "inhand-left", + "name": "on-inhand-left", "directions": 4 }, { - "name": "inhand-right", + "name": "off-inhand-right", "directions": 4 }, { - "name": "equipped-HELMET-vulpkanin", + "name": "on-inhand-right", "directions": 4 } ] diff --git a/Resources/Textures/Clothing/Head/Hardsuits/deathsquad.rsi/off-equipped-HELMET.png b/Resources/Textures/Clothing/Head/Hardsuits/deathsquad.rsi/off-equipped-HELMET.png new file mode 100644 index 0000000000..1a95cb5fcd Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hardsuits/deathsquad.rsi/off-equipped-HELMET.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/deathsquad.rsi/off-inhand-left.png b/Resources/Textures/Clothing/Head/Hardsuits/deathsquad.rsi/off-inhand-left.png new file mode 100644 index 0000000000..c14f709fe9 Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hardsuits/deathsquad.rsi/off-inhand-left.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/deathsquad.rsi/off-inhand-right.png b/Resources/Textures/Clothing/Head/Hardsuits/deathsquad.rsi/off-inhand-right.png new file mode 100644 index 0000000000..fe136ce507 Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hardsuits/deathsquad.rsi/off-inhand-right.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/deathsquad.rsi/on-equipped-HELMET.png b/Resources/Textures/Clothing/Head/Hardsuits/deathsquad.rsi/on-equipped-HELMET.png new file mode 100644 index 0000000000..fe3ddb6276 Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hardsuits/deathsquad.rsi/on-equipped-HELMET.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/deathsquad.rsi/on-inhand-left.png b/Resources/Textures/Clothing/Head/Hardsuits/deathsquad.rsi/on-inhand-left.png new file mode 100644 index 0000000000..7dea651261 Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hardsuits/deathsquad.rsi/on-inhand-left.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/deathsquad.rsi/on-inhand-right.png b/Resources/Textures/Clothing/Head/Hardsuits/deathsquad.rsi/on-inhand-right.png new file mode 100644 index 0000000000..105dfe1d72 Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hardsuits/deathsquad.rsi/on-inhand-right.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/engineering-white.rsi/meta.json b/Resources/Textures/Clothing/Head/Hardsuits/engineering-white.rsi/meta.json index 1ac1729cd2..2b7273ddce 100644 --- a/Resources/Textures/Clothing/Head/Hardsuits/engineering-white.rsi/meta.json +++ b/Resources/Textures/Clothing/Head/Hardsuits/engineering-white.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e | vulpkanin versions taken from Paradise station at https://github.com/ParadiseSS13/Paradise/commit/f0fa4e1fd809482fbc104a310aa34cebf7df157d", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e", "size": { "x": 32, "y": 32 @@ -18,23 +18,35 @@ "directions": 4 }, { - "name": "off-inhand-left", + "name": "off-equipped-HELMET-vulpkanin", "directions": 4 }, { - "name": "off-inhand-right", + "name": "off-equipped-HELMET-tajaran", "directions": 4 }, { - "name": "on-equipped-HELMET", + "name": "off-equipped-HELMET-shark", + "directions": 4 + }, + { + "name": "off-equipped-HELMET-reptilian", + "directions": 4 + }, + { + "name": "off-equipped-HELMET-harpy", + "directions": 4 + }, + { + "name": "on-equipped-HELMET-vox", "directions": 4 }, { - "name": "on-inhand-left", + "name": "off-equipped-HELMET-vox", "directions": 4 }, { - "name": "on-inhand-right", + "name": "on-equipped-HELMET", "directions": 4 }, { @@ -42,15 +54,19 @@ "directions": 4 }, { - "name": "off-equipped-HELMET-vulpkanin", - "directions": 4 + "name": "on-equipped-HELMET-tajaran", + "directions": 4 }, - { - "name": "on-equipped-HELMET-harpy", + { + "name": "on-equipped-HELMET-shark", "directions": 4 }, { - "name": "off-equipped-HELMET-harpy", + "name": "on-equipped-HELMET-reptilian", + "directions": 4 + }, + { + "name": "on-equipped-HELMET-harpy", "directions": 4 } ] diff --git a/Resources/Textures/Clothing/Head/Hardsuits/engineering-white.rsi/off-equipped-HELMET-reptilian.png b/Resources/Textures/Clothing/Head/Hardsuits/engineering-white.rsi/off-equipped-HELMET-reptilian.png new file mode 100644 index 0000000000..fae85df1b1 Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hardsuits/engineering-white.rsi/off-equipped-HELMET-reptilian.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/engineering-white.rsi/off-equipped-HELMET-shark.png b/Resources/Textures/Clothing/Head/Hardsuits/engineering-white.rsi/off-equipped-HELMET-shark.png new file mode 100644 index 0000000000..74edf85151 Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hardsuits/engineering-white.rsi/off-equipped-HELMET-shark.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/engineering-white.rsi/off-equipped-HELMET-tajaran.png b/Resources/Textures/Clothing/Head/Hardsuits/engineering-white.rsi/off-equipped-HELMET-tajaran.png new file mode 100644 index 0000000000..aefc88e440 Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hardsuits/engineering-white.rsi/off-equipped-HELMET-tajaran.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/engineering-white.rsi/off-equipped-HELMET-vox.png b/Resources/Textures/Clothing/Head/Hardsuits/engineering-white.rsi/off-equipped-HELMET-vox.png new file mode 100644 index 0000000000..683d6ce97d Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hardsuits/engineering-white.rsi/off-equipped-HELMET-vox.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/engineering-white.rsi/off-equipped-HELMET-vulpkanin.png b/Resources/Textures/Clothing/Head/Hardsuits/engineering-white.rsi/off-equipped-HELMET-vulpkanin.png index f6da4a5615..3eea9c1c15 100644 Binary files a/Resources/Textures/Clothing/Head/Hardsuits/engineering-white.rsi/off-equipped-HELMET-vulpkanin.png and b/Resources/Textures/Clothing/Head/Hardsuits/engineering-white.rsi/off-equipped-HELMET-vulpkanin.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/engineering-white.rsi/on-equipped-HELMET-reptilian.png b/Resources/Textures/Clothing/Head/Hardsuits/engineering-white.rsi/on-equipped-HELMET-reptilian.png new file mode 100644 index 0000000000..96d7ae2235 Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hardsuits/engineering-white.rsi/on-equipped-HELMET-reptilian.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/engineering-white.rsi/on-equipped-HELMET-shark.png b/Resources/Textures/Clothing/Head/Hardsuits/engineering-white.rsi/on-equipped-HELMET-shark.png new file mode 100644 index 0000000000..96d7ae2235 Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hardsuits/engineering-white.rsi/on-equipped-HELMET-shark.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/engineering-white.rsi/on-equipped-HELMET-tajaran.png b/Resources/Textures/Clothing/Head/Hardsuits/engineering-white.rsi/on-equipped-HELMET-tajaran.png new file mode 100644 index 0000000000..6a14463134 Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hardsuits/engineering-white.rsi/on-equipped-HELMET-tajaran.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/engineering-white.rsi/on-equipped-HELMET-vox.png b/Resources/Textures/Clothing/Head/Hardsuits/engineering-white.rsi/on-equipped-HELMET-vox.png new file mode 100644 index 0000000000..574b3d985b Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hardsuits/engineering-white.rsi/on-equipped-HELMET-vox.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/engineering-white.rsi/on-equipped-HELMET-vulpkanin.png b/Resources/Textures/Clothing/Head/Hardsuits/engineering-white.rsi/on-equipped-HELMET-vulpkanin.png index ee912af170..983197a562 100644 Binary files a/Resources/Textures/Clothing/Head/Hardsuits/engineering-white.rsi/on-equipped-HELMET-vulpkanin.png and b/Resources/Textures/Clothing/Head/Hardsuits/engineering-white.rsi/on-equipped-HELMET-vulpkanin.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/engineering.rsi/meta.json b/Resources/Textures/Clothing/Head/Hardsuits/engineering.rsi/meta.json index 4dae2c687d..3a577f515e 100644 --- a/Resources/Textures/Clothing/Head/Hardsuits/engineering.rsi/meta.json +++ b/Resources/Textures/Clothing/Head/Hardsuits/engineering.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e | vulpkanin versions taken from Paradise station at https://github.com/ParadiseSS13/Paradise/commit/f0fa4e1fd809482fbc104a310aa34cebf7df157d", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e", "size": { "x": 32, "y": 32 @@ -18,23 +18,23 @@ "directions": 4 }, { - "name": "off-inhand-left", + "name": "off-equipped-HELMET-vulpkanin", "directions": 4 }, { - "name": "off-inhand-right", + "name": "off-equipped-HELMET-tajaran", "directions": 4 }, { - "name": "on-equipped-HELMET", + "name": "off-equipped-HELMET-shark", "directions": 4 }, { - "name": "on-inhand-left", + "name": "off-equipped-HELMET-reptilian", "directions": 4 }, { - "name": "on-inhand-right", + "name": "on-equipped-HELMET", "directions": 4 }, { @@ -42,7 +42,23 @@ "directions": 4 }, { - "name": "off-equipped-HELMET-vulpkanin", + "name": "on-equipped-HELMET-tajaran", + "directions": 4 + }, + { + "name": "on-equipped-HELMET-shark", + "directions": 4 + }, + { + "name": "on-equipped-HELMET-vox", + "directions": 4 + }, + { + "name": "off-equipped-HELMET-vox", + "directions": 4 + }, + { + "name": "on-equipped-HELMET-reptilian", "directions": 4 } ] diff --git a/Resources/Textures/Clothing/Head/Hardsuits/engineering.rsi/off-equipped-HELMET-reptilian.png b/Resources/Textures/Clothing/Head/Hardsuits/engineering.rsi/off-equipped-HELMET-reptilian.png new file mode 100644 index 0000000000..4830bd5a3d Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hardsuits/engineering.rsi/off-equipped-HELMET-reptilian.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/engineering.rsi/off-equipped-HELMET-shark.png b/Resources/Textures/Clothing/Head/Hardsuits/engineering.rsi/off-equipped-HELMET-shark.png new file mode 100644 index 0000000000..4830bd5a3d Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hardsuits/engineering.rsi/off-equipped-HELMET-shark.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/engineering.rsi/off-equipped-HELMET-tajaran.png b/Resources/Textures/Clothing/Head/Hardsuits/engineering.rsi/off-equipped-HELMET-tajaran.png new file mode 100644 index 0000000000..3d3a517dda Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hardsuits/engineering.rsi/off-equipped-HELMET-tajaran.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/engineering.rsi/off-equipped-HELMET-vox.png b/Resources/Textures/Clothing/Head/Hardsuits/engineering.rsi/off-equipped-HELMET-vox.png new file mode 100644 index 0000000000..900ed95dc0 Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hardsuits/engineering.rsi/off-equipped-HELMET-vox.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/engineering.rsi/off-equipped-HELMET-vulpkanin.png b/Resources/Textures/Clothing/Head/Hardsuits/engineering.rsi/off-equipped-HELMET-vulpkanin.png index 110bf0cdbd..116f16998d 100644 Binary files a/Resources/Textures/Clothing/Head/Hardsuits/engineering.rsi/off-equipped-HELMET-vulpkanin.png and b/Resources/Textures/Clothing/Head/Hardsuits/engineering.rsi/off-equipped-HELMET-vulpkanin.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/engineering.rsi/on-equipped-HELMET-reptilian.png b/Resources/Textures/Clothing/Head/Hardsuits/engineering.rsi/on-equipped-HELMET-reptilian.png new file mode 100644 index 0000000000..11eb94c03e Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hardsuits/engineering.rsi/on-equipped-HELMET-reptilian.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/engineering.rsi/on-equipped-HELMET-shark.png b/Resources/Textures/Clothing/Head/Hardsuits/engineering.rsi/on-equipped-HELMET-shark.png new file mode 100644 index 0000000000..11eb94c03e Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hardsuits/engineering.rsi/on-equipped-HELMET-shark.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/engineering.rsi/on-equipped-HELMET-tajaran.png b/Resources/Textures/Clothing/Head/Hardsuits/engineering.rsi/on-equipped-HELMET-tajaran.png new file mode 100644 index 0000000000..9b9fc06185 Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hardsuits/engineering.rsi/on-equipped-HELMET-tajaran.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/engineering.rsi/on-equipped-HELMET-vox.png b/Resources/Textures/Clothing/Head/Hardsuits/engineering.rsi/on-equipped-HELMET-vox.png new file mode 100644 index 0000000000..1a40bc3a26 Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hardsuits/engineering.rsi/on-equipped-HELMET-vox.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/engineering.rsi/on-equipped-HELMET-vulpkanin.png b/Resources/Textures/Clothing/Head/Hardsuits/engineering.rsi/on-equipped-HELMET-vulpkanin.png index dc92fca2f6..88bc83b8cb 100644 Binary files a/Resources/Textures/Clothing/Head/Hardsuits/engineering.rsi/on-equipped-HELMET-vulpkanin.png and b/Resources/Textures/Clothing/Head/Hardsuits/engineering.rsi/on-equipped-HELMET-vulpkanin.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/luxury.rsi/meta.json b/Resources/Textures/Clothing/Head/Hardsuits/luxury.rsi/meta.json index d431123de2..9549cb2d12 100644 --- a/Resources/Textures/Clothing/Head/Hardsuits/luxury.rsi/meta.json +++ b/Resources/Textures/Clothing/Head/Hardsuits/luxury.rsi/meta.json @@ -18,11 +18,27 @@ "directions": 4 }, { - "name": "off-inhand-left", + "name": "off-equipped-HELMET-vulpkanin", "directions": 4 }, { - "name": "off-inhand-right", + "name": "off-equipped-HELMET-tajaran", + "directions": 4 + }, + { + "name": "off-equipped-HELMET-shark", + "directions": 4 + }, + { + "name": "off-equipped-HELMET-reptilian", + "directions": 4 + }, + { + "name": "off-equipped-HELMET-vox", + "directions": 4 + }, + { + "name": "on-equipped-HELMET-vox", "directions": 4 }, { @@ -30,11 +46,19 @@ "directions": 4 }, { - "name": "on-inhand-left", + "name": "on-equipped-HELMET-vulpkanin", + "directions": 4 + }, + { + "name": "on-equipped-HELMET-tajaran", + "directions": 4 + }, + { + "name": "on-equipped-HELMET-shark", "directions": 4 }, { - "name": "on-inhand-right", + "name": "on-equipped-HELMET-reptilian", "directions": 4 } ] diff --git a/Resources/Textures/Clothing/Head/Hardsuits/luxury.rsi/off-equipped-HELMET-reptilian.png b/Resources/Textures/Clothing/Head/Hardsuits/luxury.rsi/off-equipped-HELMET-reptilian.png new file mode 100644 index 0000000000..2a4a98b970 Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hardsuits/luxury.rsi/off-equipped-HELMET-reptilian.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/luxury.rsi/off-equipped-HELMET-shark.png b/Resources/Textures/Clothing/Head/Hardsuits/luxury.rsi/off-equipped-HELMET-shark.png new file mode 100644 index 0000000000..2a4a98b970 Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hardsuits/luxury.rsi/off-equipped-HELMET-shark.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/luxury.rsi/off-equipped-HELMET-tajaran.png b/Resources/Textures/Clothing/Head/Hardsuits/luxury.rsi/off-equipped-HELMET-tajaran.png new file mode 100644 index 0000000000..a6e78a3d49 Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hardsuits/luxury.rsi/off-equipped-HELMET-tajaran.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/luxury.rsi/off-equipped-HELMET-vox.png b/Resources/Textures/Clothing/Head/Hardsuits/luxury.rsi/off-equipped-HELMET-vox.png new file mode 100644 index 0000000000..efacfba741 Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hardsuits/luxury.rsi/off-equipped-HELMET-vox.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/luxury.rsi/off-equipped-HELMET-vulpkanin.png b/Resources/Textures/Clothing/Head/Hardsuits/luxury.rsi/off-equipped-HELMET-vulpkanin.png new file mode 100644 index 0000000000..a6e78a3d49 Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hardsuits/luxury.rsi/off-equipped-HELMET-vulpkanin.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/luxury.rsi/off-equipped-HELMET.png b/Resources/Textures/Clothing/Head/Hardsuits/luxury.rsi/off-equipped-HELMET.png index 95ed264c5e..50a1caa0e3 100644 Binary files a/Resources/Textures/Clothing/Head/Hardsuits/luxury.rsi/off-equipped-HELMET.png and b/Resources/Textures/Clothing/Head/Hardsuits/luxury.rsi/off-equipped-HELMET.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/luxury.rsi/on-equipped-HELMET-reptilian.png b/Resources/Textures/Clothing/Head/Hardsuits/luxury.rsi/on-equipped-HELMET-reptilian.png new file mode 100644 index 0000000000..8635897445 Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hardsuits/luxury.rsi/on-equipped-HELMET-reptilian.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/luxury.rsi/on-equipped-HELMET-shark.png b/Resources/Textures/Clothing/Head/Hardsuits/luxury.rsi/on-equipped-HELMET-shark.png new file mode 100644 index 0000000000..8635897445 Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hardsuits/luxury.rsi/on-equipped-HELMET-shark.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/luxury.rsi/on-equipped-HELMET-tajaran.png b/Resources/Textures/Clothing/Head/Hardsuits/luxury.rsi/on-equipped-HELMET-tajaran.png new file mode 100644 index 0000000000..2b084a1777 Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hardsuits/luxury.rsi/on-equipped-HELMET-tajaran.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/luxury.rsi/on-equipped-HELMET-vox.png b/Resources/Textures/Clothing/Head/Hardsuits/luxury.rsi/on-equipped-HELMET-vox.png new file mode 100644 index 0000000000..09d835e9b9 Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hardsuits/luxury.rsi/on-equipped-HELMET-vox.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/luxury.rsi/on-equipped-HELMET-vulpkanin.png b/Resources/Textures/Clothing/Head/Hardsuits/luxury.rsi/on-equipped-HELMET-vulpkanin.png new file mode 100644 index 0000000000..2b084a1777 Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hardsuits/luxury.rsi/on-equipped-HELMET-vulpkanin.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/luxury.rsi/on-equipped-HELMET.png b/Resources/Textures/Clothing/Head/Hardsuits/luxury.rsi/on-equipped-HELMET.png index 4377435a3b..a9087161d0 100644 Binary files a/Resources/Textures/Clothing/Head/Hardsuits/luxury.rsi/on-equipped-HELMET.png and b/Resources/Textures/Clothing/Head/Hardsuits/luxury.rsi/on-equipped-HELMET.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/maxim.rsi/equipped-HELMET-vox.png b/Resources/Textures/Clothing/Head/Hardsuits/maxim.rsi/equipped-HELMET-vox.png new file mode 100644 index 0000000000..11de602a6e Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hardsuits/maxim.rsi/equipped-HELMET-vox.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/maxim.rsi/meta.json b/Resources/Textures/Clothing/Head/Hardsuits/maxim.rsi/meta.json index 2d5aaae8c7..2a085063a4 100644 --- a/Resources/Textures/Clothing/Head/Hardsuits/maxim.rsi/meta.json +++ b/Resources/Textures/Clothing/Head/Hardsuits/maxim.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/6b3f58d7de4d4e374282819a7001eaa9bde1676d", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/6b3f58d7de4d4e374282819a7001eaa9bde1676d. Vox state by Flareguy for Space Station 14", "size": { "x": 32, "y": 32 @@ -15,11 +15,7 @@ "directions": 4 }, { - "name": "inhand-left", - "directions": 4 - }, - { - "name": "inhand-right", + "name": "equipped-HELMET-vox", "directions": 4 } ] diff --git a/Resources/Textures/Clothing/Head/Hardsuits/medical.rsi/meta.json b/Resources/Textures/Clothing/Head/Hardsuits/medical.rsi/meta.json index d168108fdf..f8fd689d11 100644 --- a/Resources/Textures/Clothing/Head/Hardsuits/medical.rsi/meta.json +++ b/Resources/Textures/Clothing/Head/Hardsuits/medical.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e | vulpkanin version taken from Paradise station at https://github.com/ParadiseSS13/Paradise/commit/f0fa4e1fd809482fbc104a310aa34cebf7df157d", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e", "size": { "x": 32, "y": 32 @@ -18,23 +18,31 @@ "directions": 4 }, { - "name": "off-inhand-left", + "name": "off-equipped-HELMET-vulpkanin", "directions": 4 }, { - "name": "off-inhand-right", + "name": "off-equipped-HELMET-tajaran", "directions": 4 }, { - "name": "on-equipped-HELMET", + "name": "off-equipped-HELMET-shark", + "directions": 4 + }, + { + "name": "off-equipped-HELMET-reptilian", + "directions": 4 + }, + { + "name": "on-equipped-HELMET-vox", "directions": 4 }, { - "name": "on-inhand-left", + "name": "off-equipped-HELMET-vox", "directions": 4 }, { - "name": "on-inhand-right", + "name": "on-equipped-HELMET", "directions": 4 }, { @@ -42,7 +50,15 @@ "directions": 4 }, { - "name": "off-equipped-HELMET-vulpkanin", + "name": "on-equipped-HELMET-tajaran", + "directions": 4 + }, + { + "name": "on-equipped-HELMET-shark", + "directions": 4 + }, + { + "name": "on-equipped-HELMET-reptilian", "directions": 4 } ] diff --git a/Resources/Textures/Clothing/Head/Hardsuits/medical.rsi/off-equipped-HELMET-reptilian.png b/Resources/Textures/Clothing/Head/Hardsuits/medical.rsi/off-equipped-HELMET-reptilian.png new file mode 100644 index 0000000000..c42e8091e2 Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hardsuits/medical.rsi/off-equipped-HELMET-reptilian.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/medical.rsi/off-equipped-HELMET-shark.png b/Resources/Textures/Clothing/Head/Hardsuits/medical.rsi/off-equipped-HELMET-shark.png new file mode 100644 index 0000000000..c42e8091e2 Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hardsuits/medical.rsi/off-equipped-HELMET-shark.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/medical.rsi/off-equipped-HELMET-tajaran.png b/Resources/Textures/Clothing/Head/Hardsuits/medical.rsi/off-equipped-HELMET-tajaran.png new file mode 100644 index 0000000000..4ece2e8c63 Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hardsuits/medical.rsi/off-equipped-HELMET-tajaran.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/medical.rsi/off-equipped-HELMET-vox.png b/Resources/Textures/Clothing/Head/Hardsuits/medical.rsi/off-equipped-HELMET-vox.png new file mode 100644 index 0000000000..1952c3152d Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hardsuits/medical.rsi/off-equipped-HELMET-vox.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/medical.rsi/off-equipped-HELMET-vulpkanin.png b/Resources/Textures/Clothing/Head/Hardsuits/medical.rsi/off-equipped-HELMET-vulpkanin.png index 471bdb6e3a..7ddeb921de 100644 Binary files a/Resources/Textures/Clothing/Head/Hardsuits/medical.rsi/off-equipped-HELMET-vulpkanin.png and b/Resources/Textures/Clothing/Head/Hardsuits/medical.rsi/off-equipped-HELMET-vulpkanin.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/medical.rsi/on-equipped-HELMET-reptilian.png b/Resources/Textures/Clothing/Head/Hardsuits/medical.rsi/on-equipped-HELMET-reptilian.png new file mode 100644 index 0000000000..7ed3e98e14 Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hardsuits/medical.rsi/on-equipped-HELMET-reptilian.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/medical.rsi/on-equipped-HELMET-shark.png b/Resources/Textures/Clothing/Head/Hardsuits/medical.rsi/on-equipped-HELMET-shark.png new file mode 100644 index 0000000000..51f8970a48 Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hardsuits/medical.rsi/on-equipped-HELMET-shark.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/medical.rsi/on-equipped-HELMET-tajaran.png b/Resources/Textures/Clothing/Head/Hardsuits/medical.rsi/on-equipped-HELMET-tajaran.png new file mode 100644 index 0000000000..2dbe42ee23 Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hardsuits/medical.rsi/on-equipped-HELMET-tajaran.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/medical.rsi/on-equipped-HELMET-vox.png b/Resources/Textures/Clothing/Head/Hardsuits/medical.rsi/on-equipped-HELMET-vox.png new file mode 100644 index 0000000000..3011afac41 Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hardsuits/medical.rsi/on-equipped-HELMET-vox.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/medical.rsi/on-equipped-HELMET-vulpkanin.png b/Resources/Textures/Clothing/Head/Hardsuits/medical.rsi/on-equipped-HELMET-vulpkanin.png index f7edf7fc2e..79625d1c40 100644 Binary files a/Resources/Textures/Clothing/Head/Hardsuits/medical.rsi/on-equipped-HELMET-vulpkanin.png and b/Resources/Textures/Clothing/Head/Hardsuits/medical.rsi/on-equipped-HELMET-vulpkanin.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/mime.rsi/icon-flash.png b/Resources/Textures/Clothing/Head/Hardsuits/mime.rsi/icon-flash.png index 2ecfd87ec4..1c6db73c31 100644 Binary files a/Resources/Textures/Clothing/Head/Hardsuits/mime.rsi/icon-flash.png and b/Resources/Textures/Clothing/Head/Hardsuits/mime.rsi/icon-flash.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/mime.rsi/icon.png b/Resources/Textures/Clothing/Head/Hardsuits/mime.rsi/icon.png index aefc368cb3..4c29938236 100644 Binary files a/Resources/Textures/Clothing/Head/Hardsuits/mime.rsi/icon.png and b/Resources/Textures/Clothing/Head/Hardsuits/mime.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/mime.rsi/meta.json b/Resources/Textures/Clothing/Head/Hardsuits/mime.rsi/meta.json index 4487b288b9..067e2ce8e2 100644 --- a/Resources/Textures/Clothing/Head/Hardsuits/mime.rsi/meta.json +++ b/Resources/Textures/Clothing/Head/Hardsuits/mime.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e, sprited by Fazansen(https://github.com/Fazansen)", + "copyright": "Sprited by Roudenn(https://github.com/Roudenn)", "size": { "x": 32, "y": 32 @@ -20,6 +20,14 @@ { "name": "on-equipped-HELMET", "directions": 4 + }, + { + "name": "off-equipped-HELMET-reptilian", + "directions": 4 + }, + { + "name": "on-equipped-HELMET-reptilian", + "directions": 4 } ] } diff --git a/Resources/Textures/Clothing/Head/Hardsuits/mime.rsi/off-equipped-HELMET-reptilian.png b/Resources/Textures/Clothing/Head/Hardsuits/mime.rsi/off-equipped-HELMET-reptilian.png new file mode 100644 index 0000000000..4f69d938dc Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hardsuits/mime.rsi/off-equipped-HELMET-reptilian.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/mime.rsi/off-equipped-HELMET.png b/Resources/Textures/Clothing/Head/Hardsuits/mime.rsi/off-equipped-HELMET.png index fa8f393622..dac7fc3458 100644 Binary files a/Resources/Textures/Clothing/Head/Hardsuits/mime.rsi/off-equipped-HELMET.png and b/Resources/Textures/Clothing/Head/Hardsuits/mime.rsi/off-equipped-HELMET.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/mime.rsi/on-equipped-HELMET-reptilian.png b/Resources/Textures/Clothing/Head/Hardsuits/mime.rsi/on-equipped-HELMET-reptilian.png new file mode 100644 index 0000000000..4f69d938dc Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hardsuits/mime.rsi/on-equipped-HELMET-reptilian.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/mime.rsi/on-equipped-HELMET.png b/Resources/Textures/Clothing/Head/Hardsuits/mime.rsi/on-equipped-HELMET.png index 531a5d5a9f..692feb6b31 100644 Binary files a/Resources/Textures/Clothing/Head/Hardsuits/mime.rsi/on-equipped-HELMET.png and b/Resources/Textures/Clothing/Head/Hardsuits/mime.rsi/on-equipped-HELMET.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/piratecaptainhelm.rsi/equipped-HELMET-vox.png b/Resources/Textures/Clothing/Head/Hardsuits/piratecaptainhelm.rsi/equipped-HELMET-vox.png new file mode 100644 index 0000000000..8d0cd093f3 Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hardsuits/piratecaptainhelm.rsi/equipped-HELMET-vox.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/piratecaptainhelm.rsi/equipped-HELMET.png b/Resources/Textures/Clothing/Head/Hardsuits/piratecaptainhelm.rsi/equipped-HELMET.png index 1e650afd17..777141aedb 100644 Binary files a/Resources/Textures/Clothing/Head/Hardsuits/piratecaptainhelm.rsi/equipped-HELMET.png and b/Resources/Textures/Clothing/Head/Hardsuits/piratecaptainhelm.rsi/equipped-HELMET.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/piratecaptainhelm.rsi/icon.png b/Resources/Textures/Clothing/Head/Hardsuits/piratecaptainhelm.rsi/icon.png index f56f852a1a..c9dd304643 100644 Binary files a/Resources/Textures/Clothing/Head/Hardsuits/piratecaptainhelm.rsi/icon.png and b/Resources/Textures/Clothing/Head/Hardsuits/piratecaptainhelm.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/piratecaptainhelm.rsi/meta.json b/Resources/Textures/Clothing/Head/Hardsuits/piratecaptainhelm.rsi/meta.json index 2244815b78..48f0cbb615 100644 --- a/Resources/Textures/Clothing/Head/Hardsuits/piratecaptainhelm.rsi/meta.json +++ b/Resources/Textures/Clothing/Head/Hardsuits/piratecaptainhelm.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Made by brainfood1183 (github) for ss14", + "copyright": "Made by brainfood1183 (github) for ss14. Vox states by Flareguy for Space Station 14", "size": { "x": 32, "y": 32 @@ -13,6 +13,10 @@ { "name": "equipped-HELMET", "directions": 4 + }, + { + "name": "equipped-HELMET-vox", + "directions": 4 } ] } diff --git a/Resources/Textures/Clothing/Head/Hardsuits/pirateeva.rsi/equipped-HELMET-vox.png b/Resources/Textures/Clothing/Head/Hardsuits/pirateeva.rsi/equipped-HELMET-vox.png new file mode 100644 index 0000000000..663733cfe8 Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hardsuits/pirateeva.rsi/equipped-HELMET-vox.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/pirateeva.rsi/meta.json b/Resources/Textures/Clothing/Head/Hardsuits/pirateeva.rsi/meta.json index 2244815b78..5bb20fd0fb 100644 --- a/Resources/Textures/Clothing/Head/Hardsuits/pirateeva.rsi/meta.json +++ b/Resources/Textures/Clothing/Head/Hardsuits/pirateeva.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Made by brainfood1183 (github) for ss14", + "copyright": "Made by brainfood1183 (github) for ss14. Vox state by Flareguy for Space Station 14", "size": { "x": 32, "y": 32 @@ -13,6 +13,10 @@ { "name": "equipped-HELMET", "directions": 4 + }, + { + "name": "equipped-HELMET-vox", + "directions": 4 } ] } diff --git a/Resources/Textures/Clothing/Head/Hardsuits/rd.rsi/icon-flash.png b/Resources/Textures/Clothing/Head/Hardsuits/rd.rsi/icon-flash.png index 31e787f822..4afcf9dbbb 100644 Binary files a/Resources/Textures/Clothing/Head/Hardsuits/rd.rsi/icon-flash.png and b/Resources/Textures/Clothing/Head/Hardsuits/rd.rsi/icon-flash.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/rd.rsi/icon.png b/Resources/Textures/Clothing/Head/Hardsuits/rd.rsi/icon.png index a134c90cca..7a52086f00 100644 Binary files a/Resources/Textures/Clothing/Head/Hardsuits/rd.rsi/icon.png and b/Resources/Textures/Clothing/Head/Hardsuits/rd.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/rd.rsi/meta.json b/Resources/Textures/Clothing/Head/Hardsuits/rd.rsi/meta.json index a2c357d43f..a3b2dd434d 100644 --- a/Resources/Textures/Clothing/Head/Hardsuits/rd.rsi/meta.json +++ b/Resources/Textures/Clothing/Head/Hardsuits/rd.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e | vulpkanin versions taken from Paradise station at https://github.com/ParadiseSS13/Paradise/commit/f0fa4e1fd809482fbc104a310aa34cebf7df157d", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e , edit by noctyrnal (github)", "size": { "x": 32, "y": 32 @@ -17,6 +17,22 @@ "name": "off-equipped-HELMET", "directions": 4 }, + { + "name": "off-equipped-HELMET-vulpkanin", + "directions": 4 + }, + { + "name": "off-equipped-HELMET-tajaran", + "directions": 4 + }, + { + "name": "off-equipped-HELMET-shark", + "directions": 4 + }, + { + "name": "off-equipped-HELMET-reptilian", + "directions": 4 + }, { "name": "off-inhand-left", "directions": 4 @@ -30,19 +46,27 @@ "directions": 4 }, { - "name": "on-inhand-left", + "name": "on-equipped-HELMET-vulpkanin", "directions": 4 }, { - "name": "on-inhand-right", + "name": "on-equipped-HELMET-tajaran", "directions": 4 }, { - "name": "on-equipped-HELMET-vulpkanin", + "name": "on-equipped-HELMET-shark", "directions": 4 }, { - "name": "off-equipped-HELMET-vulpkanin", + "name": "on-equipped-HELMET-reptilian", + "directions": 4 + }, + { + "name": "on-inhand-left", + "directions": 4 + }, + { + "name": "on-inhand-right", "directions": 4 } ] diff --git a/Resources/Textures/Clothing/Head/Hardsuits/rd.rsi/off-equipped-HELMET-reptilian.png b/Resources/Textures/Clothing/Head/Hardsuits/rd.rsi/off-equipped-HELMET-reptilian.png new file mode 100644 index 0000000000..da0e02b276 Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hardsuits/rd.rsi/off-equipped-HELMET-reptilian.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/rd.rsi/off-equipped-HELMET-shark.png b/Resources/Textures/Clothing/Head/Hardsuits/rd.rsi/off-equipped-HELMET-shark.png new file mode 100644 index 0000000000..da0e02b276 Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hardsuits/rd.rsi/off-equipped-HELMET-shark.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/rd.rsi/off-equipped-HELMET-tajaran.png b/Resources/Textures/Clothing/Head/Hardsuits/rd.rsi/off-equipped-HELMET-tajaran.png new file mode 100644 index 0000000000..0420942d1c Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hardsuits/rd.rsi/off-equipped-HELMET-tajaran.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/rd.rsi/off-equipped-HELMET-vox.png b/Resources/Textures/Clothing/Head/Hardsuits/rd.rsi/off-equipped-HELMET-vox.png new file mode 100644 index 0000000000..9f2f5c41df Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hardsuits/rd.rsi/off-equipped-HELMET-vox.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/rd.rsi/off-equipped-HELMET-vulpkanin.png b/Resources/Textures/Clothing/Head/Hardsuits/rd.rsi/off-equipped-HELMET-vulpkanin.png index f063e6e28e..0420942d1c 100644 Binary files a/Resources/Textures/Clothing/Head/Hardsuits/rd.rsi/off-equipped-HELMET-vulpkanin.png and b/Resources/Textures/Clothing/Head/Hardsuits/rd.rsi/off-equipped-HELMET-vulpkanin.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/rd.rsi/off-equipped-HELMET.png b/Resources/Textures/Clothing/Head/Hardsuits/rd.rsi/off-equipped-HELMET.png index f6e0018723..c57e59766a 100644 Binary files a/Resources/Textures/Clothing/Head/Hardsuits/rd.rsi/off-equipped-HELMET.png and b/Resources/Textures/Clothing/Head/Hardsuits/rd.rsi/off-equipped-HELMET.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/rd.rsi/off-inhand-left.png b/Resources/Textures/Clothing/Head/Hardsuits/rd.rsi/off-inhand-left.png index dc16b147b8..0944e41fcc 100644 Binary files a/Resources/Textures/Clothing/Head/Hardsuits/rd.rsi/off-inhand-left.png and b/Resources/Textures/Clothing/Head/Hardsuits/rd.rsi/off-inhand-left.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/rd.rsi/off-inhand-right.png b/Resources/Textures/Clothing/Head/Hardsuits/rd.rsi/off-inhand-right.png index e289c62a84..02e806e5fa 100644 Binary files a/Resources/Textures/Clothing/Head/Hardsuits/rd.rsi/off-inhand-right.png and b/Resources/Textures/Clothing/Head/Hardsuits/rd.rsi/off-inhand-right.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/rd.rsi/on-equipped-HELMET-reptilian.png b/Resources/Textures/Clothing/Head/Hardsuits/rd.rsi/on-equipped-HELMET-reptilian.png new file mode 100644 index 0000000000..11a06488f2 Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hardsuits/rd.rsi/on-equipped-HELMET-reptilian.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/rd.rsi/on-equipped-HELMET-shark.png b/Resources/Textures/Clothing/Head/Hardsuits/rd.rsi/on-equipped-HELMET-shark.png new file mode 100644 index 0000000000..11a06488f2 Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hardsuits/rd.rsi/on-equipped-HELMET-shark.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/rd.rsi/on-equipped-HELMET-tajaran.png b/Resources/Textures/Clothing/Head/Hardsuits/rd.rsi/on-equipped-HELMET-tajaran.png new file mode 100644 index 0000000000..a90903e29a Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hardsuits/rd.rsi/on-equipped-HELMET-tajaran.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/rd.rsi/on-equipped-HELMET-vox.png b/Resources/Textures/Clothing/Head/Hardsuits/rd.rsi/on-equipped-HELMET-vox.png new file mode 100644 index 0000000000..b577d32feb Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hardsuits/rd.rsi/on-equipped-HELMET-vox.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/rd.rsi/on-equipped-HELMET-vulpkanin.png b/Resources/Textures/Clothing/Head/Hardsuits/rd.rsi/on-equipped-HELMET-vulpkanin.png index debc649e10..a90903e29a 100644 Binary files a/Resources/Textures/Clothing/Head/Hardsuits/rd.rsi/on-equipped-HELMET-vulpkanin.png and b/Resources/Textures/Clothing/Head/Hardsuits/rd.rsi/on-equipped-HELMET-vulpkanin.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/rd.rsi/on-equipped-HELMET.png b/Resources/Textures/Clothing/Head/Hardsuits/rd.rsi/on-equipped-HELMET.png index 44ead9d1ae..9b7c54f5c3 100644 Binary files a/Resources/Textures/Clothing/Head/Hardsuits/rd.rsi/on-equipped-HELMET.png and b/Resources/Textures/Clothing/Head/Hardsuits/rd.rsi/on-equipped-HELMET.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/rd.rsi/on-inhand-left.png b/Resources/Textures/Clothing/Head/Hardsuits/rd.rsi/on-inhand-left.png index b107272dda..163605cc38 100644 Binary files a/Resources/Textures/Clothing/Head/Hardsuits/rd.rsi/on-inhand-left.png and b/Resources/Textures/Clothing/Head/Hardsuits/rd.rsi/on-inhand-left.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/rd.rsi/on-inhand-right.png b/Resources/Textures/Clothing/Head/Hardsuits/rd.rsi/on-inhand-right.png index 59a3181afb..582b73bb22 100644 Binary files a/Resources/Textures/Clothing/Head/Hardsuits/rd.rsi/on-inhand-right.png and b/Resources/Textures/Clothing/Head/Hardsuits/rd.rsi/on-inhand-right.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/salvage.rsi/meta.json b/Resources/Textures/Clothing/Head/Hardsuits/salvage.rsi/meta.json index d168108fdf..58c2cd39fa 100644 --- a/Resources/Textures/Clothing/Head/Hardsuits/salvage.rsi/meta.json +++ b/Resources/Textures/Clothing/Head/Hardsuits/salvage.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e | vulpkanin version taken from Paradise station at https://github.com/ParadiseSS13/Paradise/commit/f0fa4e1fd809482fbc104a310aa34cebf7df157d", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e", "size": { "x": 32, "y": 32 @@ -18,23 +18,31 @@ "directions": 4 }, { - "name": "off-inhand-left", + "name": "off-equipped-HELMET-vulpkanin", "directions": 4 }, { - "name": "off-inhand-right", + "name": "off-equipped-HELMET-tajaran", "directions": 4 }, { - "name": "on-equipped-HELMET", + "name": "off-equipped-HELMET-shark", + "directions": 4 + }, + { + "name": "off-equipped-HELMET-reptilian", + "directions": 4 + }, + { + "name": "off-equipped-HELMET-vox", "directions": 4 }, { - "name": "on-inhand-left", + "name": "on-equipped-HELMET-vox", "directions": 4 }, { - "name": "on-inhand-right", + "name": "on-equipped-HELMET", "directions": 4 }, { @@ -42,7 +50,15 @@ "directions": 4 }, { - "name": "off-equipped-HELMET-vulpkanin", + "name": "on-equipped-HELMET-tajaran", + "directions": 4 + }, + { + "name": "on-equipped-HELMET-shark", + "directions": 4 + }, + { + "name": "on-equipped-HELMET-reptilian", "directions": 4 } ] diff --git a/Resources/Textures/Clothing/Head/Hardsuits/salvage.rsi/off-equipped-HELMET-reptilian.png b/Resources/Textures/Clothing/Head/Hardsuits/salvage.rsi/off-equipped-HELMET-reptilian.png new file mode 100644 index 0000000000..2ae6c0f3ff Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hardsuits/salvage.rsi/off-equipped-HELMET-reptilian.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/salvage.rsi/off-equipped-HELMET-shark.png b/Resources/Textures/Clothing/Head/Hardsuits/salvage.rsi/off-equipped-HELMET-shark.png new file mode 100644 index 0000000000..2ae6c0f3ff Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hardsuits/salvage.rsi/off-equipped-HELMET-shark.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/salvage.rsi/off-equipped-HELMET-tajaran.png b/Resources/Textures/Clothing/Head/Hardsuits/salvage.rsi/off-equipped-HELMET-tajaran.png new file mode 100644 index 0000000000..9c8a34416a Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hardsuits/salvage.rsi/off-equipped-HELMET-tajaran.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/salvage.rsi/off-equipped-HELMET-vox.png b/Resources/Textures/Clothing/Head/Hardsuits/salvage.rsi/off-equipped-HELMET-vox.png new file mode 100644 index 0000000000..c3f24c8b34 Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hardsuits/salvage.rsi/off-equipped-HELMET-vox.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/salvage.rsi/off-equipped-HELMET-vulpkanin.png b/Resources/Textures/Clothing/Head/Hardsuits/salvage.rsi/off-equipped-HELMET-vulpkanin.png index 8a26351824..9c8a34416a 100644 Binary files a/Resources/Textures/Clothing/Head/Hardsuits/salvage.rsi/off-equipped-HELMET-vulpkanin.png and b/Resources/Textures/Clothing/Head/Hardsuits/salvage.rsi/off-equipped-HELMET-vulpkanin.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/salvage.rsi/off-equipped-HELMET.png b/Resources/Textures/Clothing/Head/Hardsuits/salvage.rsi/off-equipped-HELMET.png index 370d0a28cf..c17c89deea 100644 Binary files a/Resources/Textures/Clothing/Head/Hardsuits/salvage.rsi/off-equipped-HELMET.png and b/Resources/Textures/Clothing/Head/Hardsuits/salvage.rsi/off-equipped-HELMET.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/salvage.rsi/on-equipped-HELMET-reptilian.png b/Resources/Textures/Clothing/Head/Hardsuits/salvage.rsi/on-equipped-HELMET-reptilian.png new file mode 100644 index 0000000000..d944f5c476 Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hardsuits/salvage.rsi/on-equipped-HELMET-reptilian.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/salvage.rsi/on-equipped-HELMET-shark.png b/Resources/Textures/Clothing/Head/Hardsuits/salvage.rsi/on-equipped-HELMET-shark.png new file mode 100644 index 0000000000..d944f5c476 Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hardsuits/salvage.rsi/on-equipped-HELMET-shark.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/salvage.rsi/on-equipped-HELMET-tajaran.png b/Resources/Textures/Clothing/Head/Hardsuits/salvage.rsi/on-equipped-HELMET-tajaran.png new file mode 100644 index 0000000000..b7ccf6aec8 Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hardsuits/salvage.rsi/on-equipped-HELMET-tajaran.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/salvage.rsi/on-equipped-HELMET-vox.png b/Resources/Textures/Clothing/Head/Hardsuits/salvage.rsi/on-equipped-HELMET-vox.png new file mode 100644 index 0000000000..007852fc10 Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hardsuits/salvage.rsi/on-equipped-HELMET-vox.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/salvage.rsi/on-equipped-HELMET-vulpkanin.png b/Resources/Textures/Clothing/Head/Hardsuits/salvage.rsi/on-equipped-HELMET-vulpkanin.png index fd306c94c5..b7ccf6aec8 100644 Binary files a/Resources/Textures/Clothing/Head/Hardsuits/salvage.rsi/on-equipped-HELMET-vulpkanin.png and b/Resources/Textures/Clothing/Head/Hardsuits/salvage.rsi/on-equipped-HELMET-vulpkanin.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/santahelm.rsi/equipped-HELMET-vox.png b/Resources/Textures/Clothing/Head/Hardsuits/santahelm.rsi/equipped-HELMET-vox.png new file mode 100644 index 0000000000..025e702667 Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hardsuits/santahelm.rsi/equipped-HELMET-vox.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/santahelm.rsi/meta.json b/Resources/Textures/Clothing/Head/Hardsuits/santahelm.rsi/meta.json index c53de83901..afc9f219ac 100644 --- a/Resources/Textures/Clothing/Head/Hardsuits/santahelm.rsi/meta.json +++ b/Resources/Textures/Clothing/Head/Hardsuits/santahelm.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Edited by StanTheCarpenter. Originally taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e", + "copyright": "Edited by StanTheCarpenter. Originally taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e. Vox states by Flareguy for Space Station 14", "size": { "x": 32, "y": 32 @@ -15,11 +15,7 @@ "directions": 4 }, { - "name": "inhand-left", - "directions": 4 - }, - { - "name": "inhand-right", + "name": "equipped-HELMET-vox", "directions": 4 } ] diff --git a/Resources/Textures/Clothing/Head/Hardsuits/security-patrol.rsi/icon-flash.png b/Resources/Textures/Clothing/Head/Hardsuits/security-patrol.rsi/icon-flash.png new file mode 100644 index 0000000000..8dbb969c28 Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hardsuits/security-patrol.rsi/icon-flash.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/security-patrol.rsi/icon.png b/Resources/Textures/Clothing/Head/Hardsuits/security-patrol.rsi/icon.png new file mode 100644 index 0000000000..a550c75bb4 Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hardsuits/security-patrol.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/security-patrol.rsi/meta.json b/Resources/Textures/Clothing/Head/Hardsuits/security-patrol.rsi/meta.json new file mode 100644 index 0000000000..f43ab362dd --- /dev/null +++ b/Resources/Textures/Clothing/Head/Hardsuits/security-patrol.rsi/meta.json @@ -0,0 +1,49 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Made by DadNotTheBelt (https://github.com/No-Dad-Not-The-Belt) for SS14/Frontier Station 14.", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "icon-flash" + }, + { + "name": "off-equipped-HELMET", + "directions": 4 + }, + { + "name": "off-equipped-HELMET-vulpkanin", + "directions": 4 + }, + { + "name": "off-inhand-left", + "directions": 4 + }, + { + "name": "off-inhand-right", + "directions": 4 + }, + { + "name": "on-equipped-HELMET", + "directions": 4 + }, + { + "name": "on-equipped-HELMET-vulpkanin", + "directions": 4 + }, + { + "name": "on-inhand-left", + "directions": 4 + }, + { + "name": "on-inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/Clothing/Head/Hardsuits/security-patrol.rsi/off-equipped-HELMET-vulpkanin.png b/Resources/Textures/Clothing/Head/Hardsuits/security-patrol.rsi/off-equipped-HELMET-vulpkanin.png new file mode 100644 index 0000000000..86d26a13a6 Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hardsuits/security-patrol.rsi/off-equipped-HELMET-vulpkanin.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/security-patrol.rsi/off-equipped-HELMET.png b/Resources/Textures/Clothing/Head/Hardsuits/security-patrol.rsi/off-equipped-HELMET.png new file mode 100644 index 0000000000..721fd32464 Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hardsuits/security-patrol.rsi/off-equipped-HELMET.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/security-patrol.rsi/off-inhand-left.png b/Resources/Textures/Clothing/Head/Hardsuits/security-patrol.rsi/off-inhand-left.png new file mode 100644 index 0000000000..90299377c0 Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hardsuits/security-patrol.rsi/off-inhand-left.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/security-patrol.rsi/off-inhand-right.png b/Resources/Textures/Clothing/Head/Hardsuits/security-patrol.rsi/off-inhand-right.png new file mode 100644 index 0000000000..c606e45bda Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hardsuits/security-patrol.rsi/off-inhand-right.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/security-patrol.rsi/on-equipped-HELMET-vulpkanin.png b/Resources/Textures/Clothing/Head/Hardsuits/security-patrol.rsi/on-equipped-HELMET-vulpkanin.png new file mode 100644 index 0000000000..839da10f1b Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hardsuits/security-patrol.rsi/on-equipped-HELMET-vulpkanin.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/security-patrol.rsi/on-equipped-HELMET.png b/Resources/Textures/Clothing/Head/Hardsuits/security-patrol.rsi/on-equipped-HELMET.png new file mode 100644 index 0000000000..78d2a2f41d Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hardsuits/security-patrol.rsi/on-equipped-HELMET.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/security-patrol.rsi/on-inhand-left.png b/Resources/Textures/Clothing/Head/Hardsuits/security-patrol.rsi/on-inhand-left.png new file mode 100644 index 0000000000..c0b0feaa6e Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hardsuits/security-patrol.rsi/on-inhand-left.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/security-patrol.rsi/on-inhand-right.png b/Resources/Textures/Clothing/Head/Hardsuits/security-patrol.rsi/on-inhand-right.png new file mode 100644 index 0000000000..efd69347c9 Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hardsuits/security-patrol.rsi/on-inhand-right.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/security-red.rsi/meta.json b/Resources/Textures/Clothing/Head/Hardsuits/security-red.rsi/meta.json index 40c5c72b11..f8fd689d11 100644 --- a/Resources/Textures/Clothing/Head/Hardsuits/security-red.rsi/meta.json +++ b/Resources/Textures/Clothing/Head/Hardsuits/security-red.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e | vulpkanin versions taken from https://github.com/SPLURT-Station/S.P.L.U.R.T-Station-13/commit/091d9ec00f186052b87bd65125e896f78faefe38 and edited by Floofers", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e", "size": { "x": 32, "y": 32 @@ -18,23 +18,31 @@ "directions": 4 }, { - "name": "off-inhand-left", + "name": "off-equipped-HELMET-vulpkanin", "directions": 4 }, { - "name": "off-inhand-right", + "name": "off-equipped-HELMET-tajaran", "directions": 4 }, { - "name": "on-equipped-HELMET", + "name": "off-equipped-HELMET-shark", + "directions": 4 + }, + { + "name": "off-equipped-HELMET-reptilian", + "directions": 4 + }, + { + "name": "on-equipped-HELMET-vox", "directions": 4 }, { - "name": "on-inhand-left", + "name": "off-equipped-HELMET-vox", "directions": 4 }, { - "name": "on-inhand-right", + "name": "on-equipped-HELMET", "directions": 4 }, { @@ -42,7 +50,15 @@ "directions": 4 }, { - "name": "off-equipped-HELMET-vulpkanin", + "name": "on-equipped-HELMET-tajaran", + "directions": 4 + }, + { + "name": "on-equipped-HELMET-shark", + "directions": 4 + }, + { + "name": "on-equipped-HELMET-reptilian", "directions": 4 } ] diff --git a/Resources/Textures/Clothing/Head/Hardsuits/security-red.rsi/off-equipped-HELMET-reptilian.png b/Resources/Textures/Clothing/Head/Hardsuits/security-red.rsi/off-equipped-HELMET-reptilian.png new file mode 100644 index 0000000000..baf43744bf Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hardsuits/security-red.rsi/off-equipped-HELMET-reptilian.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/security-red.rsi/off-equipped-HELMET-shark.png b/Resources/Textures/Clothing/Head/Hardsuits/security-red.rsi/off-equipped-HELMET-shark.png new file mode 100644 index 0000000000..baf43744bf Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hardsuits/security-red.rsi/off-equipped-HELMET-shark.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/security-red.rsi/off-equipped-HELMET-tajaran.png b/Resources/Textures/Clothing/Head/Hardsuits/security-red.rsi/off-equipped-HELMET-tajaran.png new file mode 100644 index 0000000000..e0fc2fb7b4 Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hardsuits/security-red.rsi/off-equipped-HELMET-tajaran.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/security-red.rsi/off-equipped-HELMET-vox.png b/Resources/Textures/Clothing/Head/Hardsuits/security-red.rsi/off-equipped-HELMET-vox.png new file mode 100644 index 0000000000..6954a4e1a8 Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hardsuits/security-red.rsi/off-equipped-HELMET-vox.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/security-red.rsi/off-equipped-HELMET-vulpkanin.png b/Resources/Textures/Clothing/Head/Hardsuits/security-red.rsi/off-equipped-HELMET-vulpkanin.png index 9c2d9c505a..fda12f3bf8 100644 Binary files a/Resources/Textures/Clothing/Head/Hardsuits/security-red.rsi/off-equipped-HELMET-vulpkanin.png and b/Resources/Textures/Clothing/Head/Hardsuits/security-red.rsi/off-equipped-HELMET-vulpkanin.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/security-red.rsi/on-equipped-HELMET-reptilian.png b/Resources/Textures/Clothing/Head/Hardsuits/security-red.rsi/on-equipped-HELMET-reptilian.png new file mode 100644 index 0000000000..48db0e3df7 Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hardsuits/security-red.rsi/on-equipped-HELMET-reptilian.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/security-red.rsi/on-equipped-HELMET-shark.png b/Resources/Textures/Clothing/Head/Hardsuits/security-red.rsi/on-equipped-HELMET-shark.png new file mode 100644 index 0000000000..48db0e3df7 Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hardsuits/security-red.rsi/on-equipped-HELMET-shark.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/security-red.rsi/on-equipped-HELMET-tajaran.png b/Resources/Textures/Clothing/Head/Hardsuits/security-red.rsi/on-equipped-HELMET-tajaran.png new file mode 100644 index 0000000000..b715f1661e Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hardsuits/security-red.rsi/on-equipped-HELMET-tajaran.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/security-red.rsi/on-equipped-HELMET-vox.png b/Resources/Textures/Clothing/Head/Hardsuits/security-red.rsi/on-equipped-HELMET-vox.png new file mode 100644 index 0000000000..b48bb710d9 Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hardsuits/security-red.rsi/on-equipped-HELMET-vox.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/security-red.rsi/on-equipped-HELMET-vulpkanin.png b/Resources/Textures/Clothing/Head/Hardsuits/security-red.rsi/on-equipped-HELMET-vulpkanin.png index 5815f63369..a5489eafa4 100644 Binary files a/Resources/Textures/Clothing/Head/Hardsuits/security-red.rsi/on-equipped-HELMET-vulpkanin.png and b/Resources/Textures/Clothing/Head/Hardsuits/security-red.rsi/on-equipped-HELMET-vulpkanin.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/security-warden.rsi/meta.json b/Resources/Textures/Clothing/Head/Hardsuits/security-warden.rsi/meta.json index 14121523ca..180f95ec5b 100644 --- a/Resources/Textures/Clothing/Head/Hardsuits/security-warden.rsi/meta.json +++ b/Resources/Textures/Clothing/Head/Hardsuits/security-warden.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "sprite made by Gtheglorious based on the sprite made by Alekshhh for SS14 | vulpkanin versions made by Floofers", + "copyright": "sprite made by Gtheglorious based on the sprite made by Alekshhh for SS14", "size": { "x": 32, "y": 32 @@ -17,6 +17,22 @@ "name": "off-equipped-HELMET", "directions": 4 }, + { + "name": "off-equipped-HELMET-vulpkanin", + "directions": 4 + }, + { + "name": "off-equipped-HELMET-tajaran", + "directions": 4 + }, + { + "name": "off-equipped-HELMET-shark", + "directions": 4 + }, + { + "name": "off-equipped-HELMET-reptilian", + "directions": 4 + }, { "name": "on-equipped-HELMET", "directions": 4 @@ -26,7 +42,15 @@ "directions": 4 }, { - "name": "off-equipped-HELMET-vulpkanin", + "name": "on-equipped-HELMET-tajaran", + "directions": 4 + }, + { + "name": "on-equipped-HELMET-shark", + "directions": 4 + }, + { + "name": "on-equipped-HELMET-reptilian", "directions": 4 } ] diff --git a/Resources/Textures/Clothing/Head/Hardsuits/security-warden.rsi/off-equipped-HELMET-reptilian.png b/Resources/Textures/Clothing/Head/Hardsuits/security-warden.rsi/off-equipped-HELMET-reptilian.png new file mode 100644 index 0000000000..d8360769ac Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hardsuits/security-warden.rsi/off-equipped-HELMET-reptilian.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/security-warden.rsi/off-equipped-HELMET-shark.png b/Resources/Textures/Clothing/Head/Hardsuits/security-warden.rsi/off-equipped-HELMET-shark.png new file mode 100644 index 0000000000..a7cb08f29e Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hardsuits/security-warden.rsi/off-equipped-HELMET-shark.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/security-warden.rsi/off-equipped-HELMET-tajaran.png b/Resources/Textures/Clothing/Head/Hardsuits/security-warden.rsi/off-equipped-HELMET-tajaran.png new file mode 100644 index 0000000000..ea89c805ec Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hardsuits/security-warden.rsi/off-equipped-HELMET-tajaran.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/security-warden.rsi/off-equipped-HELMET-vox.png b/Resources/Textures/Clothing/Head/Hardsuits/security-warden.rsi/off-equipped-HELMET-vox.png new file mode 100644 index 0000000000..2a3619db8e Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hardsuits/security-warden.rsi/off-equipped-HELMET-vox.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/security-warden.rsi/off-equipped-HELMET-vulpkanin.png b/Resources/Textures/Clothing/Head/Hardsuits/security-warden.rsi/off-equipped-HELMET-vulpkanin.png index 2fa6eef37b..ec782e2eb7 100644 Binary files a/Resources/Textures/Clothing/Head/Hardsuits/security-warden.rsi/off-equipped-HELMET-vulpkanin.png and b/Resources/Textures/Clothing/Head/Hardsuits/security-warden.rsi/off-equipped-HELMET-vulpkanin.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/security-warden.rsi/on-equipped-HELMET-reptilian.png b/Resources/Textures/Clothing/Head/Hardsuits/security-warden.rsi/on-equipped-HELMET-reptilian.png new file mode 100644 index 0000000000..f36f67834d Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hardsuits/security-warden.rsi/on-equipped-HELMET-reptilian.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/security-warden.rsi/on-equipped-HELMET-shark.png b/Resources/Textures/Clothing/Head/Hardsuits/security-warden.rsi/on-equipped-HELMET-shark.png new file mode 100644 index 0000000000..4696d84b21 Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hardsuits/security-warden.rsi/on-equipped-HELMET-shark.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/security-warden.rsi/on-equipped-HELMET-tajaran.png b/Resources/Textures/Clothing/Head/Hardsuits/security-warden.rsi/on-equipped-HELMET-tajaran.png new file mode 100644 index 0000000000..8cd10238dc Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hardsuits/security-warden.rsi/on-equipped-HELMET-tajaran.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/security-warden.rsi/on-equipped-HELMET-vox.png b/Resources/Textures/Clothing/Head/Hardsuits/security-warden.rsi/on-equipped-HELMET-vox.png new file mode 100644 index 0000000000..5b9e2b19ad Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hardsuits/security-warden.rsi/on-equipped-HELMET-vox.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/security-warden.rsi/on-equipped-HELMET-vulpkanin.png b/Resources/Textures/Clothing/Head/Hardsuits/security-warden.rsi/on-equipped-HELMET-vulpkanin.png index b0b5d950fb..efb88f9534 100644 Binary files a/Resources/Textures/Clothing/Head/Hardsuits/security-warden.rsi/on-equipped-HELMET-vulpkanin.png and b/Resources/Textures/Clothing/Head/Hardsuits/security-warden.rsi/on-equipped-HELMET-vulpkanin.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/security.rsi/meta.json b/Resources/Textures/Clothing/Head/Hardsuits/security.rsi/meta.json index a2e10d4300..9b759fd249 100644 --- a/Resources/Textures/Clothing/Head/Hardsuits/security.rsi/meta.json +++ b/Resources/Textures/Clothing/Head/Hardsuits/security.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Sprite made by Gtheglorious based on the sprite taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e, | vulpkanin versions taken from https://github.com/SPLURT-Station/S.P.L.U.R.T-Station-13/commit/091d9ec00f186052b87bd65125e896f78faefe38 and edited by Floofers", + "copyright": "Sprite made by Gtheglorious based on the sprite taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e,", "size": { "x": 32, "y": 32 @@ -18,23 +18,23 @@ "directions": 4 }, { - "name": "off-inhand-left", + "name": "off-equipped-HELMET-vulpkanin", "directions": 4 }, { - "name": "off-inhand-right", + "name": "off-equipped-HELMET-tajaran", "directions": 4 }, { - "name": "on-equipped-HELMET", + "name": "off-equipped-HELMET-shark", "directions": 4 }, { - "name": "on-inhand-left", + "name": "off-equipped-HELMET-reptilian", "directions": 4 }, { - "name": "on-inhand-right", + "name": "on-equipped-HELMET", "directions": 4 }, { @@ -42,7 +42,23 @@ "directions": 4 }, { - "name": "off-equipped-HELMET-vulpkanin", + "name": "on-equipped-HELMET-tajaran", + "directions": 4 + }, + { + "name": "on-equipped-HELMET-shark", + "directions": 4 + }, + { + "name": "on-equipped-HELMET-reptilian", + "directions": 4 + }, + { + "name": "on-equipped-HELMET-vox", + "directions": 4 + }, + { + "name": "off-equipped-HELMET-vox", "directions": 4 } ] diff --git a/Resources/Textures/Clothing/Head/Hardsuits/security.rsi/off-equipped-HELMET-reptilian.png b/Resources/Textures/Clothing/Head/Hardsuits/security.rsi/off-equipped-HELMET-reptilian.png new file mode 100644 index 0000000000..18848ed0a6 Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hardsuits/security.rsi/off-equipped-HELMET-reptilian.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/security.rsi/off-equipped-HELMET-shark.png b/Resources/Textures/Clothing/Head/Hardsuits/security.rsi/off-equipped-HELMET-shark.png new file mode 100644 index 0000000000..18848ed0a6 Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hardsuits/security.rsi/off-equipped-HELMET-shark.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/security.rsi/off-equipped-HELMET-tajaran.png b/Resources/Textures/Clothing/Head/Hardsuits/security.rsi/off-equipped-HELMET-tajaran.png new file mode 100644 index 0000000000..a5b470a112 Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hardsuits/security.rsi/off-equipped-HELMET-tajaran.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/security.rsi/off-equipped-HELMET-vox.png b/Resources/Textures/Clothing/Head/Hardsuits/security.rsi/off-equipped-HELMET-vox.png new file mode 100644 index 0000000000..439b6c6ebc Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hardsuits/security.rsi/off-equipped-HELMET-vox.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/security.rsi/off-equipped-HELMET-vulpkanin.png b/Resources/Textures/Clothing/Head/Hardsuits/security.rsi/off-equipped-HELMET-vulpkanin.png index 4cda5d072d..0b97bdb4b7 100644 Binary files a/Resources/Textures/Clothing/Head/Hardsuits/security.rsi/off-equipped-HELMET-vulpkanin.png and b/Resources/Textures/Clothing/Head/Hardsuits/security.rsi/off-equipped-HELMET-vulpkanin.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/security.rsi/on-equipped-HELMET-reptilian.png b/Resources/Textures/Clothing/Head/Hardsuits/security.rsi/on-equipped-HELMET-reptilian.png new file mode 100644 index 0000000000..e75d38fa06 Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hardsuits/security.rsi/on-equipped-HELMET-reptilian.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/security.rsi/on-equipped-HELMET-shark.png b/Resources/Textures/Clothing/Head/Hardsuits/security.rsi/on-equipped-HELMET-shark.png new file mode 100644 index 0000000000..e75d38fa06 Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hardsuits/security.rsi/on-equipped-HELMET-shark.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/security.rsi/on-equipped-HELMET-tajaran.png b/Resources/Textures/Clothing/Head/Hardsuits/security.rsi/on-equipped-HELMET-tajaran.png new file mode 100644 index 0000000000..5f1eac9f36 Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hardsuits/security.rsi/on-equipped-HELMET-tajaran.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/security.rsi/on-equipped-HELMET-vox.png b/Resources/Textures/Clothing/Head/Hardsuits/security.rsi/on-equipped-HELMET-vox.png new file mode 100644 index 0000000000..56bca1c618 Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hardsuits/security.rsi/on-equipped-HELMET-vox.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/security.rsi/on-equipped-HELMET-vulpkanin.png b/Resources/Textures/Clothing/Head/Hardsuits/security.rsi/on-equipped-HELMET-vulpkanin.png index 9f6f205895..bd8ea00cc7 100644 Binary files a/Resources/Textures/Clothing/Head/Hardsuits/security.rsi/on-equipped-HELMET-vulpkanin.png and b/Resources/Textures/Clothing/Head/Hardsuits/security.rsi/on-equipped-HELMET-vulpkanin.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/spatiohelm.rsi/equipped-HELMET-light.png b/Resources/Textures/Clothing/Head/Hardsuits/spatiohelm.rsi/equipped-HELMET-light.png new file mode 100644 index 0000000000..fc79dd02ed Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hardsuits/spatiohelm.rsi/equipped-HELMET-light.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/spatiohelm.rsi/equipped-HELMET-reptilian.png b/Resources/Textures/Clothing/Head/Hardsuits/spatiohelm.rsi/equipped-HELMET-reptilian.png new file mode 100644 index 0000000000..388719a0b3 Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hardsuits/spatiohelm.rsi/equipped-HELMET-reptilian.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/spatiohelm.rsi/equipped-HELMET-shark.png b/Resources/Textures/Clothing/Head/Hardsuits/spatiohelm.rsi/equipped-HELMET-shark.png new file mode 100644 index 0000000000..4fd5488d33 Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hardsuits/spatiohelm.rsi/equipped-HELMET-shark.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/spatiohelm.rsi/equipped-HELMET-tajaran.png b/Resources/Textures/Clothing/Head/Hardsuits/spatiohelm.rsi/equipped-HELMET-tajaran.png new file mode 100644 index 0000000000..064bb88c32 Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hardsuits/spatiohelm.rsi/equipped-HELMET-tajaran.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/spatiohelm.rsi/equipped-HELMET-unshaded.png b/Resources/Textures/Clothing/Head/Hardsuits/spatiohelm.rsi/equipped-HELMET-unshaded.png new file mode 100644 index 0000000000..f5741b045f Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hardsuits/spatiohelm.rsi/equipped-HELMET-unshaded.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/spatiohelm.rsi/equipped-HELMET-vulpkanin.png b/Resources/Textures/Clothing/Head/Hardsuits/spatiohelm.rsi/equipped-HELMET-vulpkanin.png new file mode 100644 index 0000000000..c76fd2e2a9 Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hardsuits/spatiohelm.rsi/equipped-HELMET-vulpkanin.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/spatiohelm.rsi/equipped-HELMET.png b/Resources/Textures/Clothing/Head/Hardsuits/spatiohelm.rsi/equipped-HELMET.png new file mode 100644 index 0000000000..a75086dfb5 Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hardsuits/spatiohelm.rsi/equipped-HELMET.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/spatiohelm.rsi/equipped-head-light.png b/Resources/Textures/Clothing/Head/Hardsuits/spatiohelm.rsi/equipped-head-light.png index e9fb8a3e1f..8f20cb8114 100644 Binary files a/Resources/Textures/Clothing/Head/Hardsuits/spatiohelm.rsi/equipped-head-light.png and b/Resources/Textures/Clothing/Head/Hardsuits/spatiohelm.rsi/equipped-head-light.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/spatiohelm.rsi/equipped-head-unshaded.png b/Resources/Textures/Clothing/Head/Hardsuits/spatiohelm.rsi/equipped-head-unshaded.png index e8aaf06567..d29322a71c 100644 Binary files a/Resources/Textures/Clothing/Head/Hardsuits/spatiohelm.rsi/equipped-head-unshaded.png and b/Resources/Textures/Clothing/Head/Hardsuits/spatiohelm.rsi/equipped-head-unshaded.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/spatiohelm.rsi/meta.json b/Resources/Textures/Clothing/Head/Hardsuits/spatiohelm.rsi/meta.json index 35a6a87bfd..b9edbe65ef 100644 --- a/Resources/Textures/Clothing/Head/Hardsuits/spatiohelm.rsi/meta.json +++ b/Resources/Textures/Clothing/Head/Hardsuits/spatiohelm.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Original by Emisse, modified by EmoGarbage404 | vulpkanin version made by Floofers", + "copyright": "Original by Emisse, modified by EmoGarbage404", "size": { "x": 32, @@ -21,44 +21,72 @@ "name": "light-overlay" }, { - "name": "equipped-head", + "name": "equipped-HELMET", "directions": 4 }, { - "name": "equipped-head-light", + "name": "equipped-HELMET-vulpkanin", "directions": 4 }, { - "name": "equipped-head-unshaded", + "name": "equipped-HELMET-tajaran", "directions": 4 }, { - "name": "inhand-left", + "name": "equipped-HELMET-shark", "directions": 4 }, { - "name": "inhand-left-unshaded", + "name": "equipped-HELMET-reptilian", "directions": 4 }, { - "name": "inhand-left-light", + "name": "off-equipped-HELMET", "directions": 4 }, { - "name": "inhand-right", + "name": "off-equipped-HELMET-vulpkanin", "directions": 4 }, { - "name": "inhand-right-unshaded", + "name": "off-equipped-HELMET-tajaran", "directions": 4 }, { - "name": "inhand-right-light", + "name": "off-equipped-HELMET-shark", "directions": 4 }, { - "name": "equipped-head-vulpkanin", + "name": "off-equipped-HELMET-reptilian", + "directions": 4 + }, + { + "name": "on-equipped-HELMET", + "directions": 4 + }, + { + "name": "on-equipped-HELMET-vulpkanin", + "directions": 4 + }, + { + "name": "on-equipped-HELMET-tajaran", + "directions": 4 + }, + { + "name": "on-equipped-HELMET-shark", + "directions": 4 + }, + { + "name": "on-equipped-HELMET-reptilian", + "directions": 4 + }, + { + "name": "equipped-HELMET-light", + "directions": 4 + }, + { + "name": "equipped-HELMET-unshaded", "directions": 4 } ] -} \ No newline at end of file +} diff --git a/Resources/Textures/Clothing/Head/Hardsuits/spatiohelm.rsi/off-equipped-HELMET-reptilian.png b/Resources/Textures/Clothing/Head/Hardsuits/spatiohelm.rsi/off-equipped-HELMET-reptilian.png new file mode 100644 index 0000000000..388719a0b3 Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hardsuits/spatiohelm.rsi/off-equipped-HELMET-reptilian.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/spatiohelm.rsi/off-equipped-HELMET-shark.png b/Resources/Textures/Clothing/Head/Hardsuits/spatiohelm.rsi/off-equipped-HELMET-shark.png new file mode 100644 index 0000000000..4fd5488d33 Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hardsuits/spatiohelm.rsi/off-equipped-HELMET-shark.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/spatiohelm.rsi/off-equipped-HELMET-tajaran.png b/Resources/Textures/Clothing/Head/Hardsuits/spatiohelm.rsi/off-equipped-HELMET-tajaran.png new file mode 100644 index 0000000000..064bb88c32 Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hardsuits/spatiohelm.rsi/off-equipped-HELMET-tajaran.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/spatiohelm.rsi/off-equipped-HELMET-vulpkanin.png b/Resources/Textures/Clothing/Head/Hardsuits/spatiohelm.rsi/off-equipped-HELMET-vulpkanin.png new file mode 100644 index 0000000000..c76fd2e2a9 Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hardsuits/spatiohelm.rsi/off-equipped-HELMET-vulpkanin.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/spatiohelm.rsi/off-equipped-HELMET.png b/Resources/Textures/Clothing/Head/Hardsuits/spatiohelm.rsi/off-equipped-HELMET.png new file mode 100644 index 0000000000..a75086dfb5 Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hardsuits/spatiohelm.rsi/off-equipped-HELMET.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/spatiohelm.rsi/on-equipped-HELMET-reptilian.png b/Resources/Textures/Clothing/Head/Hardsuits/spatiohelm.rsi/on-equipped-HELMET-reptilian.png new file mode 100644 index 0000000000..73f5b08439 Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hardsuits/spatiohelm.rsi/on-equipped-HELMET-reptilian.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/spatiohelm.rsi/on-equipped-HELMET-shark.png b/Resources/Textures/Clothing/Head/Hardsuits/spatiohelm.rsi/on-equipped-HELMET-shark.png new file mode 100644 index 0000000000..1a8f930379 Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hardsuits/spatiohelm.rsi/on-equipped-HELMET-shark.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/spatiohelm.rsi/on-equipped-HELMET-tajaran.png b/Resources/Textures/Clothing/Head/Hardsuits/spatiohelm.rsi/on-equipped-HELMET-tajaran.png new file mode 100644 index 0000000000..19fc136403 Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hardsuits/spatiohelm.rsi/on-equipped-HELMET-tajaran.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/spatiohelm.rsi/on-equipped-HELMET-vulpkanin.png b/Resources/Textures/Clothing/Head/Hardsuits/spatiohelm.rsi/on-equipped-HELMET-vulpkanin.png new file mode 100644 index 0000000000..688fce3016 Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hardsuits/spatiohelm.rsi/on-equipped-HELMET-vulpkanin.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/spatiohelm.rsi/on-equipped-HELMET.png b/Resources/Textures/Clothing/Head/Hardsuits/spatiohelm.rsi/on-equipped-HELMET.png new file mode 100644 index 0000000000..403904c645 Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hardsuits/spatiohelm.rsi/on-equipped-HELMET.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/syndicate.rsi/icon-flash.png b/Resources/Textures/Clothing/Head/Hardsuits/syndicate.rsi/icon-flash.png index a2da102550..699a26c7bc 100644 Binary files a/Resources/Textures/Clothing/Head/Hardsuits/syndicate.rsi/icon-flash.png and b/Resources/Textures/Clothing/Head/Hardsuits/syndicate.rsi/icon-flash.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/syndicate.rsi/icon.png b/Resources/Textures/Clothing/Head/Hardsuits/syndicate.rsi/icon.png index 6a4a0e32a4..b97674fdfb 100644 Binary files a/Resources/Textures/Clothing/Head/Hardsuits/syndicate.rsi/icon.png and b/Resources/Textures/Clothing/Head/Hardsuits/syndicate.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/syndicate.rsi/meta.json b/Resources/Textures/Clothing/Head/Hardsuits/syndicate.rsi/meta.json index e9de1ae57b..58c2cd39fa 100644 --- a/Resources/Textures/Clothing/Head/Hardsuits/syndicate.rsi/meta.json +++ b/Resources/Textures/Clothing/Head/Hardsuits/syndicate.rsi/meta.json @@ -14,19 +14,31 @@ "name": "icon-flash" }, { - "name": "combat-equipped-HELMET", + "name": "off-equipped-HELMET", "directions": 4 }, { - "name": "off-equipped-HELMET", + "name": "off-equipped-HELMET-vulpkanin", + "directions": 4 + }, + { + "name": "off-equipped-HELMET-tajaran", "directions": 4 }, { - "name": "off-inhand-left", + "name": "off-equipped-HELMET-shark", "directions": 4 }, { - "name": "off-inhand-right", + "name": "off-equipped-HELMET-reptilian", + "directions": 4 + }, + { + "name": "off-equipped-HELMET-vox", + "directions": 4 + }, + { + "name": "on-equipped-HELMET-vox", "directions": 4 }, { @@ -34,11 +46,19 @@ "directions": 4 }, { - "name": "on-inhand-left", + "name": "on-equipped-HELMET-vulpkanin", + "directions": 4 + }, + { + "name": "on-equipped-HELMET-tajaran", + "directions": 4 + }, + { + "name": "on-equipped-HELMET-shark", "directions": 4 }, { - "name": "on-inhand-right", + "name": "on-equipped-HELMET-reptilian", "directions": 4 } ] diff --git a/Resources/Textures/Clothing/Head/Hardsuits/syndicate.rsi/off-equipped-HELMET-reptilian.png b/Resources/Textures/Clothing/Head/Hardsuits/syndicate.rsi/off-equipped-HELMET-reptilian.png new file mode 100644 index 0000000000..8b71b29df8 Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hardsuits/syndicate.rsi/off-equipped-HELMET-reptilian.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/syndicate.rsi/off-equipped-HELMET-shark.png b/Resources/Textures/Clothing/Head/Hardsuits/syndicate.rsi/off-equipped-HELMET-shark.png new file mode 100644 index 0000000000..a40c187129 Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hardsuits/syndicate.rsi/off-equipped-HELMET-shark.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/syndicate.rsi/off-equipped-HELMET-tajaran.png b/Resources/Textures/Clothing/Head/Hardsuits/syndicate.rsi/off-equipped-HELMET-tajaran.png new file mode 100644 index 0000000000..dcadf9aa2d Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hardsuits/syndicate.rsi/off-equipped-HELMET-tajaran.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/syndicate.rsi/off-equipped-HELMET-vox.png b/Resources/Textures/Clothing/Head/Hardsuits/syndicate.rsi/off-equipped-HELMET-vox.png new file mode 100644 index 0000000000..eb2027c5fa Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hardsuits/syndicate.rsi/off-equipped-HELMET-vox.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/syndicate.rsi/off-equipped-HELMET-vulpkanin.png b/Resources/Textures/Clothing/Head/Hardsuits/syndicate.rsi/off-equipped-HELMET-vulpkanin.png new file mode 100644 index 0000000000..27c44542e4 Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hardsuits/syndicate.rsi/off-equipped-HELMET-vulpkanin.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/syndicate.rsi/off-equipped-HELMET.png b/Resources/Textures/Clothing/Head/Hardsuits/syndicate.rsi/off-equipped-HELMET.png index e6aafcfcf0..32759d3244 100644 Binary files a/Resources/Textures/Clothing/Head/Hardsuits/syndicate.rsi/off-equipped-HELMET.png and b/Resources/Textures/Clothing/Head/Hardsuits/syndicate.rsi/off-equipped-HELMET.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/syndicate.rsi/on-equipped-HELMET-reptilian.png b/Resources/Textures/Clothing/Head/Hardsuits/syndicate.rsi/on-equipped-HELMET-reptilian.png new file mode 100644 index 0000000000..04841d78b7 Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hardsuits/syndicate.rsi/on-equipped-HELMET-reptilian.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/syndicate.rsi/on-equipped-HELMET-shark.png b/Resources/Textures/Clothing/Head/Hardsuits/syndicate.rsi/on-equipped-HELMET-shark.png new file mode 100644 index 0000000000..b6516641f2 Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hardsuits/syndicate.rsi/on-equipped-HELMET-shark.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/syndicate.rsi/on-equipped-HELMET-tajaran.png b/Resources/Textures/Clothing/Head/Hardsuits/syndicate.rsi/on-equipped-HELMET-tajaran.png new file mode 100644 index 0000000000..d09c8063cb Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hardsuits/syndicate.rsi/on-equipped-HELMET-tajaran.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/syndicate.rsi/on-equipped-HELMET-vox.png b/Resources/Textures/Clothing/Head/Hardsuits/syndicate.rsi/on-equipped-HELMET-vox.png new file mode 100644 index 0000000000..8804afa3d8 Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hardsuits/syndicate.rsi/on-equipped-HELMET-vox.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/syndicate.rsi/on-equipped-HELMET-vulpkanin.png b/Resources/Textures/Clothing/Head/Hardsuits/syndicate.rsi/on-equipped-HELMET-vulpkanin.png new file mode 100644 index 0000000000..21506df82c Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hardsuits/syndicate.rsi/on-equipped-HELMET-vulpkanin.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/syndicate.rsi/on-equipped-HELMET.png b/Resources/Textures/Clothing/Head/Hardsuits/syndicate.rsi/on-equipped-HELMET.png index 4fd853dd13..81adc533dd 100644 Binary files a/Resources/Textures/Clothing/Head/Hardsuits/syndicate.rsi/on-equipped-HELMET.png and b/Resources/Textures/Clothing/Head/Hardsuits/syndicate.rsi/on-equipped-HELMET.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/syndiecommander.rsi/icon-flash.png b/Resources/Textures/Clothing/Head/Hardsuits/syndiecommander.rsi/icon-flash.png index 8d5c3f58a5..2257c4a077 100644 Binary files a/Resources/Textures/Clothing/Head/Hardsuits/syndiecommander.rsi/icon-flash.png and b/Resources/Textures/Clothing/Head/Hardsuits/syndiecommander.rsi/icon-flash.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/syndiecommander.rsi/icon.png b/Resources/Textures/Clothing/Head/Hardsuits/syndiecommander.rsi/icon.png index 08b6d1d87c..972df70f3b 100644 Binary files a/Resources/Textures/Clothing/Head/Hardsuits/syndiecommander.rsi/icon.png and b/Resources/Textures/Clothing/Head/Hardsuits/syndiecommander.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/syndiecommander.rsi/meta.json b/Resources/Textures/Clothing/Head/Hardsuits/syndiecommander.rsi/meta.json index 038aabe605..43bce2b21e 100644 --- a/Resources/Textures/Clothing/Head/Hardsuits/syndiecommander.rsi/meta.json +++ b/Resources/Textures/Clothing/Head/Hardsuits/syndiecommander.rsi/meta.json @@ -18,6 +18,22 @@ "name": "off-equipped-HELMET", "directions": 4 }, + { + "name": "off-equipped-HELMET-vulpkanin", + "directions": 4 + }, + { + "name": "off-equipped-HELMET-tajaran", + "directions": 4 + }, + { + "name": "off-equipped-HELMET-shark", + "directions": 4 + }, + { + "name": "off-equipped-HELMET-reptilian", + "directions": 4 + }, { "name": "off-inhand-left", "directions": 4 @@ -30,6 +46,22 @@ "name": "on-equipped-HELMET", "directions": 4 }, + { + "name": "on-equipped-HELMET-vulpkanin", + "directions": 4 + }, + { + "name": "on-equipped-HELMET-tajaran", + "directions": 4 + }, + { + "name": "on-equipped-HELMET-shark", + "directions": 4 + }, + { + "name": "on-equipped-HELMET-reptilian", + "directions": 4 + }, { "name": "on-inhand-left", "directions": 4 @@ -39,4 +71,4 @@ "directions": 4 } ] -} \ No newline at end of file +} diff --git a/Resources/Textures/Clothing/Head/Hardsuits/syndiecommander.rsi/off-equipped-HELMET-reptilian.png b/Resources/Textures/Clothing/Head/Hardsuits/syndiecommander.rsi/off-equipped-HELMET-reptilian.png new file mode 100644 index 0000000000..af0905885f Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hardsuits/syndiecommander.rsi/off-equipped-HELMET-reptilian.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/syndiecommander.rsi/off-equipped-HELMET-shark.png b/Resources/Textures/Clothing/Head/Hardsuits/syndiecommander.rsi/off-equipped-HELMET-shark.png new file mode 100644 index 0000000000..818414df5d Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hardsuits/syndiecommander.rsi/off-equipped-HELMET-shark.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/syndiecommander.rsi/off-equipped-HELMET-tajaran.png b/Resources/Textures/Clothing/Head/Hardsuits/syndiecommander.rsi/off-equipped-HELMET-tajaran.png new file mode 100644 index 0000000000..5074d967cf Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hardsuits/syndiecommander.rsi/off-equipped-HELMET-tajaran.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/syndiecommander.rsi/off-equipped-HELMET-vox.png b/Resources/Textures/Clothing/Head/Hardsuits/syndiecommander.rsi/off-equipped-HELMET-vox.png new file mode 100644 index 0000000000..5276e3f681 Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hardsuits/syndiecommander.rsi/off-equipped-HELMET-vox.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/syndiecommander.rsi/off-equipped-HELMET-vulpkanin.png b/Resources/Textures/Clothing/Head/Hardsuits/syndiecommander.rsi/off-equipped-HELMET-vulpkanin.png new file mode 100644 index 0000000000..15d4e85b8d Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hardsuits/syndiecommander.rsi/off-equipped-HELMET-vulpkanin.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/syndiecommander.rsi/off-equipped-HELMET.png b/Resources/Textures/Clothing/Head/Hardsuits/syndiecommander.rsi/off-equipped-HELMET.png index 42926ed988..7b2870ea45 100644 Binary files a/Resources/Textures/Clothing/Head/Hardsuits/syndiecommander.rsi/off-equipped-HELMET.png and b/Resources/Textures/Clothing/Head/Hardsuits/syndiecommander.rsi/off-equipped-HELMET.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/syndiecommander.rsi/off-inhand-left.png b/Resources/Textures/Clothing/Head/Hardsuits/syndiecommander.rsi/off-inhand-left.png index 79a96cd711..ed24b26b91 100644 Binary files a/Resources/Textures/Clothing/Head/Hardsuits/syndiecommander.rsi/off-inhand-left.png and b/Resources/Textures/Clothing/Head/Hardsuits/syndiecommander.rsi/off-inhand-left.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/syndiecommander.rsi/off-inhand-right.png b/Resources/Textures/Clothing/Head/Hardsuits/syndiecommander.rsi/off-inhand-right.png index 0c7b0caddf..e92b71a40c 100644 Binary files a/Resources/Textures/Clothing/Head/Hardsuits/syndiecommander.rsi/off-inhand-right.png and b/Resources/Textures/Clothing/Head/Hardsuits/syndiecommander.rsi/off-inhand-right.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/syndiecommander.rsi/on-equipped-HELMET-reptilian.png b/Resources/Textures/Clothing/Head/Hardsuits/syndiecommander.rsi/on-equipped-HELMET-reptilian.png new file mode 100644 index 0000000000..9b637d78c6 Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hardsuits/syndiecommander.rsi/on-equipped-HELMET-reptilian.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/syndiecommander.rsi/on-equipped-HELMET-shark.png b/Resources/Textures/Clothing/Head/Hardsuits/syndiecommander.rsi/on-equipped-HELMET-shark.png new file mode 100644 index 0000000000..32cc6f8e94 Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hardsuits/syndiecommander.rsi/on-equipped-HELMET-shark.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/syndiecommander.rsi/on-equipped-HELMET-tajaran.png b/Resources/Textures/Clothing/Head/Hardsuits/syndiecommander.rsi/on-equipped-HELMET-tajaran.png new file mode 100644 index 0000000000..590b2663f6 Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hardsuits/syndiecommander.rsi/on-equipped-HELMET-tajaran.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/syndiecommander.rsi/on-equipped-HELMET-vox.png b/Resources/Textures/Clothing/Head/Hardsuits/syndiecommander.rsi/on-equipped-HELMET-vox.png new file mode 100644 index 0000000000..65069f91c7 Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hardsuits/syndiecommander.rsi/on-equipped-HELMET-vox.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/syndiecommander.rsi/on-equipped-HELMET-vulpkanin.png b/Resources/Textures/Clothing/Head/Hardsuits/syndiecommander.rsi/on-equipped-HELMET-vulpkanin.png new file mode 100644 index 0000000000..6e1fb2e5a4 Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hardsuits/syndiecommander.rsi/on-equipped-HELMET-vulpkanin.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/syndiecommander.rsi/on-equipped-HELMET.png b/Resources/Textures/Clothing/Head/Hardsuits/syndiecommander.rsi/on-equipped-HELMET.png index 7be67fee63..2c6ac37f57 100644 Binary files a/Resources/Textures/Clothing/Head/Hardsuits/syndiecommander.rsi/on-equipped-HELMET.png and b/Resources/Textures/Clothing/Head/Hardsuits/syndiecommander.rsi/on-equipped-HELMET.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/syndiecommander.rsi/on-inhand-left.png b/Resources/Textures/Clothing/Head/Hardsuits/syndiecommander.rsi/on-inhand-left.png index 505808fc9d..97d938f79d 100644 Binary files a/Resources/Textures/Clothing/Head/Hardsuits/syndiecommander.rsi/on-inhand-left.png and b/Resources/Textures/Clothing/Head/Hardsuits/syndiecommander.rsi/on-inhand-left.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/syndiecommander.rsi/on-inhand-right.png b/Resources/Textures/Clothing/Head/Hardsuits/syndiecommander.rsi/on-inhand-right.png index 862f6294fb..92a54785a5 100644 Binary files a/Resources/Textures/Clothing/Head/Hardsuits/syndiecommander.rsi/on-inhand-right.png and b/Resources/Textures/Clothing/Head/Hardsuits/syndiecommander.rsi/on-inhand-right.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/syndieelite.rsi/icon-flash.png b/Resources/Textures/Clothing/Head/Hardsuits/syndieelite.rsi/icon-flash.png index bbd6cdcfaf..8f40926b67 100644 Binary files a/Resources/Textures/Clothing/Head/Hardsuits/syndieelite.rsi/icon-flash.png and b/Resources/Textures/Clothing/Head/Hardsuits/syndieelite.rsi/icon-flash.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/syndieelite.rsi/icon.png b/Resources/Textures/Clothing/Head/Hardsuits/syndieelite.rsi/icon.png index 638b2358ff..a7298ff039 100644 Binary files a/Resources/Textures/Clothing/Head/Hardsuits/syndieelite.rsi/icon.png and b/Resources/Textures/Clothing/Head/Hardsuits/syndieelite.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/syndieelite.rsi/meta.json b/Resources/Textures/Clothing/Head/Hardsuits/syndieelite.rsi/meta.json index 038aabe605..43bce2b21e 100644 --- a/Resources/Textures/Clothing/Head/Hardsuits/syndieelite.rsi/meta.json +++ b/Resources/Textures/Clothing/Head/Hardsuits/syndieelite.rsi/meta.json @@ -18,6 +18,22 @@ "name": "off-equipped-HELMET", "directions": 4 }, + { + "name": "off-equipped-HELMET-vulpkanin", + "directions": 4 + }, + { + "name": "off-equipped-HELMET-tajaran", + "directions": 4 + }, + { + "name": "off-equipped-HELMET-shark", + "directions": 4 + }, + { + "name": "off-equipped-HELMET-reptilian", + "directions": 4 + }, { "name": "off-inhand-left", "directions": 4 @@ -30,6 +46,22 @@ "name": "on-equipped-HELMET", "directions": 4 }, + { + "name": "on-equipped-HELMET-vulpkanin", + "directions": 4 + }, + { + "name": "on-equipped-HELMET-tajaran", + "directions": 4 + }, + { + "name": "on-equipped-HELMET-shark", + "directions": 4 + }, + { + "name": "on-equipped-HELMET-reptilian", + "directions": 4 + }, { "name": "on-inhand-left", "directions": 4 @@ -39,4 +71,4 @@ "directions": 4 } ] -} \ No newline at end of file +} diff --git a/Resources/Textures/Clothing/Head/Hardsuits/syndieelite.rsi/off-equipped-HELMET-reptilian.png b/Resources/Textures/Clothing/Head/Hardsuits/syndieelite.rsi/off-equipped-HELMET-reptilian.png new file mode 100644 index 0000000000..e8a8579ffc Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hardsuits/syndieelite.rsi/off-equipped-HELMET-reptilian.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/syndieelite.rsi/off-equipped-HELMET-shark.png b/Resources/Textures/Clothing/Head/Hardsuits/syndieelite.rsi/off-equipped-HELMET-shark.png new file mode 100644 index 0000000000..9d4527673e Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hardsuits/syndieelite.rsi/off-equipped-HELMET-shark.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/syndieelite.rsi/off-equipped-HELMET-tajaran.png b/Resources/Textures/Clothing/Head/Hardsuits/syndieelite.rsi/off-equipped-HELMET-tajaran.png new file mode 100644 index 0000000000..adc78bb21e Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hardsuits/syndieelite.rsi/off-equipped-HELMET-tajaran.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/syndieelite.rsi/off-equipped-HELMET-vox.png b/Resources/Textures/Clothing/Head/Hardsuits/syndieelite.rsi/off-equipped-HELMET-vox.png new file mode 100644 index 0000000000..4f4b2f0f77 Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hardsuits/syndieelite.rsi/off-equipped-HELMET-vox.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/syndieelite.rsi/off-equipped-HELMET-vulpkanin.png b/Resources/Textures/Clothing/Head/Hardsuits/syndieelite.rsi/off-equipped-HELMET-vulpkanin.png new file mode 100644 index 0000000000..ad12b32a64 Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hardsuits/syndieelite.rsi/off-equipped-HELMET-vulpkanin.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/syndieelite.rsi/off-equipped-HELMET.png b/Resources/Textures/Clothing/Head/Hardsuits/syndieelite.rsi/off-equipped-HELMET.png index 6a1d34f452..68ca980fb8 100644 Binary files a/Resources/Textures/Clothing/Head/Hardsuits/syndieelite.rsi/off-equipped-HELMET.png and b/Resources/Textures/Clothing/Head/Hardsuits/syndieelite.rsi/off-equipped-HELMET.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/syndieelite.rsi/off-inhand-left.png b/Resources/Textures/Clothing/Head/Hardsuits/syndieelite.rsi/off-inhand-left.png index 22a8dd14b1..9cf29dbeee 100644 Binary files a/Resources/Textures/Clothing/Head/Hardsuits/syndieelite.rsi/off-inhand-left.png and b/Resources/Textures/Clothing/Head/Hardsuits/syndieelite.rsi/off-inhand-left.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/syndieelite.rsi/off-inhand-right.png b/Resources/Textures/Clothing/Head/Hardsuits/syndieelite.rsi/off-inhand-right.png index 71572c0ffd..c01c8aba0d 100644 Binary files a/Resources/Textures/Clothing/Head/Hardsuits/syndieelite.rsi/off-inhand-right.png and b/Resources/Textures/Clothing/Head/Hardsuits/syndieelite.rsi/off-inhand-right.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/syndieelite.rsi/on-equipped-HELMET-reptilian.png b/Resources/Textures/Clothing/Head/Hardsuits/syndieelite.rsi/on-equipped-HELMET-reptilian.png new file mode 100644 index 0000000000..8497d58ead Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hardsuits/syndieelite.rsi/on-equipped-HELMET-reptilian.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/syndieelite.rsi/on-equipped-HELMET-shark.png b/Resources/Textures/Clothing/Head/Hardsuits/syndieelite.rsi/on-equipped-HELMET-shark.png new file mode 100644 index 0000000000..2402bf72a6 Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hardsuits/syndieelite.rsi/on-equipped-HELMET-shark.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/syndieelite.rsi/on-equipped-HELMET-tajaran.png b/Resources/Textures/Clothing/Head/Hardsuits/syndieelite.rsi/on-equipped-HELMET-tajaran.png new file mode 100644 index 0000000000..05776cafbe Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hardsuits/syndieelite.rsi/on-equipped-HELMET-tajaran.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/syndieelite.rsi/on-equipped-HELMET-vox.png b/Resources/Textures/Clothing/Head/Hardsuits/syndieelite.rsi/on-equipped-HELMET-vox.png new file mode 100644 index 0000000000..bf7243ed32 Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hardsuits/syndieelite.rsi/on-equipped-HELMET-vox.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/syndieelite.rsi/on-equipped-HELMET-vulpkanin.png b/Resources/Textures/Clothing/Head/Hardsuits/syndieelite.rsi/on-equipped-HELMET-vulpkanin.png new file mode 100644 index 0000000000..44caf12ba3 Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hardsuits/syndieelite.rsi/on-equipped-HELMET-vulpkanin.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/syndieelite.rsi/on-equipped-HELMET.png b/Resources/Textures/Clothing/Head/Hardsuits/syndieelite.rsi/on-equipped-HELMET.png index 6d330d446d..fbbd061014 100644 Binary files a/Resources/Textures/Clothing/Head/Hardsuits/syndieelite.rsi/on-equipped-HELMET.png and b/Resources/Textures/Clothing/Head/Hardsuits/syndieelite.rsi/on-equipped-HELMET.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/syndieelite.rsi/on-inhand-left.png b/Resources/Textures/Clothing/Head/Hardsuits/syndieelite.rsi/on-inhand-left.png index 5a40993d72..d603248b3c 100644 Binary files a/Resources/Textures/Clothing/Head/Hardsuits/syndieelite.rsi/on-inhand-left.png and b/Resources/Textures/Clothing/Head/Hardsuits/syndieelite.rsi/on-inhand-left.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/syndieelite.rsi/on-inhand-right.png b/Resources/Textures/Clothing/Head/Hardsuits/syndieelite.rsi/on-inhand-right.png index 27a27d1e8e..ac118a95a4 100644 Binary files a/Resources/Textures/Clothing/Head/Hardsuits/syndieelite.rsi/on-inhand-right.png and b/Resources/Textures/Clothing/Head/Hardsuits/syndieelite.rsi/on-inhand-right.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/syndiemedic.rsi/icon-flash.png b/Resources/Textures/Clothing/Head/Hardsuits/syndiemedic.rsi/icon-flash.png index 6d63fa871b..58536378e6 100644 Binary files a/Resources/Textures/Clothing/Head/Hardsuits/syndiemedic.rsi/icon-flash.png and b/Resources/Textures/Clothing/Head/Hardsuits/syndiemedic.rsi/icon-flash.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/syndiemedic.rsi/icon.png b/Resources/Textures/Clothing/Head/Hardsuits/syndiemedic.rsi/icon.png index 6b2df0e84f..580ad3e90b 100644 Binary files a/Resources/Textures/Clothing/Head/Hardsuits/syndiemedic.rsi/icon.png and b/Resources/Textures/Clothing/Head/Hardsuits/syndiemedic.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/syndiemedic.rsi/meta.json b/Resources/Textures/Clothing/Head/Hardsuits/syndiemedic.rsi/meta.json index b69addc476..85cf58473c 100644 --- a/Resources/Textures/Clothing/Head/Hardsuits/syndiemedic.rsi/meta.json +++ b/Resources/Textures/Clothing/Head/Hardsuits/syndiemedic.rsi/meta.json @@ -17,6 +17,22 @@ "name": "off-equipped-HELMET", "directions": 4 }, + { + "name": "off-equipped-HELMET-vulpkanin", + "directions": 4 + }, + { + "name": "off-equipped-HELMET-tajaran", + "directions": 4 + }, + { + "name": "off-equipped-HELMET-shark", + "directions": 4 + }, + { + "name": "off-equipped-HELMET-reptilian", + "directions": 4 + }, { "name": "off-inhand-left", "directions": 4 @@ -29,6 +45,22 @@ "name": "on-equipped-HELMET", "directions": 4 }, + { + "name": "on-equipped-HELMET-vulpkanin", + "directions": 4 + }, + { + "name": "on-equipped-HELMET-tajaran", + "directions": 4 + }, + { + "name": "on-equipped-HELMET-shark", + "directions": 4 + }, + { + "name": "on-equipped-HELMET-reptilian", + "directions": 4 + }, { "name": "on-inhand-left", "directions": 4 diff --git a/Resources/Textures/Clothing/Head/Hardsuits/syndiemedic.rsi/off-equipped-HELMET-reptilian.png b/Resources/Textures/Clothing/Head/Hardsuits/syndiemedic.rsi/off-equipped-HELMET-reptilian.png new file mode 100644 index 0000000000..f187770fae Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hardsuits/syndiemedic.rsi/off-equipped-HELMET-reptilian.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/syndiemedic.rsi/off-equipped-HELMET-shark.png b/Resources/Textures/Clothing/Head/Hardsuits/syndiemedic.rsi/off-equipped-HELMET-shark.png new file mode 100644 index 0000000000..6c8e6492da Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hardsuits/syndiemedic.rsi/off-equipped-HELMET-shark.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/syndiemedic.rsi/off-equipped-HELMET-tajaran.png b/Resources/Textures/Clothing/Head/Hardsuits/syndiemedic.rsi/off-equipped-HELMET-tajaran.png new file mode 100644 index 0000000000..cf0edc5cad Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hardsuits/syndiemedic.rsi/off-equipped-HELMET-tajaran.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/syndiemedic.rsi/off-equipped-HELMET-vox.png b/Resources/Textures/Clothing/Head/Hardsuits/syndiemedic.rsi/off-equipped-HELMET-vox.png new file mode 100644 index 0000000000..4d5f2cf4b7 Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hardsuits/syndiemedic.rsi/off-equipped-HELMET-vox.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/syndiemedic.rsi/off-equipped-HELMET-vulpkanin.png b/Resources/Textures/Clothing/Head/Hardsuits/syndiemedic.rsi/off-equipped-HELMET-vulpkanin.png new file mode 100644 index 0000000000..f99c748d34 Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hardsuits/syndiemedic.rsi/off-equipped-HELMET-vulpkanin.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/syndiemedic.rsi/off-equipped-HELMET.png b/Resources/Textures/Clothing/Head/Hardsuits/syndiemedic.rsi/off-equipped-HELMET.png index 37d8a092d9..67771bb763 100644 Binary files a/Resources/Textures/Clothing/Head/Hardsuits/syndiemedic.rsi/off-equipped-HELMET.png and b/Resources/Textures/Clothing/Head/Hardsuits/syndiemedic.rsi/off-equipped-HELMET.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/syndiemedic.rsi/off-inhand-left.png b/Resources/Textures/Clothing/Head/Hardsuits/syndiemedic.rsi/off-inhand-left.png index 97f21fd350..7995d49529 100644 Binary files a/Resources/Textures/Clothing/Head/Hardsuits/syndiemedic.rsi/off-inhand-left.png and b/Resources/Textures/Clothing/Head/Hardsuits/syndiemedic.rsi/off-inhand-left.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/syndiemedic.rsi/off-inhand-right.png b/Resources/Textures/Clothing/Head/Hardsuits/syndiemedic.rsi/off-inhand-right.png index 0e950a6674..b3b5065ed8 100644 Binary files a/Resources/Textures/Clothing/Head/Hardsuits/syndiemedic.rsi/off-inhand-right.png and b/Resources/Textures/Clothing/Head/Hardsuits/syndiemedic.rsi/off-inhand-right.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/syndiemedic.rsi/on-equipped-HELMET-reptilian.png b/Resources/Textures/Clothing/Head/Hardsuits/syndiemedic.rsi/on-equipped-HELMET-reptilian.png new file mode 100644 index 0000000000..0630d7aaa8 Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hardsuits/syndiemedic.rsi/on-equipped-HELMET-reptilian.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/syndiemedic.rsi/on-equipped-HELMET-shark.png b/Resources/Textures/Clothing/Head/Hardsuits/syndiemedic.rsi/on-equipped-HELMET-shark.png new file mode 100644 index 0000000000..cf038882ae Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hardsuits/syndiemedic.rsi/on-equipped-HELMET-shark.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/syndiemedic.rsi/on-equipped-HELMET-tajaran.png b/Resources/Textures/Clothing/Head/Hardsuits/syndiemedic.rsi/on-equipped-HELMET-tajaran.png new file mode 100644 index 0000000000..9bc571bfc6 Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hardsuits/syndiemedic.rsi/on-equipped-HELMET-tajaran.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/syndiemedic.rsi/on-equipped-HELMET-vox.png b/Resources/Textures/Clothing/Head/Hardsuits/syndiemedic.rsi/on-equipped-HELMET-vox.png new file mode 100644 index 0000000000..8c072609c9 Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hardsuits/syndiemedic.rsi/on-equipped-HELMET-vox.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/syndiemedic.rsi/on-equipped-HELMET-vulpkanin.png b/Resources/Textures/Clothing/Head/Hardsuits/syndiemedic.rsi/on-equipped-HELMET-vulpkanin.png new file mode 100644 index 0000000000..63b8c8e9fa Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hardsuits/syndiemedic.rsi/on-equipped-HELMET-vulpkanin.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/syndiemedic.rsi/on-equipped-HELMET.png b/Resources/Textures/Clothing/Head/Hardsuits/syndiemedic.rsi/on-equipped-HELMET.png index 44443b7755..47a2dbd5ff 100644 Binary files a/Resources/Textures/Clothing/Head/Hardsuits/syndiemedic.rsi/on-equipped-HELMET.png and b/Resources/Textures/Clothing/Head/Hardsuits/syndiemedic.rsi/on-equipped-HELMET.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/syndiemedic.rsi/on-inhand-left.png b/Resources/Textures/Clothing/Head/Hardsuits/syndiemedic.rsi/on-inhand-left.png index 0e174c04c3..b4d1dd38d3 100644 Binary files a/Resources/Textures/Clothing/Head/Hardsuits/syndiemedic.rsi/on-inhand-left.png and b/Resources/Textures/Clothing/Head/Hardsuits/syndiemedic.rsi/on-inhand-left.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/syndiemedic.rsi/on-inhand-right.png b/Resources/Textures/Clothing/Head/Hardsuits/syndiemedic.rsi/on-inhand-right.png index b049400348..52164f50b3 100644 Binary files a/Resources/Textures/Clothing/Head/Hardsuits/syndiemedic.rsi/on-inhand-right.png and b/Resources/Textures/Clothing/Head/Hardsuits/syndiemedic.rsi/on-inhand-right.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/wizard.rsi/meta.json b/Resources/Textures/Clothing/Head/Hardsuits/wizard.rsi/meta.json index d168108fdf..bf9d488582 100644 --- a/Resources/Textures/Clothing/Head/Hardsuits/wizard.rsi/meta.json +++ b/Resources/Textures/Clothing/Head/Hardsuits/wizard.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e | vulpkanin version taken from Paradise station at https://github.com/ParadiseSS13/Paradise/commit/f0fa4e1fd809482fbc104a310aa34cebf7df157d", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e", "size": { "x": 32, "y": 32 @@ -18,11 +18,7 @@ "directions": 4 }, { - "name": "off-inhand-left", - "directions": 4 - }, - { - "name": "off-inhand-right", + "name": "off-equipped-HELMET-vulpkanin", "directions": 4 }, { @@ -30,19 +26,15 @@ "directions": 4 }, { - "name": "on-inhand-left", - "directions": 4 - }, - { - "name": "on-inhand-right", + "name": "on-equipped-HELMET-vulpkanin", "directions": 4 }, { - "name": "on-equipped-HELMET-vulpkanin", + "name": "off-equipped-HELMET-vox", "directions": 4 }, { - "name": "off-equipped-HELMET-vulpkanin", + "name": "on-equipped-HELMET-vox", "directions": 4 } ] diff --git a/Resources/Textures/Clothing/Head/Hardsuits/wizard.rsi/off-equipped-HELMET-vox.png b/Resources/Textures/Clothing/Head/Hardsuits/wizard.rsi/off-equipped-HELMET-vox.png new file mode 100644 index 0000000000..647d0e76c1 Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hardsuits/wizard.rsi/off-equipped-HELMET-vox.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/wizard.rsi/off-equipped-HELMET-vulpkanin.png b/Resources/Textures/Clothing/Head/Hardsuits/wizard.rsi/off-equipped-HELMET-vulpkanin.png index 221f9b0200..924092fb78 100644 Binary files a/Resources/Textures/Clothing/Head/Hardsuits/wizard.rsi/off-equipped-HELMET-vulpkanin.png and b/Resources/Textures/Clothing/Head/Hardsuits/wizard.rsi/off-equipped-HELMET-vulpkanin.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/wizard.rsi/on-equipped-HELMET-vox.png b/Resources/Textures/Clothing/Head/Hardsuits/wizard.rsi/on-equipped-HELMET-vox.png new file mode 100644 index 0000000000..a0345048e8 Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hardsuits/wizard.rsi/on-equipped-HELMET-vox.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/wizard.rsi/on-equipped-HELMET-vulpkanin.png b/Resources/Textures/Clothing/Head/Hardsuits/wizard.rsi/on-equipped-HELMET-vulpkanin.png index 3b256eff87..a493d86aa3 100644 Binary files a/Resources/Textures/Clothing/Head/Hardsuits/wizard.rsi/on-equipped-HELMET-vulpkanin.png and b/Resources/Textures/Clothing/Head/Hardsuits/wizard.rsi/on-equipped-HELMET-vulpkanin.png differ diff --git a/Resources/Textures/Clothing/Head/Hats/beret.rsi/icon.png b/Resources/Textures/Clothing/Head/Hats/beret.rsi/icon.png index e5d943c542..a0c7d3fffe 100644 Binary files a/Resources/Textures/Clothing/Head/Hats/beret.rsi/icon.png and b/Resources/Textures/Clothing/Head/Hats/beret.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Head/Hats/beret.rsi/inhand-left.png b/Resources/Textures/Clothing/Head/Hats/beret.rsi/inhand-left.png index bd379f8771..ebf8f69000 100644 Binary files a/Resources/Textures/Clothing/Head/Hats/beret.rsi/inhand-left.png and b/Resources/Textures/Clothing/Head/Hats/beret.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/Head/Hats/beret_brigmedic.rsi/equipped-HELMET.png b/Resources/Textures/Clothing/Head/Hats/beret_brigmedic.rsi/equipped-HELMET.png index 9a6ed93c6d..94bd456fe5 100644 Binary files a/Resources/Textures/Clothing/Head/Hats/beret_brigmedic.rsi/equipped-HELMET.png and b/Resources/Textures/Clothing/Head/Hats/beret_brigmedic.rsi/equipped-HELMET.png differ diff --git a/Resources/Textures/Clothing/Head/Hats/beret_brigmedic.rsi/icon.png b/Resources/Textures/Clothing/Head/Hats/beret_brigmedic.rsi/icon.png index e64e214856..32b31ba90d 100644 Binary files a/Resources/Textures/Clothing/Head/Hats/beret_brigmedic.rsi/icon.png and b/Resources/Textures/Clothing/Head/Hats/beret_brigmedic.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Head/Hats/beret_brigmedic.rsi/inhand-left.png b/Resources/Textures/Clothing/Head/Hats/beret_brigmedic.rsi/inhand-left.png index b516a3930b..adb9ad9f42 100644 Binary files a/Resources/Textures/Clothing/Head/Hats/beret_brigmedic.rsi/inhand-left.png and b/Resources/Textures/Clothing/Head/Hats/beret_brigmedic.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/Head/Hats/beret_brigmedic.rsi/inhand-right.png b/Resources/Textures/Clothing/Head/Hats/beret_brigmedic.rsi/inhand-right.png index cc35f7a123..665f3a13fe 100644 Binary files a/Resources/Textures/Clothing/Head/Hats/beret_brigmedic.rsi/inhand-right.png and b/Resources/Textures/Clothing/Head/Hats/beret_brigmedic.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/Head/Hats/beret_brigmedic.rsi/meta.json b/Resources/Textures/Clothing/Head/Hats/beret_brigmedic.rsi/meta.json index 11ea5a5b10..9d3912750e 100644 --- a/Resources/Textures/Clothing/Head/Hats/beret_brigmedic.rsi/meta.json +++ b/Resources/Textures/Clothing/Head/Hats/beret_brigmedic.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Sprited by Hülle#2562 (Discord)", + "copyright": "Sprited by Hülle#2562 (Discord), resprite by muriexlol", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/Clothing/Head/Hats/beret_cmo.rsi/icon.png b/Resources/Textures/Clothing/Head/Hats/beret_cmo.rsi/icon.png index ff4b00dab1..47bf6f7a25 100644 Binary files a/Resources/Textures/Clothing/Head/Hats/beret_cmo.rsi/icon.png and b/Resources/Textures/Clothing/Head/Hats/beret_cmo.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Head/Hats/beret_engineering.rsi/equipped-HELMET-hamster.png b/Resources/Textures/Clothing/Head/Hats/beret_engineering.rsi/equipped-HELMET-hamster.png index d94faf182d..5cd71c5368 100644 Binary files a/Resources/Textures/Clothing/Head/Hats/beret_engineering.rsi/equipped-HELMET-hamster.png and b/Resources/Textures/Clothing/Head/Hats/beret_engineering.rsi/equipped-HELMET-hamster.png differ diff --git a/Resources/Textures/Clothing/Head/Hats/beret_engineering.rsi/equipped-HELMET.png b/Resources/Textures/Clothing/Head/Hats/beret_engineering.rsi/equipped-HELMET.png index f7f37e478b..2eb9c5fafe 100644 Binary files a/Resources/Textures/Clothing/Head/Hats/beret_engineering.rsi/equipped-HELMET.png and b/Resources/Textures/Clothing/Head/Hats/beret_engineering.rsi/equipped-HELMET.png differ diff --git a/Resources/Textures/Clothing/Head/Hats/beret_engineering.rsi/icon.png b/Resources/Textures/Clothing/Head/Hats/beret_engineering.rsi/icon.png index 7c0099bc7b..ec5b8a1d1e 100644 Binary files a/Resources/Textures/Clothing/Head/Hats/beret_engineering.rsi/icon.png and b/Resources/Textures/Clothing/Head/Hats/beret_engineering.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Head/Hats/beret_engineering.rsi/inhand-left.png b/Resources/Textures/Clothing/Head/Hats/beret_engineering.rsi/inhand-left.png index 662316ab8d..2c24064f29 100644 Binary files a/Resources/Textures/Clothing/Head/Hats/beret_engineering.rsi/inhand-left.png and b/Resources/Textures/Clothing/Head/Hats/beret_engineering.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/Head/Hats/beret_engineering.rsi/inhand-right.png b/Resources/Textures/Clothing/Head/Hats/beret_engineering.rsi/inhand-right.png index 95e97b47bc..b31c3b5f9a 100644 Binary files a/Resources/Textures/Clothing/Head/Hats/beret_engineering.rsi/inhand-right.png and b/Resources/Textures/Clothing/Head/Hats/beret_engineering.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/Head/Hats/beret_engineering.rsi/meta.json b/Resources/Textures/Clothing/Head/Hats/beret_engineering.rsi/meta.json index ade65863af..adc8f03c68 100644 --- a/Resources/Textures/Clothing/Head/Hats/beret_engineering.rsi/meta.json +++ b/Resources/Textures/Clothing/Head/Hats/beret_engineering.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e, resprite by muriexlol", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/Clothing/Head/Hats/beret_hos.rsi/icon.png b/Resources/Textures/Clothing/Head/Hats/beret_hos.rsi/icon.png index 9085e5aa16..1beb04cc84 100644 Binary files a/Resources/Textures/Clothing/Head/Hats/beret_hos.rsi/icon.png and b/Resources/Textures/Clothing/Head/Hats/beret_hos.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Head/Hats/beret_merc.rsi/icon.png b/Resources/Textures/Clothing/Head/Hats/beret_merc.rsi/icon.png index e04ccd7765..35c621d6d0 100644 Binary files a/Resources/Textures/Clothing/Head/Hats/beret_merc.rsi/icon.png and b/Resources/Textures/Clothing/Head/Hats/beret_merc.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Head/Hats/beret_physician.rsi/equipped-HELMET.png b/Resources/Textures/Clothing/Head/Hats/beret_physician.rsi/equipped-HELMET.png index 4746355124..69989a1ea3 100644 Binary files a/Resources/Textures/Clothing/Head/Hats/beret_physician.rsi/equipped-HELMET.png and b/Resources/Textures/Clothing/Head/Hats/beret_physician.rsi/equipped-HELMET.png differ diff --git a/Resources/Textures/Clothing/Head/Hats/beret_physician.rsi/icon.png b/Resources/Textures/Clothing/Head/Hats/beret_physician.rsi/icon.png index 2a32fed12e..7a6d2b4ec9 100644 Binary files a/Resources/Textures/Clothing/Head/Hats/beret_physician.rsi/icon.png and b/Resources/Textures/Clothing/Head/Hats/beret_physician.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Head/Hats/beret_physician.rsi/inhand-left.png b/Resources/Textures/Clothing/Head/Hats/beret_physician.rsi/inhand-left.png index a1742a0d64..5fe0bf16d9 100644 Binary files a/Resources/Textures/Clothing/Head/Hats/beret_physician.rsi/inhand-left.png and b/Resources/Textures/Clothing/Head/Hats/beret_physician.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/Head/Hats/beret_physician.rsi/inhand-right.png b/Resources/Textures/Clothing/Head/Hats/beret_physician.rsi/inhand-right.png index 8b75523c98..f5396bd070 100644 Binary files a/Resources/Textures/Clothing/Head/Hats/beret_physician.rsi/inhand-right.png and b/Resources/Textures/Clothing/Head/Hats/beret_physician.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/Head/Hats/beret_qm.rsi/meta.json b/Resources/Textures/Clothing/Head/Hats/beret_qm.rsi/meta.json index 8591b0feab..a067278440 100644 --- a/Resources/Textures/Clothing/Head/Hats/beret_qm.rsi/meta.json +++ b/Resources/Textures/Clothing/Head/Hats/beret_qm.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e, recoloured by Hanzdegloker", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e, resprite by @mureixlol, recoloured by Hanzdegloker", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/Clothing/Head/Hats/beret_rnd.rsi/equipped-HELMET-hamster.png b/Resources/Textures/Clothing/Head/Hats/beret_rnd.rsi/equipped-HELMET-hamster.png index c5e77b2f3c..7614e6c678 100644 Binary files a/Resources/Textures/Clothing/Head/Hats/beret_rnd.rsi/equipped-HELMET-hamster.png and b/Resources/Textures/Clothing/Head/Hats/beret_rnd.rsi/equipped-HELMET-hamster.png differ diff --git a/Resources/Textures/Clothing/Head/Hats/beret_rnd.rsi/equipped-HELMET.png b/Resources/Textures/Clothing/Head/Hats/beret_rnd.rsi/equipped-HELMET.png index 14f97f6a44..cd1550f1de 100644 Binary files a/Resources/Textures/Clothing/Head/Hats/beret_rnd.rsi/equipped-HELMET.png and b/Resources/Textures/Clothing/Head/Hats/beret_rnd.rsi/equipped-HELMET.png differ diff --git a/Resources/Textures/Clothing/Head/Hats/beret_rnd.rsi/icon.png b/Resources/Textures/Clothing/Head/Hats/beret_rnd.rsi/icon.png index af32d2ccd1..2ab28ab01e 100644 Binary files a/Resources/Textures/Clothing/Head/Hats/beret_rnd.rsi/icon.png and b/Resources/Textures/Clothing/Head/Hats/beret_rnd.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Head/Hats/beret_rnd.rsi/inhand-left.png b/Resources/Textures/Clothing/Head/Hats/beret_rnd.rsi/inhand-left.png index 240b1bf276..c63732d489 100644 Binary files a/Resources/Textures/Clothing/Head/Hats/beret_rnd.rsi/inhand-left.png and b/Resources/Textures/Clothing/Head/Hats/beret_rnd.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/Head/Hats/beret_rnd.rsi/inhand-right.png b/Resources/Textures/Clothing/Head/Hats/beret_rnd.rsi/inhand-right.png index 83f38ce6c4..4b2381f37f 100644 Binary files a/Resources/Textures/Clothing/Head/Hats/beret_rnd.rsi/inhand-right.png and b/Resources/Textures/Clothing/Head/Hats/beret_rnd.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/Head/Hats/beret_rnd.rsi/meta.json b/Resources/Textures/Clothing/Head/Hats/beret_rnd.rsi/meta.json index 7d73315ad6..6799d6fd81 100644 --- a/Resources/Textures/Clothing/Head/Hats/beret_rnd.rsi/meta.json +++ b/Resources/Textures/Clothing/Head/Hats/beret_rnd.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e and changed by lazik", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e and changed by lazik, resprite by muriexlol", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/Clothing/Head/Hats/beret_security.rsi/equipped-HELMET-hamster.png b/Resources/Textures/Clothing/Head/Hats/beret_security.rsi/equipped-HELMET-hamster.png index 8f503d6237..33718f8d00 100644 Binary files a/Resources/Textures/Clothing/Head/Hats/beret_security.rsi/equipped-HELMET-hamster.png and b/Resources/Textures/Clothing/Head/Hats/beret_security.rsi/equipped-HELMET-hamster.png differ diff --git a/Resources/Textures/Clothing/Head/Hats/beret_security.rsi/equipped-HELMET.png b/Resources/Textures/Clothing/Head/Hats/beret_security.rsi/equipped-HELMET.png index fc1ad2e939..9b62444185 100644 Binary files a/Resources/Textures/Clothing/Head/Hats/beret_security.rsi/equipped-HELMET.png and b/Resources/Textures/Clothing/Head/Hats/beret_security.rsi/equipped-HELMET.png differ diff --git a/Resources/Textures/Clothing/Head/Hats/beret_security.rsi/icon.png b/Resources/Textures/Clothing/Head/Hats/beret_security.rsi/icon.png index 6f489ec36b..7dd4f75dfe 100644 Binary files a/Resources/Textures/Clothing/Head/Hats/beret_security.rsi/icon.png and b/Resources/Textures/Clothing/Head/Hats/beret_security.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Head/Hats/beret_security.rsi/inhand-left.png b/Resources/Textures/Clothing/Head/Hats/beret_security.rsi/inhand-left.png index e15f148f01..dc91b0b2fb 100644 Binary files a/Resources/Textures/Clothing/Head/Hats/beret_security.rsi/inhand-left.png and b/Resources/Textures/Clothing/Head/Hats/beret_security.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/Head/Hats/beret_security.rsi/inhand-right.png b/Resources/Textures/Clothing/Head/Hats/beret_security.rsi/inhand-right.png index 74bcd6a723..335f74a136 100644 Binary files a/Resources/Textures/Clothing/Head/Hats/beret_security.rsi/inhand-right.png and b/Resources/Textures/Clothing/Head/Hats/beret_security.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/Head/Hats/beret_security.rsi/meta.json b/Resources/Textures/Clothing/Head/Hats/beret_security.rsi/meta.json index ade65863af..28bbc3125c 100644 --- a/Resources/Textures/Clothing/Head/Hats/beret_security.rsi/meta.json +++ b/Resources/Textures/Clothing/Head/Hats/beret_security.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e and modified by Flareguy", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/Clothing/Head/Hats/beret_warden.rsi/icon.png b/Resources/Textures/Clothing/Head/Hats/beret_warden.rsi/icon.png index 3058abcf6e..c3ebdae446 100644 Binary files a/Resources/Textures/Clothing/Head/Hats/beret_warden.rsi/icon.png and b/Resources/Textures/Clothing/Head/Hats/beret_warden.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Head/Hats/bowler_hat.rsi/icon.png b/Resources/Textures/Clothing/Head/Hats/bowler_hat.rsi/icon.png index fde0ca6e01..8002723b8d 100644 Binary files a/Resources/Textures/Clothing/Head/Hats/bowler_hat.rsi/icon.png and b/Resources/Textures/Clothing/Head/Hats/bowler_hat.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Head/Hats/brownfedora.rsi/equipped-HELMET.png b/Resources/Textures/Clothing/Head/Hats/brownfedora.rsi/equipped-HELMET.png index 36056a0e4e..5bd073560f 100644 Binary files a/Resources/Textures/Clothing/Head/Hats/brownfedora.rsi/equipped-HELMET.png and b/Resources/Textures/Clothing/Head/Hats/brownfedora.rsi/equipped-HELMET.png differ diff --git a/Resources/Textures/Clothing/Head/Hats/brownfedora.rsi/icon.png b/Resources/Textures/Clothing/Head/Hats/brownfedora.rsi/icon.png index da90e4a62e..ebd5338bf5 100644 Binary files a/Resources/Textures/Clothing/Head/Hats/brownfedora.rsi/icon.png and b/Resources/Textures/Clothing/Head/Hats/brownfedora.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Head/Hats/brownfedora.rsi/inhand-left.png b/Resources/Textures/Clothing/Head/Hats/brownfedora.rsi/inhand-left.png index 28dc2d9d1d..8c51d5e5b2 100644 Binary files a/Resources/Textures/Clothing/Head/Hats/brownfedora.rsi/inhand-left.png and b/Resources/Textures/Clothing/Head/Hats/brownfedora.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/Head/Hats/brownfedora.rsi/inhand-right.png b/Resources/Textures/Clothing/Head/Hats/brownfedora.rsi/inhand-right.png index ef3574b017..b1bf119a28 100644 Binary files a/Resources/Textures/Clothing/Head/Hats/brownfedora.rsi/inhand-right.png and b/Resources/Textures/Clothing/Head/Hats/brownfedora.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/Head/Hats/brownfedora.rsi/meta.json b/Resources/Textures/Clothing/Head/Hats/brownfedora.rsi/meta.json index ade65863af..6154f16edd 100644 --- a/Resources/Textures/Clothing/Head/Hats/brownfedora.rsi/meta.json +++ b/Resources/Textures/Clothing/Head/Hats/brownfedora.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e and modified by Flareguy for SS14. icon state made by Flareguy for Space Station 14", "size": { "x": 32, "y": 32 @@ -14,10 +14,6 @@ "name": "equipped-HELMET", "directions": 4 }, - { - "name": "equipped-HELMET-hamster", - "directions": 4 - }, { "name": "inhand-left", "directions": 4 diff --git a/Resources/Textures/Clothing/Head/Hats/capcap.rsi/equipped-HELMET-hamster.png b/Resources/Textures/Clothing/Head/Hats/capcap.rsi/equipped-HELMET-hamster.png index e997023f30..6c2cae84f8 100644 Binary files a/Resources/Textures/Clothing/Head/Hats/capcap.rsi/equipped-HELMET-hamster.png and b/Resources/Textures/Clothing/Head/Hats/capcap.rsi/equipped-HELMET-hamster.png differ diff --git a/Resources/Textures/Clothing/Head/Hats/capcap.rsi/equipped-HELMET.png b/Resources/Textures/Clothing/Head/Hats/capcap.rsi/equipped-HELMET.png index 831b7780eb..8a05600366 100644 Binary files a/Resources/Textures/Clothing/Head/Hats/capcap.rsi/equipped-HELMET.png and b/Resources/Textures/Clothing/Head/Hats/capcap.rsi/equipped-HELMET.png differ diff --git a/Resources/Textures/Clothing/Head/Hats/capcap.rsi/icon.png b/Resources/Textures/Clothing/Head/Hats/capcap.rsi/icon.png index bbc380f6ad..0370751c92 100644 Binary files a/Resources/Textures/Clothing/Head/Hats/capcap.rsi/icon.png and b/Resources/Textures/Clothing/Head/Hats/capcap.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Head/Hats/capcap.rsi/inhand-left.png b/Resources/Textures/Clothing/Head/Hats/capcap.rsi/inhand-left.png new file mode 100644 index 0000000000..1b725c4c5b Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hats/capcap.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/Head/Hats/capcap.rsi/inhand-right.png b/Resources/Textures/Clothing/Head/Hats/capcap.rsi/inhand-right.png new file mode 100644 index 0000000000..0b29f995a0 Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hats/capcap.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/Head/Hats/capcap.rsi/meta.json b/Resources/Textures/Clothing/Head/Hats/capcap.rsi/meta.json index b21b92751c..f18f2bc3cc 100644 --- a/Resources/Textures/Clothing/Head/Hats/capcap.rsi/meta.json +++ b/Resources/Textures/Clothing/Head/Hats/capcap.rsi/meta.json @@ -1,22 +1,30 @@ { - "version": 1, - "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/commit/0671297bb1c1b31d5885f2768aecbe9dc51d39e7 , edited by Skarletto (github), edited by Emisse for ss14", - "size": { - "x": 32, - "y": 32 - }, - "states": [ - { - "name": "icon" + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from TG station at: https://github.com/tgstation/tgstation/commit/c7dde066687a52e2aad598d19ee01cc0fbaa7d43#diff-4bf8ea7edf380bc679abdb6816b5742859caa8e87532315850772b843c083a26", + "size": { + "x": 32, + "y": 32 }, - { - "name": "equipped-HELMET-hamster", - "directions": 4 - }, - { - "name": "equipped-HELMET", - "directions": 4 - } - ] + "states": [ + { + "name": "inhand-right", + "directions": 4 + }, + { + "name": "equipped-HELMET", + "directions": 4 + }, + { + "name": "icon" + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "equipped-HELMET-hamster", + "directions": 4 + } + ] } diff --git a/Resources/Textures/Clothing/Head/Hats/captain.rsi/equipped-HELMET-hamster.png b/Resources/Textures/Clothing/Head/Hats/captain.rsi/equipped-HELMET-hamster.png index 81ed7934ce..1bc30718d2 100644 Binary files a/Resources/Textures/Clothing/Head/Hats/captain.rsi/equipped-HELMET-hamster.png and b/Resources/Textures/Clothing/Head/Hats/captain.rsi/equipped-HELMET-hamster.png differ diff --git a/Resources/Textures/Clothing/Head/Hats/captain.rsi/equipped-HELMET.png b/Resources/Textures/Clothing/Head/Hats/captain.rsi/equipped-HELMET.png index 19048d7d1a..cf24a695e9 100644 Binary files a/Resources/Textures/Clothing/Head/Hats/captain.rsi/equipped-HELMET.png and b/Resources/Textures/Clothing/Head/Hats/captain.rsi/equipped-HELMET.png differ diff --git a/Resources/Textures/Clothing/Head/Hats/captain.rsi/icon.png b/Resources/Textures/Clothing/Head/Hats/captain.rsi/icon.png index c025248263..2e86e9d9b8 100644 Binary files a/Resources/Textures/Clothing/Head/Hats/captain.rsi/icon.png and b/Resources/Textures/Clothing/Head/Hats/captain.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Head/Hats/captain.rsi/inhand-left.png b/Resources/Textures/Clothing/Head/Hats/captain.rsi/inhand-left.png index 32a9300b28..832f42494f 100644 Binary files a/Resources/Textures/Clothing/Head/Hats/captain.rsi/inhand-left.png and b/Resources/Textures/Clothing/Head/Hats/captain.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/Head/Hats/captain.rsi/inhand-right.png b/Resources/Textures/Clothing/Head/Hats/captain.rsi/inhand-right.png index b59da29a4b..1f2616723b 100644 Binary files a/Resources/Textures/Clothing/Head/Hats/captain.rsi/inhand-right.png and b/Resources/Textures/Clothing/Head/Hats/captain.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/Head/Hats/captain.rsi/meta.json b/Resources/Textures/Clothing/Head/Hats/captain.rsi/meta.json index ae83b3a1d4..39f538e239 100644 --- a/Resources/Textures/Clothing/Head/Hats/captain.rsi/meta.json +++ b/Resources/Textures/Clothing/Head/Hats/captain.rsi/meta.json @@ -1,12 +1,15 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/pull/69842/commits/d8138946b0ed06fced522729ac8eaa0596864329 edited by Skarletto (github), edited by Emisse for ss14", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/2fea0a59470c476cf3f927833d3918d89cbe6af8", "size": { "x": 32, "y": 32 }, "states": [ + { + "name": "icon" + }, { "name": "equipped-HELMET", "directions": 4 @@ -22,9 +25,6 @@ { "name": "inhand-right", "directions": 4 - }, - { - "name": "icon" } ] } diff --git a/Resources/Textures/Clothing/Head/Hats/cardborg_h.rsi/equipped-HELMET-vox.png b/Resources/Textures/Clothing/Head/Hats/cardborg_h.rsi/equipped-HELMET-vox.png new file mode 100644 index 0000000000..f5a8cf7c05 Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hats/cardborg_h.rsi/equipped-HELMET-vox.png differ diff --git a/Resources/Textures/Clothing/Head/Hats/cardborg_h.rsi/meta.json b/Resources/Textures/Clothing/Head/Hats/cardborg_h.rsi/meta.json index a470e00944..cec1961dce 100644 --- a/Resources/Textures/Clothing/Head/Hats/cardborg_h.rsi/meta.json +++ b/Resources/Textures/Clothing/Head/Hats/cardborg_h.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e. vox state by Flareguy", "size": { "x": 32, "y": 32 @@ -14,6 +14,10 @@ "name": "equipped-HELMET", "directions": 4 }, + { + "name": "equipped-HELMET-vox", + "directions": 4 + }, { "name": "inhand-left", "directions": 4 diff --git a/Resources/Textures/Clothing/Head/Hats/centcom.rsi/equipped-HELMET.png b/Resources/Textures/Clothing/Head/Hats/centcom.rsi/equipped-HELMET.png index 3abd49cf75..b5938fc8b4 100644 Binary files a/Resources/Textures/Clothing/Head/Hats/centcom.rsi/equipped-HELMET.png and b/Resources/Textures/Clothing/Head/Hats/centcom.rsi/equipped-HELMET.png differ diff --git a/Resources/Textures/Clothing/Head/Hats/centcom.rsi/icon.png b/Resources/Textures/Clothing/Head/Hats/centcom.rsi/icon.png index 2a1b9d77c7..c42eefbbf8 100644 Binary files a/Resources/Textures/Clothing/Head/Hats/centcom.rsi/icon.png and b/Resources/Textures/Clothing/Head/Hats/centcom.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Head/Hats/centcom.rsi/meta.json b/Resources/Textures/Clothing/Head/Hats/centcom.rsi/meta.json index a470e00944..5a57615011 100644 --- a/Resources/Textures/Clothing/Head/Hats/centcom.rsi/meta.json +++ b/Resources/Textures/Clothing/Head/Hats/centcom.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/2fea0a59470c476cf3f927833d3918d89cbe6af8", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/Clothing/Head/Hats/chefhat.rsi/equipped-HELMET.png b/Resources/Textures/Clothing/Head/Hats/chefhat.rsi/equipped-HELMET.png index c4c9bf103a..6b61fdb701 100644 Binary files a/Resources/Textures/Clothing/Head/Hats/chefhat.rsi/equipped-HELMET.png and b/Resources/Textures/Clothing/Head/Hats/chefhat.rsi/equipped-HELMET.png differ diff --git a/Resources/Textures/Clothing/Head/Hats/chefhat.rsi/icon.png b/Resources/Textures/Clothing/Head/Hats/chefhat.rsi/icon.png index 7c702d4985..e5d83ede8a 100644 Binary files a/Resources/Textures/Clothing/Head/Hats/chefhat.rsi/icon.png and b/Resources/Textures/Clothing/Head/Hats/chefhat.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Head/Hats/fishcap.rsi/icon.png b/Resources/Textures/Clothing/Head/Hats/fishcap.rsi/icon.png index d8e6af121c..5b7f59cae4 100644 Binary files a/Resources/Textures/Clothing/Head/Hats/fishcap.rsi/icon.png and b/Resources/Textures/Clothing/Head/Hats/fishcap.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Head/Hats/gladiator.rsi/equipped-HELMET-vox.png b/Resources/Textures/Clothing/Head/Hats/gladiator.rsi/equipped-HELMET-vox.png new file mode 100644 index 0000000000..b432655c5a Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hats/gladiator.rsi/equipped-HELMET-vox.png differ diff --git a/Resources/Textures/Clothing/Head/Hats/gladiator.rsi/meta.json b/Resources/Textures/Clothing/Head/Hats/gladiator.rsi/meta.json index bbb0aac664..057d0b0ab2 100644 --- a/Resources/Textures/Clothing/Head/Hats/gladiator.rsi/meta.json +++ b/Resources/Textures/Clothing/Head/Hats/gladiator.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e. equipped-HELMET-vox state taken from /vg/station at commit https://github.com/vgstation-coders/vgstation13/commit/31d6576ba8102135d058ef49c3cb6ecbe8db8a79", "size": { "x": 32, "y": 32 @@ -20,7 +20,11 @@ }, { "name": "inhand-right", - "direction": 4 + "directions": 4 + }, + { + "name": "equipped-HELMET-vox", + "directions": 4 } ] } diff --git a/Resources/Textures/Clothing/Head/Hats/greyfedora.rsi/equipped-HELMET.png b/Resources/Textures/Clothing/Head/Hats/greyfedora.rsi/equipped-HELMET.png index 20554f5f2a..2085c26390 100644 Binary files a/Resources/Textures/Clothing/Head/Hats/greyfedora.rsi/equipped-HELMET.png and b/Resources/Textures/Clothing/Head/Hats/greyfedora.rsi/equipped-HELMET.png differ diff --git a/Resources/Textures/Clothing/Head/Hats/greyfedora.rsi/icon.png b/Resources/Textures/Clothing/Head/Hats/greyfedora.rsi/icon.png index 634dbe744c..86ad183583 100644 Binary files a/Resources/Textures/Clothing/Head/Hats/greyfedora.rsi/icon.png and b/Resources/Textures/Clothing/Head/Hats/greyfedora.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Head/Hats/greyfedora.rsi/inhand-left.png b/Resources/Textures/Clothing/Head/Hats/greyfedora.rsi/inhand-left.png index 88f5e5ef93..d51dcd817b 100644 Binary files a/Resources/Textures/Clothing/Head/Hats/greyfedora.rsi/inhand-left.png and b/Resources/Textures/Clothing/Head/Hats/greyfedora.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/Head/Hats/greyfedora.rsi/inhand-right.png b/Resources/Textures/Clothing/Head/Hats/greyfedora.rsi/inhand-right.png index 8c68945d83..4375d648b5 100644 Binary files a/Resources/Textures/Clothing/Head/Hats/greyfedora.rsi/inhand-right.png and b/Resources/Textures/Clothing/Head/Hats/greyfedora.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/Head/Hats/greyfedora.rsi/meta.json b/Resources/Textures/Clothing/Head/Hats/greyfedora.rsi/meta.json index a470e00944..cb460f5efa 100644 --- a/Resources/Textures/Clothing/Head/Hats/greyfedora.rsi/meta.json +++ b/Resources/Textures/Clothing/Head/Hats/greyfedora.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e and modified by Flareguy for space station 14. icon state made by Flareguy for Space Station 14", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/Clothing/Head/Hats/hetman_hat.rsi/equipped-HELMET.png b/Resources/Textures/Clothing/Head/Hats/hetman_hat.rsi/equipped-HELMET.png index d035dff715..ea6b9047bb 100644 Binary files a/Resources/Textures/Clothing/Head/Hats/hetman_hat.rsi/equipped-HELMET.png and b/Resources/Textures/Clothing/Head/Hats/hetman_hat.rsi/equipped-HELMET.png differ diff --git a/Resources/Textures/Clothing/Head/Hats/hetman_hat.rsi/icon.png b/Resources/Textures/Clothing/Head/Hats/hetman_hat.rsi/icon.png index 6ab19f3322..cdf1167736 100644 Binary files a/Resources/Textures/Clothing/Head/Hats/hetman_hat.rsi/icon.png and b/Resources/Textures/Clothing/Head/Hats/hetman_hat.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Head/Hats/hopcap.rsi/equipped-HELMET-hamster.png b/Resources/Textures/Clothing/Head/Hats/hopcap.rsi/equipped-HELMET-hamster.png index d7f074427c..512d1e1cbf 100644 Binary files a/Resources/Textures/Clothing/Head/Hats/hopcap.rsi/equipped-HELMET-hamster.png and b/Resources/Textures/Clothing/Head/Hats/hopcap.rsi/equipped-HELMET-hamster.png differ diff --git a/Resources/Textures/Clothing/Head/Hats/hopcap.rsi/equipped-HELMET.png b/Resources/Textures/Clothing/Head/Hats/hopcap.rsi/equipped-HELMET.png index c147928c6b..e1df83ac43 100644 Binary files a/Resources/Textures/Clothing/Head/Hats/hopcap.rsi/equipped-HELMET.png and b/Resources/Textures/Clothing/Head/Hats/hopcap.rsi/equipped-HELMET.png differ diff --git a/Resources/Textures/Clothing/Head/Hats/hopcap.rsi/icon.png b/Resources/Textures/Clothing/Head/Hats/hopcap.rsi/icon.png index 73a8391787..dc0cf72c1d 100644 Binary files a/Resources/Textures/Clothing/Head/Hats/hopcap.rsi/icon.png and b/Resources/Textures/Clothing/Head/Hats/hopcap.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Head/Hats/hopcap.rsi/inhand-left.png b/Resources/Textures/Clothing/Head/Hats/hopcap.rsi/inhand-left.png index d412692631..9c37564d42 100644 Binary files a/Resources/Textures/Clothing/Head/Hats/hopcap.rsi/inhand-left.png and b/Resources/Textures/Clothing/Head/Hats/hopcap.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/Head/Hats/hopcap.rsi/inhand-right.png b/Resources/Textures/Clothing/Head/Hats/hopcap.rsi/inhand-right.png index eb18e2b6a7..ef139d473e 100644 Binary files a/Resources/Textures/Clothing/Head/Hats/hopcap.rsi/inhand-right.png and b/Resources/Textures/Clothing/Head/Hats/hopcap.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/Head/Hats/hopcap.rsi/meta.json b/Resources/Textures/Clothing/Head/Hats/hopcap.rsi/meta.json index ade65863af..39f538e239 100644 --- a/Resources/Textures/Clothing/Head/Hats/hopcap.rsi/meta.json +++ b/Resources/Textures/Clothing/Head/Hats/hopcap.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/2fea0a59470c476cf3f927833d3918d89cbe6af8", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/Clothing/Head/Hats/hoshat.rsi/equipped-HELMET-hamster.png b/Resources/Textures/Clothing/Head/Hats/hoshat.rsi/equipped-HELMET-hamster.png index 8b7692f0ff..805cf0c124 100644 Binary files a/Resources/Textures/Clothing/Head/Hats/hoshat.rsi/equipped-HELMET-hamster.png and b/Resources/Textures/Clothing/Head/Hats/hoshat.rsi/equipped-HELMET-hamster.png differ diff --git a/Resources/Textures/Clothing/Head/Hats/hoshat.rsi/equipped-HELMET.png b/Resources/Textures/Clothing/Head/Hats/hoshat.rsi/equipped-HELMET.png index f980e7b3ec..81cee0edd6 100644 Binary files a/Resources/Textures/Clothing/Head/Hats/hoshat.rsi/equipped-HELMET.png and b/Resources/Textures/Clothing/Head/Hats/hoshat.rsi/equipped-HELMET.png differ diff --git a/Resources/Textures/Clothing/Head/Hats/hoshat.rsi/icon.png b/Resources/Textures/Clothing/Head/Hats/hoshat.rsi/icon.png index e441011bcf..bbb6d4fad9 100644 Binary files a/Resources/Textures/Clothing/Head/Hats/hoshat.rsi/icon.png and b/Resources/Textures/Clothing/Head/Hats/hoshat.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Head/Hats/hoshat.rsi/inhand-left.png b/Resources/Textures/Clothing/Head/Hats/hoshat.rsi/inhand-left.png index d0213d0eab..206c5d4fba 100644 Binary files a/Resources/Textures/Clothing/Head/Hats/hoshat.rsi/inhand-left.png and b/Resources/Textures/Clothing/Head/Hats/hoshat.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/Head/Hats/hoshat.rsi/inhand-right.png b/Resources/Textures/Clothing/Head/Hats/hoshat.rsi/inhand-right.png index 36d4c7032f..7a64c47de5 100644 Binary files a/Resources/Textures/Clothing/Head/Hats/hoshat.rsi/inhand-right.png and b/Resources/Textures/Clothing/Head/Hats/hoshat.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/Head/Hats/hoshat.rsi/meta.json b/Resources/Textures/Clothing/Head/Hats/hoshat.rsi/meta.json index 9a2a838962..648760ce17 100644 --- a/Resources/Textures/Clothing/Head/Hats/hoshat.rsi/meta.json +++ b/Resources/Textures/Clothing/Head/Hats/hoshat.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from cev-eris at commit https://github.com/discordia-space/CEV-Eris/commit/a75dee2e6d236612dbd403dd5f8687ca930c01f1", + "copyright": "Made by Flareguy for SS14. Based on the HOS cap sprite taken from tgstation at commit https://github.com/tgstation/tgstation/commit/d90c7e5de6f6d94596c164da78dbc8d3cd35bb99.", "size": { "x": 32, "y": 32 @@ -14,10 +14,6 @@ "name": "equipped-HELMET", "directions": 4 }, - { - "name": "equipped-HELMET-hamster", - "directions": 4 - }, { "name": "inhand-left", "directions": 4 diff --git a/Resources/Textures/Clothing/Head/Hats/magician.rsi/equipped-HELMET.png b/Resources/Textures/Clothing/Head/Hats/magician.rsi/equipped-HELMET.png index 037ae386a6..b29c71acdf 100644 Binary files a/Resources/Textures/Clothing/Head/Hats/magician.rsi/equipped-HELMET.png and b/Resources/Textures/Clothing/Head/Hats/magician.rsi/equipped-HELMET.png differ diff --git a/Resources/Textures/Clothing/Head/Hats/magician.rsi/icon.png b/Resources/Textures/Clothing/Head/Hats/magician.rsi/icon.png index 38bd127919..fe591810de 100644 Binary files a/Resources/Textures/Clothing/Head/Hats/magician.rsi/icon.png and b/Resources/Textures/Clothing/Head/Hats/magician.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Head/Hats/magician.rsi/inhand-left.png b/Resources/Textures/Clothing/Head/Hats/magician.rsi/inhand-left.png index ac7d245aec..601d9a98c6 100644 Binary files a/Resources/Textures/Clothing/Head/Hats/magician.rsi/inhand-left.png and b/Resources/Textures/Clothing/Head/Hats/magician.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/Head/Hats/magician.rsi/inhand-right.png b/Resources/Textures/Clothing/Head/Hats/magician.rsi/inhand-right.png index c14c928705..b70f6aee1e 100644 Binary files a/Resources/Textures/Clothing/Head/Hats/magician.rsi/inhand-right.png and b/Resources/Textures/Clothing/Head/Hats/magician.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/Head/Hats/nursehat.rsi/icon.png b/Resources/Textures/Clothing/Head/Hats/nursehat.rsi/icon.png index b9bc475b17..31f31c704e 100644 Binary files a/Resources/Textures/Clothing/Head/Hats/nursehat.rsi/icon.png and b/Resources/Textures/Clothing/Head/Hats/nursehat.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Head/Hats/outlawhat.rsi/inhand-left.png b/Resources/Textures/Clothing/Head/Hats/outlawhat.rsi/inhand-left.png index fca4fad17f..c6ef0b1504 100644 Binary files a/Resources/Textures/Clothing/Head/Hats/outlawhat.rsi/inhand-left.png and b/Resources/Textures/Clothing/Head/Hats/outlawhat.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/Head/Hats/outlawhat.rsi/inhand-right.png b/Resources/Textures/Clothing/Head/Hats/outlawhat.rsi/inhand-right.png index d96d6f196c..ec43cc89e5 100644 Binary files a/Resources/Textures/Clothing/Head/Hats/outlawhat.rsi/inhand-right.png and b/Resources/Textures/Clothing/Head/Hats/outlawhat.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/Head/Hats/paper.rsi/equipped-HELMET-vox.png b/Resources/Textures/Clothing/Head/Hats/paper.rsi/equipped-HELMET-vox.png new file mode 100644 index 0000000000..5f5c3376d7 Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hats/paper.rsi/equipped-HELMET-vox.png differ diff --git a/Resources/Textures/Clothing/Head/Hats/paper.rsi/icon.png b/Resources/Textures/Clothing/Head/Hats/paper.rsi/icon.png index c86e280868..11b8198a36 100644 Binary files a/Resources/Textures/Clothing/Head/Hats/paper.rsi/icon.png and b/Resources/Textures/Clothing/Head/Hats/paper.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Head/Hats/paper.rsi/meta.json b/Resources/Textures/Clothing/Head/Hats/paper.rsi/meta.json index a470e00944..057d0b0ab2 100644 --- a/Resources/Textures/Clothing/Head/Hats/paper.rsi/meta.json +++ b/Resources/Textures/Clothing/Head/Hats/paper.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e. equipped-HELMET-vox state taken from /vg/station at commit https://github.com/vgstation-coders/vgstation13/commit/31d6576ba8102135d058ef49c3cb6ecbe8db8a79", "size": { "x": 32, "y": 32 @@ -21,6 +21,10 @@ { "name": "inhand-right", "directions": 4 + }, + { + "name": "equipped-HELMET-vox", + "directions": 4 } ] } diff --git a/Resources/Textures/Clothing/Head/Hats/papersack.rsi/equipped-HELMET-vox.png b/Resources/Textures/Clothing/Head/Hats/papersack.rsi/equipped-HELMET-vox.png new file mode 100644 index 0000000000..10f06b436d Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hats/papersack.rsi/equipped-HELMET-vox.png differ diff --git a/Resources/Textures/Clothing/Head/Hats/papersack.rsi/meta.json b/Resources/Textures/Clothing/Head/Hats/papersack.rsi/meta.json index 35abb07e61..a455376533 100644 --- a/Resources/Textures/Clothing/Head/Hats/papersack.rsi/meta.json +++ b/Resources/Textures/Clothing/Head/Hats/papersack.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from Beestation at commit https://github.com/BeeStation/BeeStation-Hornet/commit/0bb49b1a97488349ee89308ad6a0904066e1c6f3", + "copyright": "Taken from Beestation at commit https://github.com/BeeStation/BeeStation-Hornet/commit/0bb49b1a97488349ee89308ad6a0904066e1c6f3. vox states by Flareguy", "size": { "x": 32, "y": 32 @@ -14,6 +14,10 @@ "name": "equipped-HELMET", "directions": 4 }, + { + "name": "equipped-HELMET-vox", + "directions": 4 + }, { "name": "inhand-left", "directions": 4 diff --git a/Resources/Textures/Clothing/Head/Hats/pirate.rsi/equipped-HELMET.png b/Resources/Textures/Clothing/Head/Hats/pirate.rsi/equipped-HELMET.png index d9f1ae8614..68d3c5d2f6 100644 Binary files a/Resources/Textures/Clothing/Head/Hats/pirate.rsi/equipped-HELMET.png and b/Resources/Textures/Clothing/Head/Hats/pirate.rsi/equipped-HELMET.png differ diff --git a/Resources/Textures/Clothing/Head/Hats/pirate.rsi/icon.png b/Resources/Textures/Clothing/Head/Hats/pirate.rsi/icon.png index fbf58991fd..9b9f852b60 100644 Binary files a/Resources/Textures/Clothing/Head/Hats/pirate.rsi/icon.png and b/Resources/Textures/Clothing/Head/Hats/pirate.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Head/Hats/pirate.rsi/inhand-left.png b/Resources/Textures/Clothing/Head/Hats/pirate.rsi/inhand-left.png index b5ec184680..2be217461f 100644 Binary files a/Resources/Textures/Clothing/Head/Hats/pirate.rsi/inhand-left.png and b/Resources/Textures/Clothing/Head/Hats/pirate.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/Head/Hats/pirate.rsi/inhand-right.png b/Resources/Textures/Clothing/Head/Hats/pirate.rsi/inhand-right.png index cfb6e0f91d..5f95d08855 100644 Binary files a/Resources/Textures/Clothing/Head/Hats/pirate.rsi/inhand-right.png and b/Resources/Textures/Clothing/Head/Hats/pirate.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/Head/Hats/piratetricord.rsi/equipped-HELMET.png b/Resources/Textures/Clothing/Head/Hats/piratetricord.rsi/equipped-HELMET.png index 8492fac39b..5f8e876b1d 100644 Binary files a/Resources/Textures/Clothing/Head/Hats/piratetricord.rsi/equipped-HELMET.png and b/Resources/Textures/Clothing/Head/Hats/piratetricord.rsi/equipped-HELMET.png differ diff --git a/Resources/Textures/Clothing/Head/Hats/piratetricord.rsi/icon.png b/Resources/Textures/Clothing/Head/Hats/piratetricord.rsi/icon.png index 64f56ea1d2..81ab4e827c 100644 Binary files a/Resources/Textures/Clothing/Head/Hats/piratetricord.rsi/icon.png and b/Resources/Textures/Clothing/Head/Hats/piratetricord.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Head/Hats/pyjamasyndicateblack.rsi/equipped-HELMET.png b/Resources/Textures/Clothing/Head/Hats/pyjamasyndicateblack.rsi/equipped-HELMET.png index 5a800745b7..78980b1739 100644 Binary files a/Resources/Textures/Clothing/Head/Hats/pyjamasyndicateblack.rsi/equipped-HELMET.png and b/Resources/Textures/Clothing/Head/Hats/pyjamasyndicateblack.rsi/equipped-HELMET.png differ diff --git a/Resources/Textures/Clothing/Head/Hats/pyjamasyndicateblack.rsi/icon.png b/Resources/Textures/Clothing/Head/Hats/pyjamasyndicateblack.rsi/icon.png index 7792d3ea44..02cac2e67c 100644 Binary files a/Resources/Textures/Clothing/Head/Hats/pyjamasyndicateblack.rsi/icon.png and b/Resources/Textures/Clothing/Head/Hats/pyjamasyndicateblack.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Head/Hats/pyjamasyndicateblack.rsi/inhand-left.png b/Resources/Textures/Clothing/Head/Hats/pyjamasyndicateblack.rsi/inhand-left.png index 121324831e..b5701fd483 100644 Binary files a/Resources/Textures/Clothing/Head/Hats/pyjamasyndicateblack.rsi/inhand-left.png and b/Resources/Textures/Clothing/Head/Hats/pyjamasyndicateblack.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/Head/Hats/pyjamasyndicateblack.rsi/inhand-right.png b/Resources/Textures/Clothing/Head/Hats/pyjamasyndicateblack.rsi/inhand-right.png index 88fd59c31d..f25b9aef19 100644 Binary files a/Resources/Textures/Clothing/Head/Hats/pyjamasyndicateblack.rsi/inhand-right.png and b/Resources/Textures/Clothing/Head/Hats/pyjamasyndicateblack.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/Head/Hats/pyjamasyndicatepink.rsi/equipped-HELMET.png b/Resources/Textures/Clothing/Head/Hats/pyjamasyndicatepink.rsi/equipped-HELMET.png index 1cdd035e78..cb1476ed53 100644 Binary files a/Resources/Textures/Clothing/Head/Hats/pyjamasyndicatepink.rsi/equipped-HELMET.png and b/Resources/Textures/Clothing/Head/Hats/pyjamasyndicatepink.rsi/equipped-HELMET.png differ diff --git a/Resources/Textures/Clothing/Head/Hats/pyjamasyndicatepink.rsi/icon.png b/Resources/Textures/Clothing/Head/Hats/pyjamasyndicatepink.rsi/icon.png index 219c278078..a2ed658b49 100644 Binary files a/Resources/Textures/Clothing/Head/Hats/pyjamasyndicatepink.rsi/icon.png and b/Resources/Textures/Clothing/Head/Hats/pyjamasyndicatepink.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Head/Hats/pyjamasyndicatepink.rsi/inhand-left.png b/Resources/Textures/Clothing/Head/Hats/pyjamasyndicatepink.rsi/inhand-left.png index 649723cb7f..3f4d4d8bff 100644 Binary files a/Resources/Textures/Clothing/Head/Hats/pyjamasyndicatepink.rsi/inhand-left.png and b/Resources/Textures/Clothing/Head/Hats/pyjamasyndicatepink.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/Head/Hats/pyjamasyndicatepink.rsi/inhand-right.png b/Resources/Textures/Clothing/Head/Hats/pyjamasyndicatepink.rsi/inhand-right.png index 71b72c54a6..590999aa1b 100644 Binary files a/Resources/Textures/Clothing/Head/Hats/pyjamasyndicatepink.rsi/inhand-right.png and b/Resources/Textures/Clothing/Head/Hats/pyjamasyndicatepink.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/Head/Hats/pyjamasyndicatered.rsi/equipped-HELMET.png b/Resources/Textures/Clothing/Head/Hats/pyjamasyndicatered.rsi/equipped-HELMET.png index 30c4885ed6..5ee1ee1a00 100644 Binary files a/Resources/Textures/Clothing/Head/Hats/pyjamasyndicatered.rsi/equipped-HELMET.png and b/Resources/Textures/Clothing/Head/Hats/pyjamasyndicatered.rsi/equipped-HELMET.png differ diff --git a/Resources/Textures/Clothing/Head/Hats/pyjamasyndicatered.rsi/icon.png b/Resources/Textures/Clothing/Head/Hats/pyjamasyndicatered.rsi/icon.png index 6d881c801a..f981a7ad09 100644 Binary files a/Resources/Textures/Clothing/Head/Hats/pyjamasyndicatered.rsi/icon.png and b/Resources/Textures/Clothing/Head/Hats/pyjamasyndicatered.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Head/Hats/pyjamasyndicatered.rsi/inhand-left.png b/Resources/Textures/Clothing/Head/Hats/pyjamasyndicatered.rsi/inhand-left.png index d518921fb1..6d348eb382 100644 Binary files a/Resources/Textures/Clothing/Head/Hats/pyjamasyndicatered.rsi/inhand-left.png and b/Resources/Textures/Clothing/Head/Hats/pyjamasyndicatered.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/Head/Hats/pyjamasyndicatered.rsi/inhand-right.png b/Resources/Textures/Clothing/Head/Hats/pyjamasyndicatered.rsi/inhand-right.png index 67594a7ef4..c04bd46577 100644 Binary files a/Resources/Textures/Clothing/Head/Hats/pyjamasyndicatered.rsi/inhand-right.png and b/Resources/Textures/Clothing/Head/Hats/pyjamasyndicatered.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/Head/Hats/redwizard.rsi/equipped-HELMET.png b/Resources/Textures/Clothing/Head/Hats/redwizard.rsi/equipped-HELMET.png index c8bbec6c4d..819f00a8b3 100644 Binary files a/Resources/Textures/Clothing/Head/Hats/redwizard.rsi/equipped-HELMET.png and b/Resources/Textures/Clothing/Head/Hats/redwizard.rsi/equipped-HELMET.png differ diff --git a/Resources/Textures/Clothing/Head/Hats/redwizard.rsi/icon.png b/Resources/Textures/Clothing/Head/Hats/redwizard.rsi/icon.png index b0ca54f66c..0169501fde 100644 Binary files a/Resources/Textures/Clothing/Head/Hats/redwizard.rsi/icon.png and b/Resources/Textures/Clothing/Head/Hats/redwizard.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Head/Hats/redwizard.rsi/inhand-left.png b/Resources/Textures/Clothing/Head/Hats/redwizard.rsi/inhand-left.png index dabd7cb3d3..35f789a2fb 100644 Binary files a/Resources/Textures/Clothing/Head/Hats/redwizard.rsi/inhand-left.png and b/Resources/Textures/Clothing/Head/Hats/redwizard.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/Head/Hats/redwizard.rsi/inhand-right.png b/Resources/Textures/Clothing/Head/Hats/redwizard.rsi/inhand-right.png index af141d7eec..987533679d 100644 Binary files a/Resources/Textures/Clothing/Head/Hats/redwizard.rsi/inhand-right.png and b/Resources/Textures/Clothing/Head/Hats/redwizard.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/Head/Hats/santahat.rsi/equipped-HELMET-vox.png b/Resources/Textures/Clothing/Head/Hats/santahat.rsi/equipped-HELMET-vox.png new file mode 100644 index 0000000000..9e7eca032c Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hats/santahat.rsi/equipped-HELMET-vox.png differ diff --git a/Resources/Textures/Clothing/Head/Hats/santahat.rsi/equipped-HELMET.png b/Resources/Textures/Clothing/Head/Hats/santahat.rsi/equipped-HELMET.png index 67b190a190..78830509df 100644 Binary files a/Resources/Textures/Clothing/Head/Hats/santahat.rsi/equipped-HELMET.png and b/Resources/Textures/Clothing/Head/Hats/santahat.rsi/equipped-HELMET.png differ diff --git a/Resources/Textures/Clothing/Head/Hats/santahat.rsi/icon.png b/Resources/Textures/Clothing/Head/Hats/santahat.rsi/icon.png index 88fb770f8d..fdbae63ead 100644 Binary files a/Resources/Textures/Clothing/Head/Hats/santahat.rsi/icon.png and b/Resources/Textures/Clothing/Head/Hats/santahat.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Head/Hats/santahat.rsi/inhand-left.png b/Resources/Textures/Clothing/Head/Hats/santahat.rsi/inhand-left.png index fc939dc5ca..9a419a630b 100644 Binary files a/Resources/Textures/Clothing/Head/Hats/santahat.rsi/inhand-left.png and b/Resources/Textures/Clothing/Head/Hats/santahat.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/Head/Hats/santahat.rsi/inhand-right.png b/Resources/Textures/Clothing/Head/Hats/santahat.rsi/inhand-right.png index 7e458126ec..098f38b7fd 100644 Binary files a/Resources/Textures/Clothing/Head/Hats/santahat.rsi/inhand-right.png and b/Resources/Textures/Clothing/Head/Hats/santahat.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/Head/Hats/santahat.rsi/meta.json b/Resources/Textures/Clothing/Head/Hats/santahat.rsi/meta.json index a470e00944..cec1961dce 100644 --- a/Resources/Textures/Clothing/Head/Hats/santahat.rsi/meta.json +++ b/Resources/Textures/Clothing/Head/Hats/santahat.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e. vox state by Flareguy", "size": { "x": 32, "y": 32 @@ -14,6 +14,10 @@ "name": "equipped-HELMET", "directions": 4 }, + { + "name": "equipped-HELMET-vox", + "directions": 4 + }, { "name": "inhand-left", "directions": 4 diff --git a/Resources/Textures/Clothing/Head/Hats/surgcap_blue.rsi/equipped-HELMET-vox.png b/Resources/Textures/Clothing/Head/Hats/surgcap_blue.rsi/equipped-HELMET-vox.png new file mode 100644 index 0000000000..a51c268041 Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hats/surgcap_blue.rsi/equipped-HELMET-vox.png differ diff --git a/Resources/Textures/Clothing/Head/Hats/surgcap_blue.rsi/equipped-HELMET.png b/Resources/Textures/Clothing/Head/Hats/surgcap_blue.rsi/equipped-HELMET.png index 26d5c11eea..18144f0ed1 100644 Binary files a/Resources/Textures/Clothing/Head/Hats/surgcap_blue.rsi/equipped-HELMET.png and b/Resources/Textures/Clothing/Head/Hats/surgcap_blue.rsi/equipped-HELMET.png differ diff --git a/Resources/Textures/Clothing/Head/Hats/surgcap_blue.rsi/icon.png b/Resources/Textures/Clothing/Head/Hats/surgcap_blue.rsi/icon.png index 8f180c9e45..7b80f4be1c 100644 Binary files a/Resources/Textures/Clothing/Head/Hats/surgcap_blue.rsi/icon.png and b/Resources/Textures/Clothing/Head/Hats/surgcap_blue.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Head/Hats/surgcap_blue.rsi/meta.json b/Resources/Textures/Clothing/Head/Hats/surgcap_blue.rsi/meta.json index ade65863af..39f538e239 100644 --- a/Resources/Textures/Clothing/Head/Hats/surgcap_blue.rsi/meta.json +++ b/Resources/Textures/Clothing/Head/Hats/surgcap_blue.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/2fea0a59470c476cf3f927833d3918d89cbe6af8", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/Clothing/Head/Hats/surgcap_green.rsi/equipped-HELMET-vox.png b/Resources/Textures/Clothing/Head/Hats/surgcap_green.rsi/equipped-HELMET-vox.png new file mode 100644 index 0000000000..81601c6c2b Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hats/surgcap_green.rsi/equipped-HELMET-vox.png differ diff --git a/Resources/Textures/Clothing/Head/Hats/surgcap_green.rsi/equipped-HELMET.png b/Resources/Textures/Clothing/Head/Hats/surgcap_green.rsi/equipped-HELMET.png index abc293aa93..f60ea1cac3 100644 Binary files a/Resources/Textures/Clothing/Head/Hats/surgcap_green.rsi/equipped-HELMET.png and b/Resources/Textures/Clothing/Head/Hats/surgcap_green.rsi/equipped-HELMET.png differ diff --git a/Resources/Textures/Clothing/Head/Hats/surgcap_green.rsi/icon.png b/Resources/Textures/Clothing/Head/Hats/surgcap_green.rsi/icon.png index a1bc3ed151..ec7ebdb0a8 100644 Binary files a/Resources/Textures/Clothing/Head/Hats/surgcap_green.rsi/icon.png and b/Resources/Textures/Clothing/Head/Hats/surgcap_green.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Head/Hats/surgcap_green.rsi/meta.json b/Resources/Textures/Clothing/Head/Hats/surgcap_green.rsi/meta.json index a470e00944..5a57615011 100644 --- a/Resources/Textures/Clothing/Head/Hats/surgcap_green.rsi/meta.json +++ b/Resources/Textures/Clothing/Head/Hats/surgcap_green.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/2fea0a59470c476cf3f927833d3918d89cbe6af8", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/Clothing/Head/Hats/surgcap_purple.rsi/equipped-HELMET-vox.png b/Resources/Textures/Clothing/Head/Hats/surgcap_purple.rsi/equipped-HELMET-vox.png new file mode 100644 index 0000000000..24ea1365cd Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hats/surgcap_purple.rsi/equipped-HELMET-vox.png differ diff --git a/Resources/Textures/Clothing/Head/Hats/surgcap_purple.rsi/equipped-HELMET.png b/Resources/Textures/Clothing/Head/Hats/surgcap_purple.rsi/equipped-HELMET.png index 620dca461b..858fb9b868 100644 Binary files a/Resources/Textures/Clothing/Head/Hats/surgcap_purple.rsi/equipped-HELMET.png and b/Resources/Textures/Clothing/Head/Hats/surgcap_purple.rsi/equipped-HELMET.png differ diff --git a/Resources/Textures/Clothing/Head/Hats/surgcap_purple.rsi/icon.png b/Resources/Textures/Clothing/Head/Hats/surgcap_purple.rsi/icon.png index 03983f640b..0a9316cc1c 100644 Binary files a/Resources/Textures/Clothing/Head/Hats/surgcap_purple.rsi/icon.png and b/Resources/Textures/Clothing/Head/Hats/surgcap_purple.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Head/Hats/surgcap_purple.rsi/meta.json b/Resources/Textures/Clothing/Head/Hats/surgcap_purple.rsi/meta.json index a470e00944..5a57615011 100644 --- a/Resources/Textures/Clothing/Head/Hats/surgcap_purple.rsi/meta.json +++ b/Resources/Textures/Clothing/Head/Hats/surgcap_purple.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/2fea0a59470c476cf3f927833d3918d89cbe6af8", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/Clothing/Head/Hats/tophat.rsi/icon.png b/Resources/Textures/Clothing/Head/Hats/tophat.rsi/icon.png index c90c768fa0..8982116966 100644 Binary files a/Resources/Textures/Clothing/Head/Hats/tophat.rsi/icon.png and b/Resources/Textures/Clothing/Head/Hats/tophat.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Head/Hats/truckershat.rsi/icon.png b/Resources/Textures/Clothing/Head/Hats/truckershat.rsi/icon.png index 95a2ca01f5..e9a05266ba 100644 Binary files a/Resources/Textures/Clothing/Head/Hats/truckershat.rsi/icon.png and b/Resources/Textures/Clothing/Head/Hats/truckershat.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Head/Hats/ushanka.rsi/equipped-HELMET.png b/Resources/Textures/Clothing/Head/Hats/ushanka.rsi/equipped-HELMET.png index 3abb582499..8b1762b572 100644 Binary files a/Resources/Textures/Clothing/Head/Hats/ushanka.rsi/equipped-HELMET.png and b/Resources/Textures/Clothing/Head/Hats/ushanka.rsi/equipped-HELMET.png differ diff --git a/Resources/Textures/Clothing/Head/Hats/ushanka.rsi/icon-up.png b/Resources/Textures/Clothing/Head/Hats/ushanka.rsi/icon-up.png index bc82fd5f9f..cf910145af 100644 Binary files a/Resources/Textures/Clothing/Head/Hats/ushanka.rsi/icon-up.png and b/Resources/Textures/Clothing/Head/Hats/ushanka.rsi/icon-up.png differ diff --git a/Resources/Textures/Clothing/Head/Hats/ushanka.rsi/icon.png b/Resources/Textures/Clothing/Head/Hats/ushanka.rsi/icon.png index 615a41f491..bed091cd36 100644 Binary files a/Resources/Textures/Clothing/Head/Hats/ushanka.rsi/icon.png and b/Resources/Textures/Clothing/Head/Hats/ushanka.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Head/Hats/ushanka.rsi/meta.json b/Resources/Textures/Clothing/Head/Hats/ushanka.rsi/meta.json index b3f2f7457d..7fa3b72f2e 100644 --- a/Resources/Textures/Clothing/Head/Hats/ushanka.rsi/meta.json +++ b/Resources/Textures/Clothing/Head/Hats/ushanka.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/2fea0a59470c476cf3f927833d3918d89cbe6af8", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/Clothing/Head/Hats/ushanka.rsi/up-equipped-HELMET.png b/Resources/Textures/Clothing/Head/Hats/ushanka.rsi/up-equipped-HELMET.png index 534f366077..d42ab73a71 100644 Binary files a/Resources/Textures/Clothing/Head/Hats/ushanka.rsi/up-equipped-HELMET.png and b/Resources/Textures/Clothing/Head/Hats/ushanka.rsi/up-equipped-HELMET.png differ diff --git a/Resources/Textures/Clothing/Head/Hats/violetwizard.rsi/equipped-HELMET.png b/Resources/Textures/Clothing/Head/Hats/violetwizard.rsi/equipped-HELMET.png index f457d22f2f..0b4cc4f81d 100644 Binary files a/Resources/Textures/Clothing/Head/Hats/violetwizard.rsi/equipped-HELMET.png and b/Resources/Textures/Clothing/Head/Hats/violetwizard.rsi/equipped-HELMET.png differ diff --git a/Resources/Textures/Clothing/Head/Hats/violetwizard.rsi/icon.png b/Resources/Textures/Clothing/Head/Hats/violetwizard.rsi/icon.png index 7bc7aac0d7..3016335494 100644 Binary files a/Resources/Textures/Clothing/Head/Hats/violetwizard.rsi/icon.png and b/Resources/Textures/Clothing/Head/Hats/violetwizard.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Head/Hats/violetwizard.rsi/inhand-left.png b/Resources/Textures/Clothing/Head/Hats/violetwizard.rsi/inhand-left.png index 759e6b3ed9..136f89a870 100644 Binary files a/Resources/Textures/Clothing/Head/Hats/violetwizard.rsi/inhand-left.png and b/Resources/Textures/Clothing/Head/Hats/violetwizard.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/Head/Hats/violetwizard.rsi/inhand-right.png b/Resources/Textures/Clothing/Head/Hats/violetwizard.rsi/inhand-right.png index dfbf1399ce..f76a10e946 100644 Binary files a/Resources/Textures/Clothing/Head/Hats/violetwizard.rsi/inhand-right.png and b/Resources/Textures/Clothing/Head/Hats/violetwizard.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/Head/Hats/warden.rsi/equipped-HELMET.png b/Resources/Textures/Clothing/Head/Hats/warden.rsi/equipped-HELMET.png index 10dab5101f..76d073d09b 100644 Binary files a/Resources/Textures/Clothing/Head/Hats/warden.rsi/equipped-HELMET.png and b/Resources/Textures/Clothing/Head/Hats/warden.rsi/equipped-HELMET.png differ diff --git a/Resources/Textures/Clothing/Head/Hats/warden.rsi/icon.png b/Resources/Textures/Clothing/Head/Hats/warden.rsi/icon.png index 617f6b4579..4bc117678e 100644 Binary files a/Resources/Textures/Clothing/Head/Hats/warden.rsi/icon.png and b/Resources/Textures/Clothing/Head/Hats/warden.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Head/Hats/warden.rsi/inhand-left.png b/Resources/Textures/Clothing/Head/Hats/warden.rsi/inhand-left.png new file mode 100644 index 0000000000..a979cc3a60 Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hats/warden.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/Head/Hats/warden.rsi/inhand-right.png b/Resources/Textures/Clothing/Head/Hats/warden.rsi/inhand-right.png new file mode 100644 index 0000000000..34a1f0488b Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hats/warden.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/Head/Hats/warden.rsi/meta.json b/Resources/Textures/Clothing/Head/Hats/warden.rsi/meta.json index 7bd2e3e22a..5a57615011 100644 --- a/Resources/Textures/Clothing/Head/Hats/warden.rsi/meta.json +++ b/Resources/Textures/Clothing/Head/Hats/warden.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/2fea0a59470c476cf3f927833d3918d89cbe6af8", "size": { "x": 32, "y": 32 @@ -13,6 +13,14 @@ { "name": "equipped-HELMET", "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 } ] } diff --git a/Resources/Textures/Clothing/Head/Hats/witch.rsi/equipped-HELMET.png b/Resources/Textures/Clothing/Head/Hats/witch.rsi/equipped-HELMET.png index 0e4079ae52..e04db2b34d 100644 Binary files a/Resources/Textures/Clothing/Head/Hats/witch.rsi/equipped-HELMET.png and b/Resources/Textures/Clothing/Head/Hats/witch.rsi/equipped-HELMET.png differ diff --git a/Resources/Textures/Clothing/Head/Hats/witch.rsi/icon.png b/Resources/Textures/Clothing/Head/Hats/witch.rsi/icon.png index 9699d0a6b7..4e9bb8017c 100644 Binary files a/Resources/Textures/Clothing/Head/Hats/witch.rsi/icon.png and b/Resources/Textures/Clothing/Head/Hats/witch.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Head/Hats/witch.rsi/inhand-left.png b/Resources/Textures/Clothing/Head/Hats/witch.rsi/inhand-left.png index 5523b8018f..8f030f68ef 100644 Binary files a/Resources/Textures/Clothing/Head/Hats/witch.rsi/inhand-left.png and b/Resources/Textures/Clothing/Head/Hats/witch.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/Head/Hats/witch.rsi/inhand-right.png b/Resources/Textures/Clothing/Head/Hats/witch.rsi/inhand-right.png index 1424aeaef8..1bb5b18746 100644 Binary files a/Resources/Textures/Clothing/Head/Hats/witch.rsi/inhand-right.png and b/Resources/Textures/Clothing/Head/Hats/witch.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/Head/Hats/witchhat.rsi/equipped-HELMET.png b/Resources/Textures/Clothing/Head/Hats/witchhat.rsi/equipped-HELMET.png index 58e16038b2..d48ee030dc 100644 Binary files a/Resources/Textures/Clothing/Head/Hats/witchhat.rsi/equipped-HELMET.png and b/Resources/Textures/Clothing/Head/Hats/witchhat.rsi/equipped-HELMET.png differ diff --git a/Resources/Textures/Clothing/Head/Hats/witchhat.rsi/icon.png b/Resources/Textures/Clothing/Head/Hats/witchhat.rsi/icon.png index 59bc4c7e97..6ff220ae66 100644 Binary files a/Resources/Textures/Clothing/Head/Hats/witchhat.rsi/icon.png and b/Resources/Textures/Clothing/Head/Hats/witchhat.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Head/Hats/wizard_fake.rsi/icon.png b/Resources/Textures/Clothing/Head/Hats/wizard_fake.rsi/icon.png index d06d47b6f8..f5cabff72d 100644 Binary files a/Resources/Textures/Clothing/Head/Hats/wizard_fake.rsi/icon.png and b/Resources/Textures/Clothing/Head/Hats/wizard_fake.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Head/Hats/wizardhat.rsi/equipped-HELMET.png b/Resources/Textures/Clothing/Head/Hats/wizardhat.rsi/equipped-HELMET.png index 51d09dc18c..4b27d409fb 100644 Binary files a/Resources/Textures/Clothing/Head/Hats/wizardhat.rsi/equipped-HELMET.png and b/Resources/Textures/Clothing/Head/Hats/wizardhat.rsi/equipped-HELMET.png differ diff --git a/Resources/Textures/Clothing/Head/Hats/wizardhat.rsi/icon.png b/Resources/Textures/Clothing/Head/Hats/wizardhat.rsi/icon.png index ec34c0de05..c2bbe03a2a 100644 Binary files a/Resources/Textures/Clothing/Head/Hats/wizardhat.rsi/icon.png and b/Resources/Textures/Clothing/Head/Hats/wizardhat.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Head/Helmets/ancientvoidsuit.rsi/equipped-HELMET.png b/Resources/Textures/Clothing/Head/Helmets/ancientvoidsuit.rsi/equipped-HELMET.png index 0a583d7e74..a87bf9d953 100644 Binary files a/Resources/Textures/Clothing/Head/Helmets/ancientvoidsuit.rsi/equipped-HELMET.png and b/Resources/Textures/Clothing/Head/Helmets/ancientvoidsuit.rsi/equipped-HELMET.png differ diff --git a/Resources/Textures/Clothing/Head/Helmets/ancientvoidsuit.rsi/icon.png b/Resources/Textures/Clothing/Head/Helmets/ancientvoidsuit.rsi/icon.png index 72e688bd9a..fdbf3a2e61 100644 Binary files a/Resources/Textures/Clothing/Head/Helmets/ancientvoidsuit.rsi/icon.png and b/Resources/Textures/Clothing/Head/Helmets/ancientvoidsuit.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Head/Helmets/ancientvoidsuit.rsi/meta.json b/Resources/Textures/Clothing/Head/Helmets/ancientvoidsuit.rsi/meta.json index 3b63122f2f..ce6a86ea76 100644 --- a/Resources/Textures/Clothing/Head/Helmets/ancientvoidsuit.rsi/meta.json +++ b/Resources/Textures/Clothing/Head/Helmets/ancientvoidsuit.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/tree/fb2d71495bfe81446159ef528534193d09dd8d34, sprite repaletted by Flareguy for space-station-14 | vulpkanin version taken from Paradise station at https://github.com/ParadiseSS13/Paradise/commit/f0fa4e1fd809482fbc104a310aa34cebf7df157d", + "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/tree/fb2d71495bfe81446159ef528534193d09dd8d34, sprite repaletted by Flareguy for space-station-14", "size": { "x": 32, "y": 32 @@ -21,10 +21,6 @@ { "name": "inhand-right", "directions": 4 - }, - { - "name": "equipped-HELMET-vulpkanin", - "directions": 4 } ] } diff --git a/Resources/Textures/Clothing/Head/Helmets/atmos_firehelmet.rsi/icon-flash.png b/Resources/Textures/Clothing/Head/Helmets/atmos_firehelmet.rsi/icon-flash.png index 36f945fe2a..7f19e2afbc 100644 Binary files a/Resources/Textures/Clothing/Head/Helmets/atmos_firehelmet.rsi/icon-flash.png and b/Resources/Textures/Clothing/Head/Helmets/atmos_firehelmet.rsi/icon-flash.png differ diff --git a/Resources/Textures/Clothing/Head/Helmets/atmos_firehelmet.rsi/icon.png b/Resources/Textures/Clothing/Head/Helmets/atmos_firehelmet.rsi/icon.png index b86a968e89..e5d79e13c1 100644 Binary files a/Resources/Textures/Clothing/Head/Helmets/atmos_firehelmet.rsi/icon.png and b/Resources/Textures/Clothing/Head/Helmets/atmos_firehelmet.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Head/Helmets/atmos_firehelmet.rsi/meta.json b/Resources/Textures/Clothing/Head/Helmets/atmos_firehelmet.rsi/meta.json index 26d3341e24..34cbbc0bb3 100644 --- a/Resources/Textures/Clothing/Head/Helmets/atmos_firehelmet.rsi/meta.json +++ b/Resources/Textures/Clothing/Head/Helmets/atmos_firehelmet.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation https://github.com/tgstation/tgstation/blob/master/icons/mob/clothing/head.dmi", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/2fea0a59470c476cf3f927833d3918d89cbe6af8", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/Clothing/Head/Helmets/atmos_firehelmet.rsi/off-equipped-HELMET-vox.png b/Resources/Textures/Clothing/Head/Helmets/atmos_firehelmet.rsi/off-equipped-HELMET-vox.png new file mode 100644 index 0000000000..ea6e7edce8 Binary files /dev/null and b/Resources/Textures/Clothing/Head/Helmets/atmos_firehelmet.rsi/off-equipped-HELMET-vox.png differ diff --git a/Resources/Textures/Clothing/Head/Helmets/atmos_firehelmet.rsi/on-equipped-HELMET-vox.png b/Resources/Textures/Clothing/Head/Helmets/atmos_firehelmet.rsi/on-equipped-HELMET-vox.png new file mode 100644 index 0000000000..301ff00e34 Binary files /dev/null and b/Resources/Textures/Clothing/Head/Helmets/atmos_firehelmet.rsi/on-equipped-HELMET-vox.png differ diff --git a/Resources/Textures/Clothing/Head/Helmets/ert_engineer.rsi/equipped-HELMET.png b/Resources/Textures/Clothing/Head/Helmets/ert_engineer.rsi/equipped-HELMET.png index 77b6ef5b3d..02a7034873 100644 Binary files a/Resources/Textures/Clothing/Head/Helmets/ert_engineer.rsi/equipped-HELMET.png and b/Resources/Textures/Clothing/Head/Helmets/ert_engineer.rsi/equipped-HELMET.png differ diff --git a/Resources/Textures/Clothing/Head/Helmets/ert_engineer.rsi/icon.png b/Resources/Textures/Clothing/Head/Helmets/ert_engineer.rsi/icon.png index cfee6aae70..b1f9826b90 100644 Binary files a/Resources/Textures/Clothing/Head/Helmets/ert_engineer.rsi/icon.png and b/Resources/Textures/Clothing/Head/Helmets/ert_engineer.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Head/Helmets/ert_engineer.rsi/inhand-left.png b/Resources/Textures/Clothing/Head/Helmets/ert_engineer.rsi/inhand-left.png index 5c7a58cf14..f33d605675 100644 Binary files a/Resources/Textures/Clothing/Head/Helmets/ert_engineer.rsi/inhand-left.png and b/Resources/Textures/Clothing/Head/Helmets/ert_engineer.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/Head/Helmets/ert_engineer.rsi/inhand-right.png b/Resources/Textures/Clothing/Head/Helmets/ert_engineer.rsi/inhand-right.png index 2206f9d17d..a4574bd396 100644 Binary files a/Resources/Textures/Clothing/Head/Helmets/ert_engineer.rsi/inhand-right.png and b/Resources/Textures/Clothing/Head/Helmets/ert_engineer.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/Head/Helmets/ert_engineer.rsi/meta.json b/Resources/Textures/Clothing/Head/Helmets/ert_engineer.rsi/meta.json index 6aae6f0097..8f2f13ebd7 100644 --- a/Resources/Textures/Clothing/Head/Helmets/ert_engineer.rsi/meta.json +++ b/Resources/Textures/Clothing/Head/Helmets/ert_engineer.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Sprite taken from https://github.com/ParadiseSS13/Paradise/commit/813f0a3ae556d86dddd7c4ef93a52880de8d2e37 and repaletted, inhands created by Flareguy for Space Station 14", + "copyright": "Sprite made by discord:kuro_0001 (388673708753027083)", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/Clothing/Head/Helmets/eva_large.rsi/equipped-HELMET-vox.png b/Resources/Textures/Clothing/Head/Helmets/eva_large.rsi/equipped-HELMET-vox.png new file mode 100644 index 0000000000..b5f224b98a Binary files /dev/null and b/Resources/Textures/Clothing/Head/Helmets/eva_large.rsi/equipped-HELMET-vox.png differ diff --git a/Resources/Textures/Clothing/Head/Helmets/eva_large.rsi/equipped-HELMET.png b/Resources/Textures/Clothing/Head/Helmets/eva_large.rsi/equipped-HELMET.png index c64f69b0d8..cb51468c19 100644 Binary files a/Resources/Textures/Clothing/Head/Helmets/eva_large.rsi/equipped-HELMET.png and b/Resources/Textures/Clothing/Head/Helmets/eva_large.rsi/equipped-HELMET.png differ diff --git a/Resources/Textures/Clothing/Head/Helmets/eva_large.rsi/icon.png b/Resources/Textures/Clothing/Head/Helmets/eva_large.rsi/icon.png index 25a7caf089..8a01fe2fb9 100644 Binary files a/Resources/Textures/Clothing/Head/Helmets/eva_large.rsi/icon.png and b/Resources/Textures/Clothing/Head/Helmets/eva_large.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Head/Helmets/eva_large.rsi/meta.json b/Resources/Textures/Clothing/Head/Helmets/eva_large.rsi/meta.json index 3c406ff57c..89a026869f 100644 --- a/Resources/Textures/Clothing/Head/Helmets/eva_large.rsi/meta.json +++ b/Resources/Textures/Clothing/Head/Helmets/eva_large.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Sprite edited by Flareguy for SS14, original unedited sprite can be found in https://github.com/tgstation/tgstation/commit/40d89d11ea4a5cb81d61dc1018b46f4e7d32c62a | vulpkanin version taken from Paradise station at https://github.com/ParadiseSS13/Paradise/commit/f0fa4e1fd809482fbc104a310aa34cebf7df157d modified by Floofers", + "copyright": "Sprite edited by Flareguy for SS14, original unedited sprite can be found in https://github.com/tgstation/tgstation/commit/40d89d11ea4a5cb81d61dc1018b46f4e7d32c62a", "size": { "x": 32, "y": 32 @@ -15,15 +15,15 @@ "directions": 4 }, { - "name": "inhand-left", + "name": "equipped-HELMET-vox", "directions": 4 }, { - "name": "inhand-right", + "name": "inhand-left", "directions": 4 }, { - "name": "equipped-HELMET-vulpkanin", + "name": "inhand-right", "directions": 4 } ] diff --git a/Resources/Textures/Clothing/Head/Helmets/eva_syndicate.rsi/equipped-HELMET-vox.png b/Resources/Textures/Clothing/Head/Helmets/eva_syndicate.rsi/equipped-HELMET-vox.png new file mode 100644 index 0000000000..62ff233af1 Binary files /dev/null and b/Resources/Textures/Clothing/Head/Helmets/eva_syndicate.rsi/equipped-HELMET-vox.png differ diff --git a/Resources/Textures/Clothing/Head/Helmets/eva_syndicate.rsi/equipped-HELMET.png b/Resources/Textures/Clothing/Head/Helmets/eva_syndicate.rsi/equipped-HELMET.png index f5054f7fd5..bdd08ea7bd 100644 Binary files a/Resources/Textures/Clothing/Head/Helmets/eva_syndicate.rsi/equipped-HELMET.png and b/Resources/Textures/Clothing/Head/Helmets/eva_syndicate.rsi/equipped-HELMET.png differ diff --git a/Resources/Textures/Clothing/Head/Helmets/eva_syndicate.rsi/headlight-equipped-HELMET.png b/Resources/Textures/Clothing/Head/Helmets/eva_syndicate.rsi/headlight-equipped-HELMET.png new file mode 100644 index 0000000000..fdf482a462 Binary files /dev/null and b/Resources/Textures/Clothing/Head/Helmets/eva_syndicate.rsi/headlight-equipped-HELMET.png differ diff --git a/Resources/Textures/Clothing/Head/Helmets/eva_syndicate.rsi/headlight-inhand-left.png b/Resources/Textures/Clothing/Head/Helmets/eva_syndicate.rsi/headlight-inhand-left.png new file mode 100644 index 0000000000..2ece0501f5 Binary files /dev/null and b/Resources/Textures/Clothing/Head/Helmets/eva_syndicate.rsi/headlight-inhand-left.png differ diff --git a/Resources/Textures/Clothing/Head/Helmets/eva_syndicate.rsi/headlight-inhand-right.png b/Resources/Textures/Clothing/Head/Helmets/eva_syndicate.rsi/headlight-inhand-right.png new file mode 100644 index 0000000000..9d6b725509 Binary files /dev/null and b/Resources/Textures/Clothing/Head/Helmets/eva_syndicate.rsi/headlight-inhand-right.png differ diff --git a/Resources/Textures/Clothing/Head/Helmets/eva_syndicate.rsi/headlight.png b/Resources/Textures/Clothing/Head/Helmets/eva_syndicate.rsi/headlight.png new file mode 100644 index 0000000000..1885c7ba5e Binary files /dev/null and b/Resources/Textures/Clothing/Head/Helmets/eva_syndicate.rsi/headlight.png differ diff --git a/Resources/Textures/Clothing/Head/Helmets/eva_syndicate.rsi/icon.png b/Resources/Textures/Clothing/Head/Helmets/eva_syndicate.rsi/icon.png index 93a7db32e6..a5db30743c 100644 Binary files a/Resources/Textures/Clothing/Head/Helmets/eva_syndicate.rsi/icon.png and b/Resources/Textures/Clothing/Head/Helmets/eva_syndicate.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Head/Helmets/eva_syndicate.rsi/inhand-left.png b/Resources/Textures/Clothing/Head/Helmets/eva_syndicate.rsi/inhand-left.png index 5274c94828..adc9d53c22 100644 Binary files a/Resources/Textures/Clothing/Head/Helmets/eva_syndicate.rsi/inhand-left.png and b/Resources/Textures/Clothing/Head/Helmets/eva_syndicate.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/Head/Helmets/eva_syndicate.rsi/inhand-right.png b/Resources/Textures/Clothing/Head/Helmets/eva_syndicate.rsi/inhand-right.png index 93a06a90a7..48eca11677 100644 Binary files a/Resources/Textures/Clothing/Head/Helmets/eva_syndicate.rsi/inhand-right.png and b/Resources/Textures/Clothing/Head/Helmets/eva_syndicate.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/Head/Helmets/eva_syndicate.rsi/meta.json b/Resources/Textures/Clothing/Head/Helmets/eva_syndicate.rsi/meta.json index 3c406ff57c..9d531aeeb2 100644 --- a/Resources/Textures/Clothing/Head/Helmets/eva_syndicate.rsi/meta.json +++ b/Resources/Textures/Clothing/Head/Helmets/eva_syndicate.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Sprite edited by Flareguy for SS14, original unedited sprite can be found in https://github.com/tgstation/tgstation/commit/40d89d11ea4a5cb81d61dc1018b46f4e7d32c62a | vulpkanin version taken from Paradise station at https://github.com/ParadiseSS13/Paradise/commit/f0fa4e1fd809482fbc104a310aa34cebf7df157d modified by Floofers", + "copyright": "Sprite edited by Flareguy for SS14, original unedited sprite can be found in https://github.com/tgstation/tgstation/commit/40d89d11ea4a5cb81d61dc1018b46f4e7d32c62a", "size": { "x": 32, "y": 32 @@ -10,20 +10,31 @@ { "name": "icon" }, + { + "name": "headlight" + }, { "name": "equipped-HELMET", "directions": 4 }, + { + "name": "headlight-equipped-HELMET", + "directions": 4 + }, { "name": "inhand-left", "directions": 4 }, + { + "name": "headlight-inhand-left", + "directions": 4 + }, { "name": "inhand-right", "directions": 4 }, { - "name": "equipped-HELMET-vulpkanin", + "name": "headlight-inhand-right", "directions": 4 } ] diff --git a/Resources/Textures/Clothing/Head/Helmets/firehelmet.rsi/meta.json b/Resources/Textures/Clothing/Head/Helmets/firehelmet.rsi/meta.json index 9530d0f7aa..014284471a 100644 --- a/Resources/Textures/Clothing/Head/Helmets/firehelmet.rsi/meta.json +++ b/Resources/Textures/Clothing/Head/Helmets/firehelmet.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from paradise station and modified by Peptide90 https://github.com/ParadiseSS13/Paradise/commit/46bb8d448f52278a8f027b3f5bdf061e39d06140", + "copyright": "Taken from paradise station and modified by Peptide90 https://github.com/ParadiseSS13/Paradise/commit/46bb8d448f52278a8f027b3f5bdf061e39d06140. Vox states by Flareguy for SS14", "size": { "x": 32, "y": 32 @@ -17,6 +17,10 @@ "name": "off-equipped-HELMET", "directions": 4 }, + { + "name": "off-equipped-HELMET-vox", + "directions": 4 + }, { "name": "off-inhand-left", "directions": 4 @@ -29,6 +33,10 @@ "name": "on-equipped-HELMET", "directions": 4 }, + { + "name": "on-equipped-HELMET-vox", + "directions": 4 + }, { "name": "on-inhand-left", "directions": 4 diff --git a/Resources/Textures/Clothing/Head/Helmets/firehelmet.rsi/off-equipped-HELMET-vox.png b/Resources/Textures/Clothing/Head/Helmets/firehelmet.rsi/off-equipped-HELMET-vox.png new file mode 100644 index 0000000000..ad7bbad447 Binary files /dev/null and b/Resources/Textures/Clothing/Head/Helmets/firehelmet.rsi/off-equipped-HELMET-vox.png differ diff --git a/Resources/Textures/Clothing/Head/Helmets/firehelmet.rsi/on-equipped-HELMET-vox.png b/Resources/Textures/Clothing/Head/Helmets/firehelmet.rsi/on-equipped-HELMET-vox.png new file mode 100644 index 0000000000..2ebb820f60 Binary files /dev/null and b/Resources/Textures/Clothing/Head/Helmets/firehelmet.rsi/on-equipped-HELMET-vox.png differ diff --git a/Resources/Textures/Clothing/Head/Helmets/ihvoid.rsi/equipped-HELMET-vox.png b/Resources/Textures/Clothing/Head/Helmets/ihvoid.rsi/equipped-HELMET-vox.png new file mode 100644 index 0000000000..522a2eb923 Binary files /dev/null and b/Resources/Textures/Clothing/Head/Helmets/ihvoid.rsi/equipped-HELMET-vox.png differ diff --git a/Resources/Textures/Clothing/Head/Helmets/ihvoid.rsi/equipped-HELMET.png b/Resources/Textures/Clothing/Head/Helmets/ihvoid.rsi/equipped-HELMET.png index 863e02e405..dd2e929ae8 100644 Binary files a/Resources/Textures/Clothing/Head/Helmets/ihvoid.rsi/equipped-HELMET.png and b/Resources/Textures/Clothing/Head/Helmets/ihvoid.rsi/equipped-HELMET.png differ diff --git a/Resources/Textures/Clothing/Head/Helmets/ihvoid.rsi/icon.png b/Resources/Textures/Clothing/Head/Helmets/ihvoid.rsi/icon.png index 8f9f2194f2..fdbf3a2e61 100644 Binary files a/Resources/Textures/Clothing/Head/Helmets/ihvoid.rsi/icon.png and b/Resources/Textures/Clothing/Head/Helmets/ihvoid.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Head/Helmets/ihvoid.rsi/inhand-left.png b/Resources/Textures/Clothing/Head/Helmets/ihvoid.rsi/inhand-left.png index 71423b594c..eae813a219 100644 Binary files a/Resources/Textures/Clothing/Head/Helmets/ihvoid.rsi/inhand-left.png and b/Resources/Textures/Clothing/Head/Helmets/ihvoid.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/Head/Helmets/ihvoid.rsi/inhand-right.png b/Resources/Textures/Clothing/Head/Helmets/ihvoid.rsi/inhand-right.png index 8abcd3bfa8..70b4dc0d6e 100644 Binary files a/Resources/Textures/Clothing/Head/Helmets/ihvoid.rsi/inhand-right.png and b/Resources/Textures/Clothing/Head/Helmets/ihvoid.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/Head/Helmets/ihvoid.rsi/meta.json b/Resources/Textures/Clothing/Head/Helmets/ihvoid.rsi/meta.json index 4427c7fb51..3cf0b8d484 100644 --- a/Resources/Textures/Clothing/Head/Helmets/ihvoid.rsi/meta.json +++ b/Resources/Textures/Clothing/Head/Helmets/ihvoid.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e | vulpkanin version taken from Paradise station at https://github.com/ParadiseSS13/Paradise/commit/f0fa4e1fd809482fbc104a310aa34cebf7df157d", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e. Vox state by Flareguy for Space Station 14", "size": { "x": 32, "y": 32 @@ -15,15 +15,15 @@ "directions": 4 }, { - "name": "inhand-left", + "name": "equipped-HELMET-vox", "directions": 4 }, { - "name": "inhand-right", + "name": "inhand-left", "directions": 4 }, { - "name": "equipped-HELMET-vulpkanin", + "name": "inhand-right", "directions": 4 } ] diff --git a/Resources/Textures/Clothing/Head/Helmets/light_riot.rsi/equipped-HELMET-vox.png b/Resources/Textures/Clothing/Head/Helmets/light_riot.rsi/equipped-HELMET-vox.png new file mode 100644 index 0000000000..1f6b8adceb Binary files /dev/null and b/Resources/Textures/Clothing/Head/Helmets/light_riot.rsi/equipped-HELMET-vox.png differ diff --git a/Resources/Textures/Clothing/Head/Helmets/light_riot.rsi/equipped-HELMET.png b/Resources/Textures/Clothing/Head/Helmets/light_riot.rsi/equipped-HELMET.png index 3264d3cde6..d7a25d0244 100644 Binary files a/Resources/Textures/Clothing/Head/Helmets/light_riot.rsi/equipped-HELMET.png and b/Resources/Textures/Clothing/Head/Helmets/light_riot.rsi/equipped-HELMET.png differ diff --git a/Resources/Textures/Clothing/Head/Helmets/light_riot.rsi/icon-on.png b/Resources/Textures/Clothing/Head/Helmets/light_riot.rsi/icon-on.png new file mode 100644 index 0000000000..c340a525be Binary files /dev/null and b/Resources/Textures/Clothing/Head/Helmets/light_riot.rsi/icon-on.png differ diff --git a/Resources/Textures/Clothing/Head/Helmets/light_riot.rsi/icon.png b/Resources/Textures/Clothing/Head/Helmets/light_riot.rsi/icon.png index 59457ba90c..2439024b24 100644 Binary files a/Resources/Textures/Clothing/Head/Helmets/light_riot.rsi/icon.png and b/Resources/Textures/Clothing/Head/Helmets/light_riot.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Head/Helmets/light_riot.rsi/inhand-left.png b/Resources/Textures/Clothing/Head/Helmets/light_riot.rsi/inhand-left.png index a2892255be..55eaa9ed57 100644 Binary files a/Resources/Textures/Clothing/Head/Helmets/light_riot.rsi/inhand-left.png and b/Resources/Textures/Clothing/Head/Helmets/light_riot.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/Head/Helmets/light_riot.rsi/inhand-right.png b/Resources/Textures/Clothing/Head/Helmets/light_riot.rsi/inhand-right.png index 9640ec825f..cd3dc7f557 100644 Binary files a/Resources/Textures/Clothing/Head/Helmets/light_riot.rsi/inhand-right.png and b/Resources/Textures/Clothing/Head/Helmets/light_riot.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/Head/Helmets/light_riot.rsi/meta.json b/Resources/Textures/Clothing/Head/Helmets/light_riot.rsi/meta.json index 5048ec6bb0..3610da16b7 100644 --- a/Resources/Textures/Clothing/Head/Helmets/light_riot.rsi/meta.json +++ b/Resources/Textures/Clothing/Head/Helmets/light_riot.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from TGstation github https://github.com/tgstation/tgstation/commit/fed2ddeb54d0fb8bb97cb0a899a088b7d7423bbb", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/d90c7e5de6f6d94596c164da78dbc8d3cd35bb99 and modified by Flareguy for SS14", "size": { "x": 32, "y": 32 @@ -10,10 +10,17 @@ { "name": "icon" }, + { + "name": "icon-on" + }, { "name": "equipped-HELMET", "directions": 4 }, + { + "name": "on-equipped-HELMET", + "directions": 4 + }, { "name": "inhand-left", "directions": 4 @@ -21,6 +28,14 @@ { "name": "inhand-right", "directions": 4 + }, + { + "name": "on-inhand-left", + "directions": 4 + }, + { + "name": "on-inhand-right", + "directions": 4 } ] -} \ No newline at end of file +} diff --git a/Resources/Textures/Clothing/Head/Helmets/light_riot.rsi/on-equipped-HELMET.png b/Resources/Textures/Clothing/Head/Helmets/light_riot.rsi/on-equipped-HELMET.png new file mode 100644 index 0000000000..96a18a89bf Binary files /dev/null and b/Resources/Textures/Clothing/Head/Helmets/light_riot.rsi/on-equipped-HELMET.png differ diff --git a/Resources/Textures/Clothing/Head/Helmets/light_riot.rsi/on-inhand-left.png b/Resources/Textures/Clothing/Head/Helmets/light_riot.rsi/on-inhand-left.png new file mode 100644 index 0000000000..1fbf17e69d Binary files /dev/null and b/Resources/Textures/Clothing/Head/Helmets/light_riot.rsi/on-inhand-left.png differ diff --git a/Resources/Textures/Clothing/Head/Helmets/light_riot.rsi/on-inhand-right.png b/Resources/Textures/Clothing/Head/Helmets/light_riot.rsi/on-inhand-right.png new file mode 100644 index 0000000000..2a04dafadd Binary files /dev/null and b/Resources/Textures/Clothing/Head/Helmets/light_riot.rsi/on-inhand-right.png differ diff --git a/Resources/Textures/Clothing/Head/Helmets/security.rsi/equipped-HELMET-vox.png b/Resources/Textures/Clothing/Head/Helmets/security.rsi/equipped-HELMET-vox.png new file mode 100644 index 0000000000..47a6bfb145 Binary files /dev/null and b/Resources/Textures/Clothing/Head/Helmets/security.rsi/equipped-HELMET-vox.png differ diff --git a/Resources/Textures/Clothing/Head/Helmets/security.rsi/equipped-HELMET.png b/Resources/Textures/Clothing/Head/Helmets/security.rsi/equipped-HELMET.png index 4fd9f44ff2..8dc79d4be6 100644 Binary files a/Resources/Textures/Clothing/Head/Helmets/security.rsi/equipped-HELMET.png and b/Resources/Textures/Clothing/Head/Helmets/security.rsi/equipped-HELMET.png differ diff --git a/Resources/Textures/Clothing/Head/Helmets/security.rsi/icon.png b/Resources/Textures/Clothing/Head/Helmets/security.rsi/icon.png index 325084b69f..b5e41dfe7b 100644 Binary files a/Resources/Textures/Clothing/Head/Helmets/security.rsi/icon.png and b/Resources/Textures/Clothing/Head/Helmets/security.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Head/Helmets/security.rsi/inhand-left.png b/Resources/Textures/Clothing/Head/Helmets/security.rsi/inhand-left.png index f8f7501afc..bc0c6e4c95 100644 Binary files a/Resources/Textures/Clothing/Head/Helmets/security.rsi/inhand-left.png and b/Resources/Textures/Clothing/Head/Helmets/security.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/Head/Helmets/security.rsi/inhand-right.png b/Resources/Textures/Clothing/Head/Helmets/security.rsi/inhand-right.png index a8bbe3dfac..a578aeefb3 100644 Binary files a/Resources/Textures/Clothing/Head/Helmets/security.rsi/inhand-right.png and b/Resources/Textures/Clothing/Head/Helmets/security.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/Head/Helmets/security.rsi/meta.json b/Resources/Textures/Clothing/Head/Helmets/security.rsi/meta.json index db2bbfafd4..20fb373db6 100644 --- a/Resources/Textures/Clothing/Head/Helmets/security.rsi/meta.json +++ b/Resources/Textures/Clothing/Head/Helmets/security.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/d90c7e5de6f6d94596c164da78dbc8d3cd35bb99 and modified by Flareguy for SS14", "size": { "x": 32, "y": 32 @@ -15,11 +15,7 @@ "directions": 4 }, { - "name": "light-equipped-HELMET", - "directions": 4 - }, - { - "name": "lighton-equipped-HELMET", + "name": "equipped-HELMET-vox", "directions": 4 }, { diff --git a/Resources/Textures/Clothing/Head/Helmets/spaceninja.rsi/equipped-HELMET-vox.png b/Resources/Textures/Clothing/Head/Helmets/spaceninja.rsi/equipped-HELMET-vox.png new file mode 100644 index 0000000000..59f1e3263b Binary files /dev/null and b/Resources/Textures/Clothing/Head/Helmets/spaceninja.rsi/equipped-HELMET-vox.png differ diff --git a/Resources/Textures/Clothing/Head/Helmets/spaceninja.rsi/equipped-HELMET.png b/Resources/Textures/Clothing/Head/Helmets/spaceninja.rsi/equipped-HELMET.png index 6a4f85e419..f5f0257ff7 100644 Binary files a/Resources/Textures/Clothing/Head/Helmets/spaceninja.rsi/equipped-HELMET.png and b/Resources/Textures/Clothing/Head/Helmets/spaceninja.rsi/equipped-HELMET.png differ diff --git a/Resources/Textures/Clothing/Head/Helmets/spaceninja.rsi/icon.png b/Resources/Textures/Clothing/Head/Helmets/spaceninja.rsi/icon.png index b814dfe5a5..78bbbcfd04 100644 Binary files a/Resources/Textures/Clothing/Head/Helmets/spaceninja.rsi/icon.png and b/Resources/Textures/Clothing/Head/Helmets/spaceninja.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Head/Helmets/spaceninja.rsi/inhand-left.png b/Resources/Textures/Clothing/Head/Helmets/spaceninja.rsi/inhand-left.png index e5b88c6c1a..4585c26849 100644 Binary files a/Resources/Textures/Clothing/Head/Helmets/spaceninja.rsi/inhand-left.png and b/Resources/Textures/Clothing/Head/Helmets/spaceninja.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/Head/Helmets/spaceninja.rsi/inhand-right.png b/Resources/Textures/Clothing/Head/Helmets/spaceninja.rsi/inhand-right.png index ffcd06463c..7b005ddacb 100644 Binary files a/Resources/Textures/Clothing/Head/Helmets/spaceninja.rsi/inhand-right.png and b/Resources/Textures/Clothing/Head/Helmets/spaceninja.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/Head/Helmets/spaceninja.rsi/meta.json b/Resources/Textures/Clothing/Head/Helmets/spaceninja.rsi/meta.json index 61c8ce163c..922cbddb20 100644 --- a/Resources/Textures/Clothing/Head/Helmets/spaceninja.rsi/meta.json +++ b/Resources/Textures/Clothing/Head/Helmets/spaceninja.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from paradise https://github.com/ParadiseSS13/Paradise/tree/master/icons (unknown commit) | vulpkanin version made by Floofers", + "copyright": "Taken from tgstation https://github.com/tgstation/tgstation (unknown commit)", "size": { "x": 32, "y": 32 @@ -21,10 +21,6 @@ { "name": "inhand-right", "directions": 4 - }, - { - "name": "equipped-HELMET-vulpkanin", - "directions": 4 } ] } diff --git a/Resources/Textures/Clothing/Head/Helmets/swat.rsi/equipped-HELMET-vox.png b/Resources/Textures/Clothing/Head/Helmets/swat.rsi/equipped-HELMET-vox.png new file mode 100644 index 0000000000..e13fb42099 Binary files /dev/null and b/Resources/Textures/Clothing/Head/Helmets/swat.rsi/equipped-HELMET-vox.png differ diff --git a/Resources/Textures/Clothing/Head/Helmets/swat.rsi/equipped-HELMET.png b/Resources/Textures/Clothing/Head/Helmets/swat.rsi/equipped-HELMET.png index 030107f05e..b38de96a66 100644 Binary files a/Resources/Textures/Clothing/Head/Helmets/swat.rsi/equipped-HELMET.png and b/Resources/Textures/Clothing/Head/Helmets/swat.rsi/equipped-HELMET.png differ diff --git a/Resources/Textures/Clothing/Head/Helmets/swat.rsi/icon.png b/Resources/Textures/Clothing/Head/Helmets/swat.rsi/icon.png index c7d017dcca..eb580ee76f 100644 Binary files a/Resources/Textures/Clothing/Head/Helmets/swat.rsi/icon.png and b/Resources/Textures/Clothing/Head/Helmets/swat.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Head/Helmets/swat.rsi/inhand-left.png b/Resources/Textures/Clothing/Head/Helmets/swat.rsi/inhand-left.png index c334355ba8..27ce818b8e 100644 Binary files a/Resources/Textures/Clothing/Head/Helmets/swat.rsi/inhand-left.png and b/Resources/Textures/Clothing/Head/Helmets/swat.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/Head/Helmets/swat.rsi/inhand-right.png b/Resources/Textures/Clothing/Head/Helmets/swat.rsi/inhand-right.png index 423f3fe52e..9316e65d1c 100644 Binary files a/Resources/Textures/Clothing/Head/Helmets/swat.rsi/inhand-right.png and b/Resources/Textures/Clothing/Head/Helmets/swat.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/Head/Helmets/swat.rsi/meta.json b/Resources/Textures/Clothing/Head/Helmets/swat.rsi/meta.json index 8836c0b646..20fb373db6 100644 --- a/Resources/Textures/Clothing/Head/Helmets/swat.rsi/meta.json +++ b/Resources/Textures/Clothing/Head/Helmets/swat.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/fb2d71495bfe81446159ef528534193d09dd8d34, inhand sprites by Flareguy", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/d90c7e5de6f6d94596c164da78dbc8d3cd35bb99 and modified by Flareguy for SS14", "size": { "x": 32, "y": 32 @@ -14,6 +14,10 @@ "name": "equipped-HELMET", "directions": 4 }, + { + "name": "equipped-HELMET-vox", + "directions": 4 + }, { "name": "inhand-left", "directions": 4 diff --git a/Resources/Textures/Clothing/Head/Helmets/swat_syndicate.rsi/equipped-HELMET-vox.png b/Resources/Textures/Clothing/Head/Helmets/swat_syndicate.rsi/equipped-HELMET-vox.png new file mode 100644 index 0000000000..31bb5b7ada Binary files /dev/null and b/Resources/Textures/Clothing/Head/Helmets/swat_syndicate.rsi/equipped-HELMET-vox.png differ diff --git a/Resources/Textures/Clothing/Head/Helmets/swat_syndicate.rsi/icon.png b/Resources/Textures/Clothing/Head/Helmets/swat_syndicate.rsi/icon.png index 2fb1679000..d15db8ae3a 100644 Binary files a/Resources/Textures/Clothing/Head/Helmets/swat_syndicate.rsi/icon.png and b/Resources/Textures/Clothing/Head/Helmets/swat_syndicate.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Head/Helmets/swat_syndicate.rsi/inhand-left.png b/Resources/Textures/Clothing/Head/Helmets/swat_syndicate.rsi/inhand-left.png index 6c958708c8..194c17066d 100644 Binary files a/Resources/Textures/Clothing/Head/Helmets/swat_syndicate.rsi/inhand-left.png and b/Resources/Textures/Clothing/Head/Helmets/swat_syndicate.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/Head/Helmets/swat_syndicate.rsi/inhand-right.png b/Resources/Textures/Clothing/Head/Helmets/swat_syndicate.rsi/inhand-right.png index e0ab815b50..2932481da1 100644 Binary files a/Resources/Textures/Clothing/Head/Helmets/swat_syndicate.rsi/inhand-right.png and b/Resources/Textures/Clothing/Head/Helmets/swat_syndicate.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/Head/Helmets/swat_syndicate.rsi/meta.json b/Resources/Textures/Clothing/Head/Helmets/swat_syndicate.rsi/meta.json index 8bedbfb78e..20fb373db6 100644 --- a/Resources/Textures/Clothing/Head/Helmets/swat_syndicate.rsi/meta.json +++ b/Resources/Textures/Clothing/Head/Helmets/swat_syndicate.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/fb2d71495bfe81446159ef528534193d09dd8d34, inhand sprites by Flareguy, icon edited by Flareguy", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/d90c7e5de6f6d94596c164da78dbc8d3cd35bb99 and modified by Flareguy for SS14", "size": { "x": 32, "y": 32 @@ -14,6 +14,10 @@ "name": "equipped-HELMET", "directions": 4 }, + { + "name": "equipped-HELMET-vox", + "directions": 4 + }, { "name": "inhand-left", "directions": 4 diff --git a/Resources/Textures/Clothing/Head/Helmets/templar.rsi/equipped-HELMET-vox.png b/Resources/Textures/Clothing/Head/Helmets/templar.rsi/equipped-HELMET-vox.png new file mode 100644 index 0000000000..3572a5de9f Binary files /dev/null and b/Resources/Textures/Clothing/Head/Helmets/templar.rsi/equipped-HELMET-vox.png differ diff --git a/Resources/Textures/Clothing/Head/Helmets/templar.rsi/equipped-HELMET.png b/Resources/Textures/Clothing/Head/Helmets/templar.rsi/equipped-HELMET.png index 0f9309a59f..47f44183af 100644 Binary files a/Resources/Textures/Clothing/Head/Helmets/templar.rsi/equipped-HELMET.png and b/Resources/Textures/Clothing/Head/Helmets/templar.rsi/equipped-HELMET.png differ diff --git a/Resources/Textures/Clothing/Head/Helmets/templar.rsi/icon.png b/Resources/Textures/Clothing/Head/Helmets/templar.rsi/icon.png index 60753f558b..2ba7d7b8bb 100644 Binary files a/Resources/Textures/Clothing/Head/Helmets/templar.rsi/icon.png and b/Resources/Textures/Clothing/Head/Helmets/templar.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Head/Helmets/templar.rsi/meta.json b/Resources/Textures/Clothing/Head/Helmets/templar.rsi/meta.json index 7bd2e3e22a..f5de7080d1 100644 --- a/Resources/Textures/Clothing/Head/Helmets/templar.rsi/meta.json +++ b/Resources/Textures/Clothing/Head/Helmets/templar.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/2fea0a59470c476cf3f927833d3918d89cbe6af8", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/Clothing/Head/Helmets/wizardhelm.rsi/equipped-HELMET-vox.png b/Resources/Textures/Clothing/Head/Helmets/wizardhelm.rsi/equipped-HELMET-vox.png new file mode 100644 index 0000000000..0cabbe106c Binary files /dev/null and b/Resources/Textures/Clothing/Head/Helmets/wizardhelm.rsi/equipped-HELMET-vox.png differ diff --git a/Resources/Textures/Clothing/Head/Helmets/wizardhelm.rsi/meta.json b/Resources/Textures/Clothing/Head/Helmets/wizardhelm.rsi/meta.json index a470e00944..8e639d26bc 100644 --- a/Resources/Textures/Clothing/Head/Helmets/wizardhelm.rsi/meta.json +++ b/Resources/Textures/Clothing/Head/Helmets/wizardhelm.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e. equipped-HELMET-vox state taken from /vg/station at commit https://github.com/vgstation-coders/vgstation13/commit/31d6576ba8102135d058ef49c3cb6ecbe8db8a79 and modified to remove duplicate states", "size": { "x": 32, "y": 32 @@ -21,6 +21,10 @@ { "name": "inhand-right", "directions": 4 + }, + { + "name": "equipped-HELMET-vox", + "directions": 4 } ] } diff --git a/Resources/Textures/Clothing/Head/Hoods/Bio/bio.rsi/equipped-HELMET-vox.png b/Resources/Textures/Clothing/Head/Hoods/Bio/bio.rsi/equipped-HELMET-vox.png new file mode 100644 index 0000000000..35cfa8ddc0 Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hoods/Bio/bio.rsi/equipped-HELMET-vox.png differ diff --git a/Resources/Textures/Clothing/Head/Hoods/Bio/bio.rsi/equipped-HELMET.png b/Resources/Textures/Clothing/Head/Hoods/Bio/bio.rsi/equipped-HELMET.png index 6452d864d9..9605894bfd 100644 Binary files a/Resources/Textures/Clothing/Head/Hoods/Bio/bio.rsi/equipped-HELMET.png and b/Resources/Textures/Clothing/Head/Hoods/Bio/bio.rsi/equipped-HELMET.png differ diff --git a/Resources/Textures/Clothing/Head/Hoods/Bio/bio.rsi/icon.png b/Resources/Textures/Clothing/Head/Hoods/Bio/bio.rsi/icon.png index be430564ad..a5531a4c07 100644 Binary files a/Resources/Textures/Clothing/Head/Hoods/Bio/bio.rsi/icon.png and b/Resources/Textures/Clothing/Head/Hoods/Bio/bio.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Head/Hoods/Bio/bio.rsi/inhand-left.png b/Resources/Textures/Clothing/Head/Hoods/Bio/bio.rsi/inhand-left.png index afe56631a3..22bc4bb8a8 100644 Binary files a/Resources/Textures/Clothing/Head/Hoods/Bio/bio.rsi/inhand-left.png and b/Resources/Textures/Clothing/Head/Hoods/Bio/bio.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/Head/Hoods/Bio/bio.rsi/inhand-right.png b/Resources/Textures/Clothing/Head/Hoods/Bio/bio.rsi/inhand-right.png index 9102bdea1d..a59bb1c28c 100644 Binary files a/Resources/Textures/Clothing/Head/Hoods/Bio/bio.rsi/inhand-right.png and b/Resources/Textures/Clothing/Head/Hoods/Bio/bio.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/Head/Hoods/Bio/bio.rsi/meta.json b/Resources/Textures/Clothing/Head/Hoods/Bio/bio.rsi/meta.json index 4427c7fb51..5a57615011 100644 --- a/Resources/Textures/Clothing/Head/Hoods/Bio/bio.rsi/meta.json +++ b/Resources/Textures/Clothing/Head/Hoods/Bio/bio.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e | vulpkanin version taken from Paradise station at https://github.com/ParadiseSS13/Paradise/commit/f0fa4e1fd809482fbc104a310aa34cebf7df157d", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/2fea0a59470c476cf3f927833d3918d89cbe6af8", "size": { "x": 32, "y": 32 @@ -21,10 +21,6 @@ { "name": "inhand-right", "directions": 4 - }, - { - "name": "equipped-HELMET-vulpkanin", - "directions": 4 } ] } diff --git a/Resources/Textures/Clothing/Head/Hoods/Bio/cmo.rsi/equipped-HELMET-vox.png b/Resources/Textures/Clothing/Head/Hoods/Bio/cmo.rsi/equipped-HELMET-vox.png new file mode 100644 index 0000000000..90ad846f9b Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hoods/Bio/cmo.rsi/equipped-HELMET-vox.png differ diff --git a/Resources/Textures/Clothing/Head/Hoods/Bio/cmo.rsi/equipped-HELMET.png b/Resources/Textures/Clothing/Head/Hoods/Bio/cmo.rsi/equipped-HELMET.png index 7e20448959..3917fddcce 100644 Binary files a/Resources/Textures/Clothing/Head/Hoods/Bio/cmo.rsi/equipped-HELMET.png and b/Resources/Textures/Clothing/Head/Hoods/Bio/cmo.rsi/equipped-HELMET.png differ diff --git a/Resources/Textures/Clothing/Head/Hoods/Bio/cmo.rsi/icon.png b/Resources/Textures/Clothing/Head/Hoods/Bio/cmo.rsi/icon.png index 149b6aa0cd..8f9f67bfc2 100644 Binary files a/Resources/Textures/Clothing/Head/Hoods/Bio/cmo.rsi/icon.png and b/Resources/Textures/Clothing/Head/Hoods/Bio/cmo.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Head/Hoods/Bio/cmo.rsi/inhand-left.png b/Resources/Textures/Clothing/Head/Hoods/Bio/cmo.rsi/inhand-left.png index 2fd5441f3d..f8a134c204 100644 Binary files a/Resources/Textures/Clothing/Head/Hoods/Bio/cmo.rsi/inhand-left.png and b/Resources/Textures/Clothing/Head/Hoods/Bio/cmo.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/Head/Hoods/Bio/cmo.rsi/inhand-right.png b/Resources/Textures/Clothing/Head/Hoods/Bio/cmo.rsi/inhand-right.png index 326846bc15..6b7515d083 100644 Binary files a/Resources/Textures/Clothing/Head/Hoods/Bio/cmo.rsi/inhand-right.png and b/Resources/Textures/Clothing/Head/Hoods/Bio/cmo.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/Head/Hoods/Bio/cmo.rsi/meta.json b/Resources/Textures/Clothing/Head/Hoods/Bio/cmo.rsi/meta.json index 4427c7fb51..5a57615011 100644 --- a/Resources/Textures/Clothing/Head/Hoods/Bio/cmo.rsi/meta.json +++ b/Resources/Textures/Clothing/Head/Hoods/Bio/cmo.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e | vulpkanin version taken from Paradise station at https://github.com/ParadiseSS13/Paradise/commit/f0fa4e1fd809482fbc104a310aa34cebf7df157d", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/2fea0a59470c476cf3f927833d3918d89cbe6af8", "size": { "x": 32, "y": 32 @@ -21,10 +21,6 @@ { "name": "inhand-right", "directions": 4 - }, - { - "name": "equipped-HELMET-vulpkanin", - "directions": 4 } ] } diff --git a/Resources/Textures/Clothing/Head/Hoods/Bio/general.rsi/equipped-HELMET-vox.png b/Resources/Textures/Clothing/Head/Hoods/Bio/general.rsi/equipped-HELMET-vox.png new file mode 100644 index 0000000000..35cfa8ddc0 Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hoods/Bio/general.rsi/equipped-HELMET-vox.png differ diff --git a/Resources/Textures/Clothing/Head/Hoods/Bio/general.rsi/equipped-HELMET.png b/Resources/Textures/Clothing/Head/Hoods/Bio/general.rsi/equipped-HELMET.png index 901c63fbcd..9605894bfd 100644 Binary files a/Resources/Textures/Clothing/Head/Hoods/Bio/general.rsi/equipped-HELMET.png and b/Resources/Textures/Clothing/Head/Hoods/Bio/general.rsi/equipped-HELMET.png differ diff --git a/Resources/Textures/Clothing/Head/Hoods/Bio/general.rsi/icon.png b/Resources/Textures/Clothing/Head/Hoods/Bio/general.rsi/icon.png index e04ac2e780..a5531a4c07 100644 Binary files a/Resources/Textures/Clothing/Head/Hoods/Bio/general.rsi/icon.png and b/Resources/Textures/Clothing/Head/Hoods/Bio/general.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Head/Hoods/Bio/general.rsi/inhand-left.png b/Resources/Textures/Clothing/Head/Hoods/Bio/general.rsi/inhand-left.png index 38fc09939a..22bc4bb8a8 100644 Binary files a/Resources/Textures/Clothing/Head/Hoods/Bio/general.rsi/inhand-left.png and b/Resources/Textures/Clothing/Head/Hoods/Bio/general.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/Head/Hoods/Bio/general.rsi/inhand-right.png b/Resources/Textures/Clothing/Head/Hoods/Bio/general.rsi/inhand-right.png index 00232804ed..a59bb1c28c 100644 Binary files a/Resources/Textures/Clothing/Head/Hoods/Bio/general.rsi/inhand-right.png and b/Resources/Textures/Clothing/Head/Hoods/Bio/general.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/Head/Hoods/Bio/general.rsi/meta.json b/Resources/Textures/Clothing/Head/Hoods/Bio/general.rsi/meta.json index 4427c7fb51..5a57615011 100644 --- a/Resources/Textures/Clothing/Head/Hoods/Bio/general.rsi/meta.json +++ b/Resources/Textures/Clothing/Head/Hoods/Bio/general.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e | vulpkanin version taken from Paradise station at https://github.com/ParadiseSS13/Paradise/commit/f0fa4e1fd809482fbc104a310aa34cebf7df157d", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/2fea0a59470c476cf3f927833d3918d89cbe6af8", "size": { "x": 32, "y": 32 @@ -21,10 +21,6 @@ { "name": "inhand-right", "directions": 4 - }, - { - "name": "equipped-HELMET-vulpkanin", - "directions": 4 } ] } diff --git a/Resources/Textures/Clothing/Head/Hoods/Bio/janitor.rsi/equipped-HELMET-vox.png b/Resources/Textures/Clothing/Head/Hoods/Bio/janitor.rsi/equipped-HELMET-vox.png new file mode 100644 index 0000000000..2a8f1b0cdb Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hoods/Bio/janitor.rsi/equipped-HELMET-vox.png differ diff --git a/Resources/Textures/Clothing/Head/Hoods/Bio/janitor.rsi/equipped-HELMET.png b/Resources/Textures/Clothing/Head/Hoods/Bio/janitor.rsi/equipped-HELMET.png index fa5e1929fe..d9299375dc 100644 Binary files a/Resources/Textures/Clothing/Head/Hoods/Bio/janitor.rsi/equipped-HELMET.png and b/Resources/Textures/Clothing/Head/Hoods/Bio/janitor.rsi/equipped-HELMET.png differ diff --git a/Resources/Textures/Clothing/Head/Hoods/Bio/janitor.rsi/icon.png b/Resources/Textures/Clothing/Head/Hoods/Bio/janitor.rsi/icon.png index 330da91a80..e1cb49d3bb 100644 Binary files a/Resources/Textures/Clothing/Head/Hoods/Bio/janitor.rsi/icon.png and b/Resources/Textures/Clothing/Head/Hoods/Bio/janitor.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Head/Hoods/Bio/janitor.rsi/inhand-left.png b/Resources/Textures/Clothing/Head/Hoods/Bio/janitor.rsi/inhand-left.png index 42fdefb038..5e6e052dd4 100644 Binary files a/Resources/Textures/Clothing/Head/Hoods/Bio/janitor.rsi/inhand-left.png and b/Resources/Textures/Clothing/Head/Hoods/Bio/janitor.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/Head/Hoods/Bio/janitor.rsi/inhand-right.png b/Resources/Textures/Clothing/Head/Hoods/Bio/janitor.rsi/inhand-right.png index 9f26186eec..b71f1b2620 100644 Binary files a/Resources/Textures/Clothing/Head/Hoods/Bio/janitor.rsi/inhand-right.png and b/Resources/Textures/Clothing/Head/Hoods/Bio/janitor.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/Head/Hoods/Bio/janitor.rsi/meta.json b/Resources/Textures/Clothing/Head/Hoods/Bio/janitor.rsi/meta.json index 4427c7fb51..5a57615011 100644 --- a/Resources/Textures/Clothing/Head/Hoods/Bio/janitor.rsi/meta.json +++ b/Resources/Textures/Clothing/Head/Hoods/Bio/janitor.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e | vulpkanin version taken from Paradise station at https://github.com/ParadiseSS13/Paradise/commit/f0fa4e1fd809482fbc104a310aa34cebf7df157d", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/2fea0a59470c476cf3f927833d3918d89cbe6af8", "size": { "x": 32, "y": 32 @@ -21,10 +21,6 @@ { "name": "inhand-right", "directions": 4 - }, - { - "name": "equipped-HELMET-vulpkanin", - "directions": 4 } ] } diff --git a/Resources/Textures/Clothing/Head/Hoods/Bio/scientist.rsi/equipped-HELMET-vox.png b/Resources/Textures/Clothing/Head/Hoods/Bio/scientist.rsi/equipped-HELMET-vox.png new file mode 100644 index 0000000000..4b90b700a8 Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hoods/Bio/scientist.rsi/equipped-HELMET-vox.png differ diff --git a/Resources/Textures/Clothing/Head/Hoods/Bio/scientist.rsi/equipped-HELMET.png b/Resources/Textures/Clothing/Head/Hoods/Bio/scientist.rsi/equipped-HELMET.png index a6515022f5..dd0654a1d6 100644 Binary files a/Resources/Textures/Clothing/Head/Hoods/Bio/scientist.rsi/equipped-HELMET.png and b/Resources/Textures/Clothing/Head/Hoods/Bio/scientist.rsi/equipped-HELMET.png differ diff --git a/Resources/Textures/Clothing/Head/Hoods/Bio/scientist.rsi/icon.png b/Resources/Textures/Clothing/Head/Hoods/Bio/scientist.rsi/icon.png index 1fb0a57b2b..d326ea41e4 100644 Binary files a/Resources/Textures/Clothing/Head/Hoods/Bio/scientist.rsi/icon.png and b/Resources/Textures/Clothing/Head/Hoods/Bio/scientist.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Head/Hoods/Bio/scientist.rsi/inhand-left.png b/Resources/Textures/Clothing/Head/Hoods/Bio/scientist.rsi/inhand-left.png index cc69c3d0e4..6e23c2f043 100644 Binary files a/Resources/Textures/Clothing/Head/Hoods/Bio/scientist.rsi/inhand-left.png and b/Resources/Textures/Clothing/Head/Hoods/Bio/scientist.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/Head/Hoods/Bio/scientist.rsi/inhand-right.png b/Resources/Textures/Clothing/Head/Hoods/Bio/scientist.rsi/inhand-right.png index a4f39b9f1a..724799d3db 100644 Binary files a/Resources/Textures/Clothing/Head/Hoods/Bio/scientist.rsi/inhand-right.png and b/Resources/Textures/Clothing/Head/Hoods/Bio/scientist.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/Head/Hoods/Bio/scientist.rsi/meta.json b/Resources/Textures/Clothing/Head/Hoods/Bio/scientist.rsi/meta.json index 4427c7fb51..5a57615011 100644 --- a/Resources/Textures/Clothing/Head/Hoods/Bio/scientist.rsi/meta.json +++ b/Resources/Textures/Clothing/Head/Hoods/Bio/scientist.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e | vulpkanin version taken from Paradise station at https://github.com/ParadiseSS13/Paradise/commit/f0fa4e1fd809482fbc104a310aa34cebf7df157d", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/2fea0a59470c476cf3f927833d3918d89cbe6af8", "size": { "x": 32, "y": 32 @@ -21,10 +21,6 @@ { "name": "inhand-right", "directions": 4 - }, - { - "name": "equipped-HELMET-vulpkanin", - "directions": 4 } ] } diff --git a/Resources/Textures/Clothing/Head/Hoods/Bio/security.rsi/equipped-HELMET-vox.png b/Resources/Textures/Clothing/Head/Hoods/Bio/security.rsi/equipped-HELMET-vox.png new file mode 100644 index 0000000000..402d6bf76a Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hoods/Bio/security.rsi/equipped-HELMET-vox.png differ diff --git a/Resources/Textures/Clothing/Head/Hoods/Bio/security.rsi/equipped-HELMET.png b/Resources/Textures/Clothing/Head/Hoods/Bio/security.rsi/equipped-HELMET.png index d48c6efc30..ea6cd337e7 100644 Binary files a/Resources/Textures/Clothing/Head/Hoods/Bio/security.rsi/equipped-HELMET.png and b/Resources/Textures/Clothing/Head/Hoods/Bio/security.rsi/equipped-HELMET.png differ diff --git a/Resources/Textures/Clothing/Head/Hoods/Bio/security.rsi/icon.png b/Resources/Textures/Clothing/Head/Hoods/Bio/security.rsi/icon.png index b381513333..cbf20a83fb 100644 Binary files a/Resources/Textures/Clothing/Head/Hoods/Bio/security.rsi/icon.png and b/Resources/Textures/Clothing/Head/Hoods/Bio/security.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Head/Hoods/Bio/security.rsi/inhand-left.png b/Resources/Textures/Clothing/Head/Hoods/Bio/security.rsi/inhand-left.png index b32137727b..e3ac688063 100644 Binary files a/Resources/Textures/Clothing/Head/Hoods/Bio/security.rsi/inhand-left.png and b/Resources/Textures/Clothing/Head/Hoods/Bio/security.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/Head/Hoods/Bio/security.rsi/inhand-right.png b/Resources/Textures/Clothing/Head/Hoods/Bio/security.rsi/inhand-right.png index 1c14b44f98..742decb6c8 100644 Binary files a/Resources/Textures/Clothing/Head/Hoods/Bio/security.rsi/inhand-right.png and b/Resources/Textures/Clothing/Head/Hoods/Bio/security.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/Head/Hoods/Bio/security.rsi/meta.json b/Resources/Textures/Clothing/Head/Hoods/Bio/security.rsi/meta.json index e830cae282..5e5c1cf2e0 100644 --- a/Resources/Textures/Clothing/Head/Hoods/Bio/security.rsi/meta.json +++ b/Resources/Textures/Clothing/Head/Hoods/Bio/security.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e | vulpkanin version taken from Paradise station at https://github.com/ParadiseSS13/Paradise/commit/f0fa4e1fd809482fbc104a310aa34cebf7df157d edited by Floofers", + "copyright": "Taken from vgstation at commit https://github.com/vgstation-coders/vgstation13/commit/31d6576ba8102135d058ef49c3cb6ecbe8db8a79", "size": { "x": 32, "y": 32 @@ -23,7 +23,7 @@ "directions": 4 }, { - "name": "equipped-HELMET-vulpkanin", + "name": "equipped-HELMET-vox", "directions": 4 } ] diff --git a/Resources/Textures/Clothing/Head/Hoods/Bio/virology.rsi/equipped-HELMET-vox.png b/Resources/Textures/Clothing/Head/Hoods/Bio/virology.rsi/equipped-HELMET-vox.png new file mode 100644 index 0000000000..d4a1f0848e Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hoods/Bio/virology.rsi/equipped-HELMET-vox.png differ diff --git a/Resources/Textures/Clothing/Head/Hoods/Bio/virology.rsi/equipped-HELMET.png b/Resources/Textures/Clothing/Head/Hoods/Bio/virology.rsi/equipped-HELMET.png index d7c68c9b66..ead249371c 100644 Binary files a/Resources/Textures/Clothing/Head/Hoods/Bio/virology.rsi/equipped-HELMET.png and b/Resources/Textures/Clothing/Head/Hoods/Bio/virology.rsi/equipped-HELMET.png differ diff --git a/Resources/Textures/Clothing/Head/Hoods/Bio/virology.rsi/icon.png b/Resources/Textures/Clothing/Head/Hoods/Bio/virology.rsi/icon.png index 5642e2f5a2..0ce5c67153 100644 Binary files a/Resources/Textures/Clothing/Head/Hoods/Bio/virology.rsi/icon.png and b/Resources/Textures/Clothing/Head/Hoods/Bio/virology.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Head/Hoods/Bio/virology.rsi/inhand-left.png b/Resources/Textures/Clothing/Head/Hoods/Bio/virology.rsi/inhand-left.png index 5f5845750c..ab6d8e1d1c 100644 Binary files a/Resources/Textures/Clothing/Head/Hoods/Bio/virology.rsi/inhand-left.png and b/Resources/Textures/Clothing/Head/Hoods/Bio/virology.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/Head/Hoods/Bio/virology.rsi/inhand-right.png b/Resources/Textures/Clothing/Head/Hoods/Bio/virology.rsi/inhand-right.png index a86b5f2e17..49535df051 100644 Binary files a/Resources/Textures/Clothing/Head/Hoods/Bio/virology.rsi/inhand-right.png and b/Resources/Textures/Clothing/Head/Hoods/Bio/virology.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/Head/Hoods/Bio/virology.rsi/meta.json b/Resources/Textures/Clothing/Head/Hoods/Bio/virology.rsi/meta.json index 4427c7fb51..5a57615011 100644 --- a/Resources/Textures/Clothing/Head/Hoods/Bio/virology.rsi/meta.json +++ b/Resources/Textures/Clothing/Head/Hoods/Bio/virology.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e | vulpkanin version taken from Paradise station at https://github.com/ParadiseSS13/Paradise/commit/f0fa4e1fd809482fbc104a310aa34cebf7df157d", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/2fea0a59470c476cf3f927833d3918d89cbe6af8", "size": { "x": 32, "y": 32 @@ -21,10 +21,6 @@ { "name": "inhand-right", "directions": 4 - }, - { - "name": "equipped-HELMET-vulpkanin", - "directions": 4 } ] } diff --git a/Resources/Textures/Clothing/Head/Hoods/Coat/hoodcaptain.rsi/equipped-HELMET.png b/Resources/Textures/Clothing/Head/Hoods/Coat/hoodcaptain.rsi/equipped-HELMET.png index 82c14215c2..7ba20248b7 100644 Binary files a/Resources/Textures/Clothing/Head/Hoods/Coat/hoodcaptain.rsi/equipped-HELMET.png and b/Resources/Textures/Clothing/Head/Hoods/Coat/hoodcaptain.rsi/equipped-HELMET.png differ diff --git a/Resources/Textures/Clothing/Head/Hoods/Coat/hoodcaptain.rsi/icon.png b/Resources/Textures/Clothing/Head/Hoods/Coat/hoodcaptain.rsi/icon.png index 916da17831..1bcb4a3ece 100644 Binary files a/Resources/Textures/Clothing/Head/Hoods/Coat/hoodcaptain.rsi/icon.png and b/Resources/Textures/Clothing/Head/Hoods/Coat/hoodcaptain.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Head/Hoods/Coat/hoodcargo.rsi/equipped-HELMET.png b/Resources/Textures/Clothing/Head/Hoods/Coat/hoodcargo.rsi/equipped-HELMET.png index 2e1a158b93..08673c4094 100644 Binary files a/Resources/Textures/Clothing/Head/Hoods/Coat/hoodcargo.rsi/equipped-HELMET.png and b/Resources/Textures/Clothing/Head/Hoods/Coat/hoodcargo.rsi/equipped-HELMET.png differ diff --git a/Resources/Textures/Clothing/Head/Hoods/Coat/hoodcargo.rsi/icon.png b/Resources/Textures/Clothing/Head/Hoods/Coat/hoodcargo.rsi/icon.png index f0829fd9cd..39bf3c9ed7 100644 Binary files a/Resources/Textures/Clothing/Head/Hoods/Coat/hoodcargo.rsi/icon.png and b/Resources/Textures/Clothing/Head/Hoods/Coat/hoodcargo.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Head/Hoods/Coat/hoodce.rsi/equipped-HELMET.png b/Resources/Textures/Clothing/Head/Hoods/Coat/hoodce.rsi/equipped-HELMET.png index 4ad343716f..bac65b0db2 100644 Binary files a/Resources/Textures/Clothing/Head/Hoods/Coat/hoodce.rsi/equipped-HELMET.png and b/Resources/Textures/Clothing/Head/Hoods/Coat/hoodce.rsi/equipped-HELMET.png differ diff --git a/Resources/Textures/Clothing/Head/Hoods/Coat/hoodce.rsi/icon.png b/Resources/Textures/Clothing/Head/Hoods/Coat/hoodce.rsi/icon.png index ed5d67b686..daf182520d 100644 Binary files a/Resources/Textures/Clothing/Head/Hoods/Coat/hoodce.rsi/icon.png and b/Resources/Textures/Clothing/Head/Hoods/Coat/hoodce.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Head/Hoods/Coat/hoodcentcom.rsi/equipped-HELMET.png b/Resources/Textures/Clothing/Head/Hoods/Coat/hoodcentcom.rsi/equipped-HELMET.png index 48aa664be3..084224bea8 100644 Binary files a/Resources/Textures/Clothing/Head/Hoods/Coat/hoodcentcom.rsi/equipped-HELMET.png and b/Resources/Textures/Clothing/Head/Hoods/Coat/hoodcentcom.rsi/equipped-HELMET.png differ diff --git a/Resources/Textures/Clothing/Head/Hoods/Coat/hoodcentcom.rsi/icon.png b/Resources/Textures/Clothing/Head/Hoods/Coat/hoodcentcom.rsi/icon.png index 806634d5a2..5cbc184e34 100644 Binary files a/Resources/Textures/Clothing/Head/Hoods/Coat/hoodcentcom.rsi/icon.png and b/Resources/Textures/Clothing/Head/Hoods/Coat/hoodcentcom.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Head/Hoods/Coat/hoodchemist.rsi/equipped-HELMET.png b/Resources/Textures/Clothing/Head/Hoods/Coat/hoodchemist.rsi/equipped-HELMET.png index ffc3331016..2f3ed97fc3 100644 Binary files a/Resources/Textures/Clothing/Head/Hoods/Coat/hoodchemist.rsi/equipped-HELMET.png and b/Resources/Textures/Clothing/Head/Hoods/Coat/hoodchemist.rsi/equipped-HELMET.png differ diff --git a/Resources/Textures/Clothing/Head/Hoods/Coat/hoodchemist.rsi/icon.png b/Resources/Textures/Clothing/Head/Hoods/Coat/hoodchemist.rsi/icon.png index b1ad4dfd7b..df9c92d4aa 100644 Binary files a/Resources/Textures/Clothing/Head/Hoods/Coat/hoodchemist.rsi/icon.png and b/Resources/Textures/Clothing/Head/Hoods/Coat/hoodchemist.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Head/Hoods/Coat/hoodcmo.rsi/equipped-HELMET.png b/Resources/Textures/Clothing/Head/Hoods/Coat/hoodcmo.rsi/equipped-HELMET.png index 5a57391603..4a6e660cab 100644 Binary files a/Resources/Textures/Clothing/Head/Hoods/Coat/hoodcmo.rsi/equipped-HELMET.png and b/Resources/Textures/Clothing/Head/Hoods/Coat/hoodcmo.rsi/equipped-HELMET.png differ diff --git a/Resources/Textures/Clothing/Head/Hoods/Coat/hoodcmo.rsi/icon.png b/Resources/Textures/Clothing/Head/Hoods/Coat/hoodcmo.rsi/icon.png index 2d94c9c11c..1ec7bc919f 100644 Binary files a/Resources/Textures/Clothing/Head/Hoods/Coat/hoodcmo.rsi/icon.png and b/Resources/Textures/Clothing/Head/Hoods/Coat/hoodcmo.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Head/Hoods/Coat/hooddefault.rsi/equipped-HELMET.png b/Resources/Textures/Clothing/Head/Hoods/Coat/hooddefault.rsi/equipped-HELMET.png index 5cd3633a8e..68f9c949d1 100644 Binary files a/Resources/Textures/Clothing/Head/Hoods/Coat/hooddefault.rsi/equipped-HELMET.png and b/Resources/Textures/Clothing/Head/Hoods/Coat/hooddefault.rsi/equipped-HELMET.png differ diff --git a/Resources/Textures/Clothing/Head/Hoods/Coat/hooddefault.rsi/icon.png b/Resources/Textures/Clothing/Head/Hoods/Coat/hooddefault.rsi/icon.png index 9421b9a13b..c18a4c9e48 100644 Binary files a/Resources/Textures/Clothing/Head/Hoods/Coat/hooddefault.rsi/icon.png and b/Resources/Textures/Clothing/Head/Hoods/Coat/hooddefault.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Head/Hoods/Coat/hoodengi.rsi/equipped-HELMET.png b/Resources/Textures/Clothing/Head/Hoods/Coat/hoodengi.rsi/equipped-HELMET.png index 8994d31ba5..3c0e6ab643 100644 Binary files a/Resources/Textures/Clothing/Head/Hoods/Coat/hoodengi.rsi/equipped-HELMET.png and b/Resources/Textures/Clothing/Head/Hoods/Coat/hoodengi.rsi/equipped-HELMET.png differ diff --git a/Resources/Textures/Clothing/Head/Hoods/Coat/hoodengi.rsi/icon.png b/Resources/Textures/Clothing/Head/Hoods/Coat/hoodengi.rsi/icon.png index 9a429c805a..40556fe5d3 100644 Binary files a/Resources/Textures/Clothing/Head/Hoods/Coat/hoodengi.rsi/icon.png and b/Resources/Textures/Clothing/Head/Hoods/Coat/hoodengi.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Head/Hoods/Coat/hoodhop.rsi/equipped-HELMET.png b/Resources/Textures/Clothing/Head/Hoods/Coat/hoodhop.rsi/equipped-HELMET.png index 6117c92a18..0c91e782b2 100644 Binary files a/Resources/Textures/Clothing/Head/Hoods/Coat/hoodhop.rsi/equipped-HELMET.png and b/Resources/Textures/Clothing/Head/Hoods/Coat/hoodhop.rsi/equipped-HELMET.png differ diff --git a/Resources/Textures/Clothing/Head/Hoods/Coat/hoodhop.rsi/icon.png b/Resources/Textures/Clothing/Head/Hoods/Coat/hoodhop.rsi/icon.png index 97d0e02899..d7869783a8 100644 Binary files a/Resources/Textures/Clothing/Head/Hoods/Coat/hoodhop.rsi/icon.png and b/Resources/Textures/Clothing/Head/Hoods/Coat/hoodhop.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Head/Hoods/Coat/hoodhos.rsi/equipped-HELMET.png b/Resources/Textures/Clothing/Head/Hoods/Coat/hoodhos.rsi/equipped-HELMET.png index bbee5da1d9..16bde4bdc8 100644 Binary files a/Resources/Textures/Clothing/Head/Hoods/Coat/hoodhos.rsi/equipped-HELMET.png and b/Resources/Textures/Clothing/Head/Hoods/Coat/hoodhos.rsi/equipped-HELMET.png differ diff --git a/Resources/Textures/Clothing/Head/Hoods/Coat/hoodhos.rsi/icon.png b/Resources/Textures/Clothing/Head/Hoods/Coat/hoodhos.rsi/icon.png index b678ba56b2..9d43a9d620 100644 Binary files a/Resources/Textures/Clothing/Head/Hoods/Coat/hoodhos.rsi/icon.png and b/Resources/Textures/Clothing/Head/Hoods/Coat/hoodhos.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Head/Hoods/Coat/hoodhydro.rsi/equipped-HELMET.png b/Resources/Textures/Clothing/Head/Hoods/Coat/hoodhydro.rsi/equipped-HELMET.png index 7665f462e5..3e0fca6446 100644 Binary files a/Resources/Textures/Clothing/Head/Hoods/Coat/hoodhydro.rsi/equipped-HELMET.png and b/Resources/Textures/Clothing/Head/Hoods/Coat/hoodhydro.rsi/equipped-HELMET.png differ diff --git a/Resources/Textures/Clothing/Head/Hoods/Coat/hoodhydro.rsi/icon.png b/Resources/Textures/Clothing/Head/Hoods/Coat/hoodhydro.rsi/icon.png index d7e71539f3..174bd7eefc 100644 Binary files a/Resources/Textures/Clothing/Head/Hoods/Coat/hoodhydro.rsi/icon.png and b/Resources/Textures/Clothing/Head/Hoods/Coat/hoodhydro.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Head/Hoods/Coat/hoodjani.rsi/equipped-HELMET.png b/Resources/Textures/Clothing/Head/Hoods/Coat/hoodjani.rsi/equipped-HELMET.png index 7da921de20..bf1fccf80c 100644 Binary files a/Resources/Textures/Clothing/Head/Hoods/Coat/hoodjani.rsi/equipped-HELMET.png and b/Resources/Textures/Clothing/Head/Hoods/Coat/hoodjani.rsi/equipped-HELMET.png differ diff --git a/Resources/Textures/Clothing/Head/Hoods/Coat/hoodjani.rsi/icon.png b/Resources/Textures/Clothing/Head/Hoods/Coat/hoodjani.rsi/icon.png index 115b9d52f6..27134c71af 100644 Binary files a/Resources/Textures/Clothing/Head/Hoods/Coat/hoodjani.rsi/icon.png and b/Resources/Textures/Clothing/Head/Hoods/Coat/hoodjani.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Head/Hoods/Coat/hoodmed.rsi/equipped-HELMET.png b/Resources/Textures/Clothing/Head/Hoods/Coat/hoodmed.rsi/equipped-HELMET.png index 35fa4c063b..594a47c799 100644 Binary files a/Resources/Textures/Clothing/Head/Hoods/Coat/hoodmed.rsi/equipped-HELMET.png and b/Resources/Textures/Clothing/Head/Hoods/Coat/hoodmed.rsi/equipped-HELMET.png differ diff --git a/Resources/Textures/Clothing/Head/Hoods/Coat/hoodmed.rsi/icon.png b/Resources/Textures/Clothing/Head/Hoods/Coat/hoodmed.rsi/icon.png index e4db6e6281..40b28e4863 100644 Binary files a/Resources/Textures/Clothing/Head/Hoods/Coat/hoodmed.rsi/icon.png and b/Resources/Textures/Clothing/Head/Hoods/Coat/hoodmed.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Head/Hoods/Coat/hoodmime.rsi/equipped-HELMET.png b/Resources/Textures/Clothing/Head/Hoods/Coat/hoodmime.rsi/equipped-HELMET.png index 8168b93984..761fc9cab7 100644 Binary files a/Resources/Textures/Clothing/Head/Hoods/Coat/hoodmime.rsi/equipped-HELMET.png and b/Resources/Textures/Clothing/Head/Hoods/Coat/hoodmime.rsi/equipped-HELMET.png differ diff --git a/Resources/Textures/Clothing/Head/Hoods/Coat/hoodmime.rsi/icon.png b/Resources/Textures/Clothing/Head/Hoods/Coat/hoodmime.rsi/icon.png index 37dd35df2d..c4bf294182 100644 Binary files a/Resources/Textures/Clothing/Head/Hoods/Coat/hoodmime.rsi/icon.png and b/Resources/Textures/Clothing/Head/Hoods/Coat/hoodmime.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Head/Hoods/Coat/hoodminer.rsi/equipped-HELMET.png b/Resources/Textures/Clothing/Head/Hoods/Coat/hoodminer.rsi/equipped-HELMET.png index 3de5e6a4c9..65ee1b9a02 100644 Binary files a/Resources/Textures/Clothing/Head/Hoods/Coat/hoodminer.rsi/equipped-HELMET.png and b/Resources/Textures/Clothing/Head/Hoods/Coat/hoodminer.rsi/equipped-HELMET.png differ diff --git a/Resources/Textures/Clothing/Head/Hoods/Coat/hoodminer.rsi/icon.png b/Resources/Textures/Clothing/Head/Hoods/Coat/hoodminer.rsi/icon.png index dd57205e7c..773e7e2de9 100644 Binary files a/Resources/Textures/Clothing/Head/Hoods/Coat/hoodminer.rsi/icon.png and b/Resources/Textures/Clothing/Head/Hoods/Coat/hoodminer.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Head/Hoods/Coat/hoodpara.rsi/equipped-HELMET.png b/Resources/Textures/Clothing/Head/Hoods/Coat/hoodpara.rsi/equipped-HELMET.png index 93423160eb..562eee78fb 100644 Binary files a/Resources/Textures/Clothing/Head/Hoods/Coat/hoodpara.rsi/equipped-HELMET.png and b/Resources/Textures/Clothing/Head/Hoods/Coat/hoodpara.rsi/equipped-HELMET.png differ diff --git a/Resources/Textures/Clothing/Head/Hoods/Coat/hoodpara.rsi/icon.png b/Resources/Textures/Clothing/Head/Hoods/Coat/hoodpara.rsi/icon.png index d2798bed10..ddae23916a 100644 Binary files a/Resources/Textures/Clothing/Head/Hoods/Coat/hoodpara.rsi/icon.png and b/Resources/Textures/Clothing/Head/Hoods/Coat/hoodpara.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Head/Hoods/Coat/hoodqm.rsi/equipped-HELMET.png b/Resources/Textures/Clothing/Head/Hoods/Coat/hoodqm.rsi/equipped-HELMET.png index 0508617792..aad29c45ab 100644 Binary files a/Resources/Textures/Clothing/Head/Hoods/Coat/hoodqm.rsi/equipped-HELMET.png and b/Resources/Textures/Clothing/Head/Hoods/Coat/hoodqm.rsi/equipped-HELMET.png differ diff --git a/Resources/Textures/Clothing/Head/Hoods/Coat/hoodqm.rsi/icon.png b/Resources/Textures/Clothing/Head/Hoods/Coat/hoodqm.rsi/icon.png index 6960ae2a4c..cb08505f47 100644 Binary files a/Resources/Textures/Clothing/Head/Hoods/Coat/hoodqm.rsi/icon.png and b/Resources/Textures/Clothing/Head/Hoods/Coat/hoodqm.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Head/Hoods/Coat/hoodrd.rsi/equipped-HELMET.png b/Resources/Textures/Clothing/Head/Hoods/Coat/hoodrd.rsi/equipped-HELMET.png index 492ff07c74..31dafb4663 100644 Binary files a/Resources/Textures/Clothing/Head/Hoods/Coat/hoodrd.rsi/equipped-HELMET.png and b/Resources/Textures/Clothing/Head/Hoods/Coat/hoodrd.rsi/equipped-HELMET.png differ diff --git a/Resources/Textures/Clothing/Head/Hoods/Coat/hoodrd.rsi/icon.png b/Resources/Textures/Clothing/Head/Hoods/Coat/hoodrd.rsi/icon.png index dcf2721400..b7efa265ea 100644 Binary files a/Resources/Textures/Clothing/Head/Hoods/Coat/hoodrd.rsi/icon.png and b/Resources/Textures/Clothing/Head/Hoods/Coat/hoodrd.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Head/Hoods/Coat/hoodrobo.rsi/equipped-HELMET.png b/Resources/Textures/Clothing/Head/Hoods/Coat/hoodrobo.rsi/equipped-HELMET.png index a881fb96ea..dd0032b1ed 100644 Binary files a/Resources/Textures/Clothing/Head/Hoods/Coat/hoodrobo.rsi/equipped-HELMET.png and b/Resources/Textures/Clothing/Head/Hoods/Coat/hoodrobo.rsi/equipped-HELMET.png differ diff --git a/Resources/Textures/Clothing/Head/Hoods/Coat/hoodrobo.rsi/icon.png b/Resources/Textures/Clothing/Head/Hoods/Coat/hoodrobo.rsi/icon.png index 7ee0aa7288..fa7c5d3121 100644 Binary files a/Resources/Textures/Clothing/Head/Hoods/Coat/hoodrobo.rsi/icon.png and b/Resources/Textures/Clothing/Head/Hoods/Coat/hoodrobo.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Head/Hoods/Coat/hoodsci.rsi/equipped-HELMET.png b/Resources/Textures/Clothing/Head/Hoods/Coat/hoodsci.rsi/equipped-HELMET.png index 1903db1639..de02acf326 100644 Binary files a/Resources/Textures/Clothing/Head/Hoods/Coat/hoodsci.rsi/equipped-HELMET.png and b/Resources/Textures/Clothing/Head/Hoods/Coat/hoodsci.rsi/equipped-HELMET.png differ diff --git a/Resources/Textures/Clothing/Head/Hoods/Coat/hoodsci.rsi/icon.png b/Resources/Textures/Clothing/Head/Hoods/Coat/hoodsci.rsi/icon.png index 6aa90be399..10c0f044ac 100644 Binary files a/Resources/Textures/Clothing/Head/Hoods/Coat/hoodsci.rsi/icon.png and b/Resources/Textures/Clothing/Head/Hoods/Coat/hoodsci.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Head/Hoods/Coat/hoodsec.rsi/equipped-HELMET.png b/Resources/Textures/Clothing/Head/Hoods/Coat/hoodsec.rsi/equipped-HELMET.png index f7e1738c32..355f294956 100644 Binary files a/Resources/Textures/Clothing/Head/Hoods/Coat/hoodsec.rsi/equipped-HELMET.png and b/Resources/Textures/Clothing/Head/Hoods/Coat/hoodsec.rsi/equipped-HELMET.png differ diff --git a/Resources/Textures/Clothing/Head/Hoods/Coat/hoodsec.rsi/icon.png b/Resources/Textures/Clothing/Head/Hoods/Coat/hoodsec.rsi/icon.png index 37fbbfb008..c5b3caadfd 100644 Binary files a/Resources/Textures/Clothing/Head/Hoods/Coat/hoodsec.rsi/icon.png and b/Resources/Textures/Clothing/Head/Hoods/Coat/hoodsec.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Head/Hoods/Coat/hoodsyndicate.rsi/equipped-HELMET.png b/Resources/Textures/Clothing/Head/Hoods/Coat/hoodsyndicate.rsi/equipped-HELMET.png index a9333c0f2e..8f7df65ada 100644 Binary files a/Resources/Textures/Clothing/Head/Hoods/Coat/hoodsyndicate.rsi/equipped-HELMET.png and b/Resources/Textures/Clothing/Head/Hoods/Coat/hoodsyndicate.rsi/equipped-HELMET.png differ diff --git a/Resources/Textures/Clothing/Head/Hoods/Coat/hoodsyndicate.rsi/icon.png b/Resources/Textures/Clothing/Head/Hoods/Coat/hoodsyndicate.rsi/icon.png index 5054e36643..902661b35d 100644 Binary files a/Resources/Textures/Clothing/Head/Hoods/Coat/hoodsyndicate.rsi/icon.png and b/Resources/Textures/Clothing/Head/Hoods/Coat/hoodsyndicate.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Head/Hoods/Coat/hoodweb.rsi/equipped-HELMET.png b/Resources/Textures/Clothing/Head/Hoods/Coat/hoodweb.rsi/equipped-HELMET.png index 44d6d0f9d4..6f15fd310d 100644 Binary files a/Resources/Textures/Clothing/Head/Hoods/Coat/hoodweb.rsi/equipped-HELMET.png and b/Resources/Textures/Clothing/Head/Hoods/Coat/hoodweb.rsi/equipped-HELMET.png differ diff --git a/Resources/Textures/Clothing/Head/Hoods/Coat/hoodweb.rsi/icon.png b/Resources/Textures/Clothing/Head/Hoods/Coat/hoodweb.rsi/icon.png index 2cb0dde017..8200aae9ba 100644 Binary files a/Resources/Textures/Clothing/Head/Hoods/Coat/hoodweb.rsi/icon.png and b/Resources/Textures/Clothing/Head/Hoods/Coat/hoodweb.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Head/Hoods/rad.rsi/equipped-HELMET-vox.png b/Resources/Textures/Clothing/Head/Hoods/rad.rsi/equipped-HELMET-vox.png new file mode 100644 index 0000000000..ab6cf612af Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hoods/rad.rsi/equipped-HELMET-vox.png differ diff --git a/Resources/Textures/Clothing/Head/Hoods/rad.rsi/equipped-HELMET.png b/Resources/Textures/Clothing/Head/Hoods/rad.rsi/equipped-HELMET.png index 8287d47952..38f3e2c455 100644 Binary files a/Resources/Textures/Clothing/Head/Hoods/rad.rsi/equipped-HELMET.png and b/Resources/Textures/Clothing/Head/Hoods/rad.rsi/equipped-HELMET.png differ diff --git a/Resources/Textures/Clothing/Head/Hoods/rad.rsi/icon.png b/Resources/Textures/Clothing/Head/Hoods/rad.rsi/icon.png index 9eaf4e5708..f62f3f8493 100644 Binary files a/Resources/Textures/Clothing/Head/Hoods/rad.rsi/icon.png and b/Resources/Textures/Clothing/Head/Hoods/rad.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Head/Hoods/rad.rsi/meta.json b/Resources/Textures/Clothing/Head/Hoods/rad.rsi/meta.json index 702e66d8a3..04f0d87cf2 100644 --- a/Resources/Textures/Clothing/Head/Hoods/rad.rsi/meta.json +++ b/Resources/Textures/Clothing/Head/Hoods/rad.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/discordia-space/CEV-Eris/commit/760f0be7af33a31f5a08a3291864e91539d0ebb7 | vulpkanin version taken from Paradise station at https://github.com/ParadiseSS13/Paradise/commit/f0fa4e1fd809482fbc104a310aa34cebf7df157d", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/6665eec76c98a4f3f89bebcd10b34b47dcc0b8ae. vox state by Flareguy", "size": { "x": 32, "y": 32 @@ -15,7 +15,7 @@ "directions": 4 }, { - "name": "equipped-HELMET-vulpkanin", + "name": "equipped-HELMET-vox", "directions": 4 } ] diff --git a/Resources/Textures/Clothing/Mask/bat.rsi/equipped-MASK-reptilian.png b/Resources/Textures/Clothing/Mask/bat.rsi/equipped-MASK-reptilian.png index 1515ff6ca8..e275a8fb8a 100644 Binary files a/Resources/Textures/Clothing/Mask/bat.rsi/equipped-MASK-reptilian.png and b/Resources/Textures/Clothing/Mask/bat.rsi/equipped-MASK-reptilian.png differ diff --git a/Resources/Textures/Clothing/Mask/bat.rsi/equipped-MASK-shark.png b/Resources/Textures/Clothing/Mask/bat.rsi/equipped-MASK-shark.png new file mode 100644 index 0000000000..e275a8fb8a Binary files /dev/null and b/Resources/Textures/Clothing/Mask/bat.rsi/equipped-MASK-shark.png differ diff --git a/Resources/Textures/Clothing/Mask/bat.rsi/equipped-MASK-tajaran.png b/Resources/Textures/Clothing/Mask/bat.rsi/equipped-MASK-tajaran.png new file mode 100644 index 0000000000..06fb13ba86 Binary files /dev/null and b/Resources/Textures/Clothing/Mask/bat.rsi/equipped-MASK-tajaran.png differ diff --git a/Resources/Textures/Clothing/Mask/bat.rsi/equipped-MASK-vulpkanin.png b/Resources/Textures/Clothing/Mask/bat.rsi/equipped-MASK-vulpkanin.png new file mode 100644 index 0000000000..08dd5af31c Binary files /dev/null and b/Resources/Textures/Clothing/Mask/bat.rsi/equipped-MASK-vulpkanin.png differ diff --git a/Resources/Textures/Clothing/Mask/bat.rsi/meta.json b/Resources/Textures/Clothing/Mask/bat.rsi/meta.json index cc214ea433..7c35488b87 100644 --- a/Resources/Textures/Clothing/Mask/bat.rsi/meta.json +++ b/Resources/Textures/Clothing/Mask/bat.rsi/meta.json @@ -14,6 +14,18 @@ "name": "equipped-MASK", "directions": 4 }, + { + "name": "equipped-MASK-vulpkanin", + "directions": 4 + }, + { + "name": "equipped-MASK-tajaran", + "directions": 4 + }, + { + "name": "equipped-MASK-shark", + "directions": 4 + }, { "name": "equipped-MASK-reptilian", "directions": 4 diff --git a/Resources/Textures/Clothing/Mask/bear.rsi/equipped-MASK-reptilian.png b/Resources/Textures/Clothing/Mask/bear.rsi/equipped-MASK-reptilian.png index 64b6c403d9..aab1e451fe 100644 Binary files a/Resources/Textures/Clothing/Mask/bear.rsi/equipped-MASK-reptilian.png and b/Resources/Textures/Clothing/Mask/bear.rsi/equipped-MASK-reptilian.png differ diff --git a/Resources/Textures/Clothing/Mask/bear.rsi/equipped-MASK-shark.png b/Resources/Textures/Clothing/Mask/bear.rsi/equipped-MASK-shark.png new file mode 100644 index 0000000000..639314d066 Binary files /dev/null and b/Resources/Textures/Clothing/Mask/bear.rsi/equipped-MASK-shark.png differ diff --git a/Resources/Textures/Clothing/Mask/bear.rsi/equipped-MASK-tajaran.png b/Resources/Textures/Clothing/Mask/bear.rsi/equipped-MASK-tajaran.png new file mode 100644 index 0000000000..6ad5fd2d71 Binary files /dev/null and b/Resources/Textures/Clothing/Mask/bear.rsi/equipped-MASK-tajaran.png differ diff --git a/Resources/Textures/Clothing/Mask/bear.rsi/equipped-MASK-vulpkanin.png b/Resources/Textures/Clothing/Mask/bear.rsi/equipped-MASK-vulpkanin.png new file mode 100644 index 0000000000..be43b988aa Binary files /dev/null and b/Resources/Textures/Clothing/Mask/bear.rsi/equipped-MASK-vulpkanin.png differ diff --git a/Resources/Textures/Clothing/Mask/bear.rsi/meta.json b/Resources/Textures/Clothing/Mask/bear.rsi/meta.json index cc214ea433..7c35488b87 100644 --- a/Resources/Textures/Clothing/Mask/bear.rsi/meta.json +++ b/Resources/Textures/Clothing/Mask/bear.rsi/meta.json @@ -14,6 +14,18 @@ "name": "equipped-MASK", "directions": 4 }, + { + "name": "equipped-MASK-vulpkanin", + "directions": 4 + }, + { + "name": "equipped-MASK-tajaran", + "directions": 4 + }, + { + "name": "equipped-MASK-shark", + "directions": 4 + }, { "name": "equipped-MASK-reptilian", "directions": 4 diff --git a/Resources/Textures/Clothing/Mask/bee.rsi/equipped-MASK-reptilian.png b/Resources/Textures/Clothing/Mask/bee.rsi/equipped-MASK-reptilian.png index 6ff867fa01..ef3fe8eb92 100644 Binary files a/Resources/Textures/Clothing/Mask/bee.rsi/equipped-MASK-reptilian.png and b/Resources/Textures/Clothing/Mask/bee.rsi/equipped-MASK-reptilian.png differ diff --git a/Resources/Textures/Clothing/Mask/bee.rsi/equipped-MASK-shark.png b/Resources/Textures/Clothing/Mask/bee.rsi/equipped-MASK-shark.png new file mode 100644 index 0000000000..0d5193aae3 Binary files /dev/null and b/Resources/Textures/Clothing/Mask/bee.rsi/equipped-MASK-shark.png differ diff --git a/Resources/Textures/Clothing/Mask/bee.rsi/equipped-MASK-tajaran.png b/Resources/Textures/Clothing/Mask/bee.rsi/equipped-MASK-tajaran.png new file mode 100644 index 0000000000..8c4a3a11f3 Binary files /dev/null and b/Resources/Textures/Clothing/Mask/bee.rsi/equipped-MASK-tajaran.png differ diff --git a/Resources/Textures/Clothing/Mask/bee.rsi/equipped-MASK-vox.png b/Resources/Textures/Clothing/Mask/bee.rsi/equipped-MASK-vox.png new file mode 100644 index 0000000000..05af835e9d Binary files /dev/null and b/Resources/Textures/Clothing/Mask/bee.rsi/equipped-MASK-vox.png differ diff --git a/Resources/Textures/Clothing/Mask/bee.rsi/equipped-MASK-vulpkanin.png b/Resources/Textures/Clothing/Mask/bee.rsi/equipped-MASK-vulpkanin.png new file mode 100644 index 0000000000..c3a897ea1a Binary files /dev/null and b/Resources/Textures/Clothing/Mask/bee.rsi/equipped-MASK-vulpkanin.png differ diff --git a/Resources/Textures/Clothing/Mask/bee.rsi/meta.json b/Resources/Textures/Clothing/Mask/bee.rsi/meta.json index cc214ea433..b442f744ca 100644 --- a/Resources/Textures/Clothing/Mask/bee.rsi/meta.json +++ b/Resources/Textures/Clothing/Mask/bee.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/dannno/-tg-station/blob/a51c5a85d327f562004cef2f36c081ad0d95fd9a/icons/obj/clothing/masks.dmi. Reptilian edit by Nairod(Github)", + "copyright": "Taken from tgstation at commit https://github.com/dannno/-tg-station/blob/a51c5a85d327f562004cef2f36c081ad0d95fd9a/icons/obj/clothing/masks.dmi. Reptilian edit by Nairod(Github). equipped-MASK-vox state taken from Paradise at https://github.com/ParadiseSS13/Paradise/blob/bc095ad398790a2b718b2bab4f2157cdd80a51da/icons/mob/clothing/species/vox/mask.dmi", "size": { "x": 32, "y": 32 @@ -14,9 +14,25 @@ "name": "equipped-MASK", "directions": 4 }, + { + "name": "equipped-MASK-vulpkanin", + "directions": 4 + }, + { + "name": "equipped-MASK-tajaran", + "directions": 4 + }, + { + "name": "equipped-MASK-shark", + "directions": 4 + }, { "name": "equipped-MASK-reptilian", "directions": 4 + }, + { + "name": "equipped-MASK-vox", + "directions": 4 } ] } diff --git a/Resources/Textures/Clothing/Mask/breath.rsi/equipped-MASK-chicken.png b/Resources/Textures/Clothing/Mask/breath.rsi/equipped-MASK-chicken.png new file mode 100644 index 0000000000..e1df23da3d Binary files /dev/null and b/Resources/Textures/Clothing/Mask/breath.rsi/equipped-MASK-chicken.png differ diff --git a/Resources/Textures/Clothing/Mask/breath.rsi/equipped-MASK-pitbull.png b/Resources/Textures/Clothing/Mask/breath.rsi/equipped-MASK-pitbull.png new file mode 100644 index 0000000000..e1df23da3d Binary files /dev/null and b/Resources/Textures/Clothing/Mask/breath.rsi/equipped-MASK-pitbull.png differ diff --git a/Resources/Textures/Clothing/Mask/breath.rsi/equipped-MASK-reptilian.png b/Resources/Textures/Clothing/Mask/breath.rsi/equipped-MASK-reptilian.png index b4a36fc3bb..640d796ebe 100644 Binary files a/Resources/Textures/Clothing/Mask/breath.rsi/equipped-MASK-reptilian.png and b/Resources/Textures/Clothing/Mask/breath.rsi/equipped-MASK-reptilian.png differ diff --git a/Resources/Textures/Clothing/Mask/breath.rsi/equipped-MASK-shark.png b/Resources/Textures/Clothing/Mask/breath.rsi/equipped-MASK-shark.png new file mode 100644 index 0000000000..0b0ab82d93 Binary files /dev/null and b/Resources/Textures/Clothing/Mask/breath.rsi/equipped-MASK-shark.png differ diff --git a/Resources/Textures/Clothing/Mask/breath.rsi/equipped-MASK-tajaran.png b/Resources/Textures/Clothing/Mask/breath.rsi/equipped-MASK-tajaran.png new file mode 100644 index 0000000000..33473403bb Binary files /dev/null and b/Resources/Textures/Clothing/Mask/breath.rsi/equipped-MASK-tajaran.png differ diff --git a/Resources/Textures/Clothing/Mask/breath.rsi/equipped-MASK-vulpkanin.png b/Resources/Textures/Clothing/Mask/breath.rsi/equipped-MASK-vulpkanin.png index d317cba50e..c9727d172e 100644 Binary files a/Resources/Textures/Clothing/Mask/breath.rsi/equipped-MASK-vulpkanin.png and b/Resources/Textures/Clothing/Mask/breath.rsi/equipped-MASK-vulpkanin.png differ diff --git a/Resources/Textures/Clothing/Mask/breath.rsi/meta.json b/Resources/Textures/Clothing/Mask/breath.rsi/meta.json index bed9ae64b0..f863987313 100644 --- a/Resources/Textures/Clothing/Mask/breath.rsi/meta.json +++ b/Resources/Textures/Clothing/Mask/breath.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e. Reptilian edit by Nairod(Github) equipped-MASK-secdog modified from equipped-MASK-dog by TJohnson. | vulpkanin version taken from Paradise station at https://github.com/ParadiseSS13/Paradise/commit/f0fa4e1fd809482fbc104a310aa34cebf7df157d", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e. Reptilian edit by Nairod(Github). equipped-MASK-vox & up-equipped-MASK-vox state in /vg/station at commit https://github.com/vgstation-coders/vgstation13/commit/4638130fab5ff0e9faa220688811349d3297a33e", "size": { "x": 32, "y": 32 @@ -15,71 +15,83 @@ "directions": 4 }, { - "name": "up-equipped-MASK", + "name": "equipped-MASK-vulpkanin", "directions": 4 }, { - "name": "inhand-left", + "name": "equipped-MASK-tajaran", "directions": 4 }, { - "name": "inhand-right", + "name": "equipped-MASK-shark", "directions": 4 }, { - "name": "equipped-MASK-dog", + "name": "equipped-MASK-reptilian", "directions": 4 }, { - "name": "equipped-MASK-secdog", + "name": "up-equipped-MASK", "directions": 4 }, { - "name": "equipped-MASK-puppy", + "name": "equipped-MASK-vox", "directions": 4 }, { - "name": "equipped-MASK-fox", + "name": "up-equipped-MASK-vox", "directions": 4 }, { - "name": "equipped-MASK-cat", + "name": "inhand-left", "directions": 4 }, { - "name": "equipped-MASK-sloth", + "name": "inhand-right", "directions": 4 }, { - "name": "equipped-MASK-possum", + "name": "equipped-MASK-dog", "directions": 4 }, { - "name": "equipped-MASK-vox", + "name": "equipped-MASK-puppy", "directions": 4 }, { - "name": "equipped-MASK-pig", + "name": "equipped-MASK-fox", "directions": 4 }, { - "name": "equipped-MASK-hamster", + "name": "equipped-MASK-cat", + "directions": 4 + }, + { + "name": "equipped-MASK-chicken", "directions": 4 }, { - "name": "equipped-MASK-kangaroo", + "name": "equipped-MASK-sloth", "directions": 4 }, { - "name": "equipped-MASK-reptilian", + "name": "equipped-MASK-possum", "directions": 4 }, { - "name": "equipped-MASK-vulpkanin", + "name": "equipped-MASK-pig", "directions": 4 }, { - "name": "up-equipped-MASK-vulpkanin", + "name": "equipped-MASK-pitbull", + "directions": 4 + }, + { + "name": "equipped-MASK-hamster", + "directions": 4 + }, + { + "name": "equipped-MASK-kangaroo", "directions": 4 } ] diff --git a/Resources/Textures/Clothing/Mask/breath.rsi/up-equipped-MASK-vox.png b/Resources/Textures/Clothing/Mask/breath.rsi/up-equipped-MASK-vox.png new file mode 100644 index 0000000000..770ad70cf5 Binary files /dev/null and b/Resources/Textures/Clothing/Mask/breath.rsi/up-equipped-MASK-vox.png differ diff --git a/Resources/Textures/Clothing/Mask/clown.rsi/equipped-MASK-reptilian.png b/Resources/Textures/Clothing/Mask/clown.rsi/equipped-MASK-reptilian.png index 498dec0adc..13efd3a25e 100644 Binary files a/Resources/Textures/Clothing/Mask/clown.rsi/equipped-MASK-reptilian.png and b/Resources/Textures/Clothing/Mask/clown.rsi/equipped-MASK-reptilian.png differ diff --git a/Resources/Textures/Clothing/Mask/clown.rsi/equipped-MASK-shark.png b/Resources/Textures/Clothing/Mask/clown.rsi/equipped-MASK-shark.png new file mode 100644 index 0000000000..06ac21728b Binary files /dev/null and b/Resources/Textures/Clothing/Mask/clown.rsi/equipped-MASK-shark.png differ diff --git a/Resources/Textures/Clothing/Mask/clown.rsi/equipped-MASK-tajaran.png b/Resources/Textures/Clothing/Mask/clown.rsi/equipped-MASK-tajaran.png new file mode 100644 index 0000000000..77f6e388f3 Binary files /dev/null and b/Resources/Textures/Clothing/Mask/clown.rsi/equipped-MASK-tajaran.png differ diff --git a/Resources/Textures/Clothing/Mask/clown.rsi/equipped-MASK-vox.png b/Resources/Textures/Clothing/Mask/clown.rsi/equipped-MASK-vox.png new file mode 100644 index 0000000000..0a7c6fc327 Binary files /dev/null and b/Resources/Textures/Clothing/Mask/clown.rsi/equipped-MASK-vox.png differ diff --git a/Resources/Textures/Clothing/Mask/clown.rsi/equipped-MASK-vulpkanin.png b/Resources/Textures/Clothing/Mask/clown.rsi/equipped-MASK-vulpkanin.png index 38ea9a62c8..03c416b8f3 100644 Binary files a/Resources/Textures/Clothing/Mask/clown.rsi/equipped-MASK-vulpkanin.png and b/Resources/Textures/Clothing/Mask/clown.rsi/equipped-MASK-vulpkanin.png differ diff --git a/Resources/Textures/Clothing/Mask/clown.rsi/meta.json b/Resources/Textures/Clothing/Mask/clown.rsi/meta.json index b3709bcd83..f0456e1a77 100644 --- a/Resources/Textures/Clothing/Mask/clown.rsi/meta.json +++ b/Resources/Textures/Clothing/Mask/clown.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e. Reptilian edit by Nairod(Github) | vulpkanin version taken from Paradise station at https://github.com/ParadiseSS13/Paradise/commit/f0fa4e1fd809482fbc104a310aa34cebf7df157d edited by Floofers", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e. Reptilian edit by Nairod(Github)", "size": { "x": 32, "y": 32 @@ -15,23 +15,31 @@ "directions": 4 }, { - "name": "equipped-MASK-hamster", + "name": "equipped-MASK-vulpkanin", "directions": 4 }, { - "name": "inhand-left", + "name": "equipped-MASK-tajaran", "directions": 4 }, { - "name": "inhand-right", + "name": "equipped-MASK-shark", "directions": 4 }, { - "name": "equipped-MASK-vulpkanin", + "name": "equipped-MASK-reptilian", "directions": 4 }, { - "name": "equipped-MASK-reptilian", + "name": "equipped-MASK-hamster", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", "directions": 4 } ] diff --git a/Resources/Textures/Clothing/Mask/clown_banana.rsi/equipped-MASK-reptilian.png b/Resources/Textures/Clothing/Mask/clown_banana.rsi/equipped-MASK-reptilian.png index c8061d2d63..5bcfc5cfbd 100644 Binary files a/Resources/Textures/Clothing/Mask/clown_banana.rsi/equipped-MASK-reptilian.png and b/Resources/Textures/Clothing/Mask/clown_banana.rsi/equipped-MASK-reptilian.png differ diff --git a/Resources/Textures/Clothing/Mask/clown_banana.rsi/equipped-MASK-shark.png b/Resources/Textures/Clothing/Mask/clown_banana.rsi/equipped-MASK-shark.png new file mode 100644 index 0000000000..71c33fd98c Binary files /dev/null and b/Resources/Textures/Clothing/Mask/clown_banana.rsi/equipped-MASK-shark.png differ diff --git a/Resources/Textures/Clothing/Mask/clown_banana.rsi/equipped-MASK-tajaran.png b/Resources/Textures/Clothing/Mask/clown_banana.rsi/equipped-MASK-tajaran.png new file mode 100644 index 0000000000..a1f827fdcb Binary files /dev/null and b/Resources/Textures/Clothing/Mask/clown_banana.rsi/equipped-MASK-tajaran.png differ diff --git a/Resources/Textures/Clothing/Mask/clown_banana.rsi/equipped-MASK-vulpkanin.png b/Resources/Textures/Clothing/Mask/clown_banana.rsi/equipped-MASK-vulpkanin.png new file mode 100644 index 0000000000..7ec11e7f92 Binary files /dev/null and b/Resources/Textures/Clothing/Mask/clown_banana.rsi/equipped-MASK-vulpkanin.png differ diff --git a/Resources/Textures/Clothing/Mask/clown_banana.rsi/meta.json b/Resources/Textures/Clothing/Mask/clown_banana.rsi/meta.json index df86a60683..db88a77870 100644 --- a/Resources/Textures/Clothing/Mask/clown_banana.rsi/meta.json +++ b/Resources/Textures/Clothing/Mask/clown_banana.rsi/meta.json @@ -15,20 +15,32 @@ "directions": 4 }, { - "name": "equipped-MASK-hamster", + "name": "equipped-MASK-vulpkanin", "directions": 4 }, { - "name": "inhand-left", + "name": "equipped-MASK-tajaran", "directions": 4 }, { - "name": "inhand-right", + "name": "equipped-MASK-shark", "directions": 4 }, { "name": "equipped-MASK-reptilian", "directions": 4 + }, + { + "name": "equipped-MASK-hamster", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 } ] } diff --git a/Resources/Textures/Clothing/Mask/clown_security.rsi/equipped-MASK-hamster.png b/Resources/Textures/Clothing/Mask/clown_security.rsi/equipped-MASK-hamster.png new file mode 100644 index 0000000000..27efed7a1c Binary files /dev/null and b/Resources/Textures/Clothing/Mask/clown_security.rsi/equipped-MASK-hamster.png differ diff --git a/Resources/Textures/Clothing/Mask/clown_security.rsi/equipped-MASK-reptilian.png b/Resources/Textures/Clothing/Mask/clown_security.rsi/equipped-MASK-reptilian.png new file mode 100644 index 0000000000..f41daaa15a Binary files /dev/null and b/Resources/Textures/Clothing/Mask/clown_security.rsi/equipped-MASK-reptilian.png differ diff --git a/Resources/Textures/Clothing/Mask/clown_security.rsi/equipped-MASK-vox.png b/Resources/Textures/Clothing/Mask/clown_security.rsi/equipped-MASK-vox.png new file mode 100644 index 0000000000..924520c2a8 Binary files /dev/null and b/Resources/Textures/Clothing/Mask/clown_security.rsi/equipped-MASK-vox.png differ diff --git a/Resources/Textures/Clothing/Mask/clown_security.rsi/equipped-MASK.png b/Resources/Textures/Clothing/Mask/clown_security.rsi/equipped-MASK.png new file mode 100644 index 0000000000..01013b3e5a Binary files /dev/null and b/Resources/Textures/Clothing/Mask/clown_security.rsi/equipped-MASK.png differ diff --git a/Resources/Textures/Clothing/Mask/clown_security.rsi/icon.png b/Resources/Textures/Clothing/Mask/clown_security.rsi/icon.png new file mode 100644 index 0000000000..90e9e2e1f0 Binary files /dev/null and b/Resources/Textures/Clothing/Mask/clown_security.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Mask/clown_security.rsi/inhand-left.png b/Resources/Textures/Clothing/Mask/clown_security.rsi/inhand-left.png new file mode 100644 index 0000000000..60f46602d7 Binary files /dev/null and b/Resources/Textures/Clothing/Mask/clown_security.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/Mask/clown_security.rsi/inhand-right.png b/Resources/Textures/Clothing/Mask/clown_security.rsi/inhand-right.png new file mode 100644 index 0000000000..bb3c306586 Binary files /dev/null and b/Resources/Textures/Clothing/Mask/clown_security.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/Mask/clown_security.rsi/meta.json b/Resources/Textures/Clothing/Mask/clown_security.rsi/meta.json new file mode 100644 index 0000000000..6f5cb2dc1e --- /dev/null +++ b/Resources/Textures/Clothing/Mask/clown_security.rsi/meta.json @@ -0,0 +1,38 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Modified version of clown mask by GoldenCan(github) (Copyright for clown mask: Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e. Reptilian edit by Nairod(Github). equipped-MASK-vox state taken from /vg/station at commit https://github.com/vgstation-coders/vgstation13/commit/4638130fab5ff0e9faa220688811349d3297a33e and slightly modified by Flareguy)", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-MASK", + "directions": 4 + }, + { + "name": "equipped-MASK-hamster", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + }, + { + "name": "equipped-MASK-reptilian", + "directions": 4 + }, + { + "name": "equipped-MASK-vox", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/Clothing/Mask/cluwne.rsi/equipped-MASK-reptilian.png b/Resources/Textures/Clothing/Mask/cluwne.rsi/equipped-MASK-reptilian.png index 621bdeb789..3227f3a42e 100644 Binary files a/Resources/Textures/Clothing/Mask/cluwne.rsi/equipped-MASK-reptilian.png and b/Resources/Textures/Clothing/Mask/cluwne.rsi/equipped-MASK-reptilian.png differ diff --git a/Resources/Textures/Clothing/Mask/cluwne.rsi/equipped-MASK-shark.png b/Resources/Textures/Clothing/Mask/cluwne.rsi/equipped-MASK-shark.png new file mode 100644 index 0000000000..95853a695f Binary files /dev/null and b/Resources/Textures/Clothing/Mask/cluwne.rsi/equipped-MASK-shark.png differ diff --git a/Resources/Textures/Clothing/Mask/cluwne.rsi/equipped-MASK-tajaran.png b/Resources/Textures/Clothing/Mask/cluwne.rsi/equipped-MASK-tajaran.png new file mode 100644 index 0000000000..d11dd70858 Binary files /dev/null and b/Resources/Textures/Clothing/Mask/cluwne.rsi/equipped-MASK-tajaran.png differ diff --git a/Resources/Textures/Clothing/Mask/cluwne.rsi/equipped-MASK-vulpkanin.png b/Resources/Textures/Clothing/Mask/cluwne.rsi/equipped-MASK-vulpkanin.png index 070974034f..a118dd912f 100644 Binary files a/Resources/Textures/Clothing/Mask/cluwne.rsi/equipped-MASK-vulpkanin.png and b/Resources/Textures/Clothing/Mask/cluwne.rsi/equipped-MASK-vulpkanin.png differ diff --git a/Resources/Textures/Clothing/Mask/cluwne.rsi/meta.json b/Resources/Textures/Clothing/Mask/cluwne.rsi/meta.json index 6ab2624c16..ec0c655f3e 100644 --- a/Resources/Textures/Clothing/Mask/cluwne.rsi/meta.json +++ b/Resources/Textures/Clothing/Mask/cluwne.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Made by brainfood1183 (github) for ss14. Reptilian edit by Nairod(Github) | vulpkanin version taken from Paradise station at https://github.com/ParadiseSS13/Paradise/commit/f0fa4e1fd809482fbc104a310aa34cebf7df157d edited by Floofers", + "copyright": "Made by brainfood1183 (github) for ss14. Reptilian edit by Nairod(Github)", "size": { "x": 32, "y": 32 @@ -18,6 +18,14 @@ "name": "equipped-MASK-vulpkanin", "directions": 4 }, + { + "name": "equipped-MASK-tajaran", + "directions": 4 + }, + { + "name": "equipped-MASK-shark", + "directions": 4 + }, { "name": "equipped-MASK-reptilian", "directions": 4 diff --git a/Resources/Textures/Clothing/Mask/ert.rsi/equipped-MASK-reptilian.png b/Resources/Textures/Clothing/Mask/ert.rsi/equipped-MASK-reptilian.png index ee82600baa..9a406d4f37 100644 Binary files a/Resources/Textures/Clothing/Mask/ert.rsi/equipped-MASK-reptilian.png and b/Resources/Textures/Clothing/Mask/ert.rsi/equipped-MASK-reptilian.png differ diff --git a/Resources/Textures/Clothing/Mask/ert.rsi/equipped-MASK-shark.png b/Resources/Textures/Clothing/Mask/ert.rsi/equipped-MASK-shark.png new file mode 100644 index 0000000000..9a406d4f37 Binary files /dev/null and b/Resources/Textures/Clothing/Mask/ert.rsi/equipped-MASK-shark.png differ diff --git a/Resources/Textures/Clothing/Mask/ert.rsi/equipped-MASK-tajaran.png b/Resources/Textures/Clothing/Mask/ert.rsi/equipped-MASK-tajaran.png new file mode 100644 index 0000000000..9a406d4f37 Binary files /dev/null and b/Resources/Textures/Clothing/Mask/ert.rsi/equipped-MASK-tajaran.png differ diff --git a/Resources/Textures/Clothing/Mask/ert.rsi/equipped-MASK-vulpkanin.png b/Resources/Textures/Clothing/Mask/ert.rsi/equipped-MASK-vulpkanin.png index 488c0387a7..eeecd88c57 100644 Binary files a/Resources/Textures/Clothing/Mask/ert.rsi/equipped-MASK-vulpkanin.png and b/Resources/Textures/Clothing/Mask/ert.rsi/equipped-MASK-vulpkanin.png differ diff --git a/Resources/Textures/Clothing/Mask/ert.rsi/meta.json b/Resources/Textures/Clothing/Mask/ert.rsi/meta.json index 57948ab9f7..e827911ef2 100644 --- a/Resources/Textures/Clothing/Mask/ert.rsi/meta.json +++ b/Resources/Textures/Clothing/Mask/ert.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Made by Nimfar11 (GitHub) for Space Station 14. Reptilian edit by Nairod(Github) | vulpkanin version made by Floofers", + "copyright": "Made by Nimfar11 (GitHub) for Space Station 14. Reptilian edit by Nairod(Github)", "size": { "x": 32, "y": 32 @@ -15,20 +15,28 @@ "directions": 4 }, { - "name": "inhand-left", + "name": "equipped-MASK-vulpkanin", "directions": 4 }, { - "name": "inhand-right", + "name": "equipped-MASK-tajaran", "directions": 4 }, { - "name": "equipped-MASK-vulpkanin", + "name": "equipped-MASK-shark", "directions": 4 }, { "name": "equipped-MASK-reptilian", "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 } ] } diff --git a/Resources/Textures/Clothing/Mask/fox.rsi/equipped-MASK-reptilian.png b/Resources/Textures/Clothing/Mask/fox.rsi/equipped-MASK-reptilian.png index d15b2d2098..aa3f4c10ad 100644 Binary files a/Resources/Textures/Clothing/Mask/fox.rsi/equipped-MASK-reptilian.png and b/Resources/Textures/Clothing/Mask/fox.rsi/equipped-MASK-reptilian.png differ diff --git a/Resources/Textures/Clothing/Mask/fox.rsi/equipped-MASK-shark.png b/Resources/Textures/Clothing/Mask/fox.rsi/equipped-MASK-shark.png new file mode 100644 index 0000000000..2a894d9fe8 Binary files /dev/null and b/Resources/Textures/Clothing/Mask/fox.rsi/equipped-MASK-shark.png differ diff --git a/Resources/Textures/Clothing/Mask/fox.rsi/equipped-MASK-tajaran.png b/Resources/Textures/Clothing/Mask/fox.rsi/equipped-MASK-tajaran.png new file mode 100644 index 0000000000..11549910c2 Binary files /dev/null and b/Resources/Textures/Clothing/Mask/fox.rsi/equipped-MASK-tajaran.png differ diff --git a/Resources/Textures/Clothing/Mask/fox.rsi/equipped-MASK-vulpkanin.png b/Resources/Textures/Clothing/Mask/fox.rsi/equipped-MASK-vulpkanin.png new file mode 100644 index 0000000000..76e3224354 Binary files /dev/null and b/Resources/Textures/Clothing/Mask/fox.rsi/equipped-MASK-vulpkanin.png differ diff --git a/Resources/Textures/Clothing/Mask/fox.rsi/meta.json b/Resources/Textures/Clothing/Mask/fox.rsi/meta.json index cc214ea433..7c35488b87 100644 --- a/Resources/Textures/Clothing/Mask/fox.rsi/meta.json +++ b/Resources/Textures/Clothing/Mask/fox.rsi/meta.json @@ -14,6 +14,18 @@ "name": "equipped-MASK", "directions": 4 }, + { + "name": "equipped-MASK-vulpkanin", + "directions": 4 + }, + { + "name": "equipped-MASK-tajaran", + "directions": 4 + }, + { + "name": "equipped-MASK-shark", + "directions": 4 + }, { "name": "equipped-MASK-reptilian", "directions": 4 diff --git a/Resources/Textures/Clothing/Mask/gas.rsi/equipped-MASK-reptilian.png b/Resources/Textures/Clothing/Mask/gas.rsi/equipped-MASK-reptilian.png index 09a2db0c97..282bb34a30 100644 Binary files a/Resources/Textures/Clothing/Mask/gas.rsi/equipped-MASK-reptilian.png and b/Resources/Textures/Clothing/Mask/gas.rsi/equipped-MASK-reptilian.png differ diff --git a/Resources/Textures/Clothing/Mask/gas.rsi/equipped-MASK-shark.png b/Resources/Textures/Clothing/Mask/gas.rsi/equipped-MASK-shark.png new file mode 100644 index 0000000000..282bb34a30 Binary files /dev/null and b/Resources/Textures/Clothing/Mask/gas.rsi/equipped-MASK-shark.png differ diff --git a/Resources/Textures/Clothing/Mask/gas.rsi/equipped-MASK-tajaran.png b/Resources/Textures/Clothing/Mask/gas.rsi/equipped-MASK-tajaran.png new file mode 100644 index 0000000000..07a765e8d0 Binary files /dev/null and b/Resources/Textures/Clothing/Mask/gas.rsi/equipped-MASK-tajaran.png differ diff --git a/Resources/Textures/Clothing/Mask/gas.rsi/equipped-MASK-vox.png b/Resources/Textures/Clothing/Mask/gas.rsi/equipped-MASK-vox.png new file mode 100644 index 0000000000..7170d7ebdf Binary files /dev/null and b/Resources/Textures/Clothing/Mask/gas.rsi/equipped-MASK-vox.png differ diff --git a/Resources/Textures/Clothing/Mask/gas.rsi/equipped-MASK-vulpkanin.png b/Resources/Textures/Clothing/Mask/gas.rsi/equipped-MASK-vulpkanin.png index fba0ec9b2b..12d2eab9b9 100644 Binary files a/Resources/Textures/Clothing/Mask/gas.rsi/equipped-MASK-vulpkanin.png and b/Resources/Textures/Clothing/Mask/gas.rsi/equipped-MASK-vulpkanin.png differ diff --git a/Resources/Textures/Clothing/Mask/gas.rsi/meta.json b/Resources/Textures/Clothing/Mask/gas.rsi/meta.json index 07a0c908b1..f0456e1a77 100644 --- a/Resources/Textures/Clothing/Mask/gas.rsi/meta.json +++ b/Resources/Textures/Clothing/Mask/gas.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e. Reptilian edit by Nairod(Github) | vulpkanin version taken from Paradise station at https://github.com/ParadiseSS13/Paradise/commit/f0fa4e1fd809482fbc104a310aa34cebf7df157d edited by Floofers", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e. Reptilian edit by Nairod(Github)", "size": { "x": 32, "y": 32 @@ -15,23 +15,31 @@ "directions": 4 }, { - "name": "equipped-MASK-hamster", + "name": "equipped-MASK-vulpkanin", "directions": 4 }, { - "name": "inhand-left", + "name": "equipped-MASK-tajaran", "directions": 4 }, { - "name": "inhand-right", + "name": "equipped-MASK-shark", "directions": 4 }, { - "name": "equipped-MASK-vulpkanin", + "name": "equipped-MASK-reptilian", "directions": 4 }, { - "name": "equipped-MASK-reptilian", + "name": "equipped-MASK-hamster", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", "directions": 4 } ] diff --git a/Resources/Textures/Clothing/Mask/gasatmos.rsi/equipped-MASK-reptilian.png b/Resources/Textures/Clothing/Mask/gasatmos.rsi/equipped-MASK-reptilian.png index 8bb678212d..ee59c78c4a 100644 Binary files a/Resources/Textures/Clothing/Mask/gasatmos.rsi/equipped-MASK-reptilian.png and b/Resources/Textures/Clothing/Mask/gasatmos.rsi/equipped-MASK-reptilian.png differ diff --git a/Resources/Textures/Clothing/Mask/gasatmos.rsi/equipped-MASK-shark.png b/Resources/Textures/Clothing/Mask/gasatmos.rsi/equipped-MASK-shark.png new file mode 100644 index 0000000000..ee59c78c4a Binary files /dev/null and b/Resources/Textures/Clothing/Mask/gasatmos.rsi/equipped-MASK-shark.png differ diff --git a/Resources/Textures/Clothing/Mask/gasatmos.rsi/equipped-MASK-tajaran.png b/Resources/Textures/Clothing/Mask/gasatmos.rsi/equipped-MASK-tajaran.png new file mode 100644 index 0000000000..0726eaba42 Binary files /dev/null and b/Resources/Textures/Clothing/Mask/gasatmos.rsi/equipped-MASK-tajaran.png differ diff --git a/Resources/Textures/Clothing/Mask/gasatmos.rsi/equipped-MASK-vox.png b/Resources/Textures/Clothing/Mask/gasatmos.rsi/equipped-MASK-vox.png new file mode 100644 index 0000000000..8975b1eb04 Binary files /dev/null and b/Resources/Textures/Clothing/Mask/gasatmos.rsi/equipped-MASK-vox.png differ diff --git a/Resources/Textures/Clothing/Mask/gasatmos.rsi/equipped-MASK-vulpkanin.png b/Resources/Textures/Clothing/Mask/gasatmos.rsi/equipped-MASK-vulpkanin.png index 141a7cc981..2026303aa1 100644 Binary files a/Resources/Textures/Clothing/Mask/gasatmos.rsi/equipped-MASK-vulpkanin.png and b/Resources/Textures/Clothing/Mask/gasatmos.rsi/equipped-MASK-vulpkanin.png differ diff --git a/Resources/Textures/Clothing/Mask/gasatmos.rsi/equipped-MASK.png b/Resources/Textures/Clothing/Mask/gasatmos.rsi/equipped-MASK.png index 4573a5a332..dcede619cb 100644 Binary files a/Resources/Textures/Clothing/Mask/gasatmos.rsi/equipped-MASK.png and b/Resources/Textures/Clothing/Mask/gasatmos.rsi/equipped-MASK.png differ diff --git a/Resources/Textures/Clothing/Mask/gasatmos.rsi/meta.json b/Resources/Textures/Clothing/Mask/gasatmos.rsi/meta.json index 63476f222b..5b0419322e 100644 --- a/Resources/Textures/Clothing/Mask/gasatmos.rsi/meta.json +++ b/Resources/Textures/Clothing/Mask/gasatmos.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e. Reptilian edit by Nairod(Github) | vulpkanin version taken from Paradise station at https://github.com/ParadiseSS13/Paradise/commit/f0fa4e1fd809482fbc104a310aa34cebf7df157d edited by Floofers", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e. Reptilian edit by Nairod(Github)", "size": { "x": 32, "y": 32 @@ -15,20 +15,28 @@ "directions": 4 }, { - "name": "inhand-left", + "name": "equipped-MASK-vulpkanin", "directions": 4 }, { - "name": "inhand-right", + "name": "equipped-MASK-tajaran", "directions": 4 }, { - "name": "equipped-MASK-vulpkanin", + "name": "equipped-MASK-shark", "directions": 4 }, { "name": "equipped-MASK-reptilian", "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 } ] } diff --git a/Resources/Textures/Clothing/Mask/gascaptain.rsi/equipped-MASK-reptilian.png b/Resources/Textures/Clothing/Mask/gascaptain.rsi/equipped-MASK-reptilian.png index 4d0504d922..a3608c05ef 100644 Binary files a/Resources/Textures/Clothing/Mask/gascaptain.rsi/equipped-MASK-reptilian.png and b/Resources/Textures/Clothing/Mask/gascaptain.rsi/equipped-MASK-reptilian.png differ diff --git a/Resources/Textures/Clothing/Mask/gascaptain.rsi/equipped-MASK-shark.png b/Resources/Textures/Clothing/Mask/gascaptain.rsi/equipped-MASK-shark.png new file mode 100644 index 0000000000..a3608c05ef Binary files /dev/null and b/Resources/Textures/Clothing/Mask/gascaptain.rsi/equipped-MASK-shark.png differ diff --git a/Resources/Textures/Clothing/Mask/gascaptain.rsi/equipped-MASK-tajaran.png b/Resources/Textures/Clothing/Mask/gascaptain.rsi/equipped-MASK-tajaran.png new file mode 100644 index 0000000000..91ea4c5eae Binary files /dev/null and b/Resources/Textures/Clothing/Mask/gascaptain.rsi/equipped-MASK-tajaran.png differ diff --git a/Resources/Textures/Clothing/Mask/gascaptain.rsi/equipped-MASK-vox.png b/Resources/Textures/Clothing/Mask/gascaptain.rsi/equipped-MASK-vox.png new file mode 100644 index 0000000000..bc0f5e9011 Binary files /dev/null and b/Resources/Textures/Clothing/Mask/gascaptain.rsi/equipped-MASK-vox.png differ diff --git a/Resources/Textures/Clothing/Mask/gascaptain.rsi/equipped-MASK-vulpkanin.png b/Resources/Textures/Clothing/Mask/gascaptain.rsi/equipped-MASK-vulpkanin.png index d13d3212c0..6242f568ad 100644 Binary files a/Resources/Textures/Clothing/Mask/gascaptain.rsi/equipped-MASK-vulpkanin.png and b/Resources/Textures/Clothing/Mask/gascaptain.rsi/equipped-MASK-vulpkanin.png differ diff --git a/Resources/Textures/Clothing/Mask/gascaptain.rsi/equipped-MASK.png b/Resources/Textures/Clothing/Mask/gascaptain.rsi/equipped-MASK.png index 397d7e6eb1..88618674ae 100644 Binary files a/Resources/Textures/Clothing/Mask/gascaptain.rsi/equipped-MASK.png and b/Resources/Textures/Clothing/Mask/gascaptain.rsi/equipped-MASK.png differ diff --git a/Resources/Textures/Clothing/Mask/gascaptain.rsi/icon.png b/Resources/Textures/Clothing/Mask/gascaptain.rsi/icon.png index 98bf7228dc..36921aea46 100644 Binary files a/Resources/Textures/Clothing/Mask/gascaptain.rsi/icon.png and b/Resources/Textures/Clothing/Mask/gascaptain.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Mask/gascaptain.rsi/inhand-left.png b/Resources/Textures/Clothing/Mask/gascaptain.rsi/inhand-left.png index fe2901acd1..56b548473e 100644 Binary files a/Resources/Textures/Clothing/Mask/gascaptain.rsi/inhand-left.png and b/Resources/Textures/Clothing/Mask/gascaptain.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/Mask/gascaptain.rsi/inhand-right.png b/Resources/Textures/Clothing/Mask/gascaptain.rsi/inhand-right.png index 5615899ced..4abea25fbf 100644 Binary files a/Resources/Textures/Clothing/Mask/gascaptain.rsi/inhand-right.png and b/Resources/Textures/Clothing/Mask/gascaptain.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/Mask/gascaptain.rsi/meta.json b/Resources/Textures/Clothing/Mask/gascaptain.rsi/meta.json index 4b2d043352..bec80f22c2 100644 --- a/Resources/Textures/Clothing/Mask/gascaptain.rsi/meta.json +++ b/Resources/Textures/Clothing/Mask/gascaptain.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e, edited by Emisse for ss14. Reptilian edit by Nairod(Github) | vulpkanin version taken from Paradise station at https://github.com/ParadiseSS13/Paradise/commit/f0fa4e1fd809482fbc104a310aa34cebf7df157d edited by Floofers", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e, edited by Emisse for ss14. Reptilian edit by Nairod(Github)", "size": { "x": 32, "y": 32 @@ -14,6 +14,10 @@ "name": "equipped-MASK", "directions": 4 }, + { + "name": "equipped-MASK-vulpkanin", + "directions": 4 + }, { "name": "inhand-left", "directions": 4 @@ -21,14 +25,6 @@ { "name": "inhand-right", "directions": 4 - }, - { - "name": "equipped-MASK-vulpkanin", - "directions": 4 - }, - { - "name": "equipped-MASK-reptilian", - "directions": 4 } ] } diff --git a/Resources/Textures/Clothing/Mask/gascentcom.rsi/equipped-MASK-reptilian.png b/Resources/Textures/Clothing/Mask/gascentcom.rsi/equipped-MASK-reptilian.png index c3736fb8b0..935b4fd257 100644 Binary files a/Resources/Textures/Clothing/Mask/gascentcom.rsi/equipped-MASK-reptilian.png and b/Resources/Textures/Clothing/Mask/gascentcom.rsi/equipped-MASK-reptilian.png differ diff --git a/Resources/Textures/Clothing/Mask/gascentcom.rsi/equipped-MASK-shark.png b/Resources/Textures/Clothing/Mask/gascentcom.rsi/equipped-MASK-shark.png new file mode 100644 index 0000000000..935b4fd257 Binary files /dev/null and b/Resources/Textures/Clothing/Mask/gascentcom.rsi/equipped-MASK-shark.png differ diff --git a/Resources/Textures/Clothing/Mask/gascentcom.rsi/equipped-MASK-tajaran.png b/Resources/Textures/Clothing/Mask/gascentcom.rsi/equipped-MASK-tajaran.png new file mode 100644 index 0000000000..44514cd58a Binary files /dev/null and b/Resources/Textures/Clothing/Mask/gascentcom.rsi/equipped-MASK-tajaran.png differ diff --git a/Resources/Textures/Clothing/Mask/gascentcom.rsi/equipped-MASK-vulpkanin.png b/Resources/Textures/Clothing/Mask/gascentcom.rsi/equipped-MASK-vulpkanin.png index 9d85ba2f06..9be17aa6a6 100644 Binary files a/Resources/Textures/Clothing/Mask/gascentcom.rsi/equipped-MASK-vulpkanin.png and b/Resources/Textures/Clothing/Mask/gascentcom.rsi/equipped-MASK-vulpkanin.png differ diff --git a/Resources/Textures/Clothing/Mask/gascentcom.rsi/icon.png b/Resources/Textures/Clothing/Mask/gascentcom.rsi/icon.png index 8316253b7d..d706fa23e0 100644 Binary files a/Resources/Textures/Clothing/Mask/gascentcom.rsi/icon.png and b/Resources/Textures/Clothing/Mask/gascentcom.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Mask/gascentcom.rsi/meta.json b/Resources/Textures/Clothing/Mask/gascentcom.rsi/meta.json index 9ba629faae..5b0419322e 100644 --- a/Resources/Textures/Clothing/Mask/gascentcom.rsi/meta.json +++ b/Resources/Textures/Clothing/Mask/gascentcom.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e. Reptilian edit by Nairod(Github) | vulpkanin version taken from Paradise station at https://github.com/ParadiseSS13/Paradise/commit/f0fa4e1fd809482fbc104a310aa34cebf7df157d edited by Floofers", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e. Reptilian edit by Nairod(Github)", "size": { "x": 32, "y": 32 @@ -15,20 +15,28 @@ "directions": 4 }, { - "name": "inhand-left", + "name": "equipped-MASK-vulpkanin", "directions": 4 }, { - "name": "inhand-right", + "name": "equipped-MASK-tajaran", "directions": 4 }, { - "name": "equipped-MASK-vulpkanin", + "name": "equipped-MASK-shark", "directions": 4 }, { "name": "equipped-MASK-reptilian", "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 } ] } diff --git a/Resources/Textures/Clothing/Mask/gasexplorer.rsi/equipped-MASK-reptilian.png b/Resources/Textures/Clothing/Mask/gasexplorer.rsi/equipped-MASK-reptilian.png index 6af7b28737..3c3ced2be8 100644 Binary files a/Resources/Textures/Clothing/Mask/gasexplorer.rsi/equipped-MASK-reptilian.png and b/Resources/Textures/Clothing/Mask/gasexplorer.rsi/equipped-MASK-reptilian.png differ diff --git a/Resources/Textures/Clothing/Mask/gasexplorer.rsi/equipped-MASK-shark.png b/Resources/Textures/Clothing/Mask/gasexplorer.rsi/equipped-MASK-shark.png new file mode 100644 index 0000000000..d82c591fa2 Binary files /dev/null and b/Resources/Textures/Clothing/Mask/gasexplorer.rsi/equipped-MASK-shark.png differ diff --git a/Resources/Textures/Clothing/Mask/gasexplorer.rsi/equipped-MASK-tajaran.png b/Resources/Textures/Clothing/Mask/gasexplorer.rsi/equipped-MASK-tajaran.png new file mode 100644 index 0000000000..913d63de6c Binary files /dev/null and b/Resources/Textures/Clothing/Mask/gasexplorer.rsi/equipped-MASK-tajaran.png differ diff --git a/Resources/Textures/Clothing/Mask/gasexplorer.rsi/equipped-MASK-vox.png b/Resources/Textures/Clothing/Mask/gasexplorer.rsi/equipped-MASK-vox.png new file mode 100644 index 0000000000..f504228f7d Binary files /dev/null and b/Resources/Textures/Clothing/Mask/gasexplorer.rsi/equipped-MASK-vox.png differ diff --git a/Resources/Textures/Clothing/Mask/gasexplorer.rsi/equipped-MASK-vulpkanin.png b/Resources/Textures/Clothing/Mask/gasexplorer.rsi/equipped-MASK-vulpkanin.png index 91da2da7c7..5b45186d69 100644 Binary files a/Resources/Textures/Clothing/Mask/gasexplorer.rsi/equipped-MASK-vulpkanin.png and b/Resources/Textures/Clothing/Mask/gasexplorer.rsi/equipped-MASK-vulpkanin.png differ diff --git a/Resources/Textures/Clothing/Mask/gasexplorer.rsi/meta.json b/Resources/Textures/Clothing/Mask/gasexplorer.rsi/meta.json index 600054012e..d8eef9edde 100644 --- a/Resources/Textures/Clothing/Mask/gasexplorer.rsi/meta.json +++ b/Resources/Textures/Clothing/Mask/gasexplorer.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e. Reptilian edit by Nairod(Github) | vulpkanin version edited by Floofers", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e. Reptilian edit by Nairod(Github)", "size": { "x": 32, "y": 32 @@ -15,23 +15,31 @@ "directions": 4 }, { - "name": "up-equipped-MASK", + "name": "equipped-MASK-vulpkanin", "directions": 4 }, { - "name": "inhand-left", + "name": "equipped-MASK-tajaran", "directions": 4 }, { - "name": "inhand-right", + "name": "equipped-MASK-shark", "directions": 4 }, { - "name": "equipped-MASK-vulpkanin", + "name": "equipped-MASK-reptilian", "directions": 4 }, { - "name": "equipped-MASK-reptilian", + "name": "up-equipped-MASK", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", "directions": 4 } ] diff --git a/Resources/Textures/Clothing/Mask/gassecurity.rsi/equipped-MASK-reptilian.png b/Resources/Textures/Clothing/Mask/gassecurity.rsi/equipped-MASK-reptilian.png index d835388d7c..aec2c46f18 100644 Binary files a/Resources/Textures/Clothing/Mask/gassecurity.rsi/equipped-MASK-reptilian.png and b/Resources/Textures/Clothing/Mask/gassecurity.rsi/equipped-MASK-reptilian.png differ diff --git a/Resources/Textures/Clothing/Mask/gassecurity.rsi/equipped-MASK-shark.png b/Resources/Textures/Clothing/Mask/gassecurity.rsi/equipped-MASK-shark.png new file mode 100644 index 0000000000..7a7d50fa94 Binary files /dev/null and b/Resources/Textures/Clothing/Mask/gassecurity.rsi/equipped-MASK-shark.png differ diff --git a/Resources/Textures/Clothing/Mask/gassecurity.rsi/equipped-MASK-tajaran.png b/Resources/Textures/Clothing/Mask/gassecurity.rsi/equipped-MASK-tajaran.png new file mode 100644 index 0000000000..78502a0a23 Binary files /dev/null and b/Resources/Textures/Clothing/Mask/gassecurity.rsi/equipped-MASK-tajaran.png differ diff --git a/Resources/Textures/Clothing/Mask/gassecurity.rsi/equipped-MASK-vox.png b/Resources/Textures/Clothing/Mask/gassecurity.rsi/equipped-MASK-vox.png new file mode 100644 index 0000000000..ff33f30944 Binary files /dev/null and b/Resources/Textures/Clothing/Mask/gassecurity.rsi/equipped-MASK-vox.png differ diff --git a/Resources/Textures/Clothing/Mask/gassecurity.rsi/equipped-MASK-vulpkanin.png b/Resources/Textures/Clothing/Mask/gassecurity.rsi/equipped-MASK-vulpkanin.png index b9395a9026..127ce9e399 100644 Binary files a/Resources/Textures/Clothing/Mask/gassecurity.rsi/equipped-MASK-vulpkanin.png and b/Resources/Textures/Clothing/Mask/gassecurity.rsi/equipped-MASK-vulpkanin.png differ diff --git a/Resources/Textures/Clothing/Mask/gassecurity.rsi/meta.json b/Resources/Textures/Clothing/Mask/gassecurity.rsi/meta.json index 9ed76c4839..d8eef9edde 100644 --- a/Resources/Textures/Clothing/Mask/gassecurity.rsi/meta.json +++ b/Resources/Textures/Clothing/Mask/gassecurity.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e. Reptilian edit by Nairod(Github) | vulpkanin version taken from Paradise station at https://github.com/ParadiseSS13/Paradise/commit/f0fa4e1fd809482fbc104a310aa34cebf7df157d", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e. Reptilian edit by Nairod(Github)", "size": { "x": 32, "y": 32 @@ -15,23 +15,31 @@ "directions": 4 }, { - "name": "up-equipped-MASK", + "name": "equipped-MASK-vulpkanin", "directions": 4 }, { - "name": "inhand-left", + "name": "equipped-MASK-tajaran", "directions": 4 }, { - "name": "inhand-right", + "name": "equipped-MASK-shark", "directions": 4 }, { - "name": "equipped-MASK-vulpkanin", + "name": "equipped-MASK-reptilian", "directions": 4 }, { - "name": "equipped-MASK-reptilian", + "name": "up-equipped-MASK", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", "directions": 4 } ] diff --git a/Resources/Textures/Clothing/Mask/gassecurity.rsi/up-equipped-MASK-vox.png b/Resources/Textures/Clothing/Mask/gassecurity.rsi/up-equipped-MASK-vox.png new file mode 100644 index 0000000000..e701323f55 Binary files /dev/null and b/Resources/Textures/Clothing/Mask/gassecurity.rsi/up-equipped-MASK-vox.png differ diff --git a/Resources/Textures/Clothing/Mask/gassyndicate.rsi/equipped-MASK-reptilian.png b/Resources/Textures/Clothing/Mask/gassyndicate.rsi/equipped-MASK-reptilian.png index eab9e77b1c..5195b3fbc9 100644 Binary files a/Resources/Textures/Clothing/Mask/gassyndicate.rsi/equipped-MASK-reptilian.png and b/Resources/Textures/Clothing/Mask/gassyndicate.rsi/equipped-MASK-reptilian.png differ diff --git a/Resources/Textures/Clothing/Mask/gassyndicate.rsi/equipped-MASK-shark.png b/Resources/Textures/Clothing/Mask/gassyndicate.rsi/equipped-MASK-shark.png new file mode 100644 index 0000000000..47fd784a4a Binary files /dev/null and b/Resources/Textures/Clothing/Mask/gassyndicate.rsi/equipped-MASK-shark.png differ diff --git a/Resources/Textures/Clothing/Mask/gassyndicate.rsi/equipped-MASK-tajaran.png b/Resources/Textures/Clothing/Mask/gassyndicate.rsi/equipped-MASK-tajaran.png new file mode 100644 index 0000000000..b75cde4174 Binary files /dev/null and b/Resources/Textures/Clothing/Mask/gassyndicate.rsi/equipped-MASK-tajaran.png differ diff --git a/Resources/Textures/Clothing/Mask/gassyndicate.rsi/equipped-MASK-vox.png b/Resources/Textures/Clothing/Mask/gassyndicate.rsi/equipped-MASK-vox.png new file mode 100644 index 0000000000..59a80479f7 Binary files /dev/null and b/Resources/Textures/Clothing/Mask/gassyndicate.rsi/equipped-MASK-vox.png differ diff --git a/Resources/Textures/Clothing/Mask/gassyndicate.rsi/equipped-MASK-vulpkanin.png b/Resources/Textures/Clothing/Mask/gassyndicate.rsi/equipped-MASK-vulpkanin.png index a7c913dc1e..470a15cfb0 100644 Binary files a/Resources/Textures/Clothing/Mask/gassyndicate.rsi/equipped-MASK-vulpkanin.png and b/Resources/Textures/Clothing/Mask/gassyndicate.rsi/equipped-MASK-vulpkanin.png differ diff --git a/Resources/Textures/Clothing/Mask/gassyndicate.rsi/meta.json b/Resources/Textures/Clothing/Mask/gassyndicate.rsi/meta.json index 1e01e88dc4..9cda7a7cc9 100644 --- a/Resources/Textures/Clothing/Mask/gassyndicate.rsi/meta.json +++ b/Resources/Textures/Clothing/Mask/gassyndicate.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e. Reptilian edit by Nairod(Github) | vulpkanin version taken from Paradise station at https://github.com/ParadiseSS13/Paradise/commit/f0fa4e1fd809482fbc104a310aa34cebf7df157d", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e. Reptilian edit by Nairod(Github)", "size": { "x": 32, "y": 32 @@ -21,32 +21,52 @@ ] }, { - "name": "inhand-left", - "directions": 4 + "name": "equipped-MASK-vulpkanin", + "directions": 4, + "delays": [ + [ 0.5, 0.5, 0.5, 0.5 ], + [ 0.5, 0.5, 0.5, 0.5 ], + [ 0.5, 0.5, 0.5, 0.5 ], + [ 0.5, 0.5, 0.5, 0.5 ] + ] }, { - "name": "inhand-right", - "directions": 4 + "name": "equipped-MASK-tajaran", + "directions": 4, + "delays": [ + [ 0.5, 0.5, 0.5, 0.5 ], + [ 0.5, 0.5, 0.5, 0.5 ], + [ 0.5, 0.5, 0.5, 0.5 ], + [ 0.5, 0.5, 0.5, 0.5 ] + ] }, { - "name": "equipped-MASK-vulpkanin", + "name": "equipped-MASK-shark", "directions": 4, "delays": [ - [ 0.5, 0.5, 0.5 ], - [ 0.5, 0.5, 0.5 ], - [ 0.5, 0.5, 0.5 ], - [ 0.5, 0.5, 0.5 ] + [ 0.5, 0.5, 0.5, 0.5 ], + [ 0.5, 0.5, 0.5, 0.5 ], + [ 0.5, 0.5, 0.5, 0.5 ], + [ 0.5, 0.5, 0.5, 0.5 ] ] }, { "name": "equipped-MASK-reptilian", "directions": 4, "delays": [ - [ 0.5, 0.5, 0.5 ], - [ 0.5, 0.5, 0.5 ], - [ 0.5, 0.5, 0.5 ], - [ 0.5, 0.5, 0.5 ] + [ 0.5, 0.5, 0.5, 0.5 ], + [ 0.5, 0.5, 0.5, 0.5 ], + [ 0.5, 0.5, 0.5, 0.5 ], + [ 0.5, 0.5, 0.5, 0.5 ] ] + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 } ] } diff --git a/Resources/Textures/Clothing/Mask/italian_moustache.rsi/equipped-MASK-reptilian.png b/Resources/Textures/Clothing/Mask/italian_moustache.rsi/equipped-MASK-reptilian.png new file mode 100644 index 0000000000..4451094136 Binary files /dev/null and b/Resources/Textures/Clothing/Mask/italian_moustache.rsi/equipped-MASK-reptilian.png differ diff --git a/Resources/Textures/Clothing/Mask/italian_moustache.rsi/equipped-MASK-vox.png b/Resources/Textures/Clothing/Mask/italian_moustache.rsi/equipped-MASK-vox.png new file mode 100644 index 0000000000..9bd2b35d77 Binary files /dev/null and b/Resources/Textures/Clothing/Mask/italian_moustache.rsi/equipped-MASK-vox.png differ diff --git a/Resources/Textures/Clothing/Mask/italian_moustache.rsi/equipped-MASK-vulpkanin.png b/Resources/Textures/Clothing/Mask/italian_moustache.rsi/equipped-MASK-vulpkanin.png index 9bde35f041..98cc26bf56 100644 Binary files a/Resources/Textures/Clothing/Mask/italian_moustache.rsi/equipped-MASK-vulpkanin.png and b/Resources/Textures/Clothing/Mask/italian_moustache.rsi/equipped-MASK-vulpkanin.png differ diff --git a/Resources/Textures/Clothing/Mask/italian_moustache.rsi/meta.json b/Resources/Textures/Clothing/Mask/italian_moustache.rsi/meta.json index 9621b18fe9..6da3a8f83c 100644 --- a/Resources/Textures/Clothing/Mask/italian_moustache.rsi/meta.json +++ b/Resources/Textures/Clothing/Mask/italian_moustache.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/6665eec76c98a4f3f89bebcd10b34b47dcc0b8ae | vulpkanin version taken from Paradise station at https://github.com/ParadiseSS13/Paradise/commit/f0fa4e1fd809482fbc104a310aa34cebf7df157d", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/6665eec76c98a4f3f89bebcd10b34b47dcc0b8ae", "size": { "x": 32, "y": 32 @@ -15,15 +15,15 @@ "directions": 4 }, { - "name": "inhand-left", - "directions": 4 + "name": "equipped-MASK-vulpkanin", + "directions": 4 }, { - "name": "inhand-right", + "name": "inhand-left", "directions": 4 }, { - "name": "equipped-MASK-vulpkanin", + "name": "inhand-right", "directions": 4 } ] diff --git a/Resources/Textures/Clothing/Mask/jackal.rsi/equipped-MASK-reptilian.png b/Resources/Textures/Clothing/Mask/jackal.rsi/equipped-MASK-reptilian.png index 6e884d8827..5105010474 100644 Binary files a/Resources/Textures/Clothing/Mask/jackal.rsi/equipped-MASK-reptilian.png and b/Resources/Textures/Clothing/Mask/jackal.rsi/equipped-MASK-reptilian.png differ diff --git a/Resources/Textures/Clothing/Mask/jackal.rsi/equipped-MASK-shark.png b/Resources/Textures/Clothing/Mask/jackal.rsi/equipped-MASK-shark.png new file mode 100644 index 0000000000..5060e845f2 Binary files /dev/null and b/Resources/Textures/Clothing/Mask/jackal.rsi/equipped-MASK-shark.png differ diff --git a/Resources/Textures/Clothing/Mask/jackal.rsi/equipped-MASK-tajaran.png b/Resources/Textures/Clothing/Mask/jackal.rsi/equipped-MASK-tajaran.png new file mode 100644 index 0000000000..fca30c6960 Binary files /dev/null and b/Resources/Textures/Clothing/Mask/jackal.rsi/equipped-MASK-tajaran.png differ diff --git a/Resources/Textures/Clothing/Mask/jackal.rsi/equipped-MASK-vulpkanin.png b/Resources/Textures/Clothing/Mask/jackal.rsi/equipped-MASK-vulpkanin.png new file mode 100644 index 0000000000..9b5dafb8fa Binary files /dev/null and b/Resources/Textures/Clothing/Mask/jackal.rsi/equipped-MASK-vulpkanin.png differ diff --git a/Resources/Textures/Clothing/Mask/jackal.rsi/meta.json b/Resources/Textures/Clothing/Mask/jackal.rsi/meta.json index cc214ea433..7c35488b87 100644 --- a/Resources/Textures/Clothing/Mask/jackal.rsi/meta.json +++ b/Resources/Textures/Clothing/Mask/jackal.rsi/meta.json @@ -14,6 +14,18 @@ "name": "equipped-MASK", "directions": 4 }, + { + "name": "equipped-MASK-vulpkanin", + "directions": 4 + }, + { + "name": "equipped-MASK-tajaran", + "directions": 4 + }, + { + "name": "equipped-MASK-shark", + "directions": 4 + }, { "name": "equipped-MASK-reptilian", "directions": 4 diff --git a/Resources/Textures/Clothing/Mask/joy.rsi/equipped-MASK-reptilian.png b/Resources/Textures/Clothing/Mask/joy.rsi/equipped-MASK-reptilian.png index 3cb8ce685e..3ab18277ec 100644 Binary files a/Resources/Textures/Clothing/Mask/joy.rsi/equipped-MASK-reptilian.png and b/Resources/Textures/Clothing/Mask/joy.rsi/equipped-MASK-reptilian.png differ diff --git a/Resources/Textures/Clothing/Mask/joy.rsi/equipped-MASK-shark.png b/Resources/Textures/Clothing/Mask/joy.rsi/equipped-MASK-shark.png new file mode 100644 index 0000000000..0fcb967363 Binary files /dev/null and b/Resources/Textures/Clothing/Mask/joy.rsi/equipped-MASK-shark.png differ diff --git a/Resources/Textures/Clothing/Mask/joy.rsi/equipped-MASK-tajaran.png b/Resources/Textures/Clothing/Mask/joy.rsi/equipped-MASK-tajaran.png new file mode 100644 index 0000000000..e8b6856e5b Binary files /dev/null and b/Resources/Textures/Clothing/Mask/joy.rsi/equipped-MASK-tajaran.png differ diff --git a/Resources/Textures/Clothing/Mask/joy.rsi/equipped-MASK-vulpkanin.png b/Resources/Textures/Clothing/Mask/joy.rsi/equipped-MASK-vulpkanin.png new file mode 100644 index 0000000000..1e7f04e357 Binary files /dev/null and b/Resources/Textures/Clothing/Mask/joy.rsi/equipped-MASK-vulpkanin.png differ diff --git a/Resources/Textures/Clothing/Mask/joy.rsi/equipped-MASK.png b/Resources/Textures/Clothing/Mask/joy.rsi/equipped-MASK.png index 0701011328..d9ee9e9bb4 100644 Binary files a/Resources/Textures/Clothing/Mask/joy.rsi/equipped-MASK.png and b/Resources/Textures/Clothing/Mask/joy.rsi/equipped-MASK.png differ diff --git a/Resources/Textures/Clothing/Mask/joy.rsi/meta.json b/Resources/Textures/Clothing/Mask/joy.rsi/meta.json index 98e76beb9e..cb271fb575 100644 --- a/Resources/Textures/Clothing/Mask/joy.rsi/meta.json +++ b/Resources/Textures/Clothing/Mask/joy.rsi/meta.json @@ -14,6 +14,18 @@ "name": "equipped-MASK", "directions": 4 }, + { + "name": "equipped-MASK-vulpkanin", + "directions": 4 + }, + { + "name": "equipped-MASK-tajaran", + "directions": 4 + }, + { + "name": "equipped-MASK-shark", + "directions": 4 + }, { "name": "equipped-MASK-reptilian", "directions": 4 diff --git a/Resources/Textures/Clothing/Mask/medical.rsi/equipped-MASK-chicken.png b/Resources/Textures/Clothing/Mask/medical.rsi/equipped-MASK-chicken.png new file mode 100644 index 0000000000..f2dbdf0834 Binary files /dev/null and b/Resources/Textures/Clothing/Mask/medical.rsi/equipped-MASK-chicken.png differ diff --git a/Resources/Textures/Clothing/Mask/medical.rsi/equipped-MASK-pitbull.png b/Resources/Textures/Clothing/Mask/medical.rsi/equipped-MASK-pitbull.png new file mode 100644 index 0000000000..f2dbdf0834 Binary files /dev/null and b/Resources/Textures/Clothing/Mask/medical.rsi/equipped-MASK-pitbull.png differ diff --git a/Resources/Textures/Clothing/Mask/medical.rsi/equipped-MASK-reptilian.png b/Resources/Textures/Clothing/Mask/medical.rsi/equipped-MASK-reptilian.png index 910d4ba925..640d796ebe 100644 Binary files a/Resources/Textures/Clothing/Mask/medical.rsi/equipped-MASK-reptilian.png and b/Resources/Textures/Clothing/Mask/medical.rsi/equipped-MASK-reptilian.png differ diff --git a/Resources/Textures/Clothing/Mask/medical.rsi/equipped-MASK-shark.png b/Resources/Textures/Clothing/Mask/medical.rsi/equipped-MASK-shark.png new file mode 100644 index 0000000000..0b0ab82d93 Binary files /dev/null and b/Resources/Textures/Clothing/Mask/medical.rsi/equipped-MASK-shark.png differ diff --git a/Resources/Textures/Clothing/Mask/medical.rsi/equipped-MASK-tajaran.png b/Resources/Textures/Clothing/Mask/medical.rsi/equipped-MASK-tajaran.png new file mode 100644 index 0000000000..33473403bb Binary files /dev/null and b/Resources/Textures/Clothing/Mask/medical.rsi/equipped-MASK-tajaran.png differ diff --git a/Resources/Textures/Clothing/Mask/medical.rsi/equipped-MASK-vox.png b/Resources/Textures/Clothing/Mask/medical.rsi/equipped-MASK-vox.png new file mode 100644 index 0000000000..c3fa7f5917 Binary files /dev/null and b/Resources/Textures/Clothing/Mask/medical.rsi/equipped-MASK-vox.png differ diff --git a/Resources/Textures/Clothing/Mask/medical.rsi/equipped-MASK-vulpkanin.png b/Resources/Textures/Clothing/Mask/medical.rsi/equipped-MASK-vulpkanin.png index 687ac3aed3..c9727d172e 100644 Binary files a/Resources/Textures/Clothing/Mask/medical.rsi/equipped-MASK-vulpkanin.png and b/Resources/Textures/Clothing/Mask/medical.rsi/equipped-MASK-vulpkanin.png differ diff --git a/Resources/Textures/Clothing/Mask/medical.rsi/meta.json b/Resources/Textures/Clothing/Mask/medical.rsi/meta.json index 59e292cbd4..19ea3eb93f 100644 --- a/Resources/Textures/Clothing/Mask/medical.rsi/meta.json +++ b/Resources/Textures/Clothing/Mask/medical.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e. Reptilian edit by Nairod(Github) | vulpkanin version taken from Paradise station at https://github.com/ParadiseSS13/Paradise/commit/f0fa4e1fd809482fbc104a310aa34cebf7df157d", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e. Reptilian edit by Nairod(Github)", "size": { "x": 32, "y": 32 @@ -14,6 +14,22 @@ "name": "equipped-MASK", "directions": 4 }, + { + "name": "equipped-MASK-vulpkanin", + "directions": 4 + }, + { + "name": "equipped-MASK-tajaran", + "directions": 4 + }, + { + "name": "equipped-MASK-shark", + "directions": 4 + }, + { + "name": "equipped-MASK-reptilian", + "directions": 4 + }, { "name": "equipped-MASK-dog", "directions": 4 @@ -29,6 +45,10 @@ { "name": "equipped-MASK-cat", "directions": 4 + }, + { + "name": "equipped-MASK-chicken", + "directions": 4 }, { "name": "equipped-MASK-sloth", @@ -53,27 +73,19 @@ "directions": 4 }, { - "name": "up-equipped-MASK", - "directions": 4 - }, - { - "name": "inhand-left", + "name": "equipped-MASK-pitbull", "directions": 4 }, { - "name": "inhand-right", - "directions": 4 - }, - { - "name": "equipped-MASK-vulpkanin", + "name": "up-equipped-MASK", "directions": 4 }, { - "name": "up-equipped-MASK-vulpkanin", + "name": "inhand-left", "directions": 4 }, { - "name": "equipped-MASK-reptilian", + "name": "inhand-right", "directions": 4 } ] diff --git a/Resources/Textures/Clothing/Mask/medical.rsi/up-equipped-MASK-vox.png b/Resources/Textures/Clothing/Mask/medical.rsi/up-equipped-MASK-vox.png new file mode 100644 index 0000000000..770ad70cf5 Binary files /dev/null and b/Resources/Textures/Clothing/Mask/medical.rsi/up-equipped-MASK-vox.png differ diff --git a/Resources/Textures/Clothing/Mask/medicalsecurity.rsi/equipped-MASK-chicken.png b/Resources/Textures/Clothing/Mask/medicalsecurity.rsi/equipped-MASK-chicken.png new file mode 100644 index 0000000000..ebf52b25f6 Binary files /dev/null and b/Resources/Textures/Clothing/Mask/medicalsecurity.rsi/equipped-MASK-chicken.png differ diff --git a/Resources/Textures/Clothing/Mask/medicalsecurity.rsi/equipped-MASK-pitbull.png b/Resources/Textures/Clothing/Mask/medicalsecurity.rsi/equipped-MASK-pitbull.png new file mode 100644 index 0000000000..ebf52b25f6 Binary files /dev/null and b/Resources/Textures/Clothing/Mask/medicalsecurity.rsi/equipped-MASK-pitbull.png differ diff --git a/Resources/Textures/Clothing/Mask/medicalsecurity.rsi/equipped-MASK-vulpkanin.png b/Resources/Textures/Clothing/Mask/medicalsecurity.rsi/equipped-MASK-vulpkanin.png index d317cba50e..4b2956c2be 100644 Binary files a/Resources/Textures/Clothing/Mask/medicalsecurity.rsi/equipped-MASK-vulpkanin.png and b/Resources/Textures/Clothing/Mask/medicalsecurity.rsi/equipped-MASK-vulpkanin.png differ diff --git a/Resources/Textures/Clothing/Mask/medicalsecurity.rsi/meta.json b/Resources/Textures/Clothing/Mask/medicalsecurity.rsi/meta.json index 99c06491bb..0ea6a0c5ba 100644 --- a/Resources/Textures/Clothing/Mask/medicalsecurity.rsi/meta.json +++ b/Resources/Textures/Clothing/Mask/medicalsecurity.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Sprited by LinkUyx#6557. Reptilian edit by Nairod(Github) | vulpkanin version taken from Paradise station at https://github.com/ParadiseSS13/Paradise/commit/f0fa4e1fd809482fbc104a310aa34cebf7df157d", + "copyright": "Sprited by LinkUyx#6557. Reptilian edit by Nairod(Github)", "size": { "x": 32, "y": 32 @@ -14,6 +14,10 @@ "name": "equipped-MASK", "directions": 4 }, + { + "name": "equipped-MASK-vulpkanin", + "directions": 4 + }, { "name": "equipped-MASK-dog", "directions": 4 @@ -29,6 +33,10 @@ { "name": "equipped-MASK-cat", "directions": 4 + }, + { + "name": "equipped-MASK-chicken", + "directions": 4 }, { "name": "equipped-MASK-sloth", @@ -43,27 +51,19 @@ "directions": 4 }, { - "name": "up-equipped-MASK", - "directions": 4 - }, - { - "name": "inhand-left", - "directions": 4 - }, - { - "name": "inhand-right", + "name": "equipped-MASK-pitbull", "directions": 4 }, { - "name": "equipped-MASK-vulpkanin", + "name": "up-equipped-MASK", "directions": 4 }, { - "name": "up-equipped-MASK-vulpkanin", + "name": "inhand-left", "directions": 4 }, { - "name": "equipped-MASK-reptilian", + "name": "inhand-right", "directions": 4 } ] diff --git a/Resources/Textures/Clothing/Mask/merc.rsi/equipped-MASK-reptilian.png b/Resources/Textures/Clothing/Mask/merc.rsi/equipped-MASK-reptilian.png index 5255b20b82..9b8d372eef 100644 Binary files a/Resources/Textures/Clothing/Mask/merc.rsi/equipped-MASK-reptilian.png and b/Resources/Textures/Clothing/Mask/merc.rsi/equipped-MASK-reptilian.png differ diff --git a/Resources/Textures/Clothing/Mask/merc.rsi/equipped-MASK-shark.png b/Resources/Textures/Clothing/Mask/merc.rsi/equipped-MASK-shark.png new file mode 100644 index 0000000000..387a00e03f Binary files /dev/null and b/Resources/Textures/Clothing/Mask/merc.rsi/equipped-MASK-shark.png differ diff --git a/Resources/Textures/Clothing/Mask/merc.rsi/equipped-MASK-tajaran.png b/Resources/Textures/Clothing/Mask/merc.rsi/equipped-MASK-tajaran.png new file mode 100644 index 0000000000..40797b369e Binary files /dev/null and b/Resources/Textures/Clothing/Mask/merc.rsi/equipped-MASK-tajaran.png differ diff --git a/Resources/Textures/Clothing/Mask/merc.rsi/equipped-MASK-vulpkanin.png b/Resources/Textures/Clothing/Mask/merc.rsi/equipped-MASK-vulpkanin.png index cdcebb8231..b6ea3fd836 100644 Binary files a/Resources/Textures/Clothing/Mask/merc.rsi/equipped-MASK-vulpkanin.png and b/Resources/Textures/Clothing/Mask/merc.rsi/equipped-MASK-vulpkanin.png differ diff --git a/Resources/Textures/Clothing/Mask/merc.rsi/meta.json b/Resources/Textures/Clothing/Mask/merc.rsi/meta.json index 6a07b4b956..9be934da7c 100644 --- a/Resources/Textures/Clothing/Mask/merc.rsi/meta.json +++ b/Resources/Textures/Clothing/Mask/merc.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "modified sprite from Jackal298 based on the sprite from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e. Reptilian edit by Nairod(Github) | vulpkanin version edited by Floofers", + "copyright": "modified sprite from Jackal298 based on the sprite from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e. Reptilian edit by Nairod(Github)", "size": { "x": 32, "y": 32 @@ -15,20 +15,28 @@ "directions": 4 }, { - "name": "inhand-left", + "name": "equipped-MASK-vulpkanin", "directions": 4 }, { - "name": "inhand-right", + "name": "equipped-MASK-tajaran", "directions": 4 }, { - "name": "equipped-MASK-vulpkanin", + "name": "equipped-MASK-shark", "directions": 4 }, { "name": "equipped-MASK-reptilian", "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 } ] } diff --git a/Resources/Textures/Clothing/Mask/mime.rsi/equipped-MASK-reptilian.png b/Resources/Textures/Clothing/Mask/mime.rsi/equipped-MASK-reptilian.png index 55975a7407..4785967ced 100644 Binary files a/Resources/Textures/Clothing/Mask/mime.rsi/equipped-MASK-reptilian.png and b/Resources/Textures/Clothing/Mask/mime.rsi/equipped-MASK-reptilian.png differ diff --git a/Resources/Textures/Clothing/Mask/mime.rsi/equipped-MASK-shark.png b/Resources/Textures/Clothing/Mask/mime.rsi/equipped-MASK-shark.png new file mode 100644 index 0000000000..0e74346aff Binary files /dev/null and b/Resources/Textures/Clothing/Mask/mime.rsi/equipped-MASK-shark.png differ diff --git a/Resources/Textures/Clothing/Mask/mime.rsi/equipped-MASK-tajaran.png b/Resources/Textures/Clothing/Mask/mime.rsi/equipped-MASK-tajaran.png new file mode 100644 index 0000000000..a77979cba3 Binary files /dev/null and b/Resources/Textures/Clothing/Mask/mime.rsi/equipped-MASK-tajaran.png differ diff --git a/Resources/Textures/Clothing/Mask/mime.rsi/equipped-MASK-vox.png b/Resources/Textures/Clothing/Mask/mime.rsi/equipped-MASK-vox.png new file mode 100644 index 0000000000..cab47297f0 Binary files /dev/null and b/Resources/Textures/Clothing/Mask/mime.rsi/equipped-MASK-vox.png differ diff --git a/Resources/Textures/Clothing/Mask/mime.rsi/equipped-MASK-vulpkanin.png b/Resources/Textures/Clothing/Mask/mime.rsi/equipped-MASK-vulpkanin.png index cf3d8629a3..fee324409c 100644 Binary files a/Resources/Textures/Clothing/Mask/mime.rsi/equipped-MASK-vulpkanin.png and b/Resources/Textures/Clothing/Mask/mime.rsi/equipped-MASK-vulpkanin.png differ diff --git a/Resources/Textures/Clothing/Mask/mime.rsi/equipped-MASK.png b/Resources/Textures/Clothing/Mask/mime.rsi/equipped-MASK.png index 0dff034392..71c53151f1 100644 Binary files a/Resources/Textures/Clothing/Mask/mime.rsi/equipped-MASK.png and b/Resources/Textures/Clothing/Mask/mime.rsi/equipped-MASK.png differ diff --git a/Resources/Textures/Clothing/Mask/mime.rsi/meta.json b/Resources/Textures/Clothing/Mask/mime.rsi/meta.json index 34248cb9b9..f1b0cee761 100644 --- a/Resources/Textures/Clothing/Mask/mime.rsi/meta.json +++ b/Resources/Textures/Clothing/Mask/mime.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e. Reptilian edit by Nairod(Github) | vulpkanin version taken from Paradise station at https://github.com/ParadiseSS13/Paradise/commit/f0fa4e1fd809482fbc104a310aa34cebf7df157d edited by Floofers", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e. Reptilian edit by Nairod(Github)", "size": { "x": 32, "y": 32 @@ -15,16 +15,24 @@ "directions": 4 }, { - "name": "equipped-MASK-hamster", + "name": "equipped-MASK-vulpkanin", "directions": 4 }, { - "name": "equipped-MASK-vulpkanin", + "name": "equipped-MASK-tajaran", + "directions": 4 + }, + { + "name": "equipped-MASK-shark", "directions": 4 }, { "name": "equipped-MASK-reptilian", "directions": 4 + }, + { + "name": "equipped-MASK-hamster", + "directions": 4 } ] } diff --git a/Resources/Textures/Clothing/Mask/muzzle.rsi/equipped-MASK-reptilian.png b/Resources/Textures/Clothing/Mask/muzzle.rsi/equipped-MASK-reptilian.png index be21fa8fb2..1c7f83dc36 100644 Binary files a/Resources/Textures/Clothing/Mask/muzzle.rsi/equipped-MASK-reptilian.png and b/Resources/Textures/Clothing/Mask/muzzle.rsi/equipped-MASK-reptilian.png differ diff --git a/Resources/Textures/Clothing/Mask/muzzle.rsi/equipped-MASK-shark.png b/Resources/Textures/Clothing/Mask/muzzle.rsi/equipped-MASK-shark.png new file mode 100644 index 0000000000..8d4a415dda Binary files /dev/null and b/Resources/Textures/Clothing/Mask/muzzle.rsi/equipped-MASK-shark.png differ diff --git a/Resources/Textures/Clothing/Mask/muzzle.rsi/equipped-MASK-tajaran.png b/Resources/Textures/Clothing/Mask/muzzle.rsi/equipped-MASK-tajaran.png new file mode 100644 index 0000000000..a447a9fb12 Binary files /dev/null and b/Resources/Textures/Clothing/Mask/muzzle.rsi/equipped-MASK-tajaran.png differ diff --git a/Resources/Textures/Clothing/Mask/muzzle.rsi/equipped-MASK-vox.png b/Resources/Textures/Clothing/Mask/muzzle.rsi/equipped-MASK-vox.png new file mode 100644 index 0000000000..529c87878e Binary files /dev/null and b/Resources/Textures/Clothing/Mask/muzzle.rsi/equipped-MASK-vox.png differ diff --git a/Resources/Textures/Clothing/Mask/muzzle.rsi/equipped-MASK-vulpkanin.png b/Resources/Textures/Clothing/Mask/muzzle.rsi/equipped-MASK-vulpkanin.png index 8de17b9d3a..ce00509177 100644 Binary files a/Resources/Textures/Clothing/Mask/muzzle.rsi/equipped-MASK-vulpkanin.png and b/Resources/Textures/Clothing/Mask/muzzle.rsi/equipped-MASK-vulpkanin.png differ diff --git a/Resources/Textures/Clothing/Mask/muzzle.rsi/meta.json b/Resources/Textures/Clothing/Mask/muzzle.rsi/meta.json index 33176d73e7..c59fbd9083 100644 --- a/Resources/Textures/Clothing/Mask/muzzle.rsi/meta.json +++ b/Resources/Textures/Clothing/Mask/muzzle.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e. Reptilian edit by Nairod(Github) | vulpkanin version taken from https://github.com/SPLURT-Station/S.P.L.U.R.T-Station-13/commit/091d9ec00f186052b87bd65125e896f78faefe38", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e. Reptilian edit by Nairod(Github)", "size": { "x": 32, "y": 32 @@ -11,24 +11,32 @@ "name": "icon" }, { - "name": "equipped-MASK", - "directions": 4 + "name": "equipped-MASK", + "directions": 4 }, + { + "name": "equipped-MASK-vulpkanin", + "directions": 4 + }, + { + "name": "equipped-MASK-tajaran", + "directions": 4 + }, + { + "name": "equipped-MASK-shark", + "directions": 4 + }, + { + "name": "equipped-MASK-reptilian", + "directions": 4 + }, { - "name": "inhand-left", - "directions": 4 + "name": "inhand-left", + "directions": 4 }, { - "name": "inhand-right", - "directions": 4 - }, - { - "name": "equipped-MASK-vulpkanin", - "directions": 4 - }, - { - "name": "equipped-MASK-reptilian", - "directions": 4 + "name": "inhand-right", + "directions": 4 } ] } diff --git a/Resources/Textures/Clothing/Mask/neckgaiter.rsi/equipped-MASK-shark.png b/Resources/Textures/Clothing/Mask/neckgaiter.rsi/equipped-MASK-shark.png new file mode 100644 index 0000000000..4c9162c644 Binary files /dev/null and b/Resources/Textures/Clothing/Mask/neckgaiter.rsi/equipped-MASK-shark.png differ diff --git a/Resources/Textures/Clothing/Mask/neckgaiter.rsi/equipped-MASK-tajaran.png b/Resources/Textures/Clothing/Mask/neckgaiter.rsi/equipped-MASK-tajaran.png new file mode 100644 index 0000000000..9b1da4f3ab Binary files /dev/null and b/Resources/Textures/Clothing/Mask/neckgaiter.rsi/equipped-MASK-tajaran.png differ diff --git a/Resources/Textures/Clothing/Mask/neckgaiter.rsi/equipped-MASK-vulpkanin.png b/Resources/Textures/Clothing/Mask/neckgaiter.rsi/equipped-MASK-vulpkanin.png new file mode 100644 index 0000000000..311046a13a Binary files /dev/null and b/Resources/Textures/Clothing/Mask/neckgaiter.rsi/equipped-MASK-vulpkanin.png differ diff --git a/Resources/Textures/Clothing/Mask/neckgaiter.rsi/meta.json b/Resources/Textures/Clothing/Mask/neckgaiter.rsi/meta.json index 4da74959dd..2239edb061 100644 --- a/Resources/Textures/Clothing/Mask/neckgaiter.rsi/meta.json +++ b/Resources/Textures/Clothing/Mask/neckgaiter.rsi/meta.json @@ -18,6 +18,18 @@ "name": "equipped-MASK-vox", "directions": 4 }, + { + "name": "equipped-MASK-vulpkanin", + "directions": 4 + }, + { + "name": "equipped-MASK-tajaran", + "directions": 4 + }, + { + "name": "equipped-MASK-shark", + "directions": 4 + }, { "name": "equipped-MASK-reptilian", "directions": 4 diff --git a/Resources/Textures/Clothing/Mask/ninja.rsi/equipped-MASK-reptilian.png b/Resources/Textures/Clothing/Mask/ninja.rsi/equipped-MASK-reptilian.png new file mode 100644 index 0000000000..30353ee2cf Binary files /dev/null and b/Resources/Textures/Clothing/Mask/ninja.rsi/equipped-MASK-reptilian.png differ diff --git a/Resources/Textures/Clothing/Mask/ninja.rsi/equipped-MASK-shark.png b/Resources/Textures/Clothing/Mask/ninja.rsi/equipped-MASK-shark.png new file mode 100644 index 0000000000..d154c25f97 Binary files /dev/null and b/Resources/Textures/Clothing/Mask/ninja.rsi/equipped-MASK-shark.png differ diff --git a/Resources/Textures/Clothing/Mask/ninja.rsi/equipped-MASK-tajaran.png b/Resources/Textures/Clothing/Mask/ninja.rsi/equipped-MASK-tajaran.png new file mode 100644 index 0000000000..05cd66ad05 Binary files /dev/null and b/Resources/Textures/Clothing/Mask/ninja.rsi/equipped-MASK-tajaran.png differ diff --git a/Resources/Textures/Clothing/Mask/ninja.rsi/equipped-MASK-vox.png b/Resources/Textures/Clothing/Mask/ninja.rsi/equipped-MASK-vox.png new file mode 100644 index 0000000000..924742fa94 Binary files /dev/null and b/Resources/Textures/Clothing/Mask/ninja.rsi/equipped-MASK-vox.png differ diff --git a/Resources/Textures/Clothing/Mask/ninja.rsi/equipped-MASK-vulpkanin.png b/Resources/Textures/Clothing/Mask/ninja.rsi/equipped-MASK-vulpkanin.png index 95d236c98b..249034cde6 100644 Binary files a/Resources/Textures/Clothing/Mask/ninja.rsi/equipped-MASK-vulpkanin.png and b/Resources/Textures/Clothing/Mask/ninja.rsi/equipped-MASK-vulpkanin.png differ diff --git a/Resources/Textures/Clothing/Mask/ninja.rsi/equipped-MASK.png b/Resources/Textures/Clothing/Mask/ninja.rsi/equipped-MASK.png index 2c7c443e5d..920dd4912e 100644 Binary files a/Resources/Textures/Clothing/Mask/ninja.rsi/equipped-MASK.png and b/Resources/Textures/Clothing/Mask/ninja.rsi/equipped-MASK.png differ diff --git a/Resources/Textures/Clothing/Mask/ninja.rsi/icon.png b/Resources/Textures/Clothing/Mask/ninja.rsi/icon.png index 59b716bffb..43dca0a730 100644 Binary files a/Resources/Textures/Clothing/Mask/ninja.rsi/icon.png and b/Resources/Textures/Clothing/Mask/ninja.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Mask/ninja.rsi/inhand-left.png b/Resources/Textures/Clothing/Mask/ninja.rsi/inhand-left.png index f30ac5185d..900114c31e 100644 Binary files a/Resources/Textures/Clothing/Mask/ninja.rsi/inhand-left.png and b/Resources/Textures/Clothing/Mask/ninja.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/Mask/ninja.rsi/inhand-right.png b/Resources/Textures/Clothing/Mask/ninja.rsi/inhand-right.png index 20aba07f3c..def44f1b59 100644 Binary files a/Resources/Textures/Clothing/Mask/ninja.rsi/inhand-right.png and b/Resources/Textures/Clothing/Mask/ninja.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/Mask/ninja.rsi/meta.json b/Resources/Textures/Clothing/Mask/ninja.rsi/meta.json index da51268a11..ea146b8993 100644 --- a/Resources/Textures/Clothing/Mask/ninja.rsi/meta.json +++ b/Resources/Textures/Clothing/Mask/ninja.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from paradise at commit https://github.com/ParadiseSS13/Paradise/commit/33f7c1ef477fa67db5dda48078b469ab59aa7997 | vulpkanin version taken from Paradise station at https://github.com/ParadiseSS13/Paradise/commit/f0fa4e1fd809482fbc104a310aa34cebf7df157d edited by Floofers", + "copyright": "Taken from paradise at commit https://github.com/ParadiseSS13/Paradise/commit/33f7c1ef477fa67db5dda48078b469ab59aa7997", "size": { "x": 32, "y": 32 @@ -15,15 +15,27 @@ "directions": 4 }, { - "name": "inhand-left", + "name": "equipped-MASK-vulpkanin", "directions": 4 }, { - "name": "inhand-right", + "name": "equipped-MASK-tajaran", "directions": 4 }, { - "name": "equipped-MASK-vulpkanin", + "name": "equipped-MASK-shark", + "directions": 4 + }, + { + "name": "equipped-MASK-reptilian", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", "directions": 4 } ] diff --git a/Resources/Textures/Clothing/Mask/plaguedoctormask.rsi/equipped-MASK-reptilian.png b/Resources/Textures/Clothing/Mask/plaguedoctormask.rsi/equipped-MASK-reptilian.png new file mode 100644 index 0000000000..e37d72984e Binary files /dev/null and b/Resources/Textures/Clothing/Mask/plaguedoctormask.rsi/equipped-MASK-reptilian.png differ diff --git a/Resources/Textures/Clothing/Mask/plaguedoctormask.rsi/equipped-MASK-vox.png b/Resources/Textures/Clothing/Mask/plaguedoctormask.rsi/equipped-MASK-vox.png new file mode 100644 index 0000000000..67d3c25cac Binary files /dev/null and b/Resources/Textures/Clothing/Mask/plaguedoctormask.rsi/equipped-MASK-vox.png differ diff --git a/Resources/Textures/Clothing/Mask/plaguedoctormask.rsi/equipped-MASK-vulpkanin.png b/Resources/Textures/Clothing/Mask/plaguedoctormask.rsi/equipped-MASK-vulpkanin.png index 528fa82fc8..27063473e0 100644 Binary files a/Resources/Textures/Clothing/Mask/plaguedoctormask.rsi/equipped-MASK-vulpkanin.png and b/Resources/Textures/Clothing/Mask/plaguedoctormask.rsi/equipped-MASK-vulpkanin.png differ diff --git a/Resources/Textures/Clothing/Mask/plaguedoctormask.rsi/meta.json b/Resources/Textures/Clothing/Mask/plaguedoctormask.rsi/meta.json index 0f2358a55f..769271bf05 100644 --- a/Resources/Textures/Clothing/Mask/plaguedoctormask.rsi/meta.json +++ b/Resources/Textures/Clothing/Mask/plaguedoctormask.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from TGstation github https://github.com/tgstation/tgstation/commit/e89db4dd4f42377b0adafb06806a763314a89034 , edited by Alekshhh | vulpkanin version taken from https://github.com/SPLURT-Station/S.P.L.U.R.T-Station-13/commit/091d9ec00f186052b87bd65125e896f78faefe38", + "copyright": "Taken from TGstation github https://github.com/tgstation/tgstation/commit/e89db4dd4f42377b0adafb06806a763314a89034 , edited by Alekshhh", "size": { "x": 32, "y": 32 @@ -15,15 +15,15 @@ "directions": 4 }, { - "name": "inhand-left", - "directions": 4 + "name": "equipped-MASK-vulpkanin", + "directions": 4 }, { - "name": "inhand-right", + "name": "inhand-left", "directions": 4 }, { - "name": "equipped-MASK-vulpkanin", + "name": "inhand-right", "directions": 4 } ] diff --git a/Resources/Textures/Clothing/Mask/sadmime.rsi/equipped-MASK-reptilian.png b/Resources/Textures/Clothing/Mask/sadmime.rsi/equipped-MASK-reptilian.png index 3097adcfc5..b88f5e0017 100644 Binary files a/Resources/Textures/Clothing/Mask/sadmime.rsi/equipped-MASK-reptilian.png and b/Resources/Textures/Clothing/Mask/sadmime.rsi/equipped-MASK-reptilian.png differ diff --git a/Resources/Textures/Clothing/Mask/sadmime.rsi/equipped-MASK-vulpkanin.png b/Resources/Textures/Clothing/Mask/sadmime.rsi/equipped-MASK-vulpkanin.png index da36b18523..bf7d0395d8 100644 Binary files a/Resources/Textures/Clothing/Mask/sadmime.rsi/equipped-MASK-vulpkanin.png and b/Resources/Textures/Clothing/Mask/sadmime.rsi/equipped-MASK-vulpkanin.png differ diff --git a/Resources/Textures/Clothing/Mask/sadmime.rsi/meta.json b/Resources/Textures/Clothing/Mask/sadmime.rsi/meta.json index 7e61b10f34..b95f9d339d 100644 --- a/Resources/Textures/Clothing/Mask/sadmime.rsi/meta.json +++ b/Resources/Textures/Clothing/Mask/sadmime.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/harmonyn/-tg-station/blob/11043a07f6136d3d196b0378c31deb3dc1a9532f/icons/obj/clothing/masks.dmi. Reptilian edit by Nairod(Github) | vulpkanin version taken from Paradise station at https://github.com/ParadiseSS13/Paradise/commit/f0fa4e1fd809482fbc104a310aa34cebf7df157d edited by Floofers", + "copyright": "Taken from tgstation at commit https://github.com/harmonyn/-tg-station/blob/11043a07f6136d3d196b0378c31deb3dc1a9532f/icons/obj/clothing/masks.dmi. Reptilian edit by Nairod(Github)", "size": { "x": 32, "y": 32 @@ -15,12 +15,12 @@ "directions": 4 }, { - "name": "equipped-MASK-vulpkanin", - "directions": 4 + "name": "equipped-MASK-vulpkanin", + "directions": 4 }, { - "name": "equipped-MASK-reptilian", - "directions": 4 + "name": "equipped-MASK-reptilian", + "directions": 4 } ] } diff --git a/Resources/Textures/Clothing/Mask/scaredmime.rsi/equipped-MASK-reptilian.png b/Resources/Textures/Clothing/Mask/scaredmime.rsi/equipped-MASK-reptilian.png index 940ebbfcea..b88f5e0017 100644 Binary files a/Resources/Textures/Clothing/Mask/scaredmime.rsi/equipped-MASK-reptilian.png and b/Resources/Textures/Clothing/Mask/scaredmime.rsi/equipped-MASK-reptilian.png differ diff --git a/Resources/Textures/Clothing/Mask/scaredmime.rsi/equipped-MASK-vulpkanin.png b/Resources/Textures/Clothing/Mask/scaredmime.rsi/equipped-MASK-vulpkanin.png index c0dda91a72..bf7d0395d8 100644 Binary files a/Resources/Textures/Clothing/Mask/scaredmime.rsi/equipped-MASK-vulpkanin.png and b/Resources/Textures/Clothing/Mask/scaredmime.rsi/equipped-MASK-vulpkanin.png differ diff --git a/Resources/Textures/Clothing/Mask/scaredmime.rsi/meta.json b/Resources/Textures/Clothing/Mask/scaredmime.rsi/meta.json index 5579d1b23a..b95f9d339d 100644 --- a/Resources/Textures/Clothing/Mask/scaredmime.rsi/meta.json +++ b/Resources/Textures/Clothing/Mask/scaredmime.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/harmonyn/-tg-station/blob/11043a07f6136d3d196b0378c31deb3dc1a9532f/icons/obj/clothing/masks.dmi. Reptilian edit by Nairod(Github) | vulpkanin version taken from https://github.com/SPLURT-Station/S.P.L.U.R.T-Station-13/commit/091d9ec00f186052b87bd65125e896f78faefe38 edited by Floofers", + "copyright": "Taken from tgstation at commit https://github.com/harmonyn/-tg-station/blob/11043a07f6136d3d196b0378c31deb3dc1a9532f/icons/obj/clothing/masks.dmi. Reptilian edit by Nairod(Github)", "size": { "x": 32, "y": 32 @@ -15,12 +15,12 @@ "directions": 4 }, { - "name": "equipped-MASK-vulpkanin", - "directions": 4 + "name": "equipped-MASK-vulpkanin", + "directions": 4 }, { - "name": "equipped-MASK-reptilian", - "directions": 4 + "name": "equipped-MASK-reptilian", + "directions": 4 } ] } diff --git a/Resources/Textures/Clothing/Mask/sexyclown.rsi/equipped-MASK-reptilian.png b/Resources/Textures/Clothing/Mask/sexyclown.rsi/equipped-MASK-reptilian.png index da90495b39..f9e825bc2a 100644 Binary files a/Resources/Textures/Clothing/Mask/sexyclown.rsi/equipped-MASK-reptilian.png and b/Resources/Textures/Clothing/Mask/sexyclown.rsi/equipped-MASK-reptilian.png differ diff --git a/Resources/Textures/Clothing/Mask/sexyclown.rsi/equipped-MASK-vox.png b/Resources/Textures/Clothing/Mask/sexyclown.rsi/equipped-MASK-vox.png new file mode 100644 index 0000000000..b1cb32a157 Binary files /dev/null and b/Resources/Textures/Clothing/Mask/sexyclown.rsi/equipped-MASK-vox.png differ diff --git a/Resources/Textures/Clothing/Mask/sexyclown.rsi/equipped-MASK-vulpkanin.png b/Resources/Textures/Clothing/Mask/sexyclown.rsi/equipped-MASK-vulpkanin.png index a326b5db4a..b262c40500 100644 Binary files a/Resources/Textures/Clothing/Mask/sexyclown.rsi/equipped-MASK-vulpkanin.png and b/Resources/Textures/Clothing/Mask/sexyclown.rsi/equipped-MASK-vulpkanin.png differ diff --git a/Resources/Textures/Clothing/Mask/sexyclown.rsi/meta.json b/Resources/Textures/Clothing/Mask/sexyclown.rsi/meta.json index da5fdbe7cd..6b3968272b 100644 --- a/Resources/Textures/Clothing/Mask/sexyclown.rsi/meta.json +++ b/Resources/Textures/Clothing/Mask/sexyclown.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/blob/ed466a4c67828b44ddb9d9550366be5c2d745955/icons/obj/clothing/masks.dmi. Reptilian edit by Nairod(Github) | vulpkanin version taken from Paradise station at https://github.com/ParadiseSS13/Paradise/commit/f0fa4e1fd809482fbc104a310aa34cebf7df157d", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/blob/ed466a4c67828b44ddb9d9550366be5c2d745955/icons/obj/clothing/masks.dmi. Reptilian edit by Nairod(Github). equipped-MASK-vox state taken from /vg/station at commit https://github.com/vgstation-coders/vgstation13/commit/4638130fab5ff0e9faa220688811349d3297a33e", "size": { "x": 32, "y": 32 @@ -15,12 +15,16 @@ "directions": 4 }, { - "name": "equipped-MASK-vulpkanin", - "directions": 4 + "name": "equipped-MASK-vulpkanin", + "directions": 4 }, { "name": "equipped-MASK-reptilian", "directions": 4 + }, + { + "name": "equipped-MASK-vox", + "directions": 4 } ] } diff --git a/Resources/Textures/Clothing/Mask/sexymime.rsi/equipped-MASK-reptilian.png b/Resources/Textures/Clothing/Mask/sexymime.rsi/equipped-MASK-reptilian.png index 4cf7e17fa4..62c881e512 100644 Binary files a/Resources/Textures/Clothing/Mask/sexymime.rsi/equipped-MASK-reptilian.png and b/Resources/Textures/Clothing/Mask/sexymime.rsi/equipped-MASK-reptilian.png differ diff --git a/Resources/Textures/Clothing/Mask/sexymime.rsi/equipped-MASK-vox.png b/Resources/Textures/Clothing/Mask/sexymime.rsi/equipped-MASK-vox.png new file mode 100644 index 0000000000..4ceaf59677 Binary files /dev/null and b/Resources/Textures/Clothing/Mask/sexymime.rsi/equipped-MASK-vox.png differ diff --git a/Resources/Textures/Clothing/Mask/sexymime.rsi/equipped-MASK-vulpkanin.png b/Resources/Textures/Clothing/Mask/sexymime.rsi/equipped-MASK-vulpkanin.png index 54828c8bd6..3fc25dd2a7 100644 Binary files a/Resources/Textures/Clothing/Mask/sexymime.rsi/equipped-MASK-vulpkanin.png and b/Resources/Textures/Clothing/Mask/sexymime.rsi/equipped-MASK-vulpkanin.png differ diff --git a/Resources/Textures/Clothing/Mask/sexymime.rsi/meta.json b/Resources/Textures/Clothing/Mask/sexymime.rsi/meta.json index 8c0842d68a..5ecd5eb6d4 100644 --- a/Resources/Textures/Clothing/Mask/sexymime.rsi/meta.json +++ b/Resources/Textures/Clothing/Mask/sexymime.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/blob/ed466a4c67828b44ddb9d9550366be5c2d745955/icons/obj/clothing/masks.dmi. Reptilian edit by Nairod(Github) | vulpkanin version taken from Paradise station at https://github.com/ParadiseSS13/Paradise/commit/f0fa4e1fd809482fbc104a310aa34cebf7df157d edited by Floofers", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/blob/ed466a4c67828b44ddb9d9550366be5c2d745955/icons/obj/clothing/masks.dmi. Reptilian edit by Nairod(Github)", "size": { "x": 32, "y": 32 @@ -15,12 +15,12 @@ "directions": 4 }, { - "name": "equipped-MASK-vulpkanin", - "directions": 4 + "name": "equipped-MASK-vulpkanin", + "directions": 4 }, { - "name": "equipped-MASK-reptilian", - "directions": 4 + "name": "equipped-MASK-reptilian", + "directions": 4 } ] } diff --git a/Resources/Textures/Clothing/Mask/squadron.rsi/equipped-MASK-vulpkanin.png b/Resources/Textures/Clothing/Mask/squadron.rsi/equipped-MASK-vulpkanin.png new file mode 100644 index 0000000000..648e7e6eb1 Binary files /dev/null and b/Resources/Textures/Clothing/Mask/squadron.rsi/equipped-MASK-vulpkanin.png differ diff --git a/Resources/Textures/Clothing/Mask/squadron.rsi/equipped-MASK.png b/Resources/Textures/Clothing/Mask/squadron.rsi/equipped-MASK.png index d877124420..129c766f21 100644 Binary files a/Resources/Textures/Clothing/Mask/squadron.rsi/equipped-MASK.png and b/Resources/Textures/Clothing/Mask/squadron.rsi/equipped-MASK.png differ diff --git a/Resources/Textures/Clothing/Mask/squadron.rsi/icon.png b/Resources/Textures/Clothing/Mask/squadron.rsi/icon.png index 707d9c7c14..710a0b454a 100644 Binary files a/Resources/Textures/Clothing/Mask/squadron.rsi/icon.png and b/Resources/Textures/Clothing/Mask/squadron.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Mask/squadron.rsi/inhand-left.png b/Resources/Textures/Clothing/Mask/squadron.rsi/inhand-left.png index 70795a0465..2847d9143d 100644 Binary files a/Resources/Textures/Clothing/Mask/squadron.rsi/inhand-left.png and b/Resources/Textures/Clothing/Mask/squadron.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/Mask/squadron.rsi/inhand-right.png b/Resources/Textures/Clothing/Mask/squadron.rsi/inhand-right.png index d1ecbf982a..87b42e8aef 100644 Binary files a/Resources/Textures/Clothing/Mask/squadron.rsi/inhand-right.png and b/Resources/Textures/Clothing/Mask/squadron.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/Mask/squadron.rsi/meta.json b/Resources/Textures/Clothing/Mask/squadron.rsi/meta.json index 9e9be3d62f..155bb0de1b 100644 --- a/Resources/Textures/Clothing/Mask/squadron.rsi/meta.json +++ b/Resources/Textures/Clothing/Mask/squadron.rsi/meta.json @@ -14,6 +14,10 @@ "name": "equipped-MASK", "directions": 4 }, + { + "name": "equipped-MASK-vulpkanin", + "directions": 4 + }, { "name": "inhand-left", "directions": 4 diff --git a/Resources/Textures/Clothing/Mask/sterile.rsi/equipped-MASK-vox.png b/Resources/Textures/Clothing/Mask/sterile.rsi/equipped-MASK-vox.png new file mode 100644 index 0000000000..18c64e1048 Binary files /dev/null and b/Resources/Textures/Clothing/Mask/sterile.rsi/equipped-MASK-vox.png differ diff --git a/Resources/Textures/Clothing/Mask/sterile.rsi/equipped-MASK-vulpkanin.png b/Resources/Textures/Clothing/Mask/sterile.rsi/equipped-MASK-vulpkanin.png index 71f2c83018..77eec9f04f 100644 Binary files a/Resources/Textures/Clothing/Mask/sterile.rsi/equipped-MASK-vulpkanin.png and b/Resources/Textures/Clothing/Mask/sterile.rsi/equipped-MASK-vulpkanin.png differ diff --git a/Resources/Textures/Clothing/Mask/sterile.rsi/meta.json b/Resources/Textures/Clothing/Mask/sterile.rsi/meta.json index f61bba1a32..c6ca846cf5 100644 --- a/Resources/Textures/Clothing/Mask/sterile.rsi/meta.json +++ b/Resources/Textures/Clothing/Mask/sterile.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e. Reptilian edit by Nairod(Github) | vulpkanin version taken from Paradise station at https://github.com/ParadiseSS13/Paradise/commit/f0fa4e1fd809482fbc104a310aa34cebf7df157d", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e. Reptilian edit by Nairod(Github)", "size": { "x": 32, "y": 32 @@ -14,6 +14,10 @@ "name": "equipped-MASK", "directions": 4 }, + { + "name": "equipped-MASK-vulpkanin", + "directions": 4 + }, { "name": "up-equipped-MASK", "directions": 4 @@ -26,14 +30,6 @@ "name": "inhand-right", "directions": 4 }, - { - "name": "equipped-MASK-vulpkanin", - "directions": 4 - }, - { - "name": "up-equipped-MASK-vulpkanin", - "directions": 4 - }, { "name": "equipped-MASK-reptilian", "directions": 4 diff --git a/Resources/Textures/Clothing/Mask/sterile.rsi/up-equipped-MASK-vox.png b/Resources/Textures/Clothing/Mask/sterile.rsi/up-equipped-MASK-vox.png new file mode 100644 index 0000000000..770ad70cf5 Binary files /dev/null and b/Resources/Textures/Clothing/Mask/sterile.rsi/up-equipped-MASK-vox.png differ diff --git a/Resources/Textures/Clothing/Mask/swat.rsi/equipped-MASK-vox.png b/Resources/Textures/Clothing/Mask/swat.rsi/equipped-MASK-vox.png new file mode 100644 index 0000000000..d654e3493c Binary files /dev/null and b/Resources/Textures/Clothing/Mask/swat.rsi/equipped-MASK-vox.png differ diff --git a/Resources/Textures/Clothing/Mask/swat.rsi/equipped-MASK-vulpkanin.png b/Resources/Textures/Clothing/Mask/swat.rsi/equipped-MASK-vulpkanin.png index 23cfef31d1..648e7e6eb1 100644 Binary files a/Resources/Textures/Clothing/Mask/swat.rsi/equipped-MASK-vulpkanin.png and b/Resources/Textures/Clothing/Mask/swat.rsi/equipped-MASK-vulpkanin.png differ diff --git a/Resources/Textures/Clothing/Mask/swat.rsi/meta.json b/Resources/Textures/Clothing/Mask/swat.rsi/meta.json index fb3b9e8f4a..623b511190 100644 --- a/Resources/Textures/Clothing/Mask/swat.rsi/meta.json +++ b/Resources/Textures/Clothing/Mask/swat.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/RemieRichards/-tg-station/blob/f8c05e21694cd3cb703e40edc5cfc375017944b1/icons/obj/clothing/masks.dmi. Reptilian edit by Nairod(Github) | vulpkanin version taken from Paradise station at https://github.com/ParadiseSS13/Paradise/commit/f0fa4e1fd809482fbc104a310aa34cebf7df157d", + "copyright": "Taken from tgstation at commit https://github.com/RemieRichards/-tg-station/blob/f8c05e21694cd3cb703e40edc5cfc375017944b1/icons/obj/clothing/masks.dmi. Reptilian edit by Nairod(Github). equipped-MASK-vox state taken from Paradise at https://github.com/ParadiseSS13/Paradise/blob/bc095ad398790a2b718b2bab4f2157cdd80a51da/icons/mob/clothing/species/vox/mask.dmi", "size": { "x": 32, "y": 32 @@ -15,19 +15,23 @@ "directions": 4 }, { - "name": "inhand-left", + "name": "equipped-MASK-vulpkanin", "directions": 4 }, { - "name": "inhand-right", + "name": "equipped-MASK-reptilian", "directions": 4 }, { - "name": "equipped-MASK-vulpkanin", + "name": "equipped-MASK-vox", "directions": 4 }, { - "name": "equipped-MASK-reptilian", + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", "directions": 4 } ] diff --git a/Resources/Textures/Clothing/Mask/welding-gas.rsi/equipped-MASK-vox.png b/Resources/Textures/Clothing/Mask/welding-gas.rsi/equipped-MASK-vox.png new file mode 100644 index 0000000000..e6028f3a4c Binary files /dev/null and b/Resources/Textures/Clothing/Mask/welding-gas.rsi/equipped-MASK-vox.png differ diff --git a/Resources/Textures/Clothing/Mask/welding-gas.rsi/equipped-MASK.png b/Resources/Textures/Clothing/Mask/welding-gas.rsi/equipped-MASK.png new file mode 100644 index 0000000000..5d0a7ea70d Binary files /dev/null and b/Resources/Textures/Clothing/Mask/welding-gas.rsi/equipped-MASK.png differ diff --git a/Resources/Textures/Clothing/Mask/welding-gas.rsi/icon-up.png b/Resources/Textures/Clothing/Mask/welding-gas.rsi/icon-up.png new file mode 100644 index 0000000000..352e536ca9 Binary files /dev/null and b/Resources/Textures/Clothing/Mask/welding-gas.rsi/icon-up.png differ diff --git a/Resources/Textures/Clothing/Mask/welding-gas.rsi/icon.png b/Resources/Textures/Clothing/Mask/welding-gas.rsi/icon.png new file mode 100644 index 0000000000..cdb8d4b7c7 Binary files /dev/null and b/Resources/Textures/Clothing/Mask/welding-gas.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Mask/welding-gas.rsi/inhand-left.png b/Resources/Textures/Clothing/Mask/welding-gas.rsi/inhand-left.png new file mode 100644 index 0000000000..c5111a66a9 Binary files /dev/null and b/Resources/Textures/Clothing/Mask/welding-gas.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/Mask/welding-gas.rsi/inhand-right.png b/Resources/Textures/Clothing/Mask/welding-gas.rsi/inhand-right.png new file mode 100644 index 0000000000..5841f0b846 Binary files /dev/null and b/Resources/Textures/Clothing/Mask/welding-gas.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/Mask/welding-gas.rsi/meta.json b/Resources/Textures/Clothing/Mask/welding-gas.rsi/meta.json new file mode 100644 index 0000000000..8e9b857325 --- /dev/null +++ b/Resources/Textures/Clothing/Mask/welding-gas.rsi/meta.json @@ -0,0 +1,49 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/6f5ca45e3ac06b30fb1957042214a888d8c01722. Inhands, worn sprites, and vox sprites created by EmoGarbage404 (github)", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "icon-up" + }, + { + "name": "equipped-MASK", + "directions": 4 + }, + { + "name": "up-equipped-MASK", + "directions": 4 + }, + { + "name": "equipped-MASK-vox", + "directions": 4 + }, + { + "name": "up-equipped-MASK-vox", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + }, + { + "name": "up-inhand-left", + "directions": 4 + }, + { + "name": "up-inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/Clothing/Mask/welding-gas.rsi/up-equipped-MASK-vox.png b/Resources/Textures/Clothing/Mask/welding-gas.rsi/up-equipped-MASK-vox.png new file mode 100644 index 0000000000..90871d7d00 Binary files /dev/null and b/Resources/Textures/Clothing/Mask/welding-gas.rsi/up-equipped-MASK-vox.png differ diff --git a/Resources/Textures/Clothing/Mask/welding-gas.rsi/up-equipped-MASK.png b/Resources/Textures/Clothing/Mask/welding-gas.rsi/up-equipped-MASK.png new file mode 100644 index 0000000000..449c8624c9 Binary files /dev/null and b/Resources/Textures/Clothing/Mask/welding-gas.rsi/up-equipped-MASK.png differ diff --git a/Resources/Textures/Clothing/Mask/welding-gas.rsi/up-inhand-left.png b/Resources/Textures/Clothing/Mask/welding-gas.rsi/up-inhand-left.png new file mode 100644 index 0000000000..2868ab8317 Binary files /dev/null and b/Resources/Textures/Clothing/Mask/welding-gas.rsi/up-inhand-left.png differ diff --git a/Resources/Textures/Clothing/Mask/welding-gas.rsi/up-inhand-right.png b/Resources/Textures/Clothing/Mask/welding-gas.rsi/up-inhand-right.png new file mode 100644 index 0000000000..1362d99011 Binary files /dev/null and b/Resources/Textures/Clothing/Mask/welding-gas.rsi/up-inhand-right.png differ diff --git a/Resources/Textures/Clothing/Neck/Bedsheets/captain.rsi/equipped-NECK.png b/Resources/Textures/Clothing/Neck/Bedsheets/captain.rsi/equipped-NECK.png index e4e1e34729..e5e07ee53d 100644 Binary files a/Resources/Textures/Clothing/Neck/Bedsheets/captain.rsi/equipped-NECK.png and b/Resources/Textures/Clothing/Neck/Bedsheets/captain.rsi/equipped-NECK.png differ diff --git a/Resources/Textures/Clothing/Neck/Cloaks/cap.rsi/equipped-NECK.png b/Resources/Textures/Clothing/Neck/Cloaks/cap.rsi/equipped-NECK.png index b8b19a7492..79115892c8 100644 Binary files a/Resources/Textures/Clothing/Neck/Cloaks/cap.rsi/equipped-NECK.png and b/Resources/Textures/Clothing/Neck/Cloaks/cap.rsi/equipped-NECK.png differ diff --git a/Resources/Textures/Clothing/Neck/Cloaks/cap.rsi/icon.png b/Resources/Textures/Clothing/Neck/Cloaks/cap.rsi/icon.png index 8cc45c4de2..8d0f0305d1 100644 Binary files a/Resources/Textures/Clothing/Neck/Cloaks/cap.rsi/icon.png and b/Resources/Textures/Clothing/Neck/Cloaks/cap.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Neck/Cloaks/cap.rsi/inhand-left.png b/Resources/Textures/Clothing/Neck/Cloaks/cap.rsi/inhand-left.png index b95b11e351..ee83aaf303 100644 Binary files a/Resources/Textures/Clothing/Neck/Cloaks/cap.rsi/inhand-left.png and b/Resources/Textures/Clothing/Neck/Cloaks/cap.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/Neck/Cloaks/cap.rsi/inhand-right.png b/Resources/Textures/Clothing/Neck/Cloaks/cap.rsi/inhand-right.png index 7ef44eddff..35c6c8d764 100644 Binary files a/Resources/Textures/Clothing/Neck/Cloaks/cap.rsi/inhand-right.png and b/Resources/Textures/Clothing/Neck/Cloaks/cap.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/Neck/Cloaks/cap.rsi/meta.json b/Resources/Textures/Clothing/Neck/Cloaks/cap.rsi/meta.json index 58f9b41222..ceb2d47620 100644 --- a/Resources/Textures/Clothing/Neck/Cloaks/cap.rsi/meta.json +++ b/Resources/Textures/Clothing/Neck/Cloaks/cap.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/5a73e8f825ff279e82949b9329783a9e3070e2da, sprites in hand by PuroSlavKing (Github) and RudeyCoolLeet#3875, colors edited by Skarletto (github)", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/5a73e8f825ff279e82949b9329783a9e3070e2da, sprites in hand by PuroSlavKing (Github) and RudeyCoolLeet#3875, remade by 𝚆𝚊𝚛𝚝𝚊𝚐𝚕𝚎𝚡#0912", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/Clothing/Neck/Cloaks/capcloakformal.rsi/equipped-NECK.png b/Resources/Textures/Clothing/Neck/Cloaks/capcloakformal.rsi/equipped-NECK.png index 13b1c2efce..f29a02b5cb 100644 Binary files a/Resources/Textures/Clothing/Neck/Cloaks/capcloakformal.rsi/equipped-NECK.png and b/Resources/Textures/Clothing/Neck/Cloaks/capcloakformal.rsi/equipped-NECK.png differ diff --git a/Resources/Textures/Clothing/Neck/Cloaks/capcloakformal.rsi/icon.png b/Resources/Textures/Clothing/Neck/Cloaks/capcloakformal.rsi/icon.png index 49d27a0e96..b7f2e5c6d1 100644 Binary files a/Resources/Textures/Clothing/Neck/Cloaks/capcloakformal.rsi/icon.png and b/Resources/Textures/Clothing/Neck/Cloaks/capcloakformal.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Neck/Cloaks/capcloakformal.rsi/inhand-left.png b/Resources/Textures/Clothing/Neck/Cloaks/capcloakformal.rsi/inhand-left.png index eda75fb97b..ea661b1f02 100644 Binary files a/Resources/Textures/Clothing/Neck/Cloaks/capcloakformal.rsi/inhand-left.png and b/Resources/Textures/Clothing/Neck/Cloaks/capcloakformal.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/Neck/Cloaks/capcloakformal.rsi/inhand-right.png b/Resources/Textures/Clothing/Neck/Cloaks/capcloakformal.rsi/inhand-right.png index 3b366bb979..c8780bcb71 100644 Binary files a/Resources/Textures/Clothing/Neck/Cloaks/capcloakformal.rsi/inhand-right.png and b/Resources/Textures/Clothing/Neck/Cloaks/capcloakformal.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/Neck/Cloaks/capcloakformal.rsi/meta.json b/Resources/Textures/Clothing/Neck/Cloaks/capcloakformal.rsi/meta.json index bed9789445..32564febd1 100644 --- a/Resources/Textures/Clothing/Neck/Cloaks/capcloakformal.rsi/meta.json +++ b/Resources/Textures/Clothing/Neck/Cloaks/capcloakformal.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation https://github.com/tgstation/tgstation/pull/62603 which was taken from bee station. Bee station does not have a history on the cloaks on their github, sprites in hand by PuroSlavKing (Github) and RudeyCoolLeet#3875 , colors edited by Skarletto (github), edited by Emisse for ss14", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/2fea0a59470c476cf3f927833d3918d89cbe6af8, sprites in hand by PuroSlavKing (Github) and RudeyCoolLeet#3875", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/Clothing/Neck/Cloaks/ce.rsi/equipped-NECK.png b/Resources/Textures/Clothing/Neck/Cloaks/ce.rsi/equipped-NECK.png index e275a78fe9..4f83c72bf5 100644 Binary files a/Resources/Textures/Clothing/Neck/Cloaks/ce.rsi/equipped-NECK.png and b/Resources/Textures/Clothing/Neck/Cloaks/ce.rsi/equipped-NECK.png differ diff --git a/Resources/Textures/Clothing/Neck/Cloaks/ce.rsi/icon.png b/Resources/Textures/Clothing/Neck/Cloaks/ce.rsi/icon.png index 84e06eb4e8..24178516c1 100644 Binary files a/Resources/Textures/Clothing/Neck/Cloaks/ce.rsi/icon.png and b/Resources/Textures/Clothing/Neck/Cloaks/ce.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Neck/Cloaks/ce.rsi/meta.json b/Resources/Textures/Clothing/Neck/Cloaks/ce.rsi/meta.json index fde00d6116..ee63e70a4d 100644 --- a/Resources/Textures/Clothing/Neck/Cloaks/ce.rsi/meta.json +++ b/Resources/Textures/Clothing/Neck/Cloaks/ce.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/5a73e8f825ff279e82949b9329783a9e3070e2da, sprites in hand by PuroSlavKing (Github) and RudeyCoolLeet#3875", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/2fea0a59470c476cf3f927833d3918d89cbe6af8, sprites in hand by PuroSlavKing (Github) and RudeyCoolLeet#3875", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/Clothing/Neck/Cloaks/cmo.rsi/equipped-NECK.png b/Resources/Textures/Clothing/Neck/Cloaks/cmo.rsi/equipped-NECK.png index eb9216dea1..7efaa95aa1 100644 Binary files a/Resources/Textures/Clothing/Neck/Cloaks/cmo.rsi/equipped-NECK.png and b/Resources/Textures/Clothing/Neck/Cloaks/cmo.rsi/equipped-NECK.png differ diff --git a/Resources/Textures/Clothing/Neck/Cloaks/cmo.rsi/icon.png b/Resources/Textures/Clothing/Neck/Cloaks/cmo.rsi/icon.png index 67749028d3..ffd81c10f5 100644 Binary files a/Resources/Textures/Clothing/Neck/Cloaks/cmo.rsi/icon.png and b/Resources/Textures/Clothing/Neck/Cloaks/cmo.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Neck/Cloaks/cmo.rsi/meta.json b/Resources/Textures/Clothing/Neck/Cloaks/cmo.rsi/meta.json index fde00d6116..ee63e70a4d 100644 --- a/Resources/Textures/Clothing/Neck/Cloaks/cmo.rsi/meta.json +++ b/Resources/Textures/Clothing/Neck/Cloaks/cmo.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/5a73e8f825ff279e82949b9329783a9e3070e2da, sprites in hand by PuroSlavKing (Github) and RudeyCoolLeet#3875", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/2fea0a59470c476cf3f927833d3918d89cbe6af8, sprites in hand by PuroSlavKing (Github) and RudeyCoolLeet#3875", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/Clothing/Neck/Cloaks/hop.rsi/equipped-NECK.png b/Resources/Textures/Clothing/Neck/Cloaks/hop.rsi/equipped-NECK.png index 9fc9e52b49..fbb541e9ad 100644 Binary files a/Resources/Textures/Clothing/Neck/Cloaks/hop.rsi/equipped-NECK.png and b/Resources/Textures/Clothing/Neck/Cloaks/hop.rsi/equipped-NECK.png differ diff --git a/Resources/Textures/Clothing/Neck/Cloaks/hop.rsi/icon.png b/Resources/Textures/Clothing/Neck/Cloaks/hop.rsi/icon.png index c935d29b23..ca75294673 100644 Binary files a/Resources/Textures/Clothing/Neck/Cloaks/hop.rsi/icon.png and b/Resources/Textures/Clothing/Neck/Cloaks/hop.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Neck/Cloaks/hop.rsi/inhand-left.png b/Resources/Textures/Clothing/Neck/Cloaks/hop.rsi/inhand-left.png index aea84228d8..76b0441b66 100644 Binary files a/Resources/Textures/Clothing/Neck/Cloaks/hop.rsi/inhand-left.png and b/Resources/Textures/Clothing/Neck/Cloaks/hop.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/Neck/Cloaks/hop.rsi/inhand-right.png b/Resources/Textures/Clothing/Neck/Cloaks/hop.rsi/inhand-right.png index 7c736b2eb6..5883c79809 100644 Binary files a/Resources/Textures/Clothing/Neck/Cloaks/hop.rsi/inhand-right.png and b/Resources/Textures/Clothing/Neck/Cloaks/hop.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/Neck/Cloaks/hop.rsi/meta.json b/Resources/Textures/Clothing/Neck/Cloaks/hop.rsi/meta.json index fde00d6116..ceb2d47620 100644 --- a/Resources/Textures/Clothing/Neck/Cloaks/hop.rsi/meta.json +++ b/Resources/Textures/Clothing/Neck/Cloaks/hop.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/5a73e8f825ff279e82949b9329783a9e3070e2da, sprites in hand by PuroSlavKing (Github) and RudeyCoolLeet#3875", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/5a73e8f825ff279e82949b9329783a9e3070e2da, sprites in hand by PuroSlavKing (Github) and RudeyCoolLeet#3875, remade by 𝚆𝚊𝚛𝚝𝚊𝚐𝚕𝚎𝚡#0912", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/Clothing/Neck/Cloaks/hos.rsi/equipped-NECK.png b/Resources/Textures/Clothing/Neck/Cloaks/hos.rsi/equipped-NECK.png index fe1077b134..4aea08e175 100644 Binary files a/Resources/Textures/Clothing/Neck/Cloaks/hos.rsi/equipped-NECK.png and b/Resources/Textures/Clothing/Neck/Cloaks/hos.rsi/equipped-NECK.png differ diff --git a/Resources/Textures/Clothing/Neck/Cloaks/hos.rsi/icon.png b/Resources/Textures/Clothing/Neck/Cloaks/hos.rsi/icon.png index 35bb3ef606..53da13f6a1 100644 Binary files a/Resources/Textures/Clothing/Neck/Cloaks/hos.rsi/icon.png and b/Resources/Textures/Clothing/Neck/Cloaks/hos.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Neck/Cloaks/hos.rsi/meta.json b/Resources/Textures/Clothing/Neck/Cloaks/hos.rsi/meta.json index fde00d6116..ee63e70a4d 100644 --- a/Resources/Textures/Clothing/Neck/Cloaks/hos.rsi/meta.json +++ b/Resources/Textures/Clothing/Neck/Cloaks/hos.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/5a73e8f825ff279e82949b9329783a9e3070e2da, sprites in hand by PuroSlavKing (Github) and RudeyCoolLeet#3875", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/2fea0a59470c476cf3f927833d3918d89cbe6af8, sprites in hand by PuroSlavKing (Github) and RudeyCoolLeet#3875", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/Clothing/Neck/Cloaks/miner.rsi/equipped-NECK.png b/Resources/Textures/Clothing/Neck/Cloaks/miner.rsi/equipped-NECK.png index 7028db8860..43c9ecf5a5 100644 Binary files a/Resources/Textures/Clothing/Neck/Cloaks/miner.rsi/equipped-NECK.png and b/Resources/Textures/Clothing/Neck/Cloaks/miner.rsi/equipped-NECK.png differ diff --git a/Resources/Textures/Clothing/Neck/Cloaks/miner.rsi/icon.png b/Resources/Textures/Clothing/Neck/Cloaks/miner.rsi/icon.png index 76092daabd..5d0ab7077e 100644 Binary files a/Resources/Textures/Clothing/Neck/Cloaks/miner.rsi/icon.png and b/Resources/Textures/Clothing/Neck/Cloaks/miner.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Neck/Cloaks/miner.rsi/meta.json b/Resources/Textures/Clothing/Neck/Cloaks/miner.rsi/meta.json index 4b091e8497..5a35a1c477 100644 --- a/Resources/Textures/Clothing/Neck/Cloaks/miner.rsi/meta.json +++ b/Resources/Textures/Clothing/Neck/Cloaks/miner.rsi/meta.json @@ -8,11 +8,31 @@ }, "states": [ { - "name": "icon" + "name": "icon", + "delays": [ + [ + 10.0, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1 + ] + ] }, { "name": "equipped-NECK", - "directions": 4 + "directions": 4, + "delays": [ + [10.0, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1], + [10.0, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1], + [10.0, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1], + [10.0, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1] + ] }, { "name": "inhand-left", diff --git a/Resources/Textures/Clothing/Neck/Cloaks/nanotrasen.rsi/equipped-NECK.png b/Resources/Textures/Clothing/Neck/Cloaks/nanotrasen.rsi/equipped-NECK.png index bdcf9f6260..e6c7d1a497 100644 Binary files a/Resources/Textures/Clothing/Neck/Cloaks/nanotrasen.rsi/equipped-NECK.png and b/Resources/Textures/Clothing/Neck/Cloaks/nanotrasen.rsi/equipped-NECK.png differ diff --git a/Resources/Textures/Clothing/Neck/Cloaks/nanotrasen.rsi/icon.png b/Resources/Textures/Clothing/Neck/Cloaks/nanotrasen.rsi/icon.png index dbd7286b53..cd5fd61969 100644 Binary files a/Resources/Textures/Clothing/Neck/Cloaks/nanotrasen.rsi/icon.png and b/Resources/Textures/Clothing/Neck/Cloaks/nanotrasen.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Neck/Cloaks/qm.rsi/equipped-NECK.png b/Resources/Textures/Clothing/Neck/Cloaks/qm.rsi/equipped-NECK.png index b1d615465f..7733e39c07 100644 Binary files a/Resources/Textures/Clothing/Neck/Cloaks/qm.rsi/equipped-NECK.png and b/Resources/Textures/Clothing/Neck/Cloaks/qm.rsi/equipped-NECK.png differ diff --git a/Resources/Textures/Clothing/Neck/Cloaks/qm.rsi/icon.png b/Resources/Textures/Clothing/Neck/Cloaks/qm.rsi/icon.png index a02ce22658..f9dac067e3 100644 Binary files a/Resources/Textures/Clothing/Neck/Cloaks/qm.rsi/icon.png and b/Resources/Textures/Clothing/Neck/Cloaks/qm.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Neck/Cloaks/qm.rsi/meta.json b/Resources/Textures/Clothing/Neck/Cloaks/qm.rsi/meta.json index fde00d6116..ee63e70a4d 100644 --- a/Resources/Textures/Clothing/Neck/Cloaks/qm.rsi/meta.json +++ b/Resources/Textures/Clothing/Neck/Cloaks/qm.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/5a73e8f825ff279e82949b9329783a9e3070e2da, sprites in hand by PuroSlavKing (Github) and RudeyCoolLeet#3875", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/2fea0a59470c476cf3f927833d3918d89cbe6af8, sprites in hand by PuroSlavKing (Github) and RudeyCoolLeet#3875", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/Clothing/Neck/Cloaks/rd.rsi/equipped-NECK.png b/Resources/Textures/Clothing/Neck/Cloaks/rd.rsi/equipped-NECK.png index dbcb9c6403..c473c26f0b 100644 Binary files a/Resources/Textures/Clothing/Neck/Cloaks/rd.rsi/equipped-NECK.png and b/Resources/Textures/Clothing/Neck/Cloaks/rd.rsi/equipped-NECK.png differ diff --git a/Resources/Textures/Clothing/Neck/Cloaks/rd.rsi/icon.png b/Resources/Textures/Clothing/Neck/Cloaks/rd.rsi/icon.png index 3b292659ca..f6fa3db54c 100644 Binary files a/Resources/Textures/Clothing/Neck/Cloaks/rd.rsi/icon.png and b/Resources/Textures/Clothing/Neck/Cloaks/rd.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Neck/Cloaks/rd.rsi/meta.json b/Resources/Textures/Clothing/Neck/Cloaks/rd.rsi/meta.json index fde00d6116..ee63e70a4d 100644 --- a/Resources/Textures/Clothing/Neck/Cloaks/rd.rsi/meta.json +++ b/Resources/Textures/Clothing/Neck/Cloaks/rd.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/5a73e8f825ff279e82949b9329783a9e3070e2da, sprites in hand by PuroSlavKing (Github) and RudeyCoolLeet#3875", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/2fea0a59470c476cf3f927833d3918d89cbe6af8, sprites in hand by PuroSlavKing (Github) and RudeyCoolLeet#3875", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/Clothing/Neck/Medals/bronzeheart.rsi/equipped-NECK.png b/Resources/Textures/Clothing/Neck/Medals/bronzeheart.rsi/equipped-NECK.png index fc4f89e047..c785db34bd 100644 Binary files a/Resources/Textures/Clothing/Neck/Medals/bronzeheart.rsi/equipped-NECK.png and b/Resources/Textures/Clothing/Neck/Medals/bronzeheart.rsi/equipped-NECK.png differ diff --git a/Resources/Textures/Clothing/Neck/Medals/bronzeheart.rsi/icon.png b/Resources/Textures/Clothing/Neck/Medals/bronzeheart.rsi/icon.png index 161ba525f2..f288d66c5e 100644 Binary files a/Resources/Textures/Clothing/Neck/Medals/bronzeheart.rsi/icon.png and b/Resources/Textures/Clothing/Neck/Medals/bronzeheart.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Neck/Medals/cargomedal.rsi/equipped-NECK.png b/Resources/Textures/Clothing/Neck/Medals/cargomedal.rsi/equipped-NECK.png index dc7f5ed4ea..d9342aaa11 100644 Binary files a/Resources/Textures/Clothing/Neck/Medals/cargomedal.rsi/equipped-NECK.png and b/Resources/Textures/Clothing/Neck/Medals/cargomedal.rsi/equipped-NECK.png differ diff --git a/Resources/Textures/Clothing/Neck/Medals/cargomedal.rsi/icon.png b/Resources/Textures/Clothing/Neck/Medals/cargomedal.rsi/icon.png index b5c4245c2a..848efded8b 100644 Binary files a/Resources/Textures/Clothing/Neck/Medals/cargomedal.rsi/icon.png and b/Resources/Textures/Clothing/Neck/Medals/cargomedal.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Neck/Medals/clownmedal.rsi/equipped-NECK.png b/Resources/Textures/Clothing/Neck/Medals/clownmedal.rsi/equipped-NECK.png index 78b556680a..b9869faf56 100644 Binary files a/Resources/Textures/Clothing/Neck/Medals/clownmedal.rsi/equipped-NECK.png and b/Resources/Textures/Clothing/Neck/Medals/clownmedal.rsi/equipped-NECK.png differ diff --git a/Resources/Textures/Clothing/Neck/Medals/clownmedal.rsi/icon.png b/Resources/Textures/Clothing/Neck/Medals/clownmedal.rsi/icon.png index 25aa78b0b5..b104c63979 100644 Binary files a/Resources/Textures/Clothing/Neck/Medals/clownmedal.rsi/icon.png and b/Resources/Textures/Clothing/Neck/Medals/clownmedal.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Neck/Medals/engineermedal.rsi/equipped-NECK.png b/Resources/Textures/Clothing/Neck/Medals/engineermedal.rsi/equipped-NECK.png index bc0f6ae248..e7315c7ad2 100644 Binary files a/Resources/Textures/Clothing/Neck/Medals/engineermedal.rsi/equipped-NECK.png and b/Resources/Textures/Clothing/Neck/Medals/engineermedal.rsi/equipped-NECK.png differ diff --git a/Resources/Textures/Clothing/Neck/Medals/engineermedal.rsi/icon.png b/Resources/Textures/Clothing/Neck/Medals/engineermedal.rsi/icon.png index f7f607915c..782e97ae7b 100644 Binary files a/Resources/Textures/Clothing/Neck/Medals/engineermedal.rsi/icon.png and b/Resources/Textures/Clothing/Neck/Medals/engineermedal.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Neck/Medals/gold.rsi/equipped-NECK.png b/Resources/Textures/Clothing/Neck/Medals/gold.rsi/equipped-NECK.png index 3a729fd00f..112f0e1e3d 100644 Binary files a/Resources/Textures/Clothing/Neck/Medals/gold.rsi/equipped-NECK.png and b/Resources/Textures/Clothing/Neck/Medals/gold.rsi/equipped-NECK.png differ diff --git a/Resources/Textures/Clothing/Neck/Medals/gold.rsi/icon.png b/Resources/Textures/Clothing/Neck/Medals/gold.rsi/icon.png index d6ccb7527e..948c48075a 100644 Binary files a/Resources/Textures/Clothing/Neck/Medals/gold.rsi/icon.png and b/Resources/Textures/Clothing/Neck/Medals/gold.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Neck/Medals/medicalmedal.rsi/equipped-NECK.png b/Resources/Textures/Clothing/Neck/Medals/medicalmedal.rsi/equipped-NECK.png index 54f2b18c01..c31520bb8a 100644 Binary files a/Resources/Textures/Clothing/Neck/Medals/medicalmedal.rsi/equipped-NECK.png and b/Resources/Textures/Clothing/Neck/Medals/medicalmedal.rsi/equipped-NECK.png differ diff --git a/Resources/Textures/Clothing/Neck/Medals/medicalmedal.rsi/icon.png b/Resources/Textures/Clothing/Neck/Medals/medicalmedal.rsi/icon.png index 092a6843e9..1edaeff3cd 100644 Binary files a/Resources/Textures/Clothing/Neck/Medals/medicalmedal.rsi/icon.png and b/Resources/Textures/Clothing/Neck/Medals/medicalmedal.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Neck/Medals/sciencemedal.rsi/equipped-NECK.png b/Resources/Textures/Clothing/Neck/Medals/sciencemedal.rsi/equipped-NECK.png index 9d618bbc57..eaacfcbeb9 100644 Binary files a/Resources/Textures/Clothing/Neck/Medals/sciencemedal.rsi/equipped-NECK.png and b/Resources/Textures/Clothing/Neck/Medals/sciencemedal.rsi/equipped-NECK.png differ diff --git a/Resources/Textures/Clothing/Neck/Medals/sciencemedal.rsi/icon.png b/Resources/Textures/Clothing/Neck/Medals/sciencemedal.rsi/icon.png index f70a8b4b9b..d4b8ed792c 100644 Binary files a/Resources/Textures/Clothing/Neck/Medals/sciencemedal.rsi/icon.png and b/Resources/Textures/Clothing/Neck/Medals/sciencemedal.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Neck/Medals/securitymedal.rsi/equipped-NECK.png b/Resources/Textures/Clothing/Neck/Medals/securitymedal.rsi/equipped-NECK.png index 93e1c3847f..2a5ffe975e 100644 Binary files a/Resources/Textures/Clothing/Neck/Medals/securitymedal.rsi/equipped-NECK.png and b/Resources/Textures/Clothing/Neck/Medals/securitymedal.rsi/equipped-NECK.png differ diff --git a/Resources/Textures/Clothing/Neck/Medals/securitymedal.rsi/icon.png b/Resources/Textures/Clothing/Neck/Medals/securitymedal.rsi/icon.png index f682bdbccb..f57f54b3ce 100644 Binary files a/Resources/Textures/Clothing/Neck/Medals/securitymedal.rsi/icon.png and b/Resources/Textures/Clothing/Neck/Medals/securitymedal.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Neck/Misc/pins.rsi/aro-equipped.png b/Resources/Textures/Clothing/Neck/Misc/pins.rsi/aro-equipped.png index ce50d896bc..ecf3cfb8fe 100644 Binary files a/Resources/Textures/Clothing/Neck/Misc/pins.rsi/aro-equipped.png and b/Resources/Textures/Clothing/Neck/Misc/pins.rsi/aro-equipped.png differ diff --git a/Resources/Textures/Clothing/Neck/Misc/pins.rsi/aro.png b/Resources/Textures/Clothing/Neck/Misc/pins.rsi/aro.png index 8cf2346e58..c978318811 100644 Binary files a/Resources/Textures/Clothing/Neck/Misc/pins.rsi/aro.png and b/Resources/Textures/Clothing/Neck/Misc/pins.rsi/aro.png differ diff --git a/Resources/Textures/Clothing/Neck/Misc/pins.rsi/asex-equipped.png b/Resources/Textures/Clothing/Neck/Misc/pins.rsi/asex-equipped.png index 1d74f67b20..ecf3cfb8fe 100644 Binary files a/Resources/Textures/Clothing/Neck/Misc/pins.rsi/asex-equipped.png and b/Resources/Textures/Clothing/Neck/Misc/pins.rsi/asex-equipped.png differ diff --git a/Resources/Textures/Clothing/Neck/Misc/pins.rsi/asex.png b/Resources/Textures/Clothing/Neck/Misc/pins.rsi/asex.png index 7df1114ffe..c978318811 100644 Binary files a/Resources/Textures/Clothing/Neck/Misc/pins.rsi/asex.png and b/Resources/Textures/Clothing/Neck/Misc/pins.rsi/asex.png differ diff --git a/Resources/Textures/Clothing/Neck/Misc/pins.rsi/bi-equipped.png b/Resources/Textures/Clothing/Neck/Misc/pins.rsi/bi-equipped.png index cb9e1dd8bd..ecf3cfb8fe 100644 Binary files a/Resources/Textures/Clothing/Neck/Misc/pins.rsi/bi-equipped.png and b/Resources/Textures/Clothing/Neck/Misc/pins.rsi/bi-equipped.png differ diff --git a/Resources/Textures/Clothing/Neck/Misc/pins.rsi/bi.png b/Resources/Textures/Clothing/Neck/Misc/pins.rsi/bi.png index d6d32b8bbb..c978318811 100644 Binary files a/Resources/Textures/Clothing/Neck/Misc/pins.rsi/bi.png and b/Resources/Textures/Clothing/Neck/Misc/pins.rsi/bi.png differ diff --git a/Resources/Textures/Clothing/Neck/Misc/pins.rsi/inter-equipped.png b/Resources/Textures/Clothing/Neck/Misc/pins.rsi/inter-equipped.png index d72f516ec2..ecf3cfb8fe 100644 Binary files a/Resources/Textures/Clothing/Neck/Misc/pins.rsi/inter-equipped.png and b/Resources/Textures/Clothing/Neck/Misc/pins.rsi/inter-equipped.png differ diff --git a/Resources/Textures/Clothing/Neck/Misc/pins.rsi/inter.png b/Resources/Textures/Clothing/Neck/Misc/pins.rsi/inter.png index c191729a24..c978318811 100644 Binary files a/Resources/Textures/Clothing/Neck/Misc/pins.rsi/inter.png and b/Resources/Textures/Clothing/Neck/Misc/pins.rsi/inter.png differ diff --git a/Resources/Textures/Clothing/Neck/Misc/pins.rsi/les-equipped.png b/Resources/Textures/Clothing/Neck/Misc/pins.rsi/les-equipped.png index 3f826656bf..ecf3cfb8fe 100644 Binary files a/Resources/Textures/Clothing/Neck/Misc/pins.rsi/les-equipped.png and b/Resources/Textures/Clothing/Neck/Misc/pins.rsi/les-equipped.png differ diff --git a/Resources/Textures/Clothing/Neck/Misc/pins.rsi/les.png b/Resources/Textures/Clothing/Neck/Misc/pins.rsi/les.png index 816f2bd3f4..c978318811 100644 Binary files a/Resources/Textures/Clothing/Neck/Misc/pins.rsi/les.png and b/Resources/Textures/Clothing/Neck/Misc/pins.rsi/les.png differ diff --git a/Resources/Textures/Clothing/Neck/Misc/pins.rsi/lgbt-equipped.png b/Resources/Textures/Clothing/Neck/Misc/pins.rsi/lgbt-equipped.png index 1bdd3de51e..ecf3cfb8fe 100644 Binary files a/Resources/Textures/Clothing/Neck/Misc/pins.rsi/lgbt-equipped.png and b/Resources/Textures/Clothing/Neck/Misc/pins.rsi/lgbt-equipped.png differ diff --git a/Resources/Textures/Clothing/Neck/Misc/pins.rsi/lgbt.png b/Resources/Textures/Clothing/Neck/Misc/pins.rsi/lgbt.png index 8d48afe448..c978318811 100644 Binary files a/Resources/Textures/Clothing/Neck/Misc/pins.rsi/lgbt.png and b/Resources/Textures/Clothing/Neck/Misc/pins.rsi/lgbt.png differ diff --git a/Resources/Textures/Clothing/Neck/Misc/pins.rsi/non-equipped.png b/Resources/Textures/Clothing/Neck/Misc/pins.rsi/non-equipped.png index 7774132a4d..ecf3cfb8fe 100644 Binary files a/Resources/Textures/Clothing/Neck/Misc/pins.rsi/non-equipped.png and b/Resources/Textures/Clothing/Neck/Misc/pins.rsi/non-equipped.png differ diff --git a/Resources/Textures/Clothing/Neck/Misc/pins.rsi/non.png b/Resources/Textures/Clothing/Neck/Misc/pins.rsi/non.png index 9346d5fa6a..c978318811 100644 Binary files a/Resources/Textures/Clothing/Neck/Misc/pins.rsi/non.png and b/Resources/Textures/Clothing/Neck/Misc/pins.rsi/non.png differ diff --git a/Resources/Textures/Clothing/Neck/Misc/pins.rsi/pan-equipped.png b/Resources/Textures/Clothing/Neck/Misc/pins.rsi/pan-equipped.png index bdd61cbd83..ecf3cfb8fe 100644 Binary files a/Resources/Textures/Clothing/Neck/Misc/pins.rsi/pan-equipped.png and b/Resources/Textures/Clothing/Neck/Misc/pins.rsi/pan-equipped.png differ diff --git a/Resources/Textures/Clothing/Neck/Misc/pins.rsi/pan.png b/Resources/Textures/Clothing/Neck/Misc/pins.rsi/pan.png index b74d31e792..c978318811 100644 Binary files a/Resources/Textures/Clothing/Neck/Misc/pins.rsi/pan.png and b/Resources/Textures/Clothing/Neck/Misc/pins.rsi/pan.png differ diff --git a/Resources/Textures/Clothing/Neck/Misc/pins.rsi/trans-equipped.png b/Resources/Textures/Clothing/Neck/Misc/pins.rsi/trans-equipped.png index 500797c103..ecf3cfb8fe 100644 Binary files a/Resources/Textures/Clothing/Neck/Misc/pins.rsi/trans-equipped.png and b/Resources/Textures/Clothing/Neck/Misc/pins.rsi/trans-equipped.png differ diff --git a/Resources/Textures/Clothing/Neck/Misc/pins.rsi/trans.png b/Resources/Textures/Clothing/Neck/Misc/pins.rsi/trans.png index a47420daa6..c978318811 100644 Binary files a/Resources/Textures/Clothing/Neck/Misc/pins.rsi/trans.png and b/Resources/Textures/Clothing/Neck/Misc/pins.rsi/trans.png differ diff --git a/Resources/Textures/Clothing/Neck/mantles/capmantle.rsi/equipped-NECK.png b/Resources/Textures/Clothing/Neck/mantles/capmantle.rsi/equipped-NECK.png index ee9a05fcdb..0b343eae4b 100644 Binary files a/Resources/Textures/Clothing/Neck/mantles/capmantle.rsi/equipped-NECK.png and b/Resources/Textures/Clothing/Neck/mantles/capmantle.rsi/equipped-NECK.png differ diff --git a/Resources/Textures/Clothing/Neck/mantles/capmantle.rsi/icon.png b/Resources/Textures/Clothing/Neck/mantles/capmantle.rsi/icon.png index 5264b993e4..24b5fe10dd 100644 Binary files a/Resources/Textures/Clothing/Neck/mantles/capmantle.rsi/icon.png and b/Resources/Textures/Clothing/Neck/mantles/capmantle.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Neck/mantles/capmantle.rsi/meta.json b/Resources/Textures/Clothing/Neck/mantles/capmantle.rsi/meta.json index 0a02908d9c..f68e39c818 100644 --- a/Resources/Textures/Clothing/Neck/mantles/capmantle.rsi/meta.json +++ b/Resources/Textures/Clothing/Neck/mantles/capmantle.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "made by Emisse (github) for ss14, edited by Skarletto (github)", + "copyright": "Taken from Skyrat-tg at commit https://github.com/Skyrat-SS13/Skyrat-tg/commit/42bb106e0e78142cad7e6239549b60b18da960ec", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/Clothing/Neck/mantles/cemantle.rsi/equipped-NECK.png b/Resources/Textures/Clothing/Neck/mantles/cemantle.rsi/equipped-NECK.png index 9ec0e02042..4c700f91d4 100644 Binary files a/Resources/Textures/Clothing/Neck/mantles/cemantle.rsi/equipped-NECK.png and b/Resources/Textures/Clothing/Neck/mantles/cemantle.rsi/equipped-NECK.png differ diff --git a/Resources/Textures/Clothing/Neck/mantles/cemantle.rsi/icon.png b/Resources/Textures/Clothing/Neck/mantles/cemantle.rsi/icon.png index ac1fd8367e..26421ad5a8 100644 Binary files a/Resources/Textures/Clothing/Neck/mantles/cemantle.rsi/icon.png and b/Resources/Textures/Clothing/Neck/mantles/cemantle.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Neck/mantles/cemantle.rsi/meta.json b/Resources/Textures/Clothing/Neck/mantles/cemantle.rsi/meta.json index 887d1c4c20..f68e39c818 100644 --- a/Resources/Textures/Clothing/Neck/mantles/cemantle.rsi/meta.json +++ b/Resources/Textures/Clothing/Neck/mantles/cemantle.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "made by emisse for ss14", + "copyright": "Taken from Skyrat-tg at commit https://github.com/Skyrat-SS13/Skyrat-tg/commit/42bb106e0e78142cad7e6239549b60b18da960ec", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/Clothing/Neck/mantles/cmomantle.rsi/equipped-NECK.png b/Resources/Textures/Clothing/Neck/mantles/cmomantle.rsi/equipped-NECK.png index be5f9402fa..d9694e7e0f 100644 Binary files a/Resources/Textures/Clothing/Neck/mantles/cmomantle.rsi/equipped-NECK.png and b/Resources/Textures/Clothing/Neck/mantles/cmomantle.rsi/equipped-NECK.png differ diff --git a/Resources/Textures/Clothing/Neck/mantles/cmomantle.rsi/icon.png b/Resources/Textures/Clothing/Neck/mantles/cmomantle.rsi/icon.png index e456036c67..1396487743 100644 Binary files a/Resources/Textures/Clothing/Neck/mantles/cmomantle.rsi/icon.png and b/Resources/Textures/Clothing/Neck/mantles/cmomantle.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Neck/mantles/cmomantle.rsi/meta.json b/Resources/Textures/Clothing/Neck/mantles/cmomantle.rsi/meta.json index 887d1c4c20..f68e39c818 100644 --- a/Resources/Textures/Clothing/Neck/mantles/cmomantle.rsi/meta.json +++ b/Resources/Textures/Clothing/Neck/mantles/cmomantle.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "made by emisse for ss14", + "copyright": "Taken from Skyrat-tg at commit https://github.com/Skyrat-SS13/Skyrat-tg/commit/42bb106e0e78142cad7e6239549b60b18da960ec", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/Clothing/Neck/mantles/hopmantle.rsi/equipped-NECK.png b/Resources/Textures/Clothing/Neck/mantles/hopmantle.rsi/equipped-NECK.png index e5898d7f1d..5eaf6241cf 100644 Binary files a/Resources/Textures/Clothing/Neck/mantles/hopmantle.rsi/equipped-NECK.png and b/Resources/Textures/Clothing/Neck/mantles/hopmantle.rsi/equipped-NECK.png differ diff --git a/Resources/Textures/Clothing/Neck/mantles/hopmantle.rsi/icon.png b/Resources/Textures/Clothing/Neck/mantles/hopmantle.rsi/icon.png index 5ed01af829..b756df1bc1 100644 Binary files a/Resources/Textures/Clothing/Neck/mantles/hopmantle.rsi/icon.png and b/Resources/Textures/Clothing/Neck/mantles/hopmantle.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Neck/mantles/hopmantle.rsi/meta.json b/Resources/Textures/Clothing/Neck/mantles/hopmantle.rsi/meta.json index 887d1c4c20..f68e39c818 100644 --- a/Resources/Textures/Clothing/Neck/mantles/hopmantle.rsi/meta.json +++ b/Resources/Textures/Clothing/Neck/mantles/hopmantle.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "made by emisse for ss14", + "copyright": "Taken from Skyrat-tg at commit https://github.com/Skyrat-SS13/Skyrat-tg/commit/42bb106e0e78142cad7e6239549b60b18da960ec", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/Clothing/Neck/mantles/hosmantle.rsi/equipped-NECK.png b/Resources/Textures/Clothing/Neck/mantles/hosmantle.rsi/equipped-NECK.png index c0af293f67..69fe2ff2df 100644 Binary files a/Resources/Textures/Clothing/Neck/mantles/hosmantle.rsi/equipped-NECK.png and b/Resources/Textures/Clothing/Neck/mantles/hosmantle.rsi/equipped-NECK.png differ diff --git a/Resources/Textures/Clothing/Neck/mantles/hosmantle.rsi/icon.png b/Resources/Textures/Clothing/Neck/mantles/hosmantle.rsi/icon.png index 8b044ac7be..5c49e55958 100644 Binary files a/Resources/Textures/Clothing/Neck/mantles/hosmantle.rsi/icon.png and b/Resources/Textures/Clothing/Neck/mantles/hosmantle.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Neck/mantles/hosmantle.rsi/meta.json b/Resources/Textures/Clothing/Neck/mantles/hosmantle.rsi/meta.json index 887d1c4c20..f68e39c818 100644 --- a/Resources/Textures/Clothing/Neck/mantles/hosmantle.rsi/meta.json +++ b/Resources/Textures/Clothing/Neck/mantles/hosmantle.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "made by emisse for ss14", + "copyright": "Taken from Skyrat-tg at commit https://github.com/Skyrat-SS13/Skyrat-tg/commit/42bb106e0e78142cad7e6239549b60b18da960ec", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/Clothing/Neck/mantles/hosmantle_shoulder.rsi/equipped-NECK.png b/Resources/Textures/Clothing/Neck/mantles/hosmantle_shoulder.rsi/equipped-NECK.png new file mode 100644 index 0000000000..c0af293f67 Binary files /dev/null and b/Resources/Textures/Clothing/Neck/mantles/hosmantle_shoulder.rsi/equipped-NECK.png differ diff --git a/Resources/Textures/Clothing/Neck/mantles/hosmantle_shoulder.rsi/icon.png b/Resources/Textures/Clothing/Neck/mantles/hosmantle_shoulder.rsi/icon.png new file mode 100644 index 0000000000..8b044ac7be Binary files /dev/null and b/Resources/Textures/Clothing/Neck/mantles/hosmantle_shoulder.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Neck/mantles/hosmantle_shoulder.rsi/meta.json b/Resources/Textures/Clothing/Neck/mantles/hosmantle_shoulder.rsi/meta.json new file mode 100644 index 0000000000..a9b40d83e2 --- /dev/null +++ b/Resources/Textures/Clothing/Neck/mantles/hosmantle_shoulder.rsi/meta.json @@ -0,0 +1,18 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "made by emisse for ss14", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-NECK", + "directions": 4 + } + ] +} \ No newline at end of file diff --git a/Resources/Textures/Clothing/Neck/mantles/rdmantle.rsi/equipped-NECK.png b/Resources/Textures/Clothing/Neck/mantles/rdmantle.rsi/equipped-NECK.png index 68c5c0bb23..c2258997cb 100644 Binary files a/Resources/Textures/Clothing/Neck/mantles/rdmantle.rsi/equipped-NECK.png and b/Resources/Textures/Clothing/Neck/mantles/rdmantle.rsi/equipped-NECK.png differ diff --git a/Resources/Textures/Clothing/Neck/mantles/rdmantle.rsi/icon.png b/Resources/Textures/Clothing/Neck/mantles/rdmantle.rsi/icon.png index dae1c51849..d78c6b43ba 100644 Binary files a/Resources/Textures/Clothing/Neck/mantles/rdmantle.rsi/icon.png and b/Resources/Textures/Clothing/Neck/mantles/rdmantle.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Neck/mantles/rdmantle.rsi/meta.json b/Resources/Textures/Clothing/Neck/mantles/rdmantle.rsi/meta.json index 887d1c4c20..f68e39c818 100644 --- a/Resources/Textures/Clothing/Neck/mantles/rdmantle.rsi/meta.json +++ b/Resources/Textures/Clothing/Neck/mantles/rdmantle.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "made by emisse for ss14", + "copyright": "Taken from Skyrat-tg at commit https://github.com/Skyrat-SS13/Skyrat-tg/commit/42bb106e0e78142cad7e6239549b60b18da960ec", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/Clothing/OuterClothing/Armor/armor_reflec.rsi/equipped-OUTERCLOTHING-vox.png b/Resources/Textures/Clothing/OuterClothing/Armor/armor_reflec.rsi/equipped-OUTERCLOTHING-vox.png new file mode 100644 index 0000000000..9d92b21329 Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Armor/armor_reflec.rsi/equipped-OUTERCLOTHING-vox.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Armor/armor_reflec.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/Armor/armor_reflec.rsi/equipped-OUTERCLOTHING.png index 4d206ab3cd..f2a7f0b07b 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Armor/armor_reflec.rsi/equipped-OUTERCLOTHING.png and b/Resources/Textures/Clothing/OuterClothing/Armor/armor_reflec.rsi/equipped-OUTERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Armor/armor_reflec.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Armor/armor_reflec.rsi/meta.json index c7a0afcae3..5f95573206 100644 --- a/Resources/Textures/Clothing/OuterClothing/Armor/armor_reflec.rsi/meta.json +++ b/Resources/Textures/Clothing/OuterClothing/Armor/armor_reflec.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/dbc2435fa562f4ef130a7112d2a4cc9c80099894", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/dbc2435fa562f4ef130a7112d2a4cc9c80099894. equipped-OUTERCLOTHING-vox state taken from /vg/station at commit https://github.com/vgstation-coders/vgstation13/commit/31d6576ba8102135d058ef49c3cb6ecbe8db8a79", "size": { "x": 32, "y": 32 @@ -14,6 +14,10 @@ "name": "equipped-OUTERCLOTHING", "directions": 4 }, + { + "name": "equipped-OUTERCLOTHING-vox", + "directions": 4 + }, { "name": "inhand-left", "directions": 4 diff --git a/Resources/Textures/Clothing/OuterClothing/Armor/bulletproof.rsi/equipped-OUTERCLOTHING-vox.png b/Resources/Textures/Clothing/OuterClothing/Armor/bulletproof.rsi/equipped-OUTERCLOTHING-vox.png new file mode 100644 index 0000000000..cffb51e5e5 Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Armor/bulletproof.rsi/equipped-OUTERCLOTHING-vox.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Armor/bulletproof.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/Armor/bulletproof.rsi/equipped-OUTERCLOTHING.png index 78f7cd2453..88d6caf8fe 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Armor/bulletproof.rsi/equipped-OUTERCLOTHING.png and b/Resources/Textures/Clothing/OuterClothing/Armor/bulletproof.rsi/equipped-OUTERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Armor/bulletproof.rsi/icon.png b/Resources/Textures/Clothing/OuterClothing/Armor/bulletproof.rsi/icon.png index b1405b8b06..b67450338f 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Armor/bulletproof.rsi/icon.png and b/Resources/Textures/Clothing/OuterClothing/Armor/bulletproof.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Armor/bulletproof.rsi/inhand-left.png b/Resources/Textures/Clothing/OuterClothing/Armor/bulletproof.rsi/inhand-left.png index 9e127ae459..73de4e8894 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Armor/bulletproof.rsi/inhand-left.png and b/Resources/Textures/Clothing/OuterClothing/Armor/bulletproof.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Armor/bulletproof.rsi/inhand-right.png b/Resources/Textures/Clothing/OuterClothing/Armor/bulletproof.rsi/inhand-right.png index 199daf7fe4..7be22334cc 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Armor/bulletproof.rsi/inhand-right.png and b/Resources/Textures/Clothing/OuterClothing/Armor/bulletproof.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Armor/bulletproof.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Armor/bulletproof.rsi/meta.json index 9ae7fc3f93..f9e375d700 100644 --- a/Resources/Textures/Clothing/OuterClothing/Armor/bulletproof.rsi/meta.json +++ b/Resources/Textures/Clothing/OuterClothing/Armor/bulletproof.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from https://github.com/ParadiseSS13/Paradise", + "copyright": "Taken/modified by Taral from tgstation at commit https://github.com/tgstation/tgstation/commit/dbc2435fa562f4ef130a7112d2a4cc9c80099894. Vox states by Flareguy for Space Station 14", "size": { "x": 32, "y": 32 @@ -14,6 +14,10 @@ "name": "equipped-OUTERCLOTHING", "directions": 4 }, + { + "name": "equipped-OUTERCLOTHING-vox", + "directions": 4 + }, { "name": "inhand-left", "directions": 4 diff --git a/Resources/Textures/Clothing/OuterClothing/Armor/captain_carapace.rsi/equipped-OUTERCLOTHING-vox.png b/Resources/Textures/Clothing/OuterClothing/Armor/captain_carapace.rsi/equipped-OUTERCLOTHING-vox.png new file mode 100644 index 0000000000..e0bfdfbc38 Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Armor/captain_carapace.rsi/equipped-OUTERCLOTHING-vox.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Armor/captain_carapace.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/Armor/captain_carapace.rsi/equipped-OUTERCLOTHING.png index abbb7a2555..4f75cba5d9 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Armor/captain_carapace.rsi/equipped-OUTERCLOTHING.png and b/Resources/Textures/Clothing/OuterClothing/Armor/captain_carapace.rsi/equipped-OUTERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Armor/captain_carapace.rsi/icon.png b/Resources/Textures/Clothing/OuterClothing/Armor/captain_carapace.rsi/icon.png index 1caea2582b..e933cc0fbc 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Armor/captain_carapace.rsi/icon.png and b/Resources/Textures/Clothing/OuterClothing/Armor/captain_carapace.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Armor/captain_carapace.rsi/inhand-left.png b/Resources/Textures/Clothing/OuterClothing/Armor/captain_carapace.rsi/inhand-left.png index ba2375db82..c5ba5fb533 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Armor/captain_carapace.rsi/inhand-left.png and b/Resources/Textures/Clothing/OuterClothing/Armor/captain_carapace.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Armor/captain_carapace.rsi/inhand-right.png b/Resources/Textures/Clothing/OuterClothing/Armor/captain_carapace.rsi/inhand-right.png index adb8622ebf..2cab8d4587 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Armor/captain_carapace.rsi/inhand-right.png and b/Resources/Textures/Clothing/OuterClothing/Armor/captain_carapace.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Armor/captain_carapace.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Armor/captain_carapace.rsi/meta.json index b979f8bfb8..a9366f0bc1 100644 --- a/Resources/Textures/Clothing/OuterClothing/Armor/captain_carapace.rsi/meta.json +++ b/Resources/Textures/Clothing/OuterClothing/Armor/captain_carapace.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/pull/69842/commits/d8138946b0ed06fced522729ac8eaa0596864329 edited by Skarletto (github), edited by Emisse for ss14", + "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/pull/69842/commits/d8138946b0ed06fced522729ac8eaa0596864329 edited by Skarletto (github), edited by Emisse for ss14. Vox state by Flareguy for SS14", "size": { "x": 32, "y": 32 @@ -14,6 +14,10 @@ "name": "equipped-OUTERCLOTHING", "directions": 4 }, + { + "name": "equipped-OUTERCLOTHING-vox", + "directions": 4 + }, { "name": "inhand-left", "directions": 4 diff --git a/Resources/Textures/Clothing/OuterClothing/Armor/cult_armour.rsi/equipped-OUTERCLOTHING-reptilian.png b/Resources/Textures/Clothing/OuterClothing/Armor/cult_armour.rsi/equipped-OUTERCLOTHING-reptilian.png new file mode 100644 index 0000000000..115119720c Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Armor/cult_armour.rsi/equipped-OUTERCLOTHING-reptilian.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Armor/cult_armour.rsi/equipped-OUTERCLOTHING-vox.png b/Resources/Textures/Clothing/OuterClothing/Armor/cult_armour.rsi/equipped-OUTERCLOTHING-vox.png new file mode 100644 index 0000000000..599e73c76f Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Armor/cult_armour.rsi/equipped-OUTERCLOTHING-vox.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Armor/cult_armour.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Armor/cult_armour.rsi/meta.json index e482264df5..5c326232e4 100644 --- a/Resources/Textures/Clothing/OuterClothing/Armor/cult_armour.rsi/meta.json +++ b/Resources/Textures/Clothing/OuterClothing/Armor/cult_armour.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e. equipped-OUTERCLOTHING-vox state taken from Paradise at https://github.com/ParadiseSS13/Paradise/blob/fce54deb01d465957691ba2907218d4af4830db2/icons/mob/clothing/species/vox/suit.dmi and north sprite modified", "size": { "x": 32, "y": 32 @@ -14,6 +14,10 @@ "name": "equipped-OUTERCLOTHING", "directions": 4 }, + { + "name": "equipped-OUTERCLOTHING-vox", + "directions": 4 + }, { "name": "inhand-left", "directions": 4 diff --git a/Resources/Textures/Clothing/OuterClothing/Armor/heavy.rsi/equipped-OUTERCLOTHING-reptilian.png b/Resources/Textures/Clothing/OuterClothing/Armor/heavy.rsi/equipped-OUTERCLOTHING-reptilian.png new file mode 100644 index 0000000000..a6404231f9 Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Armor/heavy.rsi/equipped-OUTERCLOTHING-reptilian.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Armor/heavy.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/Armor/heavy.rsi/equipped-OUTERCLOTHING.png index 57f22a6c32..486c6767db 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Armor/heavy.rsi/equipped-OUTERCLOTHING.png and b/Resources/Textures/Clothing/OuterClothing/Armor/heavy.rsi/equipped-OUTERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Armor/heavy.rsi/icon.png b/Resources/Textures/Clothing/OuterClothing/Armor/heavy.rsi/icon.png index 5d8cfcc494..b64e078a1c 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Armor/heavy.rsi/icon.png and b/Resources/Textures/Clothing/OuterClothing/Armor/heavy.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Armor/heavy.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Armor/heavy.rsi/meta.json index e482264df5..f8f2fba961 100644 --- a/Resources/Textures/Clothing/OuterClothing/Armor/heavy.rsi/meta.json +++ b/Resources/Textures/Clothing/OuterClothing/Armor/heavy.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/2fea0a59470c476cf3f927833d3918d89cbe6af8, reptilian made by kuro(388673708753027083)", "size": { "x": 32, "y": 32 @@ -14,6 +14,10 @@ "name": "equipped-OUTERCLOTHING", "directions": 4 }, + { + "name": "equipped-OUTERCLOTHING-reptilian", + "directions": 4 + }, { "name": "inhand-left", "directions": 4 diff --git a/Resources/Textures/Clothing/OuterClothing/Armor/heavygreen.rsi/equipped-OUTERCLOTHING-reptilian.png b/Resources/Textures/Clothing/OuterClothing/Armor/heavygreen.rsi/equipped-OUTERCLOTHING-reptilian.png new file mode 100644 index 0000000000..c84901fb25 Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Armor/heavygreen.rsi/equipped-OUTERCLOTHING-reptilian.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Armor/heavygreen.rsi/equipped-OUTERCLOTHING-vox.png b/Resources/Textures/Clothing/OuterClothing/Armor/heavygreen.rsi/equipped-OUTERCLOTHING-vox.png new file mode 100644 index 0000000000..f37eba3359 Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Armor/heavygreen.rsi/equipped-OUTERCLOTHING-vox.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Armor/heavygreen.rsi/icon.png b/Resources/Textures/Clothing/OuterClothing/Armor/heavygreen.rsi/icon.png index 1c9e96a4f5..a5e7e4e7cd 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Armor/heavygreen.rsi/icon.png and b/Resources/Textures/Clothing/OuterClothing/Armor/heavygreen.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Armor/heavygreen.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Armor/heavygreen.rsi/meta.json index e482264df5..232bec9c0a 100644 --- a/Resources/Textures/Clothing/OuterClothing/Armor/heavygreen.rsi/meta.json +++ b/Resources/Textures/Clothing/OuterClothing/Armor/heavygreen.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e. equipped-OUTERCLOTHING-vox state taken from /vg/station at commit https://github.com/vgstation-coders/vgstation13/commit/31d6576ba8102135d058ef49c3cb6ecbe8db8a79", "size": { "x": 32, "y": 32 @@ -14,6 +14,10 @@ "name": "equipped-OUTERCLOTHING", "directions": 4 }, + { + "name": "equipped-OUTERCLOTHING-vox", + "directions": 4 + }, { "name": "inhand-left", "directions": 4 diff --git a/Resources/Textures/Clothing/OuterClothing/Armor/heavyred.rsi/equipped-OUTERCLOTHING-reptilian.png b/Resources/Textures/Clothing/OuterClothing/Armor/heavyred.rsi/equipped-OUTERCLOTHING-reptilian.png new file mode 100644 index 0000000000..0a1a8fb684 Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Armor/heavyred.rsi/equipped-OUTERCLOTHING-reptilian.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Armor/heavyred.rsi/equipped-OUTERCLOTHING-vox.png b/Resources/Textures/Clothing/OuterClothing/Armor/heavyred.rsi/equipped-OUTERCLOTHING-vox.png new file mode 100644 index 0000000000..164f5e4592 Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Armor/heavyred.rsi/equipped-OUTERCLOTHING-vox.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Armor/heavyred.rsi/icon.png b/Resources/Textures/Clothing/OuterClothing/Armor/heavyred.rsi/icon.png index 26d8466aca..09c122206c 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Armor/heavyred.rsi/icon.png and b/Resources/Textures/Clothing/OuterClothing/Armor/heavyred.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Armor/heavyred.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Armor/heavyred.rsi/meta.json index e482264df5..232bec9c0a 100644 --- a/Resources/Textures/Clothing/OuterClothing/Armor/heavyred.rsi/meta.json +++ b/Resources/Textures/Clothing/OuterClothing/Armor/heavyred.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e. equipped-OUTERCLOTHING-vox state taken from /vg/station at commit https://github.com/vgstation-coders/vgstation13/commit/31d6576ba8102135d058ef49c3cb6ecbe8db8a79", "size": { "x": 32, "y": 32 @@ -14,6 +14,10 @@ "name": "equipped-OUTERCLOTHING", "directions": 4 }, + { + "name": "equipped-OUTERCLOTHING-vox", + "directions": 4 + }, { "name": "inhand-left", "directions": 4 diff --git a/Resources/Textures/Clothing/OuterClothing/Armor/lingarmor.rsi/equipped-OUTERCLOTHING-reptilian.png b/Resources/Textures/Clothing/OuterClothing/Armor/lingarmor.rsi/equipped-OUTERCLOTHING-reptilian.png new file mode 100644 index 0000000000..236ed93df6 Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Armor/lingarmor.rsi/equipped-OUTERCLOTHING-reptilian.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Armor/lingarmor.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Armor/lingarmor.rsi/meta.json index 0249e35995..8442c37d40 100644 --- a/Resources/Textures/Clothing/OuterClothing/Armor/lingarmor.rsi/meta.json +++ b/Resources/Textures/Clothing/OuterClothing/Armor/lingarmor.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/blob/master/icons/mob/clothing/suit.dmi", + "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/blob/master/icons/mob/clothing/suit.dmi, reptilian made by kuro(388673708753027083)", "size": { "x": 32, "y": 32 @@ -14,6 +14,10 @@ "name": "equipped-OUTERCLOTHING", "directions": 4 }, + { + "name": "equipped-OUTERCLOTHING-reptilian", + "directions": 4 + }, { "name": "inhand-left", "directions": 4 @@ -23,4 +27,4 @@ "directions": 4 } ] -} \ No newline at end of file +} diff --git a/Resources/Textures/Clothing/OuterClothing/Armor/magusblue.rsi/equipped-OUTERCLOTHING-reptilian.png b/Resources/Textures/Clothing/OuterClothing/Armor/magusblue.rsi/equipped-OUTERCLOTHING-reptilian.png new file mode 100644 index 0000000000..fd819e7004 Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Armor/magusblue.rsi/equipped-OUTERCLOTHING-reptilian.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Armor/magusblue.rsi/icon.png b/Resources/Textures/Clothing/OuterClothing/Armor/magusblue.rsi/icon.png index 0359c2f8eb..f588fa2efb 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Armor/magusblue.rsi/icon.png and b/Resources/Textures/Clothing/OuterClothing/Armor/magusblue.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Armor/magusblue.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Armor/magusblue.rsi/meta.json index e482264df5..16f769df39 100644 --- a/Resources/Textures/Clothing/OuterClothing/Armor/magusblue.rsi/meta.json +++ b/Resources/Textures/Clothing/OuterClothing/Armor/magusblue.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e, reptilian made by kuro(388673708753027083)", "size": { "x": 32, "y": 32 @@ -14,6 +14,10 @@ "name": "equipped-OUTERCLOTHING", "directions": 4 }, + { + "name": "equipped-OUTERCLOTHING-reptilian", + "directions": 4 + }, { "name": "inhand-left", "directions": 4 diff --git a/Resources/Textures/Clothing/OuterClothing/Armor/magusred.rsi/equipped-OUTERCLOTHING-reptilian.png b/Resources/Textures/Clothing/OuterClothing/Armor/magusred.rsi/equipped-OUTERCLOTHING-reptilian.png new file mode 100644 index 0000000000..e1b0c252f6 Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Armor/magusred.rsi/equipped-OUTERCLOTHING-reptilian.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Armor/magusred.rsi/icon.png b/Resources/Textures/Clothing/OuterClothing/Armor/magusred.rsi/icon.png index 1547127402..b305bae727 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Armor/magusred.rsi/icon.png and b/Resources/Textures/Clothing/OuterClothing/Armor/magusred.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Armor/magusred.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Armor/magusred.rsi/meta.json index e482264df5..16f769df39 100644 --- a/Resources/Textures/Clothing/OuterClothing/Armor/magusred.rsi/meta.json +++ b/Resources/Textures/Clothing/OuterClothing/Armor/magusred.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e, reptilian made by kuro(388673708753027083)", "size": { "x": 32, "y": 32 @@ -14,6 +14,10 @@ "name": "equipped-OUTERCLOTHING", "directions": 4 }, + { + "name": "equipped-OUTERCLOTHING-reptilian", + "directions": 4 + }, { "name": "inhand-left", "directions": 4 diff --git a/Resources/Textures/Clothing/OuterClothing/Armor/riot.rsi/equipped-OUTERCLOTHING-reptilian.png b/Resources/Textures/Clothing/OuterClothing/Armor/riot.rsi/equipped-OUTERCLOTHING-reptilian.png new file mode 100644 index 0000000000..27a1d51e6a Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Armor/riot.rsi/equipped-OUTERCLOTHING-reptilian.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Armor/riot.rsi/equipped-OUTERCLOTHING-vox.png b/Resources/Textures/Clothing/OuterClothing/Armor/riot.rsi/equipped-OUTERCLOTHING-vox.png new file mode 100644 index 0000000000..f0e99ee3c3 Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Armor/riot.rsi/equipped-OUTERCLOTHING-vox.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Armor/riot.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/Armor/riot.rsi/equipped-OUTERCLOTHING.png index 45ba5b9a32..594637a033 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Armor/riot.rsi/equipped-OUTERCLOTHING.png and b/Resources/Textures/Clothing/OuterClothing/Armor/riot.rsi/equipped-OUTERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Armor/riot.rsi/icon.png b/Resources/Textures/Clothing/OuterClothing/Armor/riot.rsi/icon.png index fde6c90e2c..46aae7f85e 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Armor/riot.rsi/icon.png and b/Resources/Textures/Clothing/OuterClothing/Armor/riot.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Armor/riot.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Armor/riot.rsi/meta.json index afdd4120b5..c429d1116c 100644 --- a/Resources/Textures/Clothing/OuterClothing/Armor/riot.rsi/meta.json +++ b/Resources/Textures/Clothing/OuterClothing/Armor/riot.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from https://github.com/ParadiseSS13/Paradise", + "copyright": "Taken from TGstation github https://github.com/tgstation/tgstation/commit/fed2ddeb54d0fb8bb97cb0a899a088b7d7423bbb. Vox state by Flareguy for Space Station 14", "size": { "x": 32, "y": 32 @@ -14,6 +14,10 @@ "name": "equipped-OUTERCLOTHING", "directions": 4 }, + { + "name": "equipped-OUTERCLOTHING-vox", + "directions": 4 + }, { "name": "inhand-left", "directions": 4 @@ -23,4 +27,4 @@ "directions": 4 } ] -} +} \ No newline at end of file diff --git a/Resources/Textures/Clothing/OuterClothing/Armor/security.rsi/equipped-OUTERCLOTHING-vox.png b/Resources/Textures/Clothing/OuterClothing/Armor/security.rsi/equipped-OUTERCLOTHING-vox.png new file mode 100644 index 0000000000..1d9b1d1459 Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Armor/security.rsi/equipped-OUTERCLOTHING-vox.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Armor/security.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/Armor/security.rsi/equipped-OUTERCLOTHING.png index 0063e8cda0..9ee816f624 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Armor/security.rsi/equipped-OUTERCLOTHING.png and b/Resources/Textures/Clothing/OuterClothing/Armor/security.rsi/equipped-OUTERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Armor/security.rsi/icon.png b/Resources/Textures/Clothing/OuterClothing/Armor/security.rsi/icon.png index a92566d308..ae2cdb35a3 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Armor/security.rsi/icon.png and b/Resources/Textures/Clothing/OuterClothing/Armor/security.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Armor/security.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Armor/security.rsi/meta.json index afdd4120b5..434b53f472 100644 --- a/Resources/Textures/Clothing/OuterClothing/Armor/security.rsi/meta.json +++ b/Resources/Textures/Clothing/OuterClothing/Armor/security.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from https://github.com/ParadiseSS13/Paradise", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e. Vox state by Flareguy for Space Station 14", "size": { "x": 32, "y": 32 @@ -14,6 +14,10 @@ "name": "equipped-OUTERCLOTHING", "directions": 4 }, + { + "name": "equipped-OUTERCLOTHING-vox", + "directions": 4 + }, { "name": "inhand-left", "directions": 4 diff --git a/Resources/Textures/Clothing/OuterClothing/Armor/security_slim.rsi/equipped-OUTERCLOTHING-vox.png b/Resources/Textures/Clothing/OuterClothing/Armor/security_slim.rsi/equipped-OUTERCLOTHING-vox.png new file mode 100644 index 0000000000..ea3c78dfbe Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Armor/security_slim.rsi/equipped-OUTERCLOTHING-vox.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Armor/security_slim.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/Armor/security_slim.rsi/equipped-OUTERCLOTHING.png index 59d6ea3b48..fb4087b662 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Armor/security_slim.rsi/equipped-OUTERCLOTHING.png and b/Resources/Textures/Clothing/OuterClothing/Armor/security_slim.rsi/equipped-OUTERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Armor/security_slim.rsi/icon.png b/Resources/Textures/Clothing/OuterClothing/Armor/security_slim.rsi/icon.png index 23bb26f648..f2b15dd82f 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Armor/security_slim.rsi/icon.png and b/Resources/Textures/Clothing/OuterClothing/Armor/security_slim.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Armor/security_slim.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Armor/security_slim.rsi/meta.json index afdd4120b5..9b89dd2d07 100644 --- a/Resources/Textures/Clothing/OuterClothing/Armor/security_slim.rsi/meta.json +++ b/Resources/Textures/Clothing/OuterClothing/Armor/security_slim.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from https://github.com/ParadiseSS13/Paradise", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/6665eec76c98a4f3f89bebcd10b34b47dcc0b8ae. Vox state by Flareguy for Space Station 14", "size": { "x": 32, "y": 32 @@ -14,6 +14,10 @@ "name": "equipped-OUTERCLOTHING", "directions": 4 }, + { + "name": "equipped-OUTERCLOTHING-vox", + "directions": 4 + }, { "name": "inhand-left", "directions": 4 diff --git a/Resources/Textures/Clothing/OuterClothing/Armor/syndie-raid.rsi/equipped-OUTERCLOTHING-light-vox.png b/Resources/Textures/Clothing/OuterClothing/Armor/syndie-raid.rsi/equipped-OUTERCLOTHING-light-vox.png new file mode 100644 index 0000000000..6833f25027 Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Armor/syndie-raid.rsi/equipped-OUTERCLOTHING-light-vox.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Armor/syndie-raid.rsi/equipped-OUTERCLOTHING-light.png b/Resources/Textures/Clothing/OuterClothing/Armor/syndie-raid.rsi/equipped-OUTERCLOTHING-light.png new file mode 100644 index 0000000000..58ba92e53f Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Armor/syndie-raid.rsi/equipped-OUTERCLOTHING-light.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Armor/syndie-raid.rsi/equipped-OUTERCLOTHING-vox.png b/Resources/Textures/Clothing/OuterClothing/Armor/syndie-raid.rsi/equipped-OUTERCLOTHING-vox.png new file mode 100644 index 0000000000..1ab6e6cfef Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Armor/syndie-raid.rsi/equipped-OUTERCLOTHING-vox.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Armor/syndie-raid.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/Armor/syndie-raid.rsi/equipped-OUTERCLOTHING.png new file mode 100644 index 0000000000..e6a0733e3e Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Armor/syndie-raid.rsi/equipped-OUTERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Armor/syndie-raid.rsi/icon.png b/Resources/Textures/Clothing/OuterClothing/Armor/syndie-raid.rsi/icon.png new file mode 100644 index 0000000000..54665d7a0e Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Armor/syndie-raid.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Armor/syndie-raid.rsi/inhand-left.png b/Resources/Textures/Clothing/OuterClothing/Armor/syndie-raid.rsi/inhand-left.png new file mode 100644 index 0000000000..64d25308ab Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Armor/syndie-raid.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Armor/syndie-raid.rsi/inhand-right.png b/Resources/Textures/Clothing/OuterClothing/Armor/syndie-raid.rsi/inhand-right.png new file mode 100644 index 0000000000..fd3c44d4ad Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Armor/syndie-raid.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Armor/syndie-raid.rsi/light-overlay.png b/Resources/Textures/Clothing/OuterClothing/Armor/syndie-raid.rsi/light-overlay.png new file mode 100644 index 0000000000..c98170b7e1 Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Armor/syndie-raid.rsi/light-overlay.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Armor/syndie-raid.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Armor/syndie-raid.rsi/meta.json new file mode 100644 index 0000000000..ff590848da --- /dev/null +++ b/Resources/Textures/Clothing/OuterClothing/Armor/syndie-raid.rsi/meta.json @@ -0,0 +1,41 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Made by alzore_(Discord) for SS14 using the colors of the blood-red hardsuit", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "light-overlay" + }, + { + "name": "equipped-OUTERCLOTHING", + "directions": 4 + }, + { + "name": "equipped-OUTERCLOTHING-light", + "directions": 4 + }, + { + "name": "equipped-OUTERCLOTHING-vox", + "directions": 4 + }, + { + "name": "equipped-OUTERCLOTHING-light-vox", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/Clothing/OuterClothing/Coats/detective_grey.rsi/equipped-OUTERCLOTHING-vox.png b/Resources/Textures/Clothing/OuterClothing/Coats/detective_grey.rsi/equipped-OUTERCLOTHING-vox.png new file mode 100644 index 0000000000..c1c1244752 Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Coats/detective_grey.rsi/equipped-OUTERCLOTHING-vox.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Coats/detective_grey.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/Coats/detective_grey.rsi/equipped-OUTERCLOTHING.png new file mode 100644 index 0000000000..a7c91b5ca9 Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Coats/detective_grey.rsi/equipped-OUTERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Coats/detective_grey.rsi/icon.png b/Resources/Textures/Clothing/OuterClothing/Coats/detective_grey.rsi/icon.png new file mode 100644 index 0000000000..70672d2ca9 Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Coats/detective_grey.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Coats/detective_grey.rsi/inhand-left.png b/Resources/Textures/Clothing/OuterClothing/Coats/detective_grey.rsi/inhand-left.png new file mode 100644 index 0000000000..a661e43f85 Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Coats/detective_grey.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Coats/detective_grey.rsi/inhand-right.png b/Resources/Textures/Clothing/OuterClothing/Coats/detective_grey.rsi/inhand-right.png new file mode 100644 index 0000000000..3a6c76fe53 Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Coats/detective_grey.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Coats/detective_grey.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Coats/detective_grey.rsi/meta.json new file mode 100644 index 0000000000..8e05b97e42 --- /dev/null +++ b/Resources/Textures/Clothing/OuterClothing/Coats/detective_grey.rsi/meta.json @@ -0,0 +1,30 @@ +{ + "version": 1, + "license": "CC0-1.0", + "copyright": "Modified from detective coat found in https://github.com/tgstation/tgstation/commit/d90c7e5de6f6d94596c164da78dbc8d3cd35bb99 by Flareguy. vox state modified from detective state found in vgstation13 at https://github.com/vgstation-coders/vgstation13/blob//icons/mob/species/vox/suit.dmi. icon state by Flareguy. ", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-OUTERCLOTHING", + "directions": 4 + }, + { + "name": "equipped-OUTERCLOTHING-vox", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/Clothing/OuterClothing/Coats/hos_greatcoat.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/Coats/hos_greatcoat.rsi/equipped-OUTERCLOTHING.png new file mode 100644 index 0000000000..f37d0aee7c Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Coats/hos_greatcoat.rsi/equipped-OUTERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Coats/hos_greatcoat.rsi/icon.png b/Resources/Textures/Clothing/OuterClothing/Coats/hos_greatcoat.rsi/icon.png new file mode 100644 index 0000000000..6a15724130 Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Coats/hos_greatcoat.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Coats/hos_greatcoat.rsi/inhand-left.png b/Resources/Textures/Clothing/OuterClothing/Coats/hos_greatcoat.rsi/inhand-left.png new file mode 100644 index 0000000000..dc330101a2 Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Coats/hos_greatcoat.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Coats/hos_greatcoat.rsi/inhand-right.png b/Resources/Textures/Clothing/OuterClothing/Coats/hos_greatcoat.rsi/inhand-right.png new file mode 100644 index 0000000000..f94241d12a Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Coats/hos_greatcoat.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Coats/hos_greatcoat.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Coats/hos_greatcoat.rsi/meta.json new file mode 100644 index 0000000000..8fa63fd739 --- /dev/null +++ b/Resources/Textures/Clothing/OuterClothing/Coats/hos_greatcoat.rsi/meta.json @@ -0,0 +1,26 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/2fea0a59470c476cf3f927833d3918d89cbe6af8 & inhabd updated by github:Morb0", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-OUTERCLOTHING", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertchaplain.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertchaplain.rsi/equipped-OUTERCLOTHING.png index 2acce2e63e..d12b0d72ee 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertchaplain.rsi/equipped-OUTERCLOTHING.png and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertchaplain.rsi/equipped-OUTERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertchaplain.rsi/icon.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertchaplain.rsi/icon.png index 4f4bb2b8fb..6188de8ae6 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertchaplain.rsi/icon.png and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertchaplain.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertengineer.rsi/equipped-OUTERCLOTHING-reptilian.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertengineer.rsi/equipped-OUTERCLOTHING-reptilian.png new file mode 100644 index 0000000000..4168f97e8c Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertengineer.rsi/equipped-OUTERCLOTHING-reptilian.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertengineer.rsi/equipped-OUTERCLOTHING-shark.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertengineer.rsi/equipped-OUTERCLOTHING-shark.png new file mode 100644 index 0000000000..2c950e0856 Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertengineer.rsi/equipped-OUTERCLOTHING-shark.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertengineer.rsi/equipped-OUTERCLOTHING-tajaran.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertengineer.rsi/equipped-OUTERCLOTHING-tajaran.png new file mode 100644 index 0000000000..9a189a0255 Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertengineer.rsi/equipped-OUTERCLOTHING-tajaran.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertengineer.rsi/equipped-OUTERCLOTHING-vox.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertengineer.rsi/equipped-OUTERCLOTHING-vox.png new file mode 100644 index 0000000000..be85f19ea6 Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertengineer.rsi/equipped-OUTERCLOTHING-vox.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertengineer.rsi/equipped-OUTERCLOTHING-vulpkanin.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertengineer.rsi/equipped-OUTERCLOTHING-vulpkanin.png new file mode 100644 index 0000000000..1851ff161a Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertengineer.rsi/equipped-OUTERCLOTHING-vulpkanin.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertengineer.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertengineer.rsi/equipped-OUTERCLOTHING.png index 9c188ab729..ab93e90094 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertengineer.rsi/equipped-OUTERCLOTHING.png and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertengineer.rsi/equipped-OUTERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertengineer.rsi/icon.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertengineer.rsi/icon.png index 85e6c096e3..b630caeda0 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertengineer.rsi/icon.png and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertengineer.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertengineer.rsi/inhand-left.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertengineer.rsi/inhand-left.png index 60bc426d8b..bfe14fa379 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertengineer.rsi/inhand-left.png and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertengineer.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertengineer.rsi/inhand-right.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertengineer.rsi/inhand-right.png index 8b4abf2e18..80e40ced1f 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertengineer.rsi/inhand-right.png and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertengineer.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertengineer.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertengineer.rsi/meta.json index 4fbd43a08b..bcb109e395 100644 --- a/Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertengineer.rsi/meta.json +++ b/Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertengineer.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from paradisestation at commit https://github.com/ParadiseSS13/Paradise/commit/12c21ced8432015485484b17e311dcceb7c458f6", + "copyright": "Taken from paradisestation at commit https://github.com/ParadiseSS13/Paradise/commit/12c21ced8432015485484b17e311dcceb7c458f6. Vox state by Flareguy for Space Station 14", "size": { "x": 32, "y": 32 @@ -14,6 +14,26 @@ "name": "equipped-OUTERCLOTHING", "directions": 4 }, + { + "name": "equipped-OUTERCLOTHING-reptilian", + "directions": 4 + }, + { + "name": "equipped-OUTERCLOTHING-shark", + "directions": 4 + }, + { + "name": "equipped-OUTERCLOTHING-tajaran", + "directions": 4 + }, + { + "name": "equipped-OUTERCLOTHING-vox", + "directions": 4 + }, + { + "name": "equipped-OUTERCLOTHING-vulpkanin", + "directions": 4 + }, { "name": "inhand-left", "directions": 4 diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertjanitor.rsi/equipped-OUTERCLOTHING-reptilian.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertjanitor.rsi/equipped-OUTERCLOTHING-reptilian.png new file mode 100644 index 0000000000..a823b7c549 Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertjanitor.rsi/equipped-OUTERCLOTHING-reptilian.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertjanitor.rsi/equipped-OUTERCLOTHING-shark.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertjanitor.rsi/equipped-OUTERCLOTHING-shark.png new file mode 100644 index 0000000000..767c8c6c74 Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertjanitor.rsi/equipped-OUTERCLOTHING-shark.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertjanitor.rsi/equipped-OUTERCLOTHING-tajaran.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertjanitor.rsi/equipped-OUTERCLOTHING-tajaran.png new file mode 100644 index 0000000000..ef0c0c88bc Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertjanitor.rsi/equipped-OUTERCLOTHING-tajaran.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertjanitor.rsi/equipped-OUTERCLOTHING-vox.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertjanitor.rsi/equipped-OUTERCLOTHING-vox.png new file mode 100644 index 0000000000..e5f648a31f Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertjanitor.rsi/equipped-OUTERCLOTHING-vox.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertjanitor.rsi/equipped-OUTERCLOTHING-vulpkanin.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertjanitor.rsi/equipped-OUTERCLOTHING-vulpkanin.png new file mode 100644 index 0000000000..14d8a64422 Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertjanitor.rsi/equipped-OUTERCLOTHING-vulpkanin.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertjanitor.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertjanitor.rsi/equipped-OUTERCLOTHING.png index eb6d63a755..33ee5cd036 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertjanitor.rsi/equipped-OUTERCLOTHING.png and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertjanitor.rsi/equipped-OUTERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertjanitor.rsi/icon.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertjanitor.rsi/icon.png index 432e48be40..ac2de535cc 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertjanitor.rsi/icon.png and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertjanitor.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertjanitor.rsi/inhand-left.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertjanitor.rsi/inhand-left.png index f8f5c1d402..d6d36cc7c3 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertjanitor.rsi/inhand-left.png and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertjanitor.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertjanitor.rsi/inhand-right.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertjanitor.rsi/inhand-right.png index 3ff74175cd..e92fd8d833 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertjanitor.rsi/inhand-right.png and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertjanitor.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertjanitor.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertjanitor.rsi/meta.json index 4fbd43a08b..eceb22f550 100644 --- a/Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertjanitor.rsi/meta.json +++ b/Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertjanitor.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from paradisestation at commit https://github.com/ParadiseSS13/Paradise/commit/12c21ced8432015485484b17e311dcceb7c458f6", + "copyright": "Taken from paradisestation at commit https://github.com/ParadiseSS13/Paradise/commit/12c21ced8432015485484b17e311dcceb7c458f6. Vox sprite by Flareguy for Space Station 14", "size": { "x": 32, "y": 32 @@ -14,6 +14,26 @@ "name": "equipped-OUTERCLOTHING", "directions": 4 }, + { + "name": "equipped-OUTERCLOTHING-reptilian", + "directions": 4 + }, + { + "name": "equipped-OUTERCLOTHING-shark", + "directions": 4 + }, + { + "name": "equipped-OUTERCLOTHING-tajaran", + "directions": 4 + }, + { + "name": "equipped-OUTERCLOTHING-vox", + "directions": 4 + }, + { + "name": "equipped-OUTERCLOTHING-vulpkanin", + "directions": 4 + }, { "name": "inhand-left", "directions": 4 diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertleader.rsi/equipped-OUTERCLOTHING-reptilian.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertleader.rsi/equipped-OUTERCLOTHING-reptilian.png new file mode 100644 index 0000000000..4e3edafdb7 Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertleader.rsi/equipped-OUTERCLOTHING-reptilian.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertleader.rsi/equipped-OUTERCLOTHING-shark.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertleader.rsi/equipped-OUTERCLOTHING-shark.png new file mode 100644 index 0000000000..bc49f2ff0d Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertleader.rsi/equipped-OUTERCLOTHING-shark.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertleader.rsi/equipped-OUTERCLOTHING-tajaran.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertleader.rsi/equipped-OUTERCLOTHING-tajaran.png new file mode 100644 index 0000000000..69d3a584e6 Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertleader.rsi/equipped-OUTERCLOTHING-tajaran.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertleader.rsi/equipped-OUTERCLOTHING-vox.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertleader.rsi/equipped-OUTERCLOTHING-vox.png new file mode 100644 index 0000000000..cb2c630801 Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertleader.rsi/equipped-OUTERCLOTHING-vox.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertleader.rsi/equipped-OUTERCLOTHING-vulpkanin.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertleader.rsi/equipped-OUTERCLOTHING-vulpkanin.png new file mode 100644 index 0000000000..b80f1dd539 Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertleader.rsi/equipped-OUTERCLOTHING-vulpkanin.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertleader.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertleader.rsi/equipped-OUTERCLOTHING.png index 6e1f10cfde..3d9c576518 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertleader.rsi/equipped-OUTERCLOTHING.png and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertleader.rsi/equipped-OUTERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertleader.rsi/icon.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertleader.rsi/icon.png index bd3c592a1f..b501817a1a 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertleader.rsi/icon.png and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertleader.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertleader.rsi/inhand-left.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertleader.rsi/inhand-left.png index 77994efec8..6763b53db7 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertleader.rsi/inhand-left.png and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertleader.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertleader.rsi/inhand-right.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertleader.rsi/inhand-right.png index f3aeb98d69..541b91b0c1 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertleader.rsi/inhand-right.png and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertleader.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertleader.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertleader.rsi/meta.json index 4fbd43a08b..eceb22f550 100644 --- a/Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertleader.rsi/meta.json +++ b/Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertleader.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from paradisestation at commit https://github.com/ParadiseSS13/Paradise/commit/12c21ced8432015485484b17e311dcceb7c458f6", + "copyright": "Taken from paradisestation at commit https://github.com/ParadiseSS13/Paradise/commit/12c21ced8432015485484b17e311dcceb7c458f6. Vox sprite by Flareguy for Space Station 14", "size": { "x": 32, "y": 32 @@ -14,6 +14,26 @@ "name": "equipped-OUTERCLOTHING", "directions": 4 }, + { + "name": "equipped-OUTERCLOTHING-reptilian", + "directions": 4 + }, + { + "name": "equipped-OUTERCLOTHING-shark", + "directions": 4 + }, + { + "name": "equipped-OUTERCLOTHING-tajaran", + "directions": 4 + }, + { + "name": "equipped-OUTERCLOTHING-vox", + "directions": 4 + }, + { + "name": "equipped-OUTERCLOTHING-vulpkanin", + "directions": 4 + }, { "name": "inhand-left", "directions": 4 diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertmedical.rsi/equipped-OUTERCLOTHING-reptilian.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertmedical.rsi/equipped-OUTERCLOTHING-reptilian.png new file mode 100644 index 0000000000..a69d314311 Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertmedical.rsi/equipped-OUTERCLOTHING-reptilian.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertmedical.rsi/equipped-OUTERCLOTHING-shark.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertmedical.rsi/equipped-OUTERCLOTHING-shark.png new file mode 100644 index 0000000000..3b0a7efc5a Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertmedical.rsi/equipped-OUTERCLOTHING-shark.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertmedical.rsi/equipped-OUTERCLOTHING-tajaran.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertmedical.rsi/equipped-OUTERCLOTHING-tajaran.png new file mode 100644 index 0000000000..47e3ae1620 Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertmedical.rsi/equipped-OUTERCLOTHING-tajaran.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertmedical.rsi/equipped-OUTERCLOTHING-vox.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertmedical.rsi/equipped-OUTERCLOTHING-vox.png new file mode 100644 index 0000000000..284954aabc Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertmedical.rsi/equipped-OUTERCLOTHING-vox.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertmedical.rsi/equipped-OUTERCLOTHING-vulpkanin.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertmedical.rsi/equipped-OUTERCLOTHING-vulpkanin.png new file mode 100644 index 0000000000..b0dbaf4588 Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertmedical.rsi/equipped-OUTERCLOTHING-vulpkanin.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertmedical.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertmedical.rsi/equipped-OUTERCLOTHING.png index 471347b1ff..7784fd0599 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertmedical.rsi/equipped-OUTERCLOTHING.png and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertmedical.rsi/equipped-OUTERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertmedical.rsi/icon.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertmedical.rsi/icon.png index fbd5291cf7..16ecfb475e 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertmedical.rsi/icon.png and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertmedical.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertmedical.rsi/inhand-left.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertmedical.rsi/inhand-left.png index a835bd27a0..26ae313c53 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertmedical.rsi/inhand-left.png and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertmedical.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertmedical.rsi/inhand-right.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertmedical.rsi/inhand-right.png index f89f3ddea4..376c75d50b 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertmedical.rsi/inhand-right.png and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertmedical.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertmedical.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertmedical.rsi/meta.json index 4fbd43a08b..f4ff4f9ffb 100644 --- a/Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertmedical.rsi/meta.json +++ b/Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertmedical.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from paradisestation at commit https://github.com/ParadiseSS13/Paradise/commit/12c21ced8432015485484b17e311dcceb7c458f6", + "copyright": "Taken from paradisestation at commit https://github.com/ParadiseSS13/Paradise/commit/12c21ced8432015485484b17e311dcceb7c458f6. Vox sprite made by Flareguy", "size": { "x": 32, "y": 32 @@ -14,6 +14,26 @@ "name": "equipped-OUTERCLOTHING", "directions": 4 }, + { + "name": "equipped-OUTERCLOTHING-reptilian", + "directions": 4 + }, + { + "name": "equipped-OUTERCLOTHING-shark", + "directions": 4 + }, + { + "name": "equipped-OUTERCLOTHING-tajaran", + "directions": 4 + }, + { + "name": "equipped-OUTERCLOTHING-vox", + "directions": 4 + }, + { + "name": "equipped-OUTERCLOTHING-vulpkanin", + "directions": 4 + }, { "name": "inhand-left", "directions": 4 diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertsecurity.rsi/equipped-OUTERCLOTHING-reptilian.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertsecurity.rsi/equipped-OUTERCLOTHING-reptilian.png new file mode 100644 index 0000000000..46407a40f4 Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertsecurity.rsi/equipped-OUTERCLOTHING-reptilian.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertsecurity.rsi/equipped-OUTERCLOTHING-shark.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertsecurity.rsi/equipped-OUTERCLOTHING-shark.png new file mode 100644 index 0000000000..0d18d23e50 Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertsecurity.rsi/equipped-OUTERCLOTHING-shark.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertsecurity.rsi/equipped-OUTERCLOTHING-tajaran.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertsecurity.rsi/equipped-OUTERCLOTHING-tajaran.png new file mode 100644 index 0000000000..69deb0941f Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertsecurity.rsi/equipped-OUTERCLOTHING-tajaran.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertsecurity.rsi/equipped-OUTERCLOTHING-vox.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertsecurity.rsi/equipped-OUTERCLOTHING-vox.png new file mode 100644 index 0000000000..29130c57f0 Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertsecurity.rsi/equipped-OUTERCLOTHING-vox.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertsecurity.rsi/equipped-OUTERCLOTHING-vulpkanin.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertsecurity.rsi/equipped-OUTERCLOTHING-vulpkanin.png new file mode 100644 index 0000000000..04f4a50349 Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertsecurity.rsi/equipped-OUTERCLOTHING-vulpkanin.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertsecurity.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertsecurity.rsi/equipped-OUTERCLOTHING.png index 83cd6ef902..1d345fc8d4 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertsecurity.rsi/equipped-OUTERCLOTHING.png and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertsecurity.rsi/equipped-OUTERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertsecurity.rsi/icon.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertsecurity.rsi/icon.png index 442c1230a5..6e53436023 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertsecurity.rsi/icon.png and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertsecurity.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertsecurity.rsi/inhand-left.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertsecurity.rsi/inhand-left.png index 31fc1a5227..a7353a283f 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertsecurity.rsi/inhand-left.png and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertsecurity.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertsecurity.rsi/inhand-right.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertsecurity.rsi/inhand-right.png index 05c21acd9b..7bdf151bb5 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertsecurity.rsi/inhand-right.png and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertsecurity.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertsecurity.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertsecurity.rsi/meta.json index 4fbd43a08b..eceb22f550 100644 --- a/Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertsecurity.rsi/meta.json +++ b/Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertsecurity.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from paradisestation at commit https://github.com/ParadiseSS13/Paradise/commit/12c21ced8432015485484b17e311dcceb7c458f6", + "copyright": "Taken from paradisestation at commit https://github.com/ParadiseSS13/Paradise/commit/12c21ced8432015485484b17e311dcceb7c458f6. Vox sprite by Flareguy for Space Station 14", "size": { "x": 32, "y": 32 @@ -14,6 +14,26 @@ "name": "equipped-OUTERCLOTHING", "directions": 4 }, + { + "name": "equipped-OUTERCLOTHING-reptilian", + "directions": 4 + }, + { + "name": "equipped-OUTERCLOTHING-shark", + "directions": 4 + }, + { + "name": "equipped-OUTERCLOTHING-tajaran", + "directions": 4 + }, + { + "name": "equipped-OUTERCLOTHING-vox", + "directions": 4 + }, + { + "name": "equipped-OUTERCLOTHING-vulpkanin", + "directions": 4 + }, { "name": "inhand-left", "directions": 4 diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/atmospherics.rsi/equipped-OUTERCLOTHING-reptilian.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/atmospherics.rsi/equipped-OUTERCLOTHING-reptilian.png new file mode 100644 index 0000000000..de7e36afe3 Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/atmospherics.rsi/equipped-OUTERCLOTHING-reptilian.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/atmospherics.rsi/equipped-OUTERCLOTHING-shark.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/atmospherics.rsi/equipped-OUTERCLOTHING-shark.png new file mode 100644 index 0000000000..ced510ae30 Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/atmospherics.rsi/equipped-OUTERCLOTHING-shark.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/atmospherics.rsi/equipped-OUTERCLOTHING-tajaran.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/atmospherics.rsi/equipped-OUTERCLOTHING-tajaran.png new file mode 100644 index 0000000000..1f2f87d03c Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/atmospherics.rsi/equipped-OUTERCLOTHING-tajaran.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/atmospherics.rsi/equipped-OUTERCLOTHING-vox.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/atmospherics.rsi/equipped-OUTERCLOTHING-vox.png new file mode 100644 index 0000000000..b896fbef73 Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/atmospherics.rsi/equipped-OUTERCLOTHING-vox.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/atmospherics.rsi/equipped-OUTERCLOTHING-vulpkanin.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/atmospherics.rsi/equipped-OUTERCLOTHING-vulpkanin.png new file mode 100644 index 0000000000..2df3ab98b9 Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/atmospherics.rsi/equipped-OUTERCLOTHING-vulpkanin.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/atmospherics.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/atmospherics.rsi/equipped-OUTERCLOTHING.png index a6f1904a2c..b648addc22 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Hardsuits/atmospherics.rsi/equipped-OUTERCLOTHING.png and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/atmospherics.rsi/equipped-OUTERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/atmospherics.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Hardsuits/atmospherics.rsi/meta.json index ef5e62cca4..228123d202 100644 --- a/Resources/Textures/Clothing/OuterClothing/Hardsuits/atmospherics.rsi/meta.json +++ b/Resources/Textures/Clothing/OuterClothing/Hardsuits/atmospherics.rsi/meta.json @@ -1,30 +1,50 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e. Vox state made by Flareguy for SS14", "size": { "x": 32, "y": 32 }, - "states": [ - { - "name": "icon" - }, - { - "name": "equipped-OUTERCLOTHING", - "directions": 4 - }, - { - "name": "inhand-left", - "directions": 4 - }, - { - "name": "inhand-right", - "directions": 4 - }, - { - "name": "equipped-OUTERCLOTHING-harpy", - "directions": 4 - } - ] + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-OUTERCLOTHING", + "directions": 4 + }, + { + "name": "equipped-OUTERCLOTHING-reptilian", + "directions": 4 + }, + { + "name": "equipped-OUTERCLOTHING-shark", + "directions": 4 + }, + { + "name": "equipped-OUTERCLOTHING-tajaran", + "directions": 4 + }, + { + "name": "equipped-OUTERCLOTHING-vox", + "directions": 4 + }, + { + "name": "equipped-OUTERCLOTHING-vulpkanin", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + }, + { + "name": "equipped-OUTERCLOTHING-harpy", + "directions": 4 + } + ] } diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/basic.rsi/equipped-OUTERCLOTHING-reptilian.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/basic.rsi/equipped-OUTERCLOTHING-reptilian.png new file mode 100644 index 0000000000..34e1a46b93 Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/basic.rsi/equipped-OUTERCLOTHING-reptilian.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/basic.rsi/equipped-OUTERCLOTHING-shark.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/basic.rsi/equipped-OUTERCLOTHING-shark.png new file mode 100644 index 0000000000..8b76cab2d7 Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/basic.rsi/equipped-OUTERCLOTHING-shark.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/basic.rsi/equipped-OUTERCLOTHING-tajaran.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/basic.rsi/equipped-OUTERCLOTHING-tajaran.png new file mode 100644 index 0000000000..cd6a8ad05d Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/basic.rsi/equipped-OUTERCLOTHING-tajaran.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/basic.rsi/equipped-OUTERCLOTHING-vulpkanin.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/basic.rsi/equipped-OUTERCLOTHING-vulpkanin.png new file mode 100644 index 0000000000..c9da41537c Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/basic.rsi/equipped-OUTERCLOTHING-vulpkanin.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/basic.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Hardsuits/basic.rsi/meta.json index 3067907ba9..3faa83d7b0 100644 --- a/Resources/Textures/Clothing/OuterClothing/Hardsuits/basic.rsi/meta.json +++ b/Resources/Textures/Clothing/OuterClothing/Hardsuits/basic.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/40d89d11ea4a5cb81d61dc1018b46f4e7d32c62a. Further modifications and derivate works (inhand-left and inhand-right) under same license, derivative monkey made by brainfood1183 (github) for ss14, harpy by VMSolidus", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/40d89d11ea4a5cb81d61dc1018b46f4e7d32c62a. Further modifications and derivate works (inhand-left and inhand-right) under same license, derivative monkey made by brainfood1183 (github) for ss14", "size": { "x": 32, "y": 32 @@ -15,12 +15,24 @@ "directions": 4 }, { - "name": "equipped-OUTERCLOTHING-monkey", + "name": "equipped-OUTERCLOTHING-vulpkanin", + "directions": 4 + }, + { + "name": "equipped-OUTERCLOTHING-tajaran", "directions": 4 }, { - "name": "equipped-OUTERCLOTHING-harpy", - "directions": 4 + "name": "equipped-OUTERCLOTHING-reptilian", + "directions": 4 + }, + { + "name": "equipped-OUTERCLOTHING-shark", + "directions": 4 + }, + { + "name": "equipped-OUTERCLOTHING-monkey", + "directions": 4 }, { "name": "inhand-left", @@ -29,6 +41,10 @@ { "name": "inhand-right", "directions": 4 + }, + { + "name": "equipped-OUTERCLOTHING-harpy", + "directions": 4 } ] } diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/brigmedic.rsi/equipped-OUTERCLOTHING-reptilian.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/brigmedic.rsi/equipped-OUTERCLOTHING-reptilian.png new file mode 100644 index 0000000000..5407fd2603 Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/brigmedic.rsi/equipped-OUTERCLOTHING-reptilian.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/brigmedic.rsi/equipped-OUTERCLOTHING-shark.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/brigmedic.rsi/equipped-OUTERCLOTHING-shark.png new file mode 100644 index 0000000000..406f74a736 Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/brigmedic.rsi/equipped-OUTERCLOTHING-shark.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/brigmedic.rsi/equipped-OUTERCLOTHING-tajaran.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/brigmedic.rsi/equipped-OUTERCLOTHING-tajaran.png new file mode 100644 index 0000000000..bbadb051ab Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/brigmedic.rsi/equipped-OUTERCLOTHING-tajaran.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/brigmedic.rsi/equipped-OUTERCLOTHING-vulpkanin.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/brigmedic.rsi/equipped-OUTERCLOTHING-vulpkanin.png new file mode 100644 index 0000000000..0701077d5f Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/brigmedic.rsi/equipped-OUTERCLOTHING-vulpkanin.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/brigmedic.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Hardsuits/brigmedic.rsi/meta.json index 6cfe1ea214..b0be230e43 100644 --- a/Resources/Textures/Clothing/OuterClothing/Hardsuits/brigmedic.rsi/meta.json +++ b/Resources/Textures/Clothing/OuterClothing/Hardsuits/brigmedic.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Made by PuroSlavKing (github) for SS14, harpy by VMSolidus", + "copyright": "Made by PuroSlavKing (github) for SS14", "size": { "x": 32, "y": 32 @@ -15,8 +15,20 @@ "directions": 4 }, { - "name": "equipped-OUTERCLOTHING-harpy", - "directions": 4 + "name": "equipped-OUTERCLOTHING-vulpkanin", + "directions": 4 + }, + { + "name": "equipped-OUTERCLOTHING-tajaran", + "directions": 4 + }, + { + "name": "equipped-OUTERCLOTHING-reptilian", + "directions": 4 + }, + { + "name": "equipped-OUTERCLOTHING-shark", + "directions": 4 }, { "name": "inhand-left", @@ -25,6 +37,10 @@ { "name": "inhand-right", "directions": 4 + }, + { + "name": "equipped-OUTERCLOTHING-harpy", + "directions": 4 } ] } diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/capspace.rsi/equipped-OUTERCLOTHING-reptilian.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/capspace.rsi/equipped-OUTERCLOTHING-reptilian.png new file mode 100644 index 0000000000..b68bf6a0da Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/capspace.rsi/equipped-OUTERCLOTHING-reptilian.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/capspace.rsi/equipped-OUTERCLOTHING-shark.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/capspace.rsi/equipped-OUTERCLOTHING-shark.png new file mode 100644 index 0000000000..9af15fe93e Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/capspace.rsi/equipped-OUTERCLOTHING-shark.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/capspace.rsi/equipped-OUTERCLOTHING-tajaran.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/capspace.rsi/equipped-OUTERCLOTHING-tajaran.png new file mode 100644 index 0000000000..d29109a1fe Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/capspace.rsi/equipped-OUTERCLOTHING-tajaran.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/capspace.rsi/equipped-OUTERCLOTHING-vox.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/capspace.rsi/equipped-OUTERCLOTHING-vox.png new file mode 100644 index 0000000000..644c67846b Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/capspace.rsi/equipped-OUTERCLOTHING-vox.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/capspace.rsi/equipped-OUTERCLOTHING-vulpkanin.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/capspace.rsi/equipped-OUTERCLOTHING-vulpkanin.png new file mode 100644 index 0000000000..31ddf8c19c Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/capspace.rsi/equipped-OUTERCLOTHING-vulpkanin.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/capspace.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/capspace.rsi/equipped-OUTERCLOTHING.png index 7ac2fbde5e..c93c8e9418 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Hardsuits/capspace.rsi/equipped-OUTERCLOTHING.png and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/capspace.rsi/equipped-OUTERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/capspace.rsi/icon.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/capspace.rsi/icon.png index 77e0426ef4..b6fb02ba36 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Hardsuits/capspace.rsi/icon.png and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/capspace.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/capspace.rsi/inhand-left.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/capspace.rsi/inhand-left.png index 0545ffa683..956e5e3c45 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Hardsuits/capspace.rsi/inhand-left.png and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/capspace.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/capspace.rsi/inhand-right.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/capspace.rsi/inhand-right.png index a0d0dd7125..4ac0e4cde9 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Hardsuits/capspace.rsi/inhand-right.png and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/capspace.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/capspace.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Hardsuits/capspace.rsi/meta.json index 7f50fdcf08..b4430555fe 100644 --- a/Resources/Textures/Clothing/OuterClothing/Hardsuits/capspace.rsi/meta.json +++ b/Resources/Textures/Clothing/OuterClothing/Hardsuits/capspace.rsi/meta.json @@ -1,30 +1,50 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Made by Emisse for SS14", + "copyright": "Made by Emisse for SS14. Vox state made by Flareguy for SS14", "size": { "x": 32, "y": 32 }, - "states": [ - { - "name": "icon" - }, - { - "name": "equipped-OUTERCLOTHING", - "directions": 4 - }, - { - "name": "inhand-left", - "directions": 4 - }, - { - "name": "inhand-right", - "directions": 4 - }, - { - "name": "equipped-OUTERCLOTHING-harpy", - "directions": 4 - } - ] + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-OUTERCLOTHING", + "directions": 4 + }, + { + "name": "equipped-OUTERCLOTHING-reptilian", + "directions": 4 + }, + { + "name": "equipped-OUTERCLOTHING-shark", + "directions": 4 + }, + { + "name": "equipped-OUTERCLOTHING-tajaran", + "directions": 4 + }, + { + "name": "equipped-OUTERCLOTHING-vox", + "directions": 4 + }, + { + "name": "equipped-OUTERCLOTHING-vulpkanin", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + }, + { + "name": "equipped-OUTERCLOTHING-harpy", + "directions": 4 + } + ] } diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/cburn.rsi/equipped-OUTERCLOTHING-reptilian.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/cburn.rsi/equipped-OUTERCLOTHING-reptilian.png new file mode 100644 index 0000000000..e524dadf31 Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/cburn.rsi/equipped-OUTERCLOTHING-reptilian.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/cburn.rsi/equipped-OUTERCLOTHING-shark.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/cburn.rsi/equipped-OUTERCLOTHING-shark.png new file mode 100644 index 0000000000..49b8e81781 Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/cburn.rsi/equipped-OUTERCLOTHING-shark.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/cburn.rsi/equipped-OUTERCLOTHING-tajaran.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/cburn.rsi/equipped-OUTERCLOTHING-tajaran.png new file mode 100644 index 0000000000..3ade06f818 Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/cburn.rsi/equipped-OUTERCLOTHING-tajaran.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/cburn.rsi/equipped-OUTERCLOTHING-vox.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/cburn.rsi/equipped-OUTERCLOTHING-vox.png new file mode 100644 index 0000000000..52c1cea7cf Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/cburn.rsi/equipped-OUTERCLOTHING-vox.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/cburn.rsi/equipped-OUTERCLOTHING-vulpkanin.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/cburn.rsi/equipped-OUTERCLOTHING-vulpkanin.png new file mode 100644 index 0000000000..080adf7f7a Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/cburn.rsi/equipped-OUTERCLOTHING-vulpkanin.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/cburn.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/cburn.rsi/equipped-OUTERCLOTHING.png index c7ed8fa9ff..d2f3da4fae 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Hardsuits/cburn.rsi/equipped-OUTERCLOTHING.png and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/cburn.rsi/equipped-OUTERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/cburn.rsi/icon.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/cburn.rsi/icon.png index 8d7c6be6a6..0647c9f57d 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Hardsuits/cburn.rsi/icon.png and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/cburn.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/cburn.rsi/inhand-left.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/cburn.rsi/inhand-left.png index 9071444e11..23efda3428 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Hardsuits/cburn.rsi/inhand-left.png and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/cburn.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/cburn.rsi/inhand-right.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/cburn.rsi/inhand-right.png index 715c65f4b6..e6d48fc298 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Hardsuits/cburn.rsi/inhand-right.png and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/cburn.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/cburn.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Hardsuits/cburn.rsi/meta.json index 2de954bbf9..faf5025dad 100644 --- a/Resources/Textures/Clothing/OuterClothing/Hardsuits/cburn.rsi/meta.json +++ b/Resources/Textures/Clothing/OuterClothing/Hardsuits/cburn.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Made by EmoGarbage404, harpy by VMSolidus", + "copyright": "Made by EmoGarbage404. Vox state made by Flareguy for SS14", "size": { "x": 32, "y": 32 @@ -15,8 +15,24 @@ "directions": 4 }, { - "name": "equipped-OUTERCLOTHING-harpy", - "directions": 4 + "name": "equipped-OUTERCLOTHING-reptilian", + "directions": 4 + }, + { + "name": "equipped-OUTERCLOTHING-shark", + "directions": 4 + }, + { + "name": "equipped-OUTERCLOTHING-tajaran", + "directions": 4 + }, + { + "name": "equipped-OUTERCLOTHING-vox", + "directions": 4 + }, + { + "name": "equipped-OUTERCLOTHING-vulpkanin", + "directions": 4 }, { "name": "inhand-left", @@ -25,6 +41,10 @@ { "name": "inhand-right", "directions": 4 + }, + { + "name": "equipped-OUTERCLOTHING-harpy", + "directions": 4 } ] } diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/clown.rsi/equipped-OUTERCLOTHING-reptilian.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/clown.rsi/equipped-OUTERCLOTHING-reptilian.png new file mode 100644 index 0000000000..c8008ac75f Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/clown.rsi/equipped-OUTERCLOTHING-reptilian.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/clown.rsi/equipped-OUTERCLOTHING-shark.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/clown.rsi/equipped-OUTERCLOTHING-shark.png new file mode 100644 index 0000000000..1d9ae749be Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/clown.rsi/equipped-OUTERCLOTHING-shark.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/clown.rsi/equipped-OUTERCLOTHING-tajaran.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/clown.rsi/equipped-OUTERCLOTHING-tajaran.png new file mode 100644 index 0000000000..cd6dc8e6ab Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/clown.rsi/equipped-OUTERCLOTHING-tajaran.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/clown.rsi/equipped-OUTERCLOTHING-vox.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/clown.rsi/equipped-OUTERCLOTHING-vox.png new file mode 100644 index 0000000000..bf6028dfdb Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/clown.rsi/equipped-OUTERCLOTHING-vox.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/clown.rsi/equipped-OUTERCLOTHING-vulpkanin.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/clown.rsi/equipped-OUTERCLOTHING-vulpkanin.png new file mode 100644 index 0000000000..bc104f0945 Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/clown.rsi/equipped-OUTERCLOTHING-vulpkanin.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/clown.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Hardsuits/clown.rsi/meta.json index 090140fa8c..7fecb86239 100644 --- a/Resources/Textures/Clothing/OuterClothing/Hardsuits/clown.rsi/meta.json +++ b/Resources/Textures/Clothing/OuterClothing/Hardsuits/clown.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e, modified by brainfood1183 (github), harpy by VMSolidus", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e, modified by brainfood1183 (github). Vox state made by Flareguy for SS14", "size": { "x": 32, "y": 32 @@ -14,8 +14,24 @@ "name": "equipped-OUTERCLOTHING", "directions": 4 }, + { + "name": "equipped-OUTERCLOTHING-vulpkanin", + "directions": 4 + }, + { + "name": "equipped-OUTERCLOTHING-tajaran", + "directions": 4 + }, + { + "name": "equipped-OUTERCLOTHING-reptilian", + "directions": 4 + }, + { + "name": "equipped-OUTERCLOTHING-shark", + "directions": 4 + }, { - "name": "equipped-OUTERCLOTHING-harpy", + "name": "equipped-OUTERCLOTHING-vox", "directions": 4 }, { @@ -25,6 +41,10 @@ { "name": "inhand-right", "directions": 4 + }, + { + "name": "equipped-OUTERCLOTHING-harpy", + "directions": 4 } ] } diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/cybersun.rsi/equipped-OUTERCLOTHING-reptilian.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/cybersun.rsi/equipped-OUTERCLOTHING-reptilian.png new file mode 100644 index 0000000000..afe195d573 Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/cybersun.rsi/equipped-OUTERCLOTHING-reptilian.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/cybersun.rsi/equipped-OUTERCLOTHING-shark.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/cybersun.rsi/equipped-OUTERCLOTHING-shark.png new file mode 100644 index 0000000000..702a6673b0 Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/cybersun.rsi/equipped-OUTERCLOTHING-shark.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/cybersun.rsi/equipped-OUTERCLOTHING-tajaran.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/cybersun.rsi/equipped-OUTERCLOTHING-tajaran.png new file mode 100644 index 0000000000..e9afbb40dd Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/cybersun.rsi/equipped-OUTERCLOTHING-tajaran.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/cybersun.rsi/equipped-OUTERCLOTHING-vox.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/cybersun.rsi/equipped-OUTERCLOTHING-vox.png new file mode 100644 index 0000000000..631815d06b Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/cybersun.rsi/equipped-OUTERCLOTHING-vox.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/cybersun.rsi/equipped-OUTERCLOTHING-vulpkanin.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/cybersun.rsi/equipped-OUTERCLOTHING-vulpkanin.png new file mode 100644 index 0000000000..eab6fbdf24 Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/cybersun.rsi/equipped-OUTERCLOTHING-vulpkanin.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/cybersun.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/cybersun.rsi/equipped-OUTERCLOTHING.png index 17925efbf4..003645bb30 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Hardsuits/cybersun.rsi/equipped-OUTERCLOTHING.png and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/cybersun.rsi/equipped-OUTERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/cybersun.rsi/icon.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/cybersun.rsi/icon.png index 1c3177b459..79faa4c531 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Hardsuits/cybersun.rsi/icon.png and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/cybersun.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/cybersun.rsi/inhand-left.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/cybersun.rsi/inhand-left.png index ab9ffc9a9a..0c126c8819 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Hardsuits/cybersun.rsi/inhand-left.png and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/cybersun.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/cybersun.rsi/inhand-right.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/cybersun.rsi/inhand-right.png index 560fb552f9..7a40cb38d8 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Hardsuits/cybersun.rsi/inhand-right.png and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/cybersun.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/cybersun.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Hardsuits/cybersun.rsi/meta.json index 1cfa2a9cfe..815cd31c79 100644 --- a/Resources/Textures/Clothing/OuterClothing/Hardsuits/cybersun.rsi/meta.json +++ b/Resources/Textures/Clothing/OuterClothing/Hardsuits/cybersun.rsi/meta.json @@ -1,30 +1,50 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Sprite made by Gtheglorious based on the sprite made by emisse for ss14, harpy variant by VMSolidus", + "copyright": "Sprite made by Gtheglorious based on the sprite made by emisse for ss14, vox state made by Flareguy for SS14.", "size": { "x": 32, "y": 32 }, - "states": [ - { - "name": "icon" - }, - { - "name": "equipped-OUTERCLOTHING", - "directions": 4 - }, - { - "name": "inhand-left", - "directions": 4 - }, - { - "name": "inhand-right", - "directions": 4 - }, - { - "name": "equipped-OUTERCLOTHING-harpy", - "directions": 4 - } - ] -} + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-OUTERCLOTHING", + "directions": 4 + }, + { + "name": "equipped-OUTERCLOTHING-reptilian", + "directions": 4 + }, + { + "name": "equipped-OUTERCLOTHING-shark", + "directions": 4 + }, + { + "name": "equipped-OUTERCLOTHING-tajaran", + "directions": 4 + }, + { + "name": "equipped-OUTERCLOTHING-vox", + "directions": 4 + }, + { + "name": "equipped-OUTERCLOTHING-vulpkanin", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + }, + { + "name": "equipped-OUTERCLOTHING-harpy", + "directions": 4 + } + ] +} \ No newline at end of file diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/deathsquad.rsi/equipped-OUTERCLOTHING-reptilian.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/deathsquad.rsi/equipped-OUTERCLOTHING-reptilian.png new file mode 100644 index 0000000000..3b508e4ae2 Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/deathsquad.rsi/equipped-OUTERCLOTHING-reptilian.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/deathsquad.rsi/equipped-OUTERCLOTHING-shark.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/deathsquad.rsi/equipped-OUTERCLOTHING-shark.png new file mode 100644 index 0000000000..ce5406c831 Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/deathsquad.rsi/equipped-OUTERCLOTHING-shark.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/deathsquad.rsi/equipped-OUTERCLOTHING-tajaran.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/deathsquad.rsi/equipped-OUTERCLOTHING-tajaran.png new file mode 100644 index 0000000000..ff5de58597 Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/deathsquad.rsi/equipped-OUTERCLOTHING-tajaran.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/deathsquad.rsi/equipped-OUTERCLOTHING-vox.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/deathsquad.rsi/equipped-OUTERCLOTHING-vox.png new file mode 100644 index 0000000000..cbf92dffde Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/deathsquad.rsi/equipped-OUTERCLOTHING-vox.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/deathsquad.rsi/equipped-OUTERCLOTHING-vulpkanin.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/deathsquad.rsi/equipped-OUTERCLOTHING-vulpkanin.png new file mode 100644 index 0000000000..ed1e494832 Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/deathsquad.rsi/equipped-OUTERCLOTHING-vulpkanin.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/deathsquad.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/deathsquad.rsi/equipped-OUTERCLOTHING.png index 6513ccf273..f341d2de89 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Hardsuits/deathsquad.rsi/equipped-OUTERCLOTHING.png and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/deathsquad.rsi/equipped-OUTERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/deathsquad.rsi/icon.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/deathsquad.rsi/icon.png index 6bcee818b2..2c5bde1ca5 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Hardsuits/deathsquad.rsi/icon.png and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/deathsquad.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/deathsquad.rsi/inhand-left.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/deathsquad.rsi/inhand-left.png index 32dbb4bcbd..b34546f6f1 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Hardsuits/deathsquad.rsi/inhand-left.png and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/deathsquad.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/deathsquad.rsi/inhand-right.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/deathsquad.rsi/inhand-right.png index 690d4cef20..d21f1ac8ea 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Hardsuits/deathsquad.rsi/inhand-right.png and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/deathsquad.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/deathsquad.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Hardsuits/deathsquad.rsi/meta.json index f6910b12aa..b1925cebad 100644 --- a/Resources/Textures/Clothing/OuterClothing/Hardsuits/deathsquad.rsi/meta.json +++ b/Resources/Textures/Clothing/OuterClothing/Hardsuits/deathsquad.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e, edited by Emisse for SS14, harpy edit by VMSolidus", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e, edited by Emisse for SS14. Vox state made by Flareguy for SS14", "size": { "x": 32, "y": 32 @@ -15,7 +15,23 @@ "directions": 4 }, { - "name": "equipped-OUTERCLOTHING-harpy", + "name": "equipped-OUTERCLOTHING-reptilian", + "directions": 4 + }, + { + "name": "equipped-OUTERCLOTHING-shark", + "directions": 4 + }, + { + "name": "equipped-OUTERCLOTHING-tajaran", + "directions": 4 + }, + { + "name": "equipped-OUTERCLOTHING-vox", + "directions": 4 + }, + { + "name": "equipped-OUTERCLOTHING-vulpkanin", "directions": 4 }, { @@ -25,6 +41,10 @@ { "name": "inhand-right", "directions": 4 + }, + { + "name": "equipped-OUTERCLOTHING-harpy", + "directions": 4 } ] } diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/engineering-white.rsi/equipped-OUTERCLOTHING-reptilian.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/engineering-white.rsi/equipped-OUTERCLOTHING-reptilian.png new file mode 100644 index 0000000000..1c0549923c Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/engineering-white.rsi/equipped-OUTERCLOTHING-reptilian.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/engineering-white.rsi/equipped-OUTERCLOTHING-shark.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/engineering-white.rsi/equipped-OUTERCLOTHING-shark.png new file mode 100644 index 0000000000..8db5ce7735 Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/engineering-white.rsi/equipped-OUTERCLOTHING-shark.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/engineering-white.rsi/equipped-OUTERCLOTHING-tajaran.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/engineering-white.rsi/equipped-OUTERCLOTHING-tajaran.png new file mode 100644 index 0000000000..11de76f1db Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/engineering-white.rsi/equipped-OUTERCLOTHING-tajaran.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/engineering-white.rsi/equipped-OUTERCLOTHING-vox.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/engineering-white.rsi/equipped-OUTERCLOTHING-vox.png new file mode 100644 index 0000000000..a6066c595b Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/engineering-white.rsi/equipped-OUTERCLOTHING-vox.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/engineering-white.rsi/equipped-OUTERCLOTHING-vulpkanin.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/engineering-white.rsi/equipped-OUTERCLOTHING-vulpkanin.png new file mode 100644 index 0000000000..3f5abc37fa Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/engineering-white.rsi/equipped-OUTERCLOTHING-vulpkanin.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/engineering-white.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Hardsuits/engineering-white.rsi/meta.json index ef5e62cca4..bcd99e9275 100644 --- a/Resources/Textures/Clothing/OuterClothing/Hardsuits/engineering-white.rsi/meta.json +++ b/Resources/Textures/Clothing/OuterClothing/Hardsuits/engineering-white.rsi/meta.json @@ -1,30 +1,50 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e. Vox state made by Flareguy for SS14", "size": { "x": 32, "y": 32 }, - "states": [ - { - "name": "icon" - }, - { - "name": "equipped-OUTERCLOTHING", - "directions": 4 - }, - { - "name": "inhand-left", - "directions": 4 - }, - { - "name": "inhand-right", - "directions": 4 - }, - { - "name": "equipped-OUTERCLOTHING-harpy", - "directions": 4 - } - ] + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-OUTERCLOTHING", + "directions": 4 + }, + { + "name": "equipped-OUTERCLOTHING-reptilian", + "directions": 4 + }, + { + "name": "equipped-OUTERCLOTHING-shark", + "directions": 4 + }, + { + "name": "equipped-OUTERCLOTHING-tajaran", + "directions": 4 + }, + { + "name": "equipped-OUTERCLOTHING-vox", + "directions": 4 + }, + { + "name": "equipped-OUTERCLOTHING-vulpkanin", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + }, + { + "name": "equipped-OUTERCLOTHING-harpy", + "directions": 4 + } + ] } diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/engineering.rsi/equipped-OUTERCLOTHING-reptilian.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/engineering.rsi/equipped-OUTERCLOTHING-reptilian.png new file mode 100644 index 0000000000..0a3d988415 Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/engineering.rsi/equipped-OUTERCLOTHING-reptilian.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/engineering.rsi/equipped-OUTERCLOTHING-shark.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/engineering.rsi/equipped-OUTERCLOTHING-shark.png new file mode 100644 index 0000000000..057dc88af0 Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/engineering.rsi/equipped-OUTERCLOTHING-shark.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/engineering.rsi/equipped-OUTERCLOTHING-tajaran.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/engineering.rsi/equipped-OUTERCLOTHING-tajaran.png new file mode 100644 index 0000000000..f37ceaca0e Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/engineering.rsi/equipped-OUTERCLOTHING-tajaran.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/engineering.rsi/equipped-OUTERCLOTHING-vox.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/engineering.rsi/equipped-OUTERCLOTHING-vox.png new file mode 100644 index 0000000000..7e4e050f9d Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/engineering.rsi/equipped-OUTERCLOTHING-vox.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/engineering.rsi/equipped-OUTERCLOTHING-vulpkanin.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/engineering.rsi/equipped-OUTERCLOTHING-vulpkanin.png new file mode 100644 index 0000000000..ccd0ea17d7 Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/engineering.rsi/equipped-OUTERCLOTHING-vulpkanin.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/engineering.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Hardsuits/engineering.rsi/meta.json index cbf3391af7..bcd99e9275 100644 --- a/Resources/Textures/Clothing/OuterClothing/Hardsuits/engineering.rsi/meta.json +++ b/Resources/Textures/Clothing/OuterClothing/Hardsuits/engineering.rsi/meta.json @@ -1,30 +1,50 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e, harpy version by VMSolidus", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e. Vox state made by Flareguy for SS14", "size": { "x": 32, "y": 32 }, - "states": [ - { - "name": "icon" - }, - { - "name": "equipped-OUTERCLOTHING", - "directions": 4 - }, - { - "name": "inhand-left", - "directions": 4 - }, - { - "name": "inhand-right", - "directions": 4 - }, - { - "name": "equipped-OUTERCLOTHING-harpy", - "directions": 4 - } - ] + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-OUTERCLOTHING", + "directions": 4 + }, + { + "name": "equipped-OUTERCLOTHING-reptilian", + "directions": 4 + }, + { + "name": "equipped-OUTERCLOTHING-shark", + "directions": 4 + }, + { + "name": "equipped-OUTERCLOTHING-tajaran", + "directions": 4 + }, + { + "name": "equipped-OUTERCLOTHING-vox", + "directions": 4 + }, + { + "name": "equipped-OUTERCLOTHING-vulpkanin", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + }, + { + "name": "equipped-OUTERCLOTHING-harpy", + "directions": 4 + } + ] } diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/luxury.rsi/equipped-OUTERCLOTHING-reptilian.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/luxury.rsi/equipped-OUTERCLOTHING-reptilian.png new file mode 100644 index 0000000000..6f423284a8 Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/luxury.rsi/equipped-OUTERCLOTHING-reptilian.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/luxury.rsi/equipped-OUTERCLOTHING-shark.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/luxury.rsi/equipped-OUTERCLOTHING-shark.png new file mode 100644 index 0000000000..f77d870c2a Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/luxury.rsi/equipped-OUTERCLOTHING-shark.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/luxury.rsi/equipped-OUTERCLOTHING-tajaran.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/luxury.rsi/equipped-OUTERCLOTHING-tajaran.png new file mode 100644 index 0000000000..74c408a449 Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/luxury.rsi/equipped-OUTERCLOTHING-tajaran.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/luxury.rsi/equipped-OUTERCLOTHING-vox.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/luxury.rsi/equipped-OUTERCLOTHING-vox.png new file mode 100644 index 0000000000..c082fd2340 Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/luxury.rsi/equipped-OUTERCLOTHING-vox.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/luxury.rsi/equipped-OUTERCLOTHING-vulpkanin.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/luxury.rsi/equipped-OUTERCLOTHING-vulpkanin.png new file mode 100644 index 0000000000..30cd4e9180 Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/luxury.rsi/equipped-OUTERCLOTHING-vulpkanin.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/luxury.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Hardsuits/luxury.rsi/meta.json index 0261a0564f..20a5382b79 100644 --- a/Resources/Textures/Clothing/OuterClothing/Hardsuits/luxury.rsi/meta.json +++ b/Resources/Textures/Clothing/OuterClothing/Hardsuits/luxury.rsi/meta.json @@ -1,30 +1,50 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Texture edit from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e", + "copyright": "Texture edit from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e. Vox state made by Flareguy for SS14", "size": { "x": 32, "y": 32 }, - "states": [ - { - "name": "icon" - }, - { - "name": "equipped-OUTERCLOTHING", - "directions": 4 - }, - { - "name": "inhand-left", - "directions": 4 - }, - { - "name": "inhand-right", - "directions": 4 - }, - { - "name": "equipped-OUTERCLOTHING-harpy", - "directions": 4 - } - ] + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-OUTERCLOTHING", + "directions": 4 + }, + { + "name": "equipped-OUTERCLOTHING-reptilian", + "directions": 4 + }, + { + "name": "equipped-OUTERCLOTHING-shark", + "directions": 4 + }, + { + "name": "equipped-OUTERCLOTHING-tajaran", + "directions": 4 + }, + { + "name": "equipped-OUTERCLOTHING-vox", + "directions": 4 + }, + { + "name": "equipped-OUTERCLOTHING-vulpkanin", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + }, + { + "name": "equipped-OUTERCLOTHING-harpy", + "directions": 4 + } + ] } diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/maxim.rsi/equipped-OUTERCLOTHING-vox.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/maxim.rsi/equipped-OUTERCLOTHING-vox.png new file mode 100644 index 0000000000..2085dc1c83 Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/maxim.rsi/equipped-OUTERCLOTHING-vox.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/maxim.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Hardsuits/maxim.rsi/meta.json index 3641da6f50..9acde9a4de 100644 --- a/Resources/Textures/Clothing/OuterClothing/Hardsuits/maxim.rsi/meta.json +++ b/Resources/Textures/Clothing/OuterClothing/Hardsuits/maxim.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/6b3f58d7de4d4e374282819a7001eaa9bde1676d", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/6b3f58d7de4d4e374282819a7001eaa9bde1676d. Vox state made by Flareguy for SS14", "size": { "x": 32, "y": 32 @@ -14,6 +14,10 @@ "name": "equipped-OUTERCLOTHING", "directions": 4 }, + { + "name": "equipped-OUTERCLOTHING-vox", + "directions": 4 + }, { "name": "inhand-left", "directions": 4 diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/medical.rsi/equipped-OUTERCLOTHING-reptilian.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/medical.rsi/equipped-OUTERCLOTHING-reptilian.png new file mode 100644 index 0000000000..2c593bded7 Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/medical.rsi/equipped-OUTERCLOTHING-reptilian.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/medical.rsi/equipped-OUTERCLOTHING-shark.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/medical.rsi/equipped-OUTERCLOTHING-shark.png new file mode 100644 index 0000000000..e9bed2a07b Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/medical.rsi/equipped-OUTERCLOTHING-shark.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/medical.rsi/equipped-OUTERCLOTHING-tajaran.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/medical.rsi/equipped-OUTERCLOTHING-tajaran.png new file mode 100644 index 0000000000..489aaa2569 Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/medical.rsi/equipped-OUTERCLOTHING-tajaran.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/medical.rsi/equipped-OUTERCLOTHING-vox.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/medical.rsi/equipped-OUTERCLOTHING-vox.png new file mode 100644 index 0000000000..6b6a36e0e7 Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/medical.rsi/equipped-OUTERCLOTHING-vox.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/medical.rsi/equipped-OUTERCLOTHING-vulpkanin.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/medical.rsi/equipped-OUTERCLOTHING-vulpkanin.png new file mode 100644 index 0000000000..6bed7da4b4 Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/medical.rsi/equipped-OUTERCLOTHING-vulpkanin.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/medical.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Hardsuits/medical.rsi/meta.json index ef5e62cca4..bcd99e9275 100644 --- a/Resources/Textures/Clothing/OuterClothing/Hardsuits/medical.rsi/meta.json +++ b/Resources/Textures/Clothing/OuterClothing/Hardsuits/medical.rsi/meta.json @@ -1,30 +1,50 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e. Vox state made by Flareguy for SS14", "size": { "x": 32, "y": 32 }, - "states": [ - { - "name": "icon" - }, - { - "name": "equipped-OUTERCLOTHING", - "directions": 4 - }, - { - "name": "inhand-left", - "directions": 4 - }, - { - "name": "inhand-right", - "directions": 4 - }, - { - "name": "equipped-OUTERCLOTHING-harpy", - "directions": 4 - } - ] + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-OUTERCLOTHING", + "directions": 4 + }, + { + "name": "equipped-OUTERCLOTHING-reptilian", + "directions": 4 + }, + { + "name": "equipped-OUTERCLOTHING-shark", + "directions": 4 + }, + { + "name": "equipped-OUTERCLOTHING-tajaran", + "directions": 4 + }, + { + "name": "equipped-OUTERCLOTHING-vox", + "directions": 4 + }, + { + "name": "equipped-OUTERCLOTHING-vulpkanin", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + }, + { + "name": "equipped-OUTERCLOTHING-harpy", + "directions": 4 + } + ] } diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/mime.rsi/equipped-OUTERCLOTHING-reptilian.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/mime.rsi/equipped-OUTERCLOTHING-reptilian.png new file mode 100644 index 0000000000..1eab35ed98 Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/mime.rsi/equipped-OUTERCLOTHING-reptilian.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/mime.rsi/equipped-OUTERCLOTHING-shark.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/mime.rsi/equipped-OUTERCLOTHING-shark.png new file mode 100644 index 0000000000..9f31d0b0bf Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/mime.rsi/equipped-OUTERCLOTHING-shark.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/mime.rsi/equipped-OUTERCLOTHING-tajaran.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/mime.rsi/equipped-OUTERCLOTHING-tajaran.png new file mode 100644 index 0000000000..f0848af582 Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/mime.rsi/equipped-OUTERCLOTHING-tajaran.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/mime.rsi/equipped-OUTERCLOTHING-vulpkanin.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/mime.rsi/equipped-OUTERCLOTHING-vulpkanin.png new file mode 100644 index 0000000000..1a2ec6fa83 Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/mime.rsi/equipped-OUTERCLOTHING-vulpkanin.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/mime.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/mime.rsi/equipped-OUTERCLOTHING.png index 3d91e4ba11..f962f659fb 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Hardsuits/mime.rsi/equipped-OUTERCLOTHING.png and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/mime.rsi/equipped-OUTERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/mime.rsi/icon.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/mime.rsi/icon.png index e44b9e4863..57db507a3d 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Hardsuits/mime.rsi/icon.png and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/mime.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/mime.rsi/inhand-left.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/mime.rsi/inhand-left.png index 08f1ed177f..84f9b645e0 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Hardsuits/mime.rsi/inhand-left.png and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/mime.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/mime.rsi/inhand-right.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/mime.rsi/inhand-right.png index 9ddd8a6ecd..904cb79598 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Hardsuits/mime.rsi/inhand-right.png and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/mime.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/mime.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Hardsuits/mime.rsi/meta.json index a5f992108c..e2f80b0190 100644 --- a/Resources/Textures/Clothing/OuterClothing/Hardsuits/mime.rsi/meta.json +++ b/Resources/Textures/Clothing/OuterClothing/Hardsuits/mime.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e, modified by brainfood1183 (github), sprited(resprited) by Fazansen(https://github.com/Fazansen)", + "copyright": "Sprited by Roudenn(https://github.com/Roudenn)", "size": { "x": 32, "y": 32 @@ -14,6 +14,22 @@ "name": "equipped-OUTERCLOTHING", "directions": 4 }, + { + "name": "equipped-OUTERCLOTHING-reptilian", + "directions": 4 + }, + { + "name": "equipped-OUTERCLOTHING-shark", + "directions": 4 + }, + { + "name": "equipped-OUTERCLOTHING-tajaran", + "directions": 4 + }, + { + "name": "equipped-OUTERCLOTHING-vulpkanin", + "directions": 4 + }, { "name": "inhand-left", "directions": 4 diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/paramed.rsi/equipped-OUTERCLOTHING-reptilian.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/paramed.rsi/equipped-OUTERCLOTHING-reptilian.png new file mode 100644 index 0000000000..1f8898304a Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/paramed.rsi/equipped-OUTERCLOTHING-reptilian.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/paramed.rsi/equipped-OUTERCLOTHING-shark.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/paramed.rsi/equipped-OUTERCLOTHING-shark.png new file mode 100644 index 0000000000..02a2b39e21 Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/paramed.rsi/equipped-OUTERCLOTHING-shark.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/paramed.rsi/equipped-OUTERCLOTHING-tajaran.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/paramed.rsi/equipped-OUTERCLOTHING-tajaran.png new file mode 100644 index 0000000000..224e12322c Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/paramed.rsi/equipped-OUTERCLOTHING-tajaran.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/paramed.rsi/equipped-OUTERCLOTHING-vox.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/paramed.rsi/equipped-OUTERCLOTHING-vox.png new file mode 100644 index 0000000000..e8149c9cd9 Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/paramed.rsi/equipped-OUTERCLOTHING-vox.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/paramed.rsi/equipped-OUTERCLOTHING-vulpkanin.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/paramed.rsi/equipped-OUTERCLOTHING-vulpkanin.png new file mode 100644 index 0000000000..392739cb03 Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/paramed.rsi/equipped-OUTERCLOTHING-vulpkanin.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/paramed.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/paramed.rsi/equipped-OUTERCLOTHING.png index 24837f4d9a..48ce9b0593 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Hardsuits/paramed.rsi/equipped-OUTERCLOTHING.png and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/paramed.rsi/equipped-OUTERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/paramed.rsi/icon.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/paramed.rsi/icon.png index 31f9e2f0e9..7fbeae7500 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Hardsuits/paramed.rsi/icon.png and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/paramed.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/paramed.rsi/inhand-left.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/paramed.rsi/inhand-left.png index 02bb28f88c..cac61451dd 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Hardsuits/paramed.rsi/inhand-left.png and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/paramed.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/paramed.rsi/inhand-right.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/paramed.rsi/inhand-right.png index 14e31e35ff..7b2c993890 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Hardsuits/paramed.rsi/inhand-right.png and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/paramed.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/paramed.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Hardsuits/paramed.rsi/meta.json index 64b98f1e79..0da7c51108 100644 --- a/Resources/Textures/Clothing/OuterClothing/Hardsuits/paramed.rsi/meta.json +++ b/Resources/Textures/Clothing/OuterClothing/Hardsuits/paramed.rsi/meta.json @@ -1,30 +1,50 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from paradise station git at commit https://github.com/ParadiseSS13/Paradise/commit/e5e584804b4b0b373a6a69d23afb73fd3c094365, redrawn by Ubaser", + "copyright": "Taken from paradise station git at commit https://github.com/ParadiseSS13/Paradise/commit/e5e584804b4b0b373a6a69d23afb73fd3c094365, redrawn by Ubaser. Vox state made by Flareguy for SS14", "size": { "x": 32, "y": 32 }, - "states": [ - { - "name": "icon" - }, - { - "name": "equipped-OUTERCLOTHING", - "directions": 4 - }, - { - "name": "inhand-left", - "directions": 4 - }, - { - "name": "inhand-right", - "directions": 4 - }, - { - "name": "equipped-OUTERCLOTHING-harpy", - "directions": 4 - } - ] + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-OUTERCLOTHING", + "directions": 4 + }, + { + "name": "equipped-OUTERCLOTHING-reptilian", + "directions": 4 + }, + { + "name": "equipped-OUTERCLOTHING-shark", + "directions": 4 + }, + { + "name": "equipped-OUTERCLOTHING-tajaran", + "directions": 4 + }, + { + "name": "equipped-OUTERCLOTHING-vox", + "directions": 4 + }, + { + "name": "equipped-OUTERCLOTHING-vulpkanin", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + }, + { + "name": "equipped-OUTERCLOTHING-harpy", + "directions": 4 + } + ] } diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/piratecaptain.rsi/equipped-OUTERCLOTHING-reptilian.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/piratecaptain.rsi/equipped-OUTERCLOTHING-reptilian.png new file mode 100644 index 0000000000..f70f9e6991 Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/piratecaptain.rsi/equipped-OUTERCLOTHING-reptilian.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/piratecaptain.rsi/equipped-OUTERCLOTHING-shark.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/piratecaptain.rsi/equipped-OUTERCLOTHING-shark.png new file mode 100644 index 0000000000..a870d19955 Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/piratecaptain.rsi/equipped-OUTERCLOTHING-shark.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/piratecaptain.rsi/equipped-OUTERCLOTHING-tajaran.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/piratecaptain.rsi/equipped-OUTERCLOTHING-tajaran.png new file mode 100644 index 0000000000..38abea8a7f Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/piratecaptain.rsi/equipped-OUTERCLOTHING-tajaran.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/piratecaptain.rsi/equipped-OUTERCLOTHING-vox.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/piratecaptain.rsi/equipped-OUTERCLOTHING-vox.png new file mode 100644 index 0000000000..f0638fc80d Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/piratecaptain.rsi/equipped-OUTERCLOTHING-vox.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/piratecaptain.rsi/equipped-OUTERCLOTHING-vulpkanin.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/piratecaptain.rsi/equipped-OUTERCLOTHING-vulpkanin.png new file mode 100644 index 0000000000..0f3522c5a9 Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/piratecaptain.rsi/equipped-OUTERCLOTHING-vulpkanin.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/piratecaptain.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Hardsuits/piratecaptain.rsi/meta.json index 8840689d9e..3318ac86aa 100644 --- a/Resources/Textures/Clothing/OuterClothing/Hardsuits/piratecaptain.rsi/meta.json +++ b/Resources/Textures/Clothing/OuterClothing/Hardsuits/piratecaptain.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Made by brainfood1183 (Github) for ss14", + "copyright": "Made by brainfood1183 (Github) for ss14. Vox state made by Flareguy for SS14", "size": { "x": 32, "y": 32 @@ -14,6 +14,26 @@ "name": "equipped-OUTERCLOTHING", "directions": 4 }, + { + "name": "equipped-OUTERCLOTHING-reptilian", + "directions": 4 + }, + { + "name": "equipped-OUTERCLOTHING-shark", + "directions": 4 + }, + { + "name": "equipped-OUTERCLOTHING-tajaran", + "directions": 4 + }, + { + "name": "equipped-OUTERCLOTHING-vox", + "directions": 4 + }, + { + "name": "equipped-OUTERCLOTHING-vulpkanin", + "directions": 4 + }, { "name": "inhand-left", "directions": 4 diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/pirateeva.rsi/equipped-OUTERCLOTHING-reptilian.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/pirateeva.rsi/equipped-OUTERCLOTHING-reptilian.png new file mode 100644 index 0000000000..e1f74ecf6a Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/pirateeva.rsi/equipped-OUTERCLOTHING-reptilian.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/pirateeva.rsi/equipped-OUTERCLOTHING-shark.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/pirateeva.rsi/equipped-OUTERCLOTHING-shark.png new file mode 100644 index 0000000000..c4a113ea66 Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/pirateeva.rsi/equipped-OUTERCLOTHING-shark.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/pirateeva.rsi/equipped-OUTERCLOTHING-tajaran.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/pirateeva.rsi/equipped-OUTERCLOTHING-tajaran.png new file mode 100644 index 0000000000..c423dbfd79 Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/pirateeva.rsi/equipped-OUTERCLOTHING-tajaran.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/pirateeva.rsi/equipped-OUTERCLOTHING-vox.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/pirateeva.rsi/equipped-OUTERCLOTHING-vox.png new file mode 100644 index 0000000000..ce3d20cc20 Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/pirateeva.rsi/equipped-OUTERCLOTHING-vox.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/pirateeva.rsi/equipped-OUTERCLOTHING-vulpkanin.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/pirateeva.rsi/equipped-OUTERCLOTHING-vulpkanin.png new file mode 100644 index 0000000000..3fbcd1d530 Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/pirateeva.rsi/equipped-OUTERCLOTHING-vulpkanin.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/pirateeva.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Hardsuits/pirateeva.rsi/meta.json index 8840689d9e..3318ac86aa 100644 --- a/Resources/Textures/Clothing/OuterClothing/Hardsuits/pirateeva.rsi/meta.json +++ b/Resources/Textures/Clothing/OuterClothing/Hardsuits/pirateeva.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Made by brainfood1183 (Github) for ss14", + "copyright": "Made by brainfood1183 (Github) for ss14. Vox state made by Flareguy for SS14", "size": { "x": 32, "y": 32 @@ -14,6 +14,26 @@ "name": "equipped-OUTERCLOTHING", "directions": 4 }, + { + "name": "equipped-OUTERCLOTHING-reptilian", + "directions": 4 + }, + { + "name": "equipped-OUTERCLOTHING-shark", + "directions": 4 + }, + { + "name": "equipped-OUTERCLOTHING-tajaran", + "directions": 4 + }, + { + "name": "equipped-OUTERCLOTHING-vox", + "directions": 4 + }, + { + "name": "equipped-OUTERCLOTHING-vulpkanin", + "directions": 4 + }, { "name": "inhand-left", "directions": 4 diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/rd.rsi/equipped-OUTERCLOTHING-reptilian.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/rd.rsi/equipped-OUTERCLOTHING-reptilian.png new file mode 100644 index 0000000000..d922869895 Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/rd.rsi/equipped-OUTERCLOTHING-reptilian.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/rd.rsi/equipped-OUTERCLOTHING-shark.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/rd.rsi/equipped-OUTERCLOTHING-shark.png new file mode 100644 index 0000000000..edef8520ca Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/rd.rsi/equipped-OUTERCLOTHING-shark.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/rd.rsi/equipped-OUTERCLOTHING-tajaran.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/rd.rsi/equipped-OUTERCLOTHING-tajaran.png new file mode 100644 index 0000000000..7ddc30aa45 Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/rd.rsi/equipped-OUTERCLOTHING-tajaran.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/rd.rsi/equipped-OUTERCLOTHING-vox.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/rd.rsi/equipped-OUTERCLOTHING-vox.png new file mode 100644 index 0000000000..629584e995 Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/rd.rsi/equipped-OUTERCLOTHING-vox.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/rd.rsi/equipped-OUTERCLOTHING-vulpkanin.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/rd.rsi/equipped-OUTERCLOTHING-vulpkanin.png new file mode 100644 index 0000000000..4a79ee2aef Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/rd.rsi/equipped-OUTERCLOTHING-vulpkanin.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/rd.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/rd.rsi/equipped-OUTERCLOTHING.png index 3465700d9b..202aabb452 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Hardsuits/rd.rsi/equipped-OUTERCLOTHING.png and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/rd.rsi/equipped-OUTERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/rd.rsi/icon.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/rd.rsi/icon.png index 8081c5962d..c84e368dc1 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Hardsuits/rd.rsi/icon.png and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/rd.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/rd.rsi/inhand-left.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/rd.rsi/inhand-left.png index 21b03dcf0e..ff9d6f28ba 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Hardsuits/rd.rsi/inhand-left.png and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/rd.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/rd.rsi/inhand-right.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/rd.rsi/inhand-right.png index dd794e37b0..90759c48dc 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Hardsuits/rd.rsi/inhand-right.png and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/rd.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/rd.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Hardsuits/rd.rsi/meta.json index def2d42704..bcd99e9275 100644 --- a/Resources/Textures/Clothing/OuterClothing/Hardsuits/rd.rsi/meta.json +++ b/Resources/Textures/Clothing/OuterClothing/Hardsuits/rd.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e. Vox state made by Flareguy for SS14", "size": { "x": 32, "y": 32 @@ -15,8 +15,24 @@ "directions": 4 }, { - "name": "equipped-OUTERCLOTHING-harpy", - "directions": 4 + "name": "equipped-OUTERCLOTHING-reptilian", + "directions": 4 + }, + { + "name": "equipped-OUTERCLOTHING-shark", + "directions": 4 + }, + { + "name": "equipped-OUTERCLOTHING-tajaran", + "directions": 4 + }, + { + "name": "equipped-OUTERCLOTHING-vox", + "directions": 4 + }, + { + "name": "equipped-OUTERCLOTHING-vulpkanin", + "directions": 4 }, { "name": "inhand-left", @@ -25,6 +41,10 @@ { "name": "inhand-right", "directions": 4 + }, + { + "name": "equipped-OUTERCLOTHING-harpy", + "directions": 4 } ] } diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/salvage.rsi/equipped-OUTERCLOTHING-reptilian.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/salvage.rsi/equipped-OUTERCLOTHING-reptilian.png new file mode 100644 index 0000000000..71fb026786 Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/salvage.rsi/equipped-OUTERCLOTHING-reptilian.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/salvage.rsi/equipped-OUTERCLOTHING-shark.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/salvage.rsi/equipped-OUTERCLOTHING-shark.png new file mode 100644 index 0000000000..1f974f9f5a Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/salvage.rsi/equipped-OUTERCLOTHING-shark.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/salvage.rsi/equipped-OUTERCLOTHING-tajaran.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/salvage.rsi/equipped-OUTERCLOTHING-tajaran.png new file mode 100644 index 0000000000..e4f2f0335a Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/salvage.rsi/equipped-OUTERCLOTHING-tajaran.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/salvage.rsi/equipped-OUTERCLOTHING-vox.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/salvage.rsi/equipped-OUTERCLOTHING-vox.png new file mode 100644 index 0000000000..b8c26d6f41 Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/salvage.rsi/equipped-OUTERCLOTHING-vox.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/salvage.rsi/equipped-OUTERCLOTHING-vulpkanin.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/salvage.rsi/equipped-OUTERCLOTHING-vulpkanin.png new file mode 100644 index 0000000000..863dd727f2 Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/salvage.rsi/equipped-OUTERCLOTHING-vulpkanin.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/salvage.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Hardsuits/salvage.rsi/meta.json index ef5e62cca4..bcd99e9275 100644 --- a/Resources/Textures/Clothing/OuterClothing/Hardsuits/salvage.rsi/meta.json +++ b/Resources/Textures/Clothing/OuterClothing/Hardsuits/salvage.rsi/meta.json @@ -1,30 +1,50 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e. Vox state made by Flareguy for SS14", "size": { "x": 32, "y": 32 }, - "states": [ - { - "name": "icon" - }, - { - "name": "equipped-OUTERCLOTHING", - "directions": 4 - }, - { - "name": "inhand-left", - "directions": 4 - }, - { - "name": "inhand-right", - "directions": 4 - }, - { - "name": "equipped-OUTERCLOTHING-harpy", - "directions": 4 - } - ] + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-OUTERCLOTHING", + "directions": 4 + }, + { + "name": "equipped-OUTERCLOTHING-reptilian", + "directions": 4 + }, + { + "name": "equipped-OUTERCLOTHING-shark", + "directions": 4 + }, + { + "name": "equipped-OUTERCLOTHING-tajaran", + "directions": 4 + }, + { + "name": "equipped-OUTERCLOTHING-vox", + "directions": 4 + }, + { + "name": "equipped-OUTERCLOTHING-vulpkanin", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + }, + { + "name": "equipped-OUTERCLOTHING-harpy", + "directions": 4 + } + ] } diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/security-patrol.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/security-patrol.rsi/equipped-OUTERCLOTHING.png new file mode 100644 index 0000000000..e30e6f7fb7 Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/security-patrol.rsi/equipped-OUTERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/security-patrol.rsi/icon.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/security-patrol.rsi/icon.png new file mode 100644 index 0000000000..02179f93ec Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/security-patrol.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/security-patrol.rsi/inhand-left.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/security-patrol.rsi/inhand-left.png new file mode 100644 index 0000000000..c42574591f Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/security-patrol.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/security-patrol.rsi/inhand-right.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/security-patrol.rsi/inhand-right.png new file mode 100644 index 0000000000..1524156409 Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/security-patrol.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/security-patrol.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Hardsuits/security-patrol.rsi/meta.json new file mode 100644 index 0000000000..e541c9afe9 --- /dev/null +++ b/Resources/Textures/Clothing/OuterClothing/Hardsuits/security-patrol.rsi/meta.json @@ -0,0 +1,26 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Made by DadNotTheBelt (https://github.com/No-Dad-Not-The-Belt) for SS14/Frontier Station 14.", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-OUTERCLOTHING", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/security-red.rsi/equipped-OUTERCLOTHING-reptilian.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/security-red.rsi/equipped-OUTERCLOTHING-reptilian.png new file mode 100644 index 0000000000..a97d1c2ba0 Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/security-red.rsi/equipped-OUTERCLOTHING-reptilian.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/security-red.rsi/equipped-OUTERCLOTHING-shark.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/security-red.rsi/equipped-OUTERCLOTHING-shark.png new file mode 100644 index 0000000000..d154165e04 Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/security-red.rsi/equipped-OUTERCLOTHING-shark.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/security-red.rsi/equipped-OUTERCLOTHING-tajaran.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/security-red.rsi/equipped-OUTERCLOTHING-tajaran.png new file mode 100644 index 0000000000..98cdc513ca Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/security-red.rsi/equipped-OUTERCLOTHING-tajaran.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/security-red.rsi/equipped-OUTERCLOTHING-vox.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/security-red.rsi/equipped-OUTERCLOTHING-vox.png new file mode 100644 index 0000000000..8c301cbe55 Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/security-red.rsi/equipped-OUTERCLOTHING-vox.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/security-red.rsi/equipped-OUTERCLOTHING-vulpkanin.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/security-red.rsi/equipped-OUTERCLOTHING-vulpkanin.png new file mode 100644 index 0000000000..da42d083cf Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/security-red.rsi/equipped-OUTERCLOTHING-vulpkanin.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/security-red.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Hardsuits/security-red.rsi/meta.json index e482264df5..0899e560cc 100644 --- a/Resources/Textures/Clothing/OuterClothing/Hardsuits/security-red.rsi/meta.json +++ b/Resources/Textures/Clothing/OuterClothing/Hardsuits/security-red.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e. Vox state made by Flareguy for SS14", "size": { "x": 32, "y": 32 @@ -14,6 +14,26 @@ "name": "equipped-OUTERCLOTHING", "directions": 4 }, + { + "name": "equipped-OUTERCLOTHING-reptilian", + "directions": 4 + }, + { + "name": "equipped-OUTERCLOTHING-shark", + "directions": 4 + }, + { + "name": "equipped-OUTERCLOTHING-tajaran", + "directions": 4 + }, + { + "name": "equipped-OUTERCLOTHING-vox", + "directions": 4 + }, + { + "name": "equipped-OUTERCLOTHING-vulpkanin", + "directions": 4 + }, { "name": "inhand-left", "directions": 4 diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/security-warden.rsi/equipped-OUTERCLOTHING-reptilian.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/security-warden.rsi/equipped-OUTERCLOTHING-reptilian.png new file mode 100644 index 0000000000..b377577a5a Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/security-warden.rsi/equipped-OUTERCLOTHING-reptilian.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/security-warden.rsi/equipped-OUTERCLOTHING-shark.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/security-warden.rsi/equipped-OUTERCLOTHING-shark.png new file mode 100644 index 0000000000..ada16f91a8 Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/security-warden.rsi/equipped-OUTERCLOTHING-shark.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/security-warden.rsi/equipped-OUTERCLOTHING-tajaran.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/security-warden.rsi/equipped-OUTERCLOTHING-tajaran.png new file mode 100644 index 0000000000..0979b2dc3e Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/security-warden.rsi/equipped-OUTERCLOTHING-tajaran.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/security-warden.rsi/equipped-OUTERCLOTHING-vox.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/security-warden.rsi/equipped-OUTERCLOTHING-vox.png new file mode 100644 index 0000000000..30cf54325e Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/security-warden.rsi/equipped-OUTERCLOTHING-vox.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/security-warden.rsi/equipped-OUTERCLOTHING-vulpkanin.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/security-warden.rsi/equipped-OUTERCLOTHING-vulpkanin.png new file mode 100644 index 0000000000..ada9c3a728 Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/security-warden.rsi/equipped-OUTERCLOTHING-vulpkanin.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/security-warden.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Hardsuits/security-warden.rsi/meta.json index 54a0ed85fa..ccfa802605 100644 --- a/Resources/Textures/Clothing/OuterClothing/Hardsuits/security-warden.rsi/meta.json +++ b/Resources/Textures/Clothing/OuterClothing/Hardsuits/security-warden.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Sprite made by Gtheglorious based on the sprite made by Alekshhh for SS14", + "copyright": "Sprite made by Gtheglorious based on the sprite made by Alekshhh for SS14. Vox state made by Flareguy for SS14", "size": { "x": 32, "y": 32 @@ -14,6 +14,26 @@ "name": "equipped-OUTERCLOTHING", "directions": 4 }, + { + "name": "equipped-OUTERCLOTHING-reptilian", + "directions": 4 + }, + { + "name": "equipped-OUTERCLOTHING-shark", + "directions": 4 + }, + { + "name": "equipped-OUTERCLOTHING-tajaran", + "directions": 4 + }, + { + "name": "equipped-OUTERCLOTHING-vox", + "directions": 4 + }, + { + "name": "equipped-OUTERCLOTHING-vulpkanin", + "directions": 4 + }, { "name": "inhand-left", "directions": 4 diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/security.rsi/equipped-OUTERCLOTHING-reptilian.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/security.rsi/equipped-OUTERCLOTHING-reptilian.png new file mode 100644 index 0000000000..449eda9160 Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/security.rsi/equipped-OUTERCLOTHING-reptilian.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/security.rsi/equipped-OUTERCLOTHING-shark.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/security.rsi/equipped-OUTERCLOTHING-shark.png new file mode 100644 index 0000000000..c14be0f2d7 Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/security.rsi/equipped-OUTERCLOTHING-shark.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/security.rsi/equipped-OUTERCLOTHING-tajaran.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/security.rsi/equipped-OUTERCLOTHING-tajaran.png new file mode 100644 index 0000000000..7826c96bc3 Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/security.rsi/equipped-OUTERCLOTHING-tajaran.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/security.rsi/equipped-OUTERCLOTHING-vox.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/security.rsi/equipped-OUTERCLOTHING-vox.png new file mode 100644 index 0000000000..c06d8fae90 Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/security.rsi/equipped-OUTERCLOTHING-vox.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/security.rsi/equipped-OUTERCLOTHING-vulpkanin.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/security.rsi/equipped-OUTERCLOTHING-vulpkanin.png new file mode 100644 index 0000000000..39443dd12b Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/security.rsi/equipped-OUTERCLOTHING-vulpkanin.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/security.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Hardsuits/security.rsi/meta.json index 32d6d8901a..63aede55af 100644 --- a/Resources/Textures/Clothing/OuterClothing/Hardsuits/security.rsi/meta.json +++ b/Resources/Textures/Clothing/OuterClothing/Hardsuits/security.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Sprite made by Gtheglorious based on the sprite taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e", + "copyright": "Sprite made by Gtheglorious based on the sprite taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e. Vox state made by Flareguy for SS14", "size": { "x": 32, "y": 32 @@ -14,6 +14,26 @@ "name": "equipped-OUTERCLOTHING", "directions": 4 }, + { + "name": "equipped-OUTERCLOTHING-reptilian", + "directions": 4 + }, + { + "name": "equipped-OUTERCLOTHING-shark", + "directions": 4 + }, + { + "name": "equipped-OUTERCLOTHING-tajaran", + "directions": 4 + }, + { + "name": "equipped-OUTERCLOTHING-vox", + "directions": 4 + }, + { + "name": "equipped-OUTERCLOTHING-vulpkanin", + "directions": 4 + }, { "name": "inhand-left", "directions": 4 diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/spatio.rsi/equipped-OUTERCLOTHING-reptilian.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/spatio.rsi/equipped-OUTERCLOTHING-reptilian.png new file mode 100644 index 0000000000..e2154b1c46 Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/spatio.rsi/equipped-OUTERCLOTHING-reptilian.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/spatio.rsi/equipped-OUTERCLOTHING-shark.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/spatio.rsi/equipped-OUTERCLOTHING-shark.png new file mode 100644 index 0000000000..d052689348 Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/spatio.rsi/equipped-OUTERCLOTHING-shark.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/spatio.rsi/equipped-OUTERCLOTHING-tajaran.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/spatio.rsi/equipped-OUTERCLOTHING-tajaran.png new file mode 100644 index 0000000000..93b7c40174 Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/spatio.rsi/equipped-OUTERCLOTHING-tajaran.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/spatio.rsi/equipped-OUTERCLOTHING-vox.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/spatio.rsi/equipped-OUTERCLOTHING-vox.png new file mode 100644 index 0000000000..999761e150 Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/spatio.rsi/equipped-OUTERCLOTHING-vox.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/spatio.rsi/equipped-OUTERCLOTHING-vulpkanin.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/spatio.rsi/equipped-OUTERCLOTHING-vulpkanin.png new file mode 100644 index 0000000000..31f9f05e7f Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/spatio.rsi/equipped-OUTERCLOTHING-vulpkanin.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/spatio.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Hardsuits/spatio.rsi/meta.json index f6a942a895..3f89a14594 100644 --- a/Resources/Textures/Clothing/OuterClothing/Hardsuits/spatio.rsi/meta.json +++ b/Resources/Textures/Clothing/OuterClothing/Hardsuits/spatio.rsi/meta.json @@ -2,31 +2,51 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Original by Emisse, modified by EmoGarbage404", + "copyright": "Original by Emisse, modified by EmoGarbage404. Vox state made by Flareguy for SS14", "size": { "x": 32, "y": 32 }, - "states": [ - { - "name": "icon" - }, - { - "name": "equipped-OUTERCLOTHING", - "directions": 4 - }, - { - "name": "inhand-left", - "directions": 4 - }, - { - "name": "inhand-right", - "directions": 4 - }, - { - "name": "equipped-OUTERCLOTHING-harpy", - "directions": 4 - } - ] -} + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-OUTERCLOTHING", + "directions": 4 + }, + { + "name": "equipped-OUTERCLOTHING-reptilian", + "directions": 4 + }, + { + "name": "equipped-OUTERCLOTHING-shark", + "directions": 4 + }, + { + "name": "equipped-OUTERCLOTHING-tajaran", + "directions": 4 + }, + { + "name": "equipped-OUTERCLOTHING-vox", + "directions": 4 + }, + { + "name": "equipped-OUTERCLOTHING-vulpkanin", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + }, + { + "name": "equipped-OUTERCLOTHING-harpy", + "directions": 4 + } + ] +} \ No newline at end of file diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/syndicate.rsi/equipped-OUTERCLOTHING-reptilian.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/syndicate.rsi/equipped-OUTERCLOTHING-reptilian.png new file mode 100644 index 0000000000..edcacfc511 Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/syndicate.rsi/equipped-OUTERCLOTHING-reptilian.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/syndicate.rsi/equipped-OUTERCLOTHING-shark.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/syndicate.rsi/equipped-OUTERCLOTHING-shark.png new file mode 100644 index 0000000000..723cadce0a Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/syndicate.rsi/equipped-OUTERCLOTHING-shark.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/syndicate.rsi/equipped-OUTERCLOTHING-tajaran.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/syndicate.rsi/equipped-OUTERCLOTHING-tajaran.png new file mode 100644 index 0000000000..668df0d365 Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/syndicate.rsi/equipped-OUTERCLOTHING-tajaran.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/syndicate.rsi/equipped-OUTERCLOTHING-vox.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/syndicate.rsi/equipped-OUTERCLOTHING-vox.png new file mode 100644 index 0000000000..df2abbbf03 Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/syndicate.rsi/equipped-OUTERCLOTHING-vox.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/syndicate.rsi/equipped-OUTERCLOTHING-vulpkanin.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/syndicate.rsi/equipped-OUTERCLOTHING-vulpkanin.png new file mode 100644 index 0000000000..d6990e3b70 Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/syndicate.rsi/equipped-OUTERCLOTHING-vulpkanin.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/syndicate.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/syndicate.rsi/equipped-OUTERCLOTHING.png index 09402a1cb7..7f16c61a2a 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Hardsuits/syndicate.rsi/equipped-OUTERCLOTHING.png and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/syndicate.rsi/equipped-OUTERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/syndicate.rsi/icon.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/syndicate.rsi/icon.png index d8ace82fae..d94dd3bc29 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Hardsuits/syndicate.rsi/icon.png and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/syndicate.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/syndicate.rsi/inhand-left.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/syndicate.rsi/inhand-left.png index 2102993402..268fde26b1 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Hardsuits/syndicate.rsi/inhand-left.png and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/syndicate.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/syndicate.rsi/inhand-right.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/syndicate.rsi/inhand-right.png index e4113194a3..29b67726d8 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Hardsuits/syndicate.rsi/inhand-right.png and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/syndicate.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/syndicate.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Hardsuits/syndicate.rsi/meta.json index b9b739337b..6dd668d375 100644 --- a/Resources/Textures/Clothing/OuterClothing/Hardsuits/syndicate.rsi/meta.json +++ b/Resources/Textures/Clothing/OuterClothing/Hardsuits/syndicate.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/fb2d71495bfe81446159ef528534193d09dd8d34, equipped-OUTERCLOTHING-monkey made by Dutch-VanDerLinde", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/fb2d71495bfe81446159ef528534193d09dd8d34, equipped-OUTERCLOTHING-monkey made by Dutch-VanDerLinde, vox state made by Flareguy for SS14", "size": { "x": 32, "y": 32 @@ -14,6 +14,26 @@ "name": "equipped-OUTERCLOTHING", "directions": 4 }, + { + "name": "equipped-OUTERCLOTHING-reptilian", + "directions": 4 + }, + { + "name": "equipped-OUTERCLOTHING-shark", + "directions": 4 + }, + { + "name": "equipped-OUTERCLOTHING-tajaran", + "directions": 4 + }, + { + "name": "equipped-OUTERCLOTHING-vox", + "directions": 4 + }, + { + "name": "equipped-OUTERCLOTHING-vulpkanin", + "directions": 4 + }, { "name": "equipped-OUTERCLOTHING-monkey", "directions": 4 diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/syndiecommander.rsi/equipped-OUTERCLOTHING-reptilian.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/syndiecommander.rsi/equipped-OUTERCLOTHING-reptilian.png new file mode 100644 index 0000000000..7d5c245163 Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/syndiecommander.rsi/equipped-OUTERCLOTHING-reptilian.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/syndiecommander.rsi/equipped-OUTERCLOTHING-shark.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/syndiecommander.rsi/equipped-OUTERCLOTHING-shark.png new file mode 100644 index 0000000000..421905ff1e Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/syndiecommander.rsi/equipped-OUTERCLOTHING-shark.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/syndiecommander.rsi/equipped-OUTERCLOTHING-tajaran.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/syndiecommander.rsi/equipped-OUTERCLOTHING-tajaran.png new file mode 100644 index 0000000000..2d6e45457a Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/syndiecommander.rsi/equipped-OUTERCLOTHING-tajaran.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/syndiecommander.rsi/equipped-OUTERCLOTHING-vox.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/syndiecommander.rsi/equipped-OUTERCLOTHING-vox.png new file mode 100644 index 0000000000..24c1aa2a87 Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/syndiecommander.rsi/equipped-OUTERCLOTHING-vox.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/syndiecommander.rsi/equipped-OUTERCLOTHING-vulpkanin.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/syndiecommander.rsi/equipped-OUTERCLOTHING-vulpkanin.png new file mode 100644 index 0000000000..2463962cbd Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/syndiecommander.rsi/equipped-OUTERCLOTHING-vulpkanin.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/syndiecommander.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/syndiecommander.rsi/equipped-OUTERCLOTHING.png index ecf87e190a..b7b52f0c41 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Hardsuits/syndiecommander.rsi/equipped-OUTERCLOTHING.png and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/syndiecommander.rsi/equipped-OUTERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/syndiecommander.rsi/icon.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/syndiecommander.rsi/icon.png index 7a423e798d..871fcbd074 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Hardsuits/syndiecommander.rsi/icon.png and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/syndiecommander.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/syndiecommander.rsi/inhand-left.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/syndiecommander.rsi/inhand-left.png index 2102993402..a27d75760a 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Hardsuits/syndiecommander.rsi/inhand-left.png and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/syndiecommander.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/syndiecommander.rsi/inhand-right.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/syndiecommander.rsi/inhand-right.png index e4113194a3..11f4011e6e 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Hardsuits/syndiecommander.rsi/inhand-right.png and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/syndiecommander.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/syndiecommander.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Hardsuits/syndiecommander.rsi/meta.json index 4aa4d60ccb..c7e5babd28 100644 --- a/Resources/Textures/Clothing/OuterClothing/Hardsuits/syndiecommander.rsi/meta.json +++ b/Resources/Textures/Clothing/OuterClothing/Hardsuits/syndiecommander.rsi/meta.json @@ -1,30 +1,50 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from vg at commit https://github.com/vgstation-coders/vgstation13/commit/a16e41020a93479e9a7e2af343b1b74f7f2a61bd", + "copyright": "Taken from vg at commit https://github.com/vgstation-coders/vgstation13/commit/a16e41020a93479e9a7e2af343b1b74f7f2a61bd. Vox state made by Flareguy for SS14", "size": { "x": 32, "y": 32 }, - "states": [ - { - "name": "icon" - }, - { - "name": "equipped-OUTERCLOTHING", - "directions": 4 - }, - { - "name": "inhand-left", - "directions": 4 - }, - { - "name": "inhand-right", - "directions": 4 - }, - { - "name": "equipped-OUTERCLOTHING-harpy", - "directions": 4 - } - ] -} + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-OUTERCLOTHING", + "directions": 4 + }, + { + "name": "equipped-OUTERCLOTHING-reptilian", + "directions": 4 + }, + { + "name": "equipped-OUTERCLOTHING-shark", + "directions": 4 + }, + { + "name": "equipped-OUTERCLOTHING-tajaran", + "directions": 4 + }, + { + "name": "equipped-OUTERCLOTHING-vox", + "directions": 4 + }, + { + "name": "equipped-OUTERCLOTHING-vulpkanin", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + }, + { + "name": "equipped-OUTERCLOTHING-harpy", + "directions": 4 + } + ] +} \ No newline at end of file diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/syndieelite.rsi/equipped-OUTERCLOTHING-reptilian.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/syndieelite.rsi/equipped-OUTERCLOTHING-reptilian.png new file mode 100644 index 0000000000..67b978a2df Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/syndieelite.rsi/equipped-OUTERCLOTHING-reptilian.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/syndieelite.rsi/equipped-OUTERCLOTHING-shark.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/syndieelite.rsi/equipped-OUTERCLOTHING-shark.png new file mode 100644 index 0000000000..a9cfae1503 Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/syndieelite.rsi/equipped-OUTERCLOTHING-shark.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/syndieelite.rsi/equipped-OUTERCLOTHING-tajaran.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/syndieelite.rsi/equipped-OUTERCLOTHING-tajaran.png new file mode 100644 index 0000000000..9600c9fbef Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/syndieelite.rsi/equipped-OUTERCLOTHING-tajaran.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/syndieelite.rsi/equipped-OUTERCLOTHING-vox.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/syndieelite.rsi/equipped-OUTERCLOTHING-vox.png new file mode 100644 index 0000000000..869cf41ce2 Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/syndieelite.rsi/equipped-OUTERCLOTHING-vox.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/syndieelite.rsi/equipped-OUTERCLOTHING-vulpkanin.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/syndieelite.rsi/equipped-OUTERCLOTHING-vulpkanin.png new file mode 100644 index 0000000000..ecbd29e6fa Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/syndieelite.rsi/equipped-OUTERCLOTHING-vulpkanin.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/syndieelite.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/syndieelite.rsi/equipped-OUTERCLOTHING.png index 8a88030e8e..24970c7ac6 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Hardsuits/syndieelite.rsi/equipped-OUTERCLOTHING.png and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/syndieelite.rsi/equipped-OUTERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/syndieelite.rsi/icon.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/syndieelite.rsi/icon.png index 28c21b611b..0ba07b9c38 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Hardsuits/syndieelite.rsi/icon.png and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/syndieelite.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/syndieelite.rsi/inhand-left.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/syndieelite.rsi/inhand-left.png index 0f415d109b..3ffcc52ad0 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Hardsuits/syndieelite.rsi/inhand-left.png and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/syndieelite.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/syndieelite.rsi/inhand-right.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/syndieelite.rsi/inhand-right.png index 75076efb12..a5ae29e366 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Hardsuits/syndieelite.rsi/inhand-right.png and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/syndieelite.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/syndieelite.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Hardsuits/syndieelite.rsi/meta.json index b85c75656c..c7e5babd28 100644 --- a/Resources/Textures/Clothing/OuterClothing/Hardsuits/syndieelite.rsi/meta.json +++ b/Resources/Textures/Clothing/OuterClothing/Hardsuits/syndieelite.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from vg at commit https://github.com/vgstation-coders/vgstation13/commit/a16e41020a93479e9a7e2af343b1b74f7f2a61bd, harpy by VMSolidus", + "copyright": "Taken from vg at commit https://github.com/vgstation-coders/vgstation13/commit/a16e41020a93479e9a7e2af343b1b74f7f2a61bd. Vox state made by Flareguy for SS14", "size": { "x": 32, "y": 32 @@ -15,8 +15,24 @@ "directions": 4 }, { - "name": "equipped-OUTERCLOTHING-harpy", - "directions": 4 + "name": "equipped-OUTERCLOTHING-reptilian", + "directions": 4 + }, + { + "name": "equipped-OUTERCLOTHING-shark", + "directions": 4 + }, + { + "name": "equipped-OUTERCLOTHING-tajaran", + "directions": 4 + }, + { + "name": "equipped-OUTERCLOTHING-vox", + "directions": 4 + }, + { + "name": "equipped-OUTERCLOTHING-vulpkanin", + "directions": 4 }, { "name": "inhand-left", @@ -25,6 +41,10 @@ { "name": "inhand-right", "directions": 4 + }, + { + "name": "equipped-OUTERCLOTHING-harpy", + "directions": 4 } ] -} +} \ No newline at end of file diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/syndiemedic.rsi/equipped-OUTERCLOTHING-reptilian.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/syndiemedic.rsi/equipped-OUTERCLOTHING-reptilian.png new file mode 100644 index 0000000000..bf78a3e74a Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/syndiemedic.rsi/equipped-OUTERCLOTHING-reptilian.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/syndiemedic.rsi/equipped-OUTERCLOTHING-shark.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/syndiemedic.rsi/equipped-OUTERCLOTHING-shark.png new file mode 100644 index 0000000000..e56ac623cd Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/syndiemedic.rsi/equipped-OUTERCLOTHING-shark.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/syndiemedic.rsi/equipped-OUTERCLOTHING-tajaran.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/syndiemedic.rsi/equipped-OUTERCLOTHING-tajaran.png new file mode 100644 index 0000000000..94e9ecb1b4 Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/syndiemedic.rsi/equipped-OUTERCLOTHING-tajaran.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/syndiemedic.rsi/equipped-OUTERCLOTHING-vox.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/syndiemedic.rsi/equipped-OUTERCLOTHING-vox.png new file mode 100644 index 0000000000..9417c5547b Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/syndiemedic.rsi/equipped-OUTERCLOTHING-vox.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/syndiemedic.rsi/equipped-OUTERCLOTHING-vulpkanin.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/syndiemedic.rsi/equipped-OUTERCLOTHING-vulpkanin.png new file mode 100644 index 0000000000..41dbfecd45 Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/syndiemedic.rsi/equipped-OUTERCLOTHING-vulpkanin.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/syndiemedic.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/syndiemedic.rsi/equipped-OUTERCLOTHING.png index 2fc4a8bc9d..1ae4bd3036 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Hardsuits/syndiemedic.rsi/equipped-OUTERCLOTHING.png and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/syndiemedic.rsi/equipped-OUTERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/syndiemedic.rsi/icon.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/syndiemedic.rsi/icon.png index 8f2ed21fe5..ef1d5c5721 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Hardsuits/syndiemedic.rsi/icon.png and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/syndiemedic.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/syndiemedic.rsi/inhand-left.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/syndiemedic.rsi/inhand-left.png index 6fdf0f3318..b3240d5514 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Hardsuits/syndiemedic.rsi/inhand-left.png and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/syndiemedic.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/syndiemedic.rsi/inhand-right.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/syndiemedic.rsi/inhand-right.png index 0e6f5a83c8..4fc74ac8c5 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Hardsuits/syndiemedic.rsi/inhand-right.png and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/syndiemedic.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/syndiemedic.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Hardsuits/syndiemedic.rsi/meta.json index 88d91565d7..5636fdd120 100644 --- a/Resources/Textures/Clothing/OuterClothing/Hardsuits/syndiemedic.rsi/meta.json +++ b/Resources/Textures/Clothing/OuterClothing/Hardsuits/syndiemedic.rsi/meta.json @@ -1,30 +1,50 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Based on tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e, modified by EmoGarbage404 (github), harpy by VMSolidus", + "copyright": "Based on tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e, modified by EmoGarbage404 (github). Vox state made by Flareguy for SS14", "size": { "x": 32, "y": 32 }, - "states": [ - { - "name": "icon" - }, - { - "name": "equipped-OUTERCLOTHING", - "directions": 4 - }, - { - "name": "inhand-left", - "directions": 4 - }, - { - "name": "inhand-right", - "directions": 4 - }, - { - "name": "equipped-OUTERCLOTHING-harpy", - "directions": 4 - } - ] + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-OUTERCLOTHING", + "directions": 4 + }, + { + "name": "equipped-OUTERCLOTHING-reptilian", + "directions": 4 + }, + { + "name": "equipped-OUTERCLOTHING-shark", + "directions": 4 + }, + { + "name": "equipped-OUTERCLOTHING-tajaran", + "directions": 4 + }, + { + "name": "equipped-OUTERCLOTHING-vox", + "directions": 4 + }, + { + "name": "equipped-OUTERCLOTHING-vulpkanin", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + }, + { + "name": "equipped-OUTERCLOTHING-harpy", + "directions": 4 + } + ] } diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/wizard.rsi/equipped-OUTERCLOTHING-reptilian.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/wizard.rsi/equipped-OUTERCLOTHING-reptilian.png new file mode 100644 index 0000000000..17de51fd01 Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/wizard.rsi/equipped-OUTERCLOTHING-reptilian.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/wizard.rsi/equipped-OUTERCLOTHING-vox.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/wizard.rsi/equipped-OUTERCLOTHING-vox.png new file mode 100644 index 0000000000..d4e4ab0f53 Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/wizard.rsi/equipped-OUTERCLOTHING-vox.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/wizard.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/wizard.rsi/equipped-OUTERCLOTHING.png index 24be13e43e..fa32938570 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Hardsuits/wizard.rsi/equipped-OUTERCLOTHING.png and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/wizard.rsi/equipped-OUTERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/wizard.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Hardsuits/wizard.rsi/meta.json index e482264df5..15aef26a56 100644 --- a/Resources/Textures/Clothing/OuterClothing/Hardsuits/wizard.rsi/meta.json +++ b/Resources/Textures/Clothing/OuterClothing/Hardsuits/wizard.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e. Vox state made by Flareguy for SS14", "size": { "x": 32, "y": 32 @@ -14,6 +14,10 @@ "name": "equipped-OUTERCLOTHING", "directions": 4 }, + { + "name": "equipped-OUTERCLOTHING-vox", + "directions": 4 + }, { "name": "inhand-left", "directions": 4 diff --git a/Resources/Textures/Clothing/OuterClothing/Vests/detvest.rsi/equipped-OUTERCLOTHING-vox.png b/Resources/Textures/Clothing/OuterClothing/Vests/detvest.rsi/equipped-OUTERCLOTHING-vox.png new file mode 100644 index 0000000000..9e02aa280a Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Vests/detvest.rsi/equipped-OUTERCLOTHING-vox.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Vests/detvest.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/Vests/detvest.rsi/equipped-OUTERCLOTHING.png index 2e86e34438..085b66f501 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Vests/detvest.rsi/equipped-OUTERCLOTHING.png and b/Resources/Textures/Clothing/OuterClothing/Vests/detvest.rsi/equipped-OUTERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Vests/detvest.rsi/icon.png b/Resources/Textures/Clothing/OuterClothing/Vests/detvest.rsi/icon.png index e0de8c7ec9..fa5e1f9420 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Vests/detvest.rsi/icon.png and b/Resources/Textures/Clothing/OuterClothing/Vests/detvest.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Vests/detvest.rsi/inhand-left.png b/Resources/Textures/Clothing/OuterClothing/Vests/detvest.rsi/inhand-left.png index 457d2f0aa7..30dd5afe3f 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Vests/detvest.rsi/inhand-left.png and b/Resources/Textures/Clothing/OuterClothing/Vests/detvest.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Vests/detvest.rsi/inhand-right.png b/Resources/Textures/Clothing/OuterClothing/Vests/detvest.rsi/inhand-right.png index 46c4bf259c..26ec896bf6 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Vests/detvest.rsi/inhand-right.png and b/Resources/Textures/Clothing/OuterClothing/Vests/detvest.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Vests/detvest.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Vests/detvest.rsi/meta.json index e482264df5..175876d3d7 100644 --- a/Resources/Textures/Clothing/OuterClothing/Vests/detvest.rsi/meta.json +++ b/Resources/Textures/Clothing/OuterClothing/Vests/detvest.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/d90c7e5de6f6d94596c164da78dbc8d3cd35bb99 and modified by Flareguy", "size": { "x": 32, "y": 32 @@ -14,6 +14,10 @@ "name": "equipped-OUTERCLOTHING", "directions": 4 }, + { + "name": "equipped-OUTERCLOTHING-vox", + "directions": 4 + }, { "name": "inhand-left", "directions": 4 diff --git a/Resources/Textures/Clothing/OuterClothing/Vests/hazard.rsi/equipped-OUTERCLOTHING-vox.png b/Resources/Textures/Clothing/OuterClothing/Vests/hazard.rsi/equipped-OUTERCLOTHING-vox.png new file mode 100644 index 0000000000..6d9f6dbead Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Vests/hazard.rsi/equipped-OUTERCLOTHING-vox.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Vests/hazard.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/Vests/hazard.rsi/equipped-OUTERCLOTHING.png index 17e322a695..9474a31375 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Vests/hazard.rsi/equipped-OUTERCLOTHING.png and b/Resources/Textures/Clothing/OuterClothing/Vests/hazard.rsi/equipped-OUTERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Vests/hazard.rsi/icon.png b/Resources/Textures/Clothing/OuterClothing/Vests/hazard.rsi/icon.png index 57fe7a1def..36396bc3f0 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Vests/hazard.rsi/icon.png and b/Resources/Textures/Clothing/OuterClothing/Vests/hazard.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Vests/hazard.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Vests/hazard.rsi/meta.json index 05ec90135e..4c56c355a4 100644 --- a/Resources/Textures/Clothing/OuterClothing/Vests/hazard.rsi/meta.json +++ b/Resources/Textures/Clothing/OuterClothing/Vests/hazard.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c838ba21dae97db345e0113f99596decd1d66039", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c838ba21dae97db345e0113f99596decd1d66039. Vox state made by Flareguy for Space Station 14", "size": { "x": 32, "y": 32 @@ -14,6 +14,10 @@ "name": "equipped-OUTERCLOTHING", "directions": 4 }, + { + "name": "equipped-OUTERCLOTHING-vox", + "directions": 4 + }, { "name": "inhand-left", "directions": 4 diff --git a/Resources/Textures/Clothing/OuterClothing/Vests/vest.rsi/equipped-OUTERCLOTHING-vox.png b/Resources/Textures/Clothing/OuterClothing/Vests/vest.rsi/equipped-OUTERCLOTHING-vox.png new file mode 100644 index 0000000000..ee35c40fbd Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Vests/vest.rsi/equipped-OUTERCLOTHING-vox.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Vests/vest.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/Vests/vest.rsi/equipped-OUTERCLOTHING.png index 0ac62cbf2f..dfee2f6882 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Vests/vest.rsi/equipped-OUTERCLOTHING.png and b/Resources/Textures/Clothing/OuterClothing/Vests/vest.rsi/equipped-OUTERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Vests/vest.rsi/icon.png b/Resources/Textures/Clothing/OuterClothing/Vests/vest.rsi/icon.png index 78a44d8bc1..5a55affff8 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Vests/vest.rsi/icon.png and b/Resources/Textures/Clothing/OuterClothing/Vests/vest.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Vests/vest.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Vests/vest.rsi/meta.json index e482264df5..920eab5520 100644 --- a/Resources/Textures/Clothing/OuterClothing/Vests/vest.rsi/meta.json +++ b/Resources/Textures/Clothing/OuterClothing/Vests/vest.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e. Vox state made by Flareguy for Space Station 14", "size": { "x": 32, "y": 32 @@ -14,6 +14,10 @@ "name": "equipped-OUTERCLOTHING", "directions": 4 }, + { + "name": "equipped-OUTERCLOTHING-vox", + "directions": 4 + }, { "name": "inhand-left", "directions": 4 diff --git a/Resources/Textures/Clothing/OuterClothing/Vests/webvest.rsi/equipped-OUTERCLOTHING-vox.png b/Resources/Textures/Clothing/OuterClothing/Vests/webvest.rsi/equipped-OUTERCLOTHING-vox.png new file mode 100644 index 0000000000..17d75d29b3 Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Vests/webvest.rsi/equipped-OUTERCLOTHING-vox.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Vests/webvest.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Vests/webvest.rsi/meta.json index e482264df5..0e30ab4d3f 100644 --- a/Resources/Textures/Clothing/OuterClothing/Vests/webvest.rsi/meta.json +++ b/Resources/Textures/Clothing/OuterClothing/Vests/webvest.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e. Vox state by Flareguy for SS14", "size": { "x": 32, "y": 32 @@ -14,6 +14,10 @@ "name": "equipped-OUTERCLOTHING", "directions": 4 }, + { + "name": "equipped-OUTERCLOTHING-vox", + "directions": 4 + }, { "name": "inhand-left", "directions": 4 diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/equipped-OUTERCLOTHING-vox.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/equipped-OUTERCLOTHING-vox.png new file mode 100644 index 0000000000..440fc3375f Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/equipped-OUTERCLOTHING-vox.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/equipped-OUTERCLOTHING.png index f1892bc740..c1bef37042 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/equipped-OUTERCLOTHING.png and b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/equipped-OUTERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/icon.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/icon.png index d0c43471e9..ea0e69d4f4 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/icon.png and b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/meta.json index 7752722477..3fbc68d915 100644 --- a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/meta.json +++ b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/77cff42b6c514e73881a885036be4b4dd2949f62", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/77cff42b6c514e73881a885036be4b4dd2949f62. equipped-OUTERCLOTHING-vox state taken from /vg/station at commit https://github.com/vgstation-coders/vgstation13/commit/31d6576ba8102135d058ef49c3cb6ecbe8db8a79", "size": { "x": 32, "y": 32 @@ -14,6 +14,10 @@ "name": "equipped-OUTERCLOTHING", "directions": 4 }, + { + "name": "equipped-OUTERCLOTHING-vox", + "directions": 4 + }, { "name": "inhand-left", "directions": 4 diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatatmos.rsi/equipped-OUTERCLOTHING-12341324.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatatmos.rsi/equipped-OUTERCLOTHING-12341324.png new file mode 100644 index 0000000000..ae51ad43da Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatatmos.rsi/equipped-OUTERCLOTHING-12341324.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatatmos.rsi/equipped-OUTERCLOTHING-12341325.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatatmos.rsi/equipped-OUTERCLOTHING-12341325.png new file mode 100644 index 0000000000..88fa7daa7a Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatatmos.rsi/equipped-OUTERCLOTHING-12341325.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatatmos.rsi/equipped-OUTERCLOTHING-12341326.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatatmos.rsi/equipped-OUTERCLOTHING-12341326.png new file mode 100644 index 0000000000..4e4a1911e6 Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatatmos.rsi/equipped-OUTERCLOTHING-12341326.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatatmos.rsi/equipped-OUTERCLOTHING-12341327.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatatmos.rsi/equipped-OUTERCLOTHING-12341327.png new file mode 100644 index 0000000000..e813524516 Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatatmos.rsi/equipped-OUTERCLOTHING-12341327.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatatmos.rsi/equipped-OUTERCLOTHING-vox.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatatmos.rsi/equipped-OUTERCLOTHING-vox.png new file mode 100644 index 0000000000..1d75531317 Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatatmos.rsi/equipped-OUTERCLOTHING-vox.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatatmos.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatatmos.rsi/equipped-OUTERCLOTHING.png index ced9838dd7..0822145e3a 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatatmos.rsi/equipped-OUTERCLOTHING.png and b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatatmos.rsi/equipped-OUTERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatatmos.rsi/icon.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatatmos.rsi/icon.png index d0de463ca2..506ef8e9ff 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatatmos.rsi/icon.png and b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatatmos.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatatmos.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatatmos.rsi/meta.json index 7752722477..955dcc49fd 100644 --- a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatatmos.rsi/meta.json +++ b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatatmos.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/77cff42b6c514e73881a885036be4b4dd2949f62", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/77cff42b6c514e73881a885036be4b4dd2949f62. equipped-OUTERCLOTHING-vox state taken from /vg/station at commit https://github.com/vgstation-coders/vgstation13/commit/31d6576ba8102135d058ef49c3cb6ecbe8db8a79", "size": { "x": 32, "y": 32 @@ -14,6 +14,10 @@ "name": "equipped-OUTERCLOTHING", "directions": 4 }, + { + "name": "equipped-OUTERCLOTHING-vox", + "directions": 4 + }, { "name": "inhand-left", "directions": 4 @@ -23,4 +27,4 @@ "directions": 4 } ] -} \ No newline at end of file +} diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatbar.rsi/equipped-OUTERCLOTHING-vox.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatbar.rsi/equipped-OUTERCLOTHING-vox.png new file mode 100644 index 0000000000..092d66ea3e Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatbar.rsi/equipped-OUTERCLOTHING-vox.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatbar.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatbar.rsi/meta.json index 7863947d1c..4c644af011 100644 --- a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatbar.rsi/meta.json +++ b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatbar.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from vg at commit https://github.com/vgstation-coders/vgstation13/commit/a16e41020a93479e9a7e2af343b1b74f7f2a61bd", + "copyright": "Taken from vg at commit https://github.com/vgstation-coders/vgstation13/commit/31d6576ba8102135d058ef49c3cb6ecbe8db8a79", "size": { "x": 32, "y": 32 @@ -14,6 +14,10 @@ "name": "equipped-OUTERCLOTHING", "directions": 4 }, + { + "name": "equipped-OUTERCLOTHING-vox", + "directions": 4 + }, { "name": "inhand-left", "directions": 4 diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatcap.rsi/equipped-OUTERCLOTHING-vox.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatcap.rsi/equipped-OUTERCLOTHING-vox.png new file mode 100644 index 0000000000..0fca4396ea Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatcap.rsi/equipped-OUTERCLOTHING-vox.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatcap.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatcap.rsi/equipped-OUTERCLOTHING.png index 0b3086ac58..687810dc88 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatcap.rsi/equipped-OUTERCLOTHING.png and b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatcap.rsi/equipped-OUTERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatcap.rsi/icon.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatcap.rsi/icon.png index dd14ac0a8a..407dabf42b 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatcap.rsi/icon.png and b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatcap.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatcap.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatcap.rsi/meta.json index 46b3e631a0..86d50ff6e5 100644 --- a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatcap.rsi/meta.json +++ b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatcap.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/77cff42b6c514e73881a885036be4b4dd2949f62 , edited by Skarletto (github)", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/77cff42b6c514e73881a885036be4b4dd2949f62, edited by Skarletto (github). equipped-OUTERCLOTHING-vox state taken from /vg/station at commit https://github.com/vgstation-coders/vgstation13/commit/31d6576ba8102135d058ef49c3cb6ecbe8db8a79 and repaletted to match with the default state", "size": { "x": 32, "y": 32 @@ -14,6 +14,10 @@ "name": "equipped-OUTERCLOTHING", "directions": 4 }, + { + "name": "equipped-OUTERCLOTHING-vox", + "directions": 4 + }, { "name": "inhand-left", "directions": 4 diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatcargo.rsi/equipped-OUTERCLOTHING-vox.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatcargo.rsi/equipped-OUTERCLOTHING-vox.png new file mode 100644 index 0000000000..f4427249ec Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatcargo.rsi/equipped-OUTERCLOTHING-vox.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatcargo.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatcargo.rsi/equipped-OUTERCLOTHING.png index a4751765d5..e9a5f8b6bc 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatcargo.rsi/equipped-OUTERCLOTHING.png and b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatcargo.rsi/equipped-OUTERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatcargo.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatcargo.rsi/meta.json index 7752722477..3fbc68d915 100644 --- a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatcargo.rsi/meta.json +++ b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatcargo.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/77cff42b6c514e73881a885036be4b4dd2949f62", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/77cff42b6c514e73881a885036be4b4dd2949f62. equipped-OUTERCLOTHING-vox state taken from /vg/station at commit https://github.com/vgstation-coders/vgstation13/commit/31d6576ba8102135d058ef49c3cb6ecbe8db8a79", "size": { "x": 32, "y": 32 @@ -14,6 +14,10 @@ "name": "equipped-OUTERCLOTHING", "directions": 4 }, + { + "name": "equipped-OUTERCLOTHING-vox", + "directions": 4 + }, { "name": "inhand-left", "directions": 4 diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatce.rsi/equipped-OUTERCLOTHING-vox.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatce.rsi/equipped-OUTERCLOTHING-vox.png new file mode 100644 index 0000000000..29002eaf6b Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatce.rsi/equipped-OUTERCLOTHING-vox.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatce.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatce.rsi/equipped-OUTERCLOTHING.png index 7a7061d42e..111d332535 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatce.rsi/equipped-OUTERCLOTHING.png and b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatce.rsi/equipped-OUTERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatce.rsi/icon.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatce.rsi/icon.png index a867bb2a97..7a8f610aca 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatce.rsi/icon.png and b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatce.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatce.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatce.rsi/meta.json index 7752722477..3fbc68d915 100644 --- a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatce.rsi/meta.json +++ b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatce.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/77cff42b6c514e73881a885036be4b4dd2949f62", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/77cff42b6c514e73881a885036be4b4dd2949f62. equipped-OUTERCLOTHING-vox state taken from /vg/station at commit https://github.com/vgstation-coders/vgstation13/commit/31d6576ba8102135d058ef49c3cb6ecbe8db8a79", "size": { "x": 32, "y": 32 @@ -14,6 +14,10 @@ "name": "equipped-OUTERCLOTHING", "directions": 4 }, + { + "name": "equipped-OUTERCLOTHING-vox", + "directions": 4 + }, { "name": "inhand-left", "directions": 4 diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatcentcom.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatcentcom.rsi/equipped-OUTERCLOTHING.png index afd123b81e..0f8b26f539 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatcentcom.rsi/equipped-OUTERCLOTHING.png and b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatcentcom.rsi/equipped-OUTERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatcentcom.rsi/icon.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatcentcom.rsi/icon.png index 2993e8f19b..077ec0bdd3 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatcentcom.rsi/icon.png and b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatcentcom.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatcentcom.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatcentcom.rsi/meta.json index 7752722477..b9bb5c47d0 100644 --- a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatcentcom.rsi/meta.json +++ b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatcentcom.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/77cff42b6c514e73881a885036be4b4dd2949f62", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/46a92082e4dd599e233ebf280050fb5be0107da9", "size": { "x": 32, "y": 32 @@ -23,4 +23,4 @@ "directions": 4 } ] -} \ No newline at end of file +} diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatchem.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatchem.rsi/equipped-OUTERCLOTHING.png index 111444a42c..7b0ddc07f1 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatchem.rsi/equipped-OUTERCLOTHING.png and b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatchem.rsi/equipped-OUTERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatchem.rsi/icon.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatchem.rsi/icon.png index 65b29650ec..d4b8ec88cb 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatchem.rsi/icon.png and b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatchem.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatchem.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatchem.rsi/meta.json index 7752722477..b9bb5c47d0 100644 --- a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatchem.rsi/meta.json +++ b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatchem.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/77cff42b6c514e73881a885036be4b4dd2949f62", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/46a92082e4dd599e233ebf280050fb5be0107da9", "size": { "x": 32, "y": 32 @@ -23,4 +23,4 @@ "directions": 4 } ] -} \ No newline at end of file +} diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatclown.rsi/equipped-OUTERCLOTHING-vox.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatclown.rsi/equipped-OUTERCLOTHING-vox.png new file mode 100644 index 0000000000..781df9000b Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatclown.rsi/equipped-OUTERCLOTHING-vox.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatclown.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatclown.rsi/meta.json index 7863947d1c..4c644af011 100644 --- a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatclown.rsi/meta.json +++ b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatclown.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from vg at commit https://github.com/vgstation-coders/vgstation13/commit/a16e41020a93479e9a7e2af343b1b74f7f2a61bd", + "copyright": "Taken from vg at commit https://github.com/vgstation-coders/vgstation13/commit/31d6576ba8102135d058ef49c3cb6ecbe8db8a79", "size": { "x": 32, "y": 32 @@ -14,6 +14,10 @@ "name": "equipped-OUTERCLOTHING", "directions": 4 }, + { + "name": "equipped-OUTERCLOTHING-vox", + "directions": 4 + }, { "name": "inhand-left", "directions": 4 diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatcmo.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatcmo.rsi/equipped-OUTERCLOTHING.png index cbc9deecfd..b4cd682060 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatcmo.rsi/equipped-OUTERCLOTHING.png and b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatcmo.rsi/equipped-OUTERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatcmo.rsi/icon.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatcmo.rsi/icon.png index 22c04eddbf..097ee689d4 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatcmo.rsi/icon.png and b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatcmo.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatcmo.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatcmo.rsi/meta.json index 7752722477..b9bb5c47d0 100644 --- a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatcmo.rsi/meta.json +++ b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatcmo.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/77cff42b6c514e73881a885036be4b4dd2949f62", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/46a92082e4dd599e233ebf280050fb5be0107da9", "size": { "x": 32, "y": 32 @@ -23,4 +23,4 @@ "directions": 4 } ] -} \ No newline at end of file +} diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatengi.rsi/equipped-OUTERCLOTHING-vox.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatengi.rsi/equipped-OUTERCLOTHING-vox.png new file mode 100644 index 0000000000..015e325023 Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatengi.rsi/equipped-OUTERCLOTHING-vox.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatengi.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatengi.rsi/equipped-OUTERCLOTHING.png index d28cc36bce..dac05117e2 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatengi.rsi/equipped-OUTERCLOTHING.png and b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatengi.rsi/equipped-OUTERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatengi.rsi/icon.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatengi.rsi/icon.png index 438bbcadbb..d5dc668092 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatengi.rsi/icon.png and b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatengi.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatengi.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatengi.rsi/meta.json index 7752722477..3fbc68d915 100644 --- a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatengi.rsi/meta.json +++ b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatengi.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/77cff42b6c514e73881a885036be4b4dd2949f62", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/77cff42b6c514e73881a885036be4b4dd2949f62. equipped-OUTERCLOTHING-vox state taken from /vg/station at commit https://github.com/vgstation-coders/vgstation13/commit/31d6576ba8102135d058ef49c3cb6ecbe8db8a79", "size": { "x": 32, "y": 32 @@ -14,6 +14,10 @@ "name": "equipped-OUTERCLOTHING", "directions": 4 }, + { + "name": "equipped-OUTERCLOTHING-vox", + "directions": 4 + }, { "name": "inhand-left", "directions": 4 diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatgen.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatgen.rsi/equipped-OUTERCLOTHING.png index 1ddb961169..1e1303e45d 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatgen.rsi/equipped-OUTERCLOTHING.png and b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatgen.rsi/equipped-OUTERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatgen.rsi/icon.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatgen.rsi/icon.png index dc1dce02ce..3a49301eca 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatgen.rsi/icon.png and b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatgen.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatgen.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatgen.rsi/meta.json index 7752722477..b9bb5c47d0 100644 --- a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatgen.rsi/meta.json +++ b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatgen.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/77cff42b6c514e73881a885036be4b4dd2949f62", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/46a92082e4dd599e233ebf280050fb5be0107da9", "size": { "x": 32, "y": 32 @@ -23,4 +23,4 @@ "directions": 4 } ] -} \ No newline at end of file +} diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coathop.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coathop.rsi/equipped-OUTERCLOTHING.png index 4687286793..73967afb0a 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coathop.rsi/equipped-OUTERCLOTHING.png and b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coathop.rsi/equipped-OUTERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coathop.rsi/icon.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coathop.rsi/icon.png index bfeebc5ab8..367eb564d1 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coathop.rsi/icon.png and b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coathop.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coathop.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coathop.rsi/meta.json index 7752722477..b9bb5c47d0 100644 --- a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coathop.rsi/meta.json +++ b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coathop.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/77cff42b6c514e73881a885036be4b4dd2949f62", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/46a92082e4dd599e233ebf280050fb5be0107da9", "size": { "x": 32, "y": 32 @@ -23,4 +23,4 @@ "directions": 4 } ] -} \ No newline at end of file +} diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coathos.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coathos.rsi/equipped-OUTERCLOTHING.png index 22b8a7a1c1..8e39e4df88 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coathos.rsi/equipped-OUTERCLOTHING.png and b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coathos.rsi/equipped-OUTERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coathos.rsi/icon.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coathos.rsi/icon.png index b4b72c1784..855b6bb3e4 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coathos.rsi/icon.png and b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coathos.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coathos.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coathos.rsi/meta.json index 7752722477..cfdbe72fce 100644 --- a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coathos.rsi/meta.json +++ b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coathos.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/77cff42b6c514e73881a885036be4b4dd2949f62", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/2fea0a59470c476cf3f927833d3918d89cbe6af8", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coathosarmored.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coathosarmored.rsi/equipped-OUTERCLOTHING.png new file mode 100644 index 0000000000..d279e92da2 Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coathosarmored.rsi/equipped-OUTERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coathosarmored.rsi/icon.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coathosarmored.rsi/icon.png new file mode 100644 index 0000000000..6f7573420d Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coathosarmored.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coathosarmored.rsi/inhand-left.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coathosarmored.rsi/inhand-left.png new file mode 100644 index 0000000000..85a0b83457 Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coathosarmored.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coathosarmored.rsi/inhand-right.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coathosarmored.rsi/inhand-right.png new file mode 100644 index 0000000000..70ade34a8d Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coathosarmored.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coathosarmored.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coathosarmored.rsi/meta.json new file mode 100644 index 0000000000..4010520850 --- /dev/null +++ b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coathosarmored.rsi/meta.json @@ -0,0 +1,26 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from vg at commit https://github.com/vgstation-coders/vgstation13/commit/a16e41020a93479e9a7e2af343b1b74f7f2a61bd, recolored by Github user PursuitinAshes", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-OUTERCLOTHING", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coathydro.rsi/equipped-OUTERCLOTHING-vox.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coathydro.rsi/equipped-OUTERCLOTHING-vox.png new file mode 100644 index 0000000000..334e1e8fe8 Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coathydro.rsi/equipped-OUTERCLOTHING-vox.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coathydro.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coathydro.rsi/equipped-OUTERCLOTHING.png index e7b6ea0e77..c5ea3fd239 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coathydro.rsi/equipped-OUTERCLOTHING.png and b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coathydro.rsi/equipped-OUTERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coathydro.rsi/icon.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coathydro.rsi/icon.png index 3d19bd85b7..96b3281455 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coathydro.rsi/icon.png and b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coathydro.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coathydro.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coathydro.rsi/meta.json index 7752722477..3fbc68d915 100644 --- a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coathydro.rsi/meta.json +++ b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coathydro.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/77cff42b6c514e73881a885036be4b4dd2949f62", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/77cff42b6c514e73881a885036be4b4dd2949f62. equipped-OUTERCLOTHING-vox state taken from /vg/station at commit https://github.com/vgstation-coders/vgstation13/commit/31d6576ba8102135d058ef49c3cb6ecbe8db8a79", "size": { "x": 32, "y": 32 @@ -14,6 +14,10 @@ "name": "equipped-OUTERCLOTHING", "directions": 4 }, + { + "name": "equipped-OUTERCLOTHING-vox", + "directions": 4 + }, { "name": "inhand-left", "directions": 4 diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatjani.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatjani.rsi/equipped-OUTERCLOTHING.png index 2efa802498..788bce0c83 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatjani.rsi/equipped-OUTERCLOTHING.png and b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatjani.rsi/equipped-OUTERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatjani.rsi/icon.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatjani.rsi/icon.png index 5ee73fd113..cc65b63316 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatjani.rsi/icon.png and b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatjani.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatjani.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatjani.rsi/meta.json index 7752722477..b9bb5c47d0 100644 --- a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatjani.rsi/meta.json +++ b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatjani.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/77cff42b6c514e73881a885036be4b4dd2949f62", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/46a92082e4dd599e233ebf280050fb5be0107da9", "size": { "x": 32, "y": 32 @@ -23,4 +23,4 @@ "directions": 4 } ] -} \ No newline at end of file +} diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatmed.rsi/equipped-OUTERCLOTHING-vox.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatmed.rsi/equipped-OUTERCLOTHING-vox.png new file mode 100644 index 0000000000..7b1b9d883c Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatmed.rsi/equipped-OUTERCLOTHING-vox.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatmed.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatmed.rsi/equipped-OUTERCLOTHING.png index 9f624b8c61..1fa168b3cf 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatmed.rsi/equipped-OUTERCLOTHING.png and b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatmed.rsi/equipped-OUTERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatmed.rsi/icon.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatmed.rsi/icon.png index d4a0c976c8..a4a352d098 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatmed.rsi/icon.png and b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatmed.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatmed.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatmed.rsi/meta.json index 7752722477..3fbc68d915 100644 --- a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatmed.rsi/meta.json +++ b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatmed.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/77cff42b6c514e73881a885036be4b4dd2949f62", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/77cff42b6c514e73881a885036be4b4dd2949f62. equipped-OUTERCLOTHING-vox state taken from /vg/station at commit https://github.com/vgstation-coders/vgstation13/commit/31d6576ba8102135d058ef49c3cb6ecbe8db8a79", "size": { "x": 32, "y": 32 @@ -14,6 +14,10 @@ "name": "equipped-OUTERCLOTHING", "directions": 4 }, + { + "name": "equipped-OUTERCLOTHING-vox", + "directions": 4 + }, { "name": "inhand-left", "directions": 4 diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatmime.rsi/equipped-OUTERCLOTHING-vox.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatmime.rsi/equipped-OUTERCLOTHING-vox.png new file mode 100644 index 0000000000..f713d3c846 Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatmime.rsi/equipped-OUTERCLOTHING-vox.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatmime.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatmime.rsi/equipped-OUTERCLOTHING.png index 74bb92031c..3062975c59 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatmime.rsi/equipped-OUTERCLOTHING.png and b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatmime.rsi/equipped-OUTERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatmime.rsi/icon.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatmime.rsi/icon.png index c3e059dfd1..0d3a0e680a 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatmime.rsi/icon.png and b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatmime.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatmime.rsi/inhand-left.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatmime.rsi/inhand-left.png index 27db7d78b0..8e86495356 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatmime.rsi/inhand-left.png and b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatmime.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatmime.rsi/inhand-right.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatmime.rsi/inhand-right.png index 855b726b35..ffa0818f5b 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatmime.rsi/inhand-right.png and b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatmime.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatmime.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatmime.rsi/meta.json index 7863947d1c..4c644af011 100644 --- a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatmime.rsi/meta.json +++ b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatmime.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from vg at commit https://github.com/vgstation-coders/vgstation13/commit/a16e41020a93479e9a7e2af343b1b74f7f2a61bd", + "copyright": "Taken from vg at commit https://github.com/vgstation-coders/vgstation13/commit/31d6576ba8102135d058ef49c3cb6ecbe8db8a79", "size": { "x": 32, "y": 32 @@ -14,6 +14,10 @@ "name": "equipped-OUTERCLOTHING", "directions": 4 }, + { + "name": "equipped-OUTERCLOTHING-vox", + "directions": 4 + }, { "name": "inhand-left", "directions": 4 diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatminer.rsi/equipped-OUTERCLOTHING-vox.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatminer.rsi/equipped-OUTERCLOTHING-vox.png new file mode 100644 index 0000000000..438eced1b5 Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatminer.rsi/equipped-OUTERCLOTHING-vox.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatminer.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatminer.rsi/equipped-OUTERCLOTHING.png index c9166a8add..10b9f3bdc2 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatminer.rsi/equipped-OUTERCLOTHING.png and b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatminer.rsi/equipped-OUTERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatminer.rsi/icon.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatminer.rsi/icon.png index d1ac8ea82a..bd41206918 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatminer.rsi/icon.png and b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatminer.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatminer.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatminer.rsi/meta.json index 7752722477..3fbc68d915 100644 --- a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatminer.rsi/meta.json +++ b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatminer.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/77cff42b6c514e73881a885036be4b4dd2949f62", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/77cff42b6c514e73881a885036be4b4dd2949f62. equipped-OUTERCLOTHING-vox state taken from /vg/station at commit https://github.com/vgstation-coders/vgstation13/commit/31d6576ba8102135d058ef49c3cb6ecbe8db8a79", "size": { "x": 32, "y": 32 @@ -14,6 +14,10 @@ "name": "equipped-OUTERCLOTHING", "directions": 4 }, + { + "name": "equipped-OUTERCLOTHING-vox", + "directions": 4 + }, { "name": "inhand-left", "directions": 4 diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatparamed.rsi/equipped-OUTERCLOTHING-vox.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatparamed.rsi/equipped-OUTERCLOTHING-vox.png new file mode 100644 index 0000000000..a7ff104066 Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatparamed.rsi/equipped-OUTERCLOTHING-vox.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatparamed.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatparamed.rsi/equipped-OUTERCLOTHING.png index 231dd31f01..6b4f55fedb 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatparamed.rsi/equipped-OUTERCLOTHING.png and b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatparamed.rsi/equipped-OUTERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatparamed.rsi/icon.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatparamed.rsi/icon.png index cf00747dce..1a8a4cc50b 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatparamed.rsi/icon.png and b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatparamed.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatparamed.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatparamed.rsi/meta.json index 7752722477..3fbc68d915 100644 --- a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatparamed.rsi/meta.json +++ b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatparamed.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/77cff42b6c514e73881a885036be4b4dd2949f62", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/77cff42b6c514e73881a885036be4b4dd2949f62. equipped-OUTERCLOTHING-vox state taken from /vg/station at commit https://github.com/vgstation-coders/vgstation13/commit/31d6576ba8102135d058ef49c3cb6ecbe8db8a79", "size": { "x": 32, "y": 32 @@ -14,6 +14,10 @@ "name": "equipped-OUTERCLOTHING", "directions": 4 }, + { + "name": "equipped-OUTERCLOTHING-vox", + "directions": 4 + }, { "name": "inhand-left", "directions": 4 diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatqm.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatqm.rsi/equipped-OUTERCLOTHING.png index ef618ecc1d..56cc382923 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatqm.rsi/equipped-OUTERCLOTHING.png and b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatqm.rsi/equipped-OUTERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatqm.rsi/icon.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatqm.rsi/icon.png index 12537c8d09..0c906ae237 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatqm.rsi/icon.png and b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatqm.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatqm.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatqm.rsi/meta.json index 7752722477..b9bb5c47d0 100644 --- a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatqm.rsi/meta.json +++ b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatqm.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/77cff42b6c514e73881a885036be4b4dd2949f62", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/46a92082e4dd599e233ebf280050fb5be0107da9", "size": { "x": 32, "y": 32 @@ -23,4 +23,4 @@ "directions": 4 } ] -} \ No newline at end of file +} diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatrd.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatrd.rsi/equipped-OUTERCLOTHING.png index 2a803b480a..354bd77b7b 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatrd.rsi/equipped-OUTERCLOTHING.png and b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatrd.rsi/equipped-OUTERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatrd.rsi/icon.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatrd.rsi/icon.png index 92f99ea46d..062378ba5c 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatrd.rsi/icon.png and b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatrd.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatrd.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatrd.rsi/meta.json index 7752722477..b9bb5c47d0 100644 --- a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatrd.rsi/meta.json +++ b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatrd.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/77cff42b6c514e73881a885036be4b4dd2949f62", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/46a92082e4dd599e233ebf280050fb5be0107da9", "size": { "x": 32, "y": 32 @@ -23,4 +23,4 @@ "directions": 4 } ] -} \ No newline at end of file +} diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatrobo.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatrobo.rsi/equipped-OUTERCLOTHING.png index f7ddec5305..0ac466ee2c 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatrobo.rsi/equipped-OUTERCLOTHING.png and b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatrobo.rsi/equipped-OUTERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatrobo.rsi/icon.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatrobo.rsi/icon.png index 5ecc8c108f..7cef5a4490 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatrobo.rsi/icon.png and b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatrobo.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatrobo.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatrobo.rsi/meta.json index 7752722477..b9bb5c47d0 100644 --- a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatrobo.rsi/meta.json +++ b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatrobo.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/77cff42b6c514e73881a885036be4b4dd2949f62", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/46a92082e4dd599e233ebf280050fb5be0107da9", "size": { "x": 32, "y": 32 @@ -23,4 +23,4 @@ "directions": 4 } ] -} \ No newline at end of file +} diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatsci.rsi/equipped-OUTERCLOTHING-vox.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatsci.rsi/equipped-OUTERCLOTHING-vox.png new file mode 100644 index 0000000000..1634304d13 Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatsci.rsi/equipped-OUTERCLOTHING-vox.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatsci.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatsci.rsi/equipped-OUTERCLOTHING.png index f451197532..61bf1b5b0f 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatsci.rsi/equipped-OUTERCLOTHING.png and b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatsci.rsi/equipped-OUTERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatsci.rsi/icon.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatsci.rsi/icon.png index 075acb7eab..f155f597ce 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatsci.rsi/icon.png and b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatsci.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatsci.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatsci.rsi/meta.json index 7752722477..3fbc68d915 100644 --- a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatsci.rsi/meta.json +++ b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatsci.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/77cff42b6c514e73881a885036be4b4dd2949f62", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/77cff42b6c514e73881a885036be4b4dd2949f62. equipped-OUTERCLOTHING-vox state taken from /vg/station at commit https://github.com/vgstation-coders/vgstation13/commit/31d6576ba8102135d058ef49c3cb6ecbe8db8a79", "size": { "x": 32, "y": 32 @@ -14,6 +14,10 @@ "name": "equipped-OUTERCLOTHING", "directions": 4 }, + { + "name": "equipped-OUTERCLOTHING-vox", + "directions": 4 + }, { "name": "inhand-left", "directions": 4 diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatsec.rsi/equipped-OUTERCLOTHING-vox.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatsec.rsi/equipped-OUTERCLOTHING-vox.png new file mode 100644 index 0000000000..e67c55f114 Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatsec.rsi/equipped-OUTERCLOTHING-vox.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatsec.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatsec.rsi/equipped-OUTERCLOTHING.png index 9d201dc1ec..6a6e97b9b3 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatsec.rsi/equipped-OUTERCLOTHING.png and b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatsec.rsi/equipped-OUTERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatsec.rsi/icon.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatsec.rsi/icon.png index 00b5a10f03..deef07ea16 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatsec.rsi/icon.png and b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatsec.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatsec.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatsec.rsi/meta.json index 7752722477..3fbc68d915 100644 --- a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatsec.rsi/meta.json +++ b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatsec.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/77cff42b6c514e73881a885036be4b4dd2949f62", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/77cff42b6c514e73881a885036be4b4dd2949f62. equipped-OUTERCLOTHING-vox state taken from /vg/station at commit https://github.com/vgstation-coders/vgstation13/commit/31d6576ba8102135d058ef49c3cb6ecbe8db8a79", "size": { "x": 32, "y": 32 @@ -14,6 +14,10 @@ "name": "equipped-OUTERCLOTHING", "directions": 4 }, + { + "name": "equipped-OUTERCLOTHING-vox", + "directions": 4 + }, { "name": "inhand-left", "directions": 4 diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatviro.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatviro.rsi/equipped-OUTERCLOTHING.png index 3c5303d52c..cb1eedcf87 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatviro.rsi/equipped-OUTERCLOTHING.png and b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatviro.rsi/equipped-OUTERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatviro.rsi/icon.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatviro.rsi/icon.png index bb8bb2820b..a3bdca4be7 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatviro.rsi/icon.png and b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatviro.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatviro.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatviro.rsi/meta.json index 7752722477..b9bb5c47d0 100644 --- a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatviro.rsi/meta.json +++ b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatviro.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/77cff42b6c514e73881a885036be4b4dd2949f62", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/46a92082e4dd599e233ebf280050fb5be0107da9", "size": { "x": 32, "y": 32 @@ -23,4 +23,4 @@ "directions": 4 } ] -} \ No newline at end of file +} diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatwarden.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatwarden.rsi/equipped-OUTERCLOTHING.png index 28cf03f49c..4283f3ffeb 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatwarden.rsi/equipped-OUTERCLOTHING.png and b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatwarden.rsi/equipped-OUTERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatwarden.rsi/icon.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatwarden.rsi/icon.png index eaf984f437..b4e958b0b7 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatwarden.rsi/icon.png and b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatwarden.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatwarden.rsi/inhand-left.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatwarden.rsi/inhand-left.png index df033631e9..83e5da1b6b 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatwarden.rsi/inhand-left.png and b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatwarden.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatwarden.rsi/inhand-right.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatwarden.rsi/inhand-right.png index 77baaca885..a59a524635 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatwarden.rsi/inhand-right.png and b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatwarden.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatwarden.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatwarden.rsi/meta.json index 7863947d1c..fc3df87e91 100644 --- a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatwarden.rsi/meta.json +++ b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatwarden.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from vg at commit https://github.com/vgstation-coders/vgstation13/commit/a16e41020a93479e9a7e2af343b1b74f7f2a61bd", + "copyright": "Taken from vg at commit https://github.com/vgstation-coders/vgstation13/commit/31d6576ba8102135d058ef49c3cb6ecbe8db8a79 / https://github.com/tgstation/tgstation/commit/77cff42b6c514e73881a885036be4b4dd2949f62, recolored by Github user Dutch-VanDerLinde.", "size": { "x": 32, "y": 32 @@ -23,4 +23,4 @@ "directions": 4 } ] -} \ No newline at end of file +} diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatwardenarmored.rsi/equipped-OUTERCLOTHING-vox.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatwardenarmored.rsi/equipped-OUTERCLOTHING-vox.png new file mode 100644 index 0000000000..f6e8747d4a Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatwardenarmored.rsi/equipped-OUTERCLOTHING-vox.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatwardenarmored.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatwardenarmored.rsi/equipped-OUTERCLOTHING.png new file mode 100644 index 0000000000..890563ab43 Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatwardenarmored.rsi/equipped-OUTERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatwardenarmored.rsi/icon.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatwardenarmored.rsi/icon.png new file mode 100644 index 0000000000..b12879adfd Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatwardenarmored.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatwardenarmored.rsi/inhand-left.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatwardenarmored.rsi/inhand-left.png new file mode 100644 index 0000000000..df033631e9 Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatwardenarmored.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatwardenarmored.rsi/inhand-right.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatwardenarmored.rsi/inhand-right.png new file mode 100644 index 0000000000..77baaca885 Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatwardenarmored.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatwardenarmored.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatwardenarmored.rsi/meta.json new file mode 100644 index 0000000000..1ffb8fc6bd --- /dev/null +++ b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatwardenarmored.rsi/meta.json @@ -0,0 +1,30 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from vg at commit https://github.com/vgstation-coders/vgstation13/commit/a16e41020a93479e9a7e2af343b1b74f7f2a61bd and modified by Flareguy", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-OUTERCLOTHING", + "directions": 4 + }, + { + "name": "equipped-OUTERCLOTHING-vox", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} \ No newline at end of file diff --git a/Resources/Textures/Clothing/Shoes/Boots/combatboots.rsi/equipped-FEET-reptilian.png b/Resources/Textures/Clothing/Shoes/Boots/combatboots.rsi/equipped-FEET-reptilian.png new file mode 100644 index 0000000000..488d58f186 Binary files /dev/null and b/Resources/Textures/Clothing/Shoes/Boots/combatboots.rsi/equipped-FEET-reptilian.png differ diff --git a/Resources/Textures/Clothing/Shoes/Boots/combatboots.rsi/equipped-FEET-vox.png b/Resources/Textures/Clothing/Shoes/Boots/combatboots.rsi/equipped-FEET-vox.png new file mode 100644 index 0000000000..77af7765e5 Binary files /dev/null and b/Resources/Textures/Clothing/Shoes/Boots/combatboots.rsi/equipped-FEET-vox.png differ diff --git a/Resources/Textures/Clothing/Shoes/Boots/combatboots.rsi/meta.json b/Resources/Textures/Clothing/Shoes/Boots/combatboots.rsi/meta.json index f5bb702feb..75c13fcc2b 100644 --- a/Resources/Textures/Clothing/Shoes/Boots/combatboots.rsi/meta.json +++ b/Resources/Textures/Clothing/Shoes/Boots/combatboots.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Made by @ninruB#7795, based off tgstation's jackboots at commit https://github.com/tgstation/tgstation/commit/7e4e9d432d88981fb9bb463970c5b98ce85c0abe", + "copyright": "Made by @ninruB#7795, based off tgstation's jackboots at commit https://github.com/tgstation/tgstation/commit/7e4e9d432d88981fb9bb463970c5b98ce85c0abe. Vox state modified from jackboots.rsi by Flareguy", "size": { "x": 32, "y": 32 @@ -14,6 +14,10 @@ "name": "equipped-FEET", "directions": 4 }, + { + "name": "equipped-FEET-vox", + "directions": 4 + }, { "name": "inhand-left", "directions": 4 diff --git a/Resources/Textures/Clothing/Shoes/Boots/explorer.rsi/equipped-FEET-reptilian.png b/Resources/Textures/Clothing/Shoes/Boots/explorer.rsi/equipped-FEET-reptilian.png new file mode 100644 index 0000000000..1b47cb65f0 Binary files /dev/null and b/Resources/Textures/Clothing/Shoes/Boots/explorer.rsi/equipped-FEET-reptilian.png differ diff --git a/Resources/Textures/Clothing/Shoes/Boots/explorer.rsi/meta.json b/Resources/Textures/Clothing/Shoes/Boots/explorer.rsi/meta.json index 53fe5af64d..48a60c083e 100644 --- a/Resources/Textures/Clothing/Shoes/Boots/explorer.rsi/meta.json +++ b/Resources/Textures/Clothing/Shoes/Boots/explorer.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/6236a0ddd1bd3c4e5574eb9fdebf4d79ccad2d2f", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/6236a0ddd1bd3c4e5574eb9fdebf4d79ccad2d2f, reptilian made by kuro(388673708753027083)", "size": { "x": 32, "y": 32 @@ -14,6 +14,7 @@ "name": "equipped-FEET", "directions": 4 }, + { "name": "inhand-left", "directions": 4 diff --git a/Resources/Textures/Clothing/Shoes/Boots/jackboots.rsi/equipped-FEET-reptilian.png b/Resources/Textures/Clothing/Shoes/Boots/jackboots.rsi/equipped-FEET-reptilian.png new file mode 100644 index 0000000000..881cdffd80 Binary files /dev/null and b/Resources/Textures/Clothing/Shoes/Boots/jackboots.rsi/equipped-FEET-reptilian.png differ diff --git a/Resources/Textures/Clothing/Shoes/Boots/jackboots.rsi/equipped-FEET-vox.png b/Resources/Textures/Clothing/Shoes/Boots/jackboots.rsi/equipped-FEET-vox.png new file mode 100644 index 0000000000..73ab1326b8 Binary files /dev/null and b/Resources/Textures/Clothing/Shoes/Boots/jackboots.rsi/equipped-FEET-vox.png differ diff --git a/Resources/Textures/Clothing/Shoes/Boots/jackboots.rsi/equipped-FEET.png b/Resources/Textures/Clothing/Shoes/Boots/jackboots.rsi/equipped-FEET.png index fce29d1595..71dcffaeab 100644 Binary files a/Resources/Textures/Clothing/Shoes/Boots/jackboots.rsi/equipped-FEET.png and b/Resources/Textures/Clothing/Shoes/Boots/jackboots.rsi/equipped-FEET.png differ diff --git a/Resources/Textures/Clothing/Shoes/Boots/jackboots.rsi/icon.png b/Resources/Textures/Clothing/Shoes/Boots/jackboots.rsi/icon.png index 4ee3de12f2..3e64cb37e8 100644 Binary files a/Resources/Textures/Clothing/Shoes/Boots/jackboots.rsi/icon.png and b/Resources/Textures/Clothing/Shoes/Boots/jackboots.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Shoes/Boots/jackboots.rsi/meta.json b/Resources/Textures/Clothing/Shoes/Boots/jackboots.rsi/meta.json index 54b1191d42..1abf6951f1 100644 --- a/Resources/Textures/Clothing/Shoes/Boots/jackboots.rsi/meta.json +++ b/Resources/Textures/Clothing/Shoes/Boots/jackboots.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/7e4e9d432d88981fb9bb463970c5b98ce85c0abe", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/7e4e9d432d88981fb9bb463970c5b98ce85c0abe. equipped-FEET-vox state taken from vgstation13 at https://github.com/vgstation-coders/vgstation13/blob/31d6576ba8102135d058ef49c3cb6ecbe8db8a79/icons/mob/species/vox/shoes.dmi", "size": { "x": 32, "y": 32 @@ -14,6 +14,10 @@ "name": "equipped-FEET", "directions": 4 }, + { + "name": "equipped-FEET-vox", + "directions": 4 + }, { "name": "inhand-left", "directions": 4 diff --git a/Resources/Textures/Clothing/Shoes/Boots/laceups.rsi/equipped-FEET-reptilian.png b/Resources/Textures/Clothing/Shoes/Boots/laceups.rsi/equipped-FEET-reptilian.png new file mode 100644 index 0000000000..7c5ac81dd3 Binary files /dev/null and b/Resources/Textures/Clothing/Shoes/Boots/laceups.rsi/equipped-FEET-reptilian.png differ diff --git a/Resources/Textures/Clothing/Shoes/Boots/laceups.rsi/meta.json b/Resources/Textures/Clothing/Shoes/Boots/laceups.rsi/meta.json index c9cd5639c1..0b88f3a46d 100644 --- a/Resources/Textures/Clothing/Shoes/Boots/laceups.rsi/meta.json +++ b/Resources/Textures/Clothing/Shoes/Boots/laceups.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/d672aade35db25affc6ed5e1c7aa0b640f118d4c", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/d672aade35db25affc6ed5e1c7aa0b640f118d4c, reptilian made by kuro(388673708753027083)", "size": { "x": 32, "y": 32 @@ -14,6 +14,7 @@ "name": "equipped-FEET", "directions": 4 }, + { "name": "inhand-left", "directions": 4 diff --git a/Resources/Textures/Clothing/Shoes/Boots/magboots-advanced.rsi/equipped-FEET-reptilian.png b/Resources/Textures/Clothing/Shoes/Boots/magboots-advanced.rsi/equipped-FEET-reptilian.png new file mode 100644 index 0000000000..8023b4caeb Binary files /dev/null and b/Resources/Textures/Clothing/Shoes/Boots/magboots-advanced.rsi/equipped-FEET-reptilian.png differ diff --git a/Resources/Textures/Clothing/Shoes/Boots/magboots-advanced.rsi/equipped-FEET-vox.png b/Resources/Textures/Clothing/Shoes/Boots/magboots-advanced.rsi/equipped-FEET-vox.png new file mode 100644 index 0000000000..0d3d83cbad Binary files /dev/null and b/Resources/Textures/Clothing/Shoes/Boots/magboots-advanced.rsi/equipped-FEET-vox.png differ diff --git a/Resources/Textures/Clothing/Shoes/Boots/magboots-advanced.rsi/equipped-FEET.png b/Resources/Textures/Clothing/Shoes/Boots/magboots-advanced.rsi/equipped-FEET.png index d38680fd86..16afeda1ba 100644 Binary files a/Resources/Textures/Clothing/Shoes/Boots/magboots-advanced.rsi/equipped-FEET.png and b/Resources/Textures/Clothing/Shoes/Boots/magboots-advanced.rsi/equipped-FEET.png differ diff --git a/Resources/Textures/Clothing/Shoes/Boots/magboots-advanced.rsi/icon-on.png b/Resources/Textures/Clothing/Shoes/Boots/magboots-advanced.rsi/icon-on.png index 81c024c2da..9b0b7c706b 100644 Binary files a/Resources/Textures/Clothing/Shoes/Boots/magboots-advanced.rsi/icon-on.png and b/Resources/Textures/Clothing/Shoes/Boots/magboots-advanced.rsi/icon-on.png differ diff --git a/Resources/Textures/Clothing/Shoes/Boots/magboots-advanced.rsi/icon.png b/Resources/Textures/Clothing/Shoes/Boots/magboots-advanced.rsi/icon.png index ed83a21a61..89c3417b16 100644 Binary files a/Resources/Textures/Clothing/Shoes/Boots/magboots-advanced.rsi/icon.png and b/Resources/Textures/Clothing/Shoes/Boots/magboots-advanced.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Shoes/Boots/magboots-advanced.rsi/meta.json b/Resources/Textures/Clothing/Shoes/Boots/magboots-advanced.rsi/meta.json index 8d56bf0c2b..5b3afdcd74 100644 --- a/Resources/Textures/Clothing/Shoes/Boots/magboots-advanced.rsi/meta.json +++ b/Resources/Textures/Clothing/Shoes/Boots/magboots-advanced.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "https://github.com/tgstation/tgstation/commit/3d319f6157acc1c1cd9ebcb0f6f12641e051cf91", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/3d319f6157acc1c1cd9ebcb0f6f12641e051cf91. equipped-FEET-vox & on-equipped-FEET-vox state taken from vgstation13 at https://github.com/vgstation-coders/vgstation13/blob/31d6576ba8102135d058ef49c3cb6ecbe8db8a79/icons/mob/species/vox/shoes.dmi, and equipped-FEET-vox state modified to fix inconsistencies", "size": { "x": 32, "y": 32 @@ -15,6 +15,14 @@ "name": "on-equipped-FEET", "directions": 4 }, + { + "name": "equipped-FEET-vox", + "directions": 4 + }, + { + "name": "on-equipped-FEET-vox", + "directions": 4 + }, { "name": "icon" }, diff --git a/Resources/Textures/Clothing/Shoes/Boots/magboots-advanced.rsi/on-equipped-FEET-reptilian.png b/Resources/Textures/Clothing/Shoes/Boots/magboots-advanced.rsi/on-equipped-FEET-reptilian.png new file mode 100644 index 0000000000..fa46fdac0e Binary files /dev/null and b/Resources/Textures/Clothing/Shoes/Boots/magboots-advanced.rsi/on-equipped-FEET-reptilian.png differ diff --git a/Resources/Textures/Clothing/Shoes/Boots/magboots-advanced.rsi/on-equipped-FEET-vox.png b/Resources/Textures/Clothing/Shoes/Boots/magboots-advanced.rsi/on-equipped-FEET-vox.png new file mode 100644 index 0000000000..9c1af7f061 Binary files /dev/null and b/Resources/Textures/Clothing/Shoes/Boots/magboots-advanced.rsi/on-equipped-FEET-vox.png differ diff --git a/Resources/Textures/Clothing/Shoes/Boots/magboots-advanced.rsi/on-equipped-FEET.png b/Resources/Textures/Clothing/Shoes/Boots/magboots-advanced.rsi/on-equipped-FEET.png index 03bed4bbc9..ba9fdd9f0e 100644 Binary files a/Resources/Textures/Clothing/Shoes/Boots/magboots-advanced.rsi/on-equipped-FEET.png and b/Resources/Textures/Clothing/Shoes/Boots/magboots-advanced.rsi/on-equipped-FEET.png differ diff --git a/Resources/Textures/Clothing/Shoes/Boots/magboots-science.rsi/equipped-FEET-reptilian.png b/Resources/Textures/Clothing/Shoes/Boots/magboots-science.rsi/equipped-FEET-reptilian.png new file mode 100644 index 0000000000..03d004ae76 Binary files /dev/null and b/Resources/Textures/Clothing/Shoes/Boots/magboots-science.rsi/equipped-FEET-reptilian.png differ diff --git a/Resources/Textures/Clothing/Shoes/Boots/magboots-science.rsi/equipped-FEET-vox.png b/Resources/Textures/Clothing/Shoes/Boots/magboots-science.rsi/equipped-FEET-vox.png new file mode 100644 index 0000000000..dc22be4ac2 Binary files /dev/null and b/Resources/Textures/Clothing/Shoes/Boots/magboots-science.rsi/equipped-FEET-vox.png differ diff --git a/Resources/Textures/Clothing/Shoes/Boots/magboots-science.rsi/equipped-FEET.png b/Resources/Textures/Clothing/Shoes/Boots/magboots-science.rsi/equipped-FEET.png index d93f51bb59..ace3a5ea1d 100644 Binary files a/Resources/Textures/Clothing/Shoes/Boots/magboots-science.rsi/equipped-FEET.png and b/Resources/Textures/Clothing/Shoes/Boots/magboots-science.rsi/equipped-FEET.png differ diff --git a/Resources/Textures/Clothing/Shoes/Boots/magboots-science.rsi/icon-on.png b/Resources/Textures/Clothing/Shoes/Boots/magboots-science.rsi/icon-on.png index ac9b827a9c..162d296d59 100644 Binary files a/Resources/Textures/Clothing/Shoes/Boots/magboots-science.rsi/icon-on.png and b/Resources/Textures/Clothing/Shoes/Boots/magboots-science.rsi/icon-on.png differ diff --git a/Resources/Textures/Clothing/Shoes/Boots/magboots-science.rsi/icon.png b/Resources/Textures/Clothing/Shoes/Boots/magboots-science.rsi/icon.png index e0dc9ffb3e..f0eb5f871b 100644 Binary files a/Resources/Textures/Clothing/Shoes/Boots/magboots-science.rsi/icon.png and b/Resources/Textures/Clothing/Shoes/Boots/magboots-science.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Shoes/Boots/magboots-science.rsi/inhand-left.png b/Resources/Textures/Clothing/Shoes/Boots/magboots-science.rsi/inhand-left.png index 6bfce53798..ba823c99bf 100644 Binary files a/Resources/Textures/Clothing/Shoes/Boots/magboots-science.rsi/inhand-left.png and b/Resources/Textures/Clothing/Shoes/Boots/magboots-science.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/Shoes/Boots/magboots-science.rsi/inhand-right.png b/Resources/Textures/Clothing/Shoes/Boots/magboots-science.rsi/inhand-right.png index 257fe01411..ebf7d64d69 100644 Binary files a/Resources/Textures/Clothing/Shoes/Boots/magboots-science.rsi/inhand-right.png and b/Resources/Textures/Clothing/Shoes/Boots/magboots-science.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/Shoes/Boots/magboots-science.rsi/meta.json b/Resources/Textures/Clothing/Shoes/Boots/magboots-science.rsi/meta.json index 2880b8eec4..6b1053d8ea 100644 --- a/Resources/Textures/Clothing/Shoes/Boots/magboots-science.rsi/meta.json +++ b/Resources/Textures/Clothing/Shoes/Boots/magboots-science.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Drawn by Ubaser.", + "copyright": "Drawn by Ubaser. Vox states made by Flareguy, modified from magboots.rsi", "size": { "x": 32, "y": 32 @@ -15,6 +15,14 @@ "name": "on-equipped-FEET", "directions": 4 }, + { + "name": "equipped-FEET-vox", + "directions": 4 + }, + { + "name": "on-equipped-FEET-vox", + "directions": 4 + }, { "name": "icon" }, diff --git a/Resources/Textures/Clothing/Shoes/Boots/magboots-science.rsi/on-equipped-FEET-reptilian.png b/Resources/Textures/Clothing/Shoes/Boots/magboots-science.rsi/on-equipped-FEET-reptilian.png new file mode 100644 index 0000000000..dadd841efc Binary files /dev/null and b/Resources/Textures/Clothing/Shoes/Boots/magboots-science.rsi/on-equipped-FEET-reptilian.png differ diff --git a/Resources/Textures/Clothing/Shoes/Boots/magboots-science.rsi/on-equipped-FEET-vox.png b/Resources/Textures/Clothing/Shoes/Boots/magboots-science.rsi/on-equipped-FEET-vox.png new file mode 100644 index 0000000000..04605be106 Binary files /dev/null and b/Resources/Textures/Clothing/Shoes/Boots/magboots-science.rsi/on-equipped-FEET-vox.png differ diff --git a/Resources/Textures/Clothing/Shoes/Boots/magboots-science.rsi/on-equipped-FEET.png b/Resources/Textures/Clothing/Shoes/Boots/magboots-science.rsi/on-equipped-FEET.png index fb64b8b361..a659e730a1 100644 Binary files a/Resources/Textures/Clothing/Shoes/Boots/magboots-science.rsi/on-equipped-FEET.png and b/Resources/Textures/Clothing/Shoes/Boots/magboots-science.rsi/on-equipped-FEET.png differ diff --git a/Resources/Textures/Clothing/Shoes/Boots/magboots-science.rsi/on-inhand-left.png b/Resources/Textures/Clothing/Shoes/Boots/magboots-science.rsi/on-inhand-left.png index 16c9ed4a7f..4998fce5fd 100644 Binary files a/Resources/Textures/Clothing/Shoes/Boots/magboots-science.rsi/on-inhand-left.png and b/Resources/Textures/Clothing/Shoes/Boots/magboots-science.rsi/on-inhand-left.png differ diff --git a/Resources/Textures/Clothing/Shoes/Boots/magboots-science.rsi/on-inhand-right.png b/Resources/Textures/Clothing/Shoes/Boots/magboots-science.rsi/on-inhand-right.png index 5f8ef8d6b0..1f9087cb27 100644 Binary files a/Resources/Textures/Clothing/Shoes/Boots/magboots-science.rsi/on-inhand-right.png and b/Resources/Textures/Clothing/Shoes/Boots/magboots-science.rsi/on-inhand-right.png differ diff --git a/Resources/Textures/Clothing/Shoes/Boots/magboots-syndicate.rsi/equipped-FEET-reptilian.png b/Resources/Textures/Clothing/Shoes/Boots/magboots-syndicate.rsi/equipped-FEET-reptilian.png new file mode 100644 index 0000000000..710685c250 Binary files /dev/null and b/Resources/Textures/Clothing/Shoes/Boots/magboots-syndicate.rsi/equipped-FEET-reptilian.png differ diff --git a/Resources/Textures/Clothing/Shoes/Boots/magboots-syndicate.rsi/equipped-FEET-vox.png b/Resources/Textures/Clothing/Shoes/Boots/magboots-syndicate.rsi/equipped-FEET-vox.png new file mode 100644 index 0000000000..ff7074dbe3 Binary files /dev/null and b/Resources/Textures/Clothing/Shoes/Boots/magboots-syndicate.rsi/equipped-FEET-vox.png differ diff --git a/Resources/Textures/Clothing/Shoes/Boots/magboots-syndicate.rsi/equipped-FEET.png b/Resources/Textures/Clothing/Shoes/Boots/magboots-syndicate.rsi/equipped-FEET.png index f83edfab43..46c3c07f2a 100644 Binary files a/Resources/Textures/Clothing/Shoes/Boots/magboots-syndicate.rsi/equipped-FEET.png and b/Resources/Textures/Clothing/Shoes/Boots/magboots-syndicate.rsi/equipped-FEET.png differ diff --git a/Resources/Textures/Clothing/Shoes/Boots/magboots-syndicate.rsi/icon-on-i.png b/Resources/Textures/Clothing/Shoes/Boots/magboots-syndicate.rsi/icon-on-i.png new file mode 100644 index 0000000000..8ac7d47e22 Binary files /dev/null and b/Resources/Textures/Clothing/Shoes/Boots/magboots-syndicate.rsi/icon-on-i.png differ diff --git a/Resources/Textures/Clothing/Shoes/Boots/magboots-syndicate.rsi/icon-on.png b/Resources/Textures/Clothing/Shoes/Boots/magboots-syndicate.rsi/icon-on.png index 68fd67a438..8ac7d47e22 100644 Binary files a/Resources/Textures/Clothing/Shoes/Boots/magboots-syndicate.rsi/icon-on.png and b/Resources/Textures/Clothing/Shoes/Boots/magboots-syndicate.rsi/icon-on.png differ diff --git a/Resources/Textures/Clothing/Shoes/Boots/magboots-syndicate.rsi/icon.png b/Resources/Textures/Clothing/Shoes/Boots/magboots-syndicate.rsi/icon.png index ef258167a2..d32bae80d9 100644 Binary files a/Resources/Textures/Clothing/Shoes/Boots/magboots-syndicate.rsi/icon.png and b/Resources/Textures/Clothing/Shoes/Boots/magboots-syndicate.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Shoes/Boots/magboots-syndicate.rsi/meta.json b/Resources/Textures/Clothing/Shoes/Boots/magboots-syndicate.rsi/meta.json index ead74d8896..ae71606af3 100644 --- a/Resources/Textures/Clothing/Shoes/Boots/magboots-syndicate.rsi/meta.json +++ b/Resources/Textures/Clothing/Shoes/Boots/magboots-syndicate.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/debf90acfcafa4fb8d6723a37e0b8ac556c0702b", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/debf90acfcafa4fb8d6723a37e0b8ac556c0702b. equipped-FEET-vox & on-equipped-FEET-vox state taken from vgstation13 at https://github.com/vgstation-coders/vgstation13/blob/31d6576ba8102135d058ef49c3cb6ecbe8db8a79/icons/mob/species/vox/shoes.dmi, and equipped-FEET-vox state modified to fix inconsistencies", "size": { "x": 32, "y": 32 @@ -15,6 +15,14 @@ "name": "on-equipped-FEET", "directions": 4 }, + { + "name": "equipped-FEET-vox", + "directions": 4 + }, + { + "name": "on-equipped-FEET-vox", + "directions": 4 + }, { "name": "icon" }, diff --git a/Resources/Textures/Clothing/Shoes/Boots/magboots-syndicate.rsi/on-equipped-FEET-reptilian.png b/Resources/Textures/Clothing/Shoes/Boots/magboots-syndicate.rsi/on-equipped-FEET-reptilian.png new file mode 100644 index 0000000000..3a7fa01664 Binary files /dev/null and b/Resources/Textures/Clothing/Shoes/Boots/magboots-syndicate.rsi/on-equipped-FEET-reptilian.png differ diff --git a/Resources/Textures/Clothing/Shoes/Boots/magboots-syndicate.rsi/on-equipped-FEET-vox.png b/Resources/Textures/Clothing/Shoes/Boots/magboots-syndicate.rsi/on-equipped-FEET-vox.png new file mode 100644 index 0000000000..c14f707834 Binary files /dev/null and b/Resources/Textures/Clothing/Shoes/Boots/magboots-syndicate.rsi/on-equipped-FEET-vox.png differ diff --git a/Resources/Textures/Clothing/Shoes/Boots/magboots-syndicate.rsi/on-equipped-FEET.png b/Resources/Textures/Clothing/Shoes/Boots/magboots-syndicate.rsi/on-equipped-FEET.png index 569eda8481..cb52d744c4 100644 Binary files a/Resources/Textures/Clothing/Shoes/Boots/magboots-syndicate.rsi/on-equipped-FEET.png and b/Resources/Textures/Clothing/Shoes/Boots/magboots-syndicate.rsi/on-equipped-FEET.png differ diff --git a/Resources/Textures/Clothing/Shoes/Boots/magboots.rsi/equipped-FEET-reptilian.png b/Resources/Textures/Clothing/Shoes/Boots/magboots.rsi/equipped-FEET-reptilian.png new file mode 100644 index 0000000000..4d6abd4fbc Binary files /dev/null and b/Resources/Textures/Clothing/Shoes/Boots/magboots.rsi/equipped-FEET-reptilian.png differ diff --git a/Resources/Textures/Clothing/Shoes/Boots/magboots.rsi/equipped-FEET-vox.png b/Resources/Textures/Clothing/Shoes/Boots/magboots.rsi/equipped-FEET-vox.png new file mode 100644 index 0000000000..66083b253d Binary files /dev/null and b/Resources/Textures/Clothing/Shoes/Boots/magboots.rsi/equipped-FEET-vox.png differ diff --git a/Resources/Textures/Clothing/Shoes/Boots/magboots.rsi/equipped-FEET.png b/Resources/Textures/Clothing/Shoes/Boots/magboots.rsi/equipped-FEET.png index 46b1be28c9..b72bb89dab 100644 Binary files a/Resources/Textures/Clothing/Shoes/Boots/magboots.rsi/equipped-FEET.png and b/Resources/Textures/Clothing/Shoes/Boots/magboots.rsi/equipped-FEET.png differ diff --git a/Resources/Textures/Clothing/Shoes/Boots/magboots.rsi/icon-on.png b/Resources/Textures/Clothing/Shoes/Boots/magboots.rsi/icon-on.png index 6a94a728a6..3b1b9b1875 100644 Binary files a/Resources/Textures/Clothing/Shoes/Boots/magboots.rsi/icon-on.png and b/Resources/Textures/Clothing/Shoes/Boots/magboots.rsi/icon-on.png differ diff --git a/Resources/Textures/Clothing/Shoes/Boots/magboots.rsi/icon.png b/Resources/Textures/Clothing/Shoes/Boots/magboots.rsi/icon.png index 31ec6b6e46..a489f65b73 100644 Binary files a/Resources/Textures/Clothing/Shoes/Boots/magboots.rsi/icon.png and b/Resources/Textures/Clothing/Shoes/Boots/magboots.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Shoes/Boots/magboots.rsi/meta.json b/Resources/Textures/Clothing/Shoes/Boots/magboots.rsi/meta.json index 96b3f4109e..f2aa6dbc5b 100644 --- a/Resources/Textures/Clothing/Shoes/Boots/magboots.rsi/meta.json +++ b/Resources/Textures/Clothing/Shoes/Boots/magboots.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/7e4e9d432d88981fb9bb463970c5b98ce85c0abe", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/7e4e9d432d88981fb9bb463970c5b98ce85c0abe. equipped-FEET-vox & on-equipped-FEET-vox state taken from vgstation13 at https://github.com/vgstation-coders/vgstation13/blob/31d6576ba8102135d058ef49c3cb6ecbe8db8a79/icons/mob/species/vox/shoes.dmi, and equipped-FEET-vox state modified to fix inconsistencies", "size": { "x": 32, "y": 32 @@ -15,6 +15,14 @@ "name": "on-equipped-FEET", "directions": 4 }, + { + "name": "equipped-FEET-vox", + "directions": 4 + }, + { + "name": "on-equipped-FEET-vox", + "directions": 4 + }, { "name": "icon" }, diff --git a/Resources/Textures/Clothing/Shoes/Boots/magboots.rsi/on-equipped-FEET-reptilian.png b/Resources/Textures/Clothing/Shoes/Boots/magboots.rsi/on-equipped-FEET-reptilian.png new file mode 100644 index 0000000000..5be3860724 Binary files /dev/null and b/Resources/Textures/Clothing/Shoes/Boots/magboots.rsi/on-equipped-FEET-reptilian.png differ diff --git a/Resources/Textures/Clothing/Shoes/Boots/magboots.rsi/on-equipped-FEET-vox.png b/Resources/Textures/Clothing/Shoes/Boots/magboots.rsi/on-equipped-FEET-vox.png new file mode 100644 index 0000000000..e9d3dffc76 Binary files /dev/null and b/Resources/Textures/Clothing/Shoes/Boots/magboots.rsi/on-equipped-FEET-vox.png differ diff --git a/Resources/Textures/Clothing/Shoes/Boots/magboots.rsi/on-equipped-FEET.png b/Resources/Textures/Clothing/Shoes/Boots/magboots.rsi/on-equipped-FEET.png index cdc6751941..9ca69a7258 100644 Binary files a/Resources/Textures/Clothing/Shoes/Boots/magboots.rsi/on-equipped-FEET.png and b/Resources/Textures/Clothing/Shoes/Boots/magboots.rsi/on-equipped-FEET.png differ diff --git a/Resources/Textures/Clothing/Shoes/Boots/mercboots.rsi/equipped-FEET-reptilian.png b/Resources/Textures/Clothing/Shoes/Boots/mercboots.rsi/equipped-FEET-reptilian.png new file mode 100644 index 0000000000..659e9d1593 Binary files /dev/null and b/Resources/Textures/Clothing/Shoes/Boots/mercboots.rsi/equipped-FEET-reptilian.png differ diff --git a/Resources/Textures/Clothing/Shoes/Boots/mercboots.rsi/meta.json b/Resources/Textures/Clothing/Shoes/Boots/mercboots.rsi/meta.json index f9a7088d3f..ec148c6f2b 100644 --- a/Resources/Textures/Clothing/Shoes/Boots/mercboots.rsi/meta.json +++ b/Resources/Textures/Clothing/Shoes/Boots/mercboots.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "modified sprite from Jackal298 based on the sprite from tgstation at commit https://github.com/tgstation/tgstation/commit/7e4e9d432d88981fb9bb463970c5b98ce85c0abe", + "copyright": "modified sprite from Jackal298 based on the sprite from tgstation at commit https://github.com/tgstation/tgstation/commit/7e4e9d432d88981fb9bb463970c5b98ce85c0abe, reptilian made by kuro(388673708753027083)", "size": { "x": 32, "y": 32 @@ -14,6 +14,7 @@ "name": "equipped-FEET", "directions": 4 }, + { "name": "inhand-left", "directions": 4 diff --git a/Resources/Textures/Clothing/Shoes/Boots/moonboots.rsi/equipped-FEET-vox.png b/Resources/Textures/Clothing/Shoes/Boots/moonboots.rsi/equipped-FEET-vox.png new file mode 100644 index 0000000000..a65deca760 Binary files /dev/null and b/Resources/Textures/Clothing/Shoes/Boots/moonboots.rsi/equipped-FEET-vox.png differ diff --git a/Resources/Textures/Clothing/Shoes/Boots/moonboots.rsi/equipped-FEET.png b/Resources/Textures/Clothing/Shoes/Boots/moonboots.rsi/equipped-FEET.png new file mode 100644 index 0000000000..2b4cdf400d Binary files /dev/null and b/Resources/Textures/Clothing/Shoes/Boots/moonboots.rsi/equipped-FEET.png differ diff --git a/Resources/Textures/Clothing/Shoes/Boots/moonboots.rsi/icon.png b/Resources/Textures/Clothing/Shoes/Boots/moonboots.rsi/icon.png new file mode 100644 index 0000000000..04f662d6d3 Binary files /dev/null and b/Resources/Textures/Clothing/Shoes/Boots/moonboots.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Shoes/Boots/moonboots.rsi/inhand-left.png b/Resources/Textures/Clothing/Shoes/Boots/moonboots.rsi/inhand-left.png new file mode 100644 index 0000000000..03bdacf9fb Binary files /dev/null and b/Resources/Textures/Clothing/Shoes/Boots/moonboots.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/Shoes/Boots/moonboots.rsi/inhand-right.png b/Resources/Textures/Clothing/Shoes/Boots/moonboots.rsi/inhand-right.png new file mode 100644 index 0000000000..f00d861ca5 Binary files /dev/null and b/Resources/Textures/Clothing/Shoes/Boots/moonboots.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/Shoes/Boots/moonboots.rsi/meta.json b/Resources/Textures/Clothing/Shoes/Boots/moonboots.rsi/meta.json new file mode 100644 index 0000000000..2c2d49e031 --- /dev/null +++ b/Resources/Textures/Clothing/Shoes/Boots/moonboots.rsi/meta.json @@ -0,0 +1,30 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from Tau Ceti Station at commit https://github.com/TauCetiStation/TauCetiClassic/blob/HEAD/icons/obj/clothing/shoes.dmi", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-FEET", + "directions": 4 + }, + { + "name": "equipped-FEET-vox", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/Clothing/Shoes/Boots/performer.rsi/equipped-FEET-reptilian.png b/Resources/Textures/Clothing/Shoes/Boots/performer.rsi/equipped-FEET-reptilian.png new file mode 100644 index 0000000000..f0282a65a4 Binary files /dev/null and b/Resources/Textures/Clothing/Shoes/Boots/performer.rsi/equipped-FEET-reptilian.png differ diff --git a/Resources/Textures/Clothing/Shoes/Boots/performer.rsi/meta.json b/Resources/Textures/Clothing/Shoes/Boots/performer.rsi/meta.json index 9f2d1bef54..a664e6f01f 100644 --- a/Resources/Textures/Clothing/Shoes/Boots/performer.rsi/meta.json +++ b/Resources/Textures/Clothing/Shoes/Boots/performer.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-NC-3.0", - "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/commit/40d89d11ea4a5cb81d61dc1018b46f4e7d32c62a. This sprite features an adaptation of Hatsune Miku, © Crypton Future Media, Inc. 2007, licensed under a CC BY-NC: https://creativecommons.org/licenses/by-nc/3.0/", + "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/commit/40d89d11ea4a5cb81d61dc1018b46f4e7d32c62a. This sprite features an adaptation of Hatsune Miku, © Crypton Future Media, Inc. 2007, licensed under a CC BY-NC: https://creativecommons.org/licenses/by-nc/3.0/, reptilian made by kuro(388673708753027083)", "size": { "x": 32, "y": 32 @@ -13,6 +13,10 @@ { "name": "equipped-FEET", "directions": 4 + }, + { + "name": "equipped-FEET-reptilian", + "directions": 4 } ] } diff --git a/Resources/Textures/Clothing/Shoes/Boots/speedboots.rsi/equipped-FEET-vox.png b/Resources/Textures/Clothing/Shoes/Boots/speedboots.rsi/equipped-FEET-vox.png new file mode 100644 index 0000000000..ff5c3a0589 Binary files /dev/null and b/Resources/Textures/Clothing/Shoes/Boots/speedboots.rsi/equipped-FEET-vox.png differ diff --git a/Resources/Textures/Clothing/Shoes/Boots/speedboots.rsi/meta.json b/Resources/Textures/Clothing/Shoes/Boots/speedboots.rsi/meta.json index 3aa61e31c5..7c3599192c 100644 --- a/Resources/Textures/Clothing/Shoes/Boots/speedboots.rsi/meta.json +++ b/Resources/Textures/Clothing/Shoes/Boots/speedboots.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC0-1.0", - "copyright": "Created by EmoGarbage404", + "copyright": "Created by EmoGarbage404. Vox states made by Flareguy, modified from magboots.rsi", "size": { "x": 32, "y": 32 @@ -15,6 +15,14 @@ "name": "on-equipped-FEET", "directions": 4 }, + { + "name": "equipped-FEET-vox", + "directions": 4 + }, + { + "name": "on-equipped-FEET-vox", + "directions": 4 + }, { "name": "icon" }, diff --git a/Resources/Textures/Clothing/Shoes/Boots/speedboots.rsi/on-equipped-FEET-vox.png b/Resources/Textures/Clothing/Shoes/Boots/speedboots.rsi/on-equipped-FEET-vox.png new file mode 100644 index 0000000000..66ae1ee7e8 Binary files /dev/null and b/Resources/Textures/Clothing/Shoes/Boots/speedboots.rsi/on-equipped-FEET-vox.png differ diff --git a/Resources/Textures/Clothing/Shoes/Boots/workboots.rsi/equipped-FEET-reptilian.png b/Resources/Textures/Clothing/Shoes/Boots/workboots.rsi/equipped-FEET-reptilian.png new file mode 100644 index 0000000000..f5a2082efd Binary files /dev/null and b/Resources/Textures/Clothing/Shoes/Boots/workboots.rsi/equipped-FEET-reptilian.png differ diff --git a/Resources/Textures/Clothing/Shoes/Boots/workboots.rsi/equipped-FEET.png b/Resources/Textures/Clothing/Shoes/Boots/workboots.rsi/equipped-FEET.png index a94840421a..80cca57bef 100644 Binary files a/Resources/Textures/Clothing/Shoes/Boots/workboots.rsi/equipped-FEET.png and b/Resources/Textures/Clothing/Shoes/Boots/workboots.rsi/equipped-FEET.png differ diff --git a/Resources/Textures/Clothing/Shoes/Boots/workboots.rsi/icon.png b/Resources/Textures/Clothing/Shoes/Boots/workboots.rsi/icon.png index d0337e0323..04a64ba539 100644 Binary files a/Resources/Textures/Clothing/Shoes/Boots/workboots.rsi/icon.png and b/Resources/Textures/Clothing/Shoes/Boots/workboots.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Shoes/Boots/workboots.rsi/meta.json b/Resources/Textures/Clothing/Shoes/Boots/workboots.rsi/meta.json index 54b1191d42..b124ed3ddc 100644 --- a/Resources/Textures/Clothing/Shoes/Boots/workboots.rsi/meta.json +++ b/Resources/Textures/Clothing/Shoes/Boots/workboots.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/7e4e9d432d88981fb9bb463970c5b98ce85c0abe", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/2fea0a59470c476cf3f927833d3918d89cbe6af8, reptilian made by kuro(388673708753027083)", "size": { "x": 32, "y": 32 @@ -14,6 +14,7 @@ "name": "equipped-FEET", "directions": 4 }, + { "name": "inhand-left", "directions": 4 diff --git a/Resources/Textures/Clothing/Shoes/Misc/damedaneshoes.rsi/equipped-FEET-reptilian.png b/Resources/Textures/Clothing/Shoes/Misc/damedaneshoes.rsi/equipped-FEET-reptilian.png new file mode 100644 index 0000000000..9e1049cf81 Binary files /dev/null and b/Resources/Textures/Clothing/Shoes/Misc/damedaneshoes.rsi/equipped-FEET-reptilian.png differ diff --git a/Resources/Textures/Clothing/Shoes/Misc/damedaneshoes.rsi/meta.json b/Resources/Textures/Clothing/Shoes/Misc/damedaneshoes.rsi/meta.json index b5ea733f55..da110fcf27 100644 --- a/Resources/Textures/Clothing/Shoes/Misc/damedaneshoes.rsi/meta.json +++ b/Resources/Textures/Clothing/Shoes/Misc/damedaneshoes.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Made by Alekshhh (Github) for SS14, inspired by Kazuma Kiryu outfit", + "copyright": "Made by Alekshhh (Github) for SS14, inspired by Kazuma Kiryu outfit, reptilian made by kuro(388673708753027083)", "size": { "x": 32, "y": 32 @@ -14,6 +14,7 @@ "name": "equipped-FEET", "directions": 4 }, + { "name": "inhand-left", "directions": 4 diff --git a/Resources/Textures/Clothing/Shoes/Misc/duck-slippers.rsi/equipped-FEET-reptilian.png b/Resources/Textures/Clothing/Shoes/Misc/duck-slippers.rsi/equipped-FEET-reptilian.png new file mode 100644 index 0000000000..d177a998f0 Binary files /dev/null and b/Resources/Textures/Clothing/Shoes/Misc/duck-slippers.rsi/equipped-FEET-reptilian.png differ diff --git a/Resources/Textures/Clothing/Shoes/Misc/duck-slippers.rsi/meta.json b/Resources/Textures/Clothing/Shoes/Misc/duck-slippers.rsi/meta.json index e3bd2c38ec..38aa403032 100644 --- a/Resources/Textures/Clothing/Shoes/Misc/duck-slippers.rsi/meta.json +++ b/Resources/Textures/Clothing/Shoes/Misc/duck-slippers.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from ParadiseSS13 at commit https://github.com/ParadiseSS13/Paradise/commit/de795c4e312980d6f239375a9fa589cd57151599", + "copyright": "Taken from ParadiseSS13 at commit https://github.com/ParadiseSS13/Paradise/commit/de795c4e312980d6f239375a9fa589cd57151599, reptilian made by kuro(388673708753027083)", "size": { "x": 32, "y": 32 @@ -14,6 +14,7 @@ "name": "equipped-FEET", "directions": 4 }, + { "name": "inhand-left", "directions": 4 diff --git a/Resources/Textures/Clothing/Shoes/Misc/flippers.rsi/equipped-FEET-reptilian.png b/Resources/Textures/Clothing/Shoes/Misc/flippers.rsi/equipped-FEET-reptilian.png new file mode 100644 index 0000000000..854d6baa16 Binary files /dev/null and b/Resources/Textures/Clothing/Shoes/Misc/flippers.rsi/equipped-FEET-reptilian.png differ diff --git a/Resources/Textures/Clothing/Shoes/Misc/flippers.rsi/meta.json b/Resources/Textures/Clothing/Shoes/Misc/flippers.rsi/meta.json index 54b1191d42..f312354f38 100644 --- a/Resources/Textures/Clothing/Shoes/Misc/flippers.rsi/meta.json +++ b/Resources/Textures/Clothing/Shoes/Misc/flippers.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/7e4e9d432d88981fb9bb463970c5b98ce85c0abe", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/7e4e9d432d88981fb9bb463970c5b98ce85c0abe, reptilian made by kuro(388673708753027083)", "size": { "x": 32, "y": 32 @@ -14,6 +14,7 @@ "name": "equipped-FEET", "directions": 4 }, + { "name": "inhand-left", "directions": 4 diff --git a/Resources/Textures/Clothing/Shoes/Misc/leather.rsi/equipped-FEET-reptilian.png b/Resources/Textures/Clothing/Shoes/Misc/leather.rsi/equipped-FEET-reptilian.png new file mode 100644 index 0000000000..93d4ad4826 Binary files /dev/null and b/Resources/Textures/Clothing/Shoes/Misc/leather.rsi/equipped-FEET-reptilian.png differ diff --git a/Resources/Textures/Clothing/Shoes/Misc/leather.rsi/meta.json b/Resources/Textures/Clothing/Shoes/Misc/leather.rsi/meta.json index 54b1191d42..f312354f38 100644 --- a/Resources/Textures/Clothing/Shoes/Misc/leather.rsi/meta.json +++ b/Resources/Textures/Clothing/Shoes/Misc/leather.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/7e4e9d432d88981fb9bb463970c5b98ce85c0abe", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/7e4e9d432d88981fb9bb463970c5b98ce85c0abe, reptilian made by kuro(388673708753027083)", "size": { "x": 32, "y": 32 @@ -14,6 +14,7 @@ "name": "equipped-FEET", "directions": 4 }, + { "name": "inhand-left", "directions": 4 diff --git a/Resources/Textures/Clothing/Shoes/Misc/slippers.rsi/equipped-FEET-reptilian.png b/Resources/Textures/Clothing/Shoes/Misc/slippers.rsi/equipped-FEET-reptilian.png new file mode 100644 index 0000000000..8c15a41b57 Binary files /dev/null and b/Resources/Textures/Clothing/Shoes/Misc/slippers.rsi/equipped-FEET-reptilian.png differ diff --git a/Resources/Textures/Clothing/Shoes/Misc/slippers.rsi/equipped-FEET-vox.png b/Resources/Textures/Clothing/Shoes/Misc/slippers.rsi/equipped-FEET-vox.png new file mode 100644 index 0000000000..02a752334b Binary files /dev/null and b/Resources/Textures/Clothing/Shoes/Misc/slippers.rsi/equipped-FEET-vox.png differ diff --git a/Resources/Textures/Clothing/Shoes/Misc/slippers.rsi/meta.json b/Resources/Textures/Clothing/Shoes/Misc/slippers.rsi/meta.json index 54b1191d42..1abf6951f1 100644 --- a/Resources/Textures/Clothing/Shoes/Misc/slippers.rsi/meta.json +++ b/Resources/Textures/Clothing/Shoes/Misc/slippers.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/7e4e9d432d88981fb9bb463970c5b98ce85c0abe", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/7e4e9d432d88981fb9bb463970c5b98ce85c0abe. equipped-FEET-vox state taken from vgstation13 at https://github.com/vgstation-coders/vgstation13/blob/31d6576ba8102135d058ef49c3cb6ecbe8db8a79/icons/mob/species/vox/shoes.dmi", "size": { "x": 32, "y": 32 @@ -14,6 +14,10 @@ "name": "equipped-FEET", "directions": 4 }, + { + "name": "equipped-FEET-vox", + "directions": 4 + }, { "name": "inhand-left", "directions": 4 diff --git a/Resources/Textures/Clothing/Shoes/Misc/tourist.rsi/equipped-FEET-reptilian.png b/Resources/Textures/Clothing/Shoes/Misc/tourist.rsi/equipped-FEET-reptilian.png new file mode 100644 index 0000000000..9c1fd2efe3 Binary files /dev/null and b/Resources/Textures/Clothing/Shoes/Misc/tourist.rsi/equipped-FEET-reptilian.png differ diff --git a/Resources/Textures/Clothing/Shoes/Misc/tourist.rsi/equipped-FEET-vox.png b/Resources/Textures/Clothing/Shoes/Misc/tourist.rsi/equipped-FEET-vox.png new file mode 100644 index 0000000000..a738307297 Binary files /dev/null and b/Resources/Textures/Clothing/Shoes/Misc/tourist.rsi/equipped-FEET-vox.png differ diff --git a/Resources/Textures/Clothing/Shoes/Misc/tourist.rsi/equipped-FEET.png b/Resources/Textures/Clothing/Shoes/Misc/tourist.rsi/equipped-FEET.png index 7f2f880a73..8ee80171a7 100644 Binary files a/Resources/Textures/Clothing/Shoes/Misc/tourist.rsi/equipped-FEET.png and b/Resources/Textures/Clothing/Shoes/Misc/tourist.rsi/equipped-FEET.png differ diff --git a/Resources/Textures/Clothing/Shoes/Misc/tourist.rsi/meta.json b/Resources/Textures/Clothing/Shoes/Misc/tourist.rsi/meta.json index 54b1191d42..1abf6951f1 100644 --- a/Resources/Textures/Clothing/Shoes/Misc/tourist.rsi/meta.json +++ b/Resources/Textures/Clothing/Shoes/Misc/tourist.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/7e4e9d432d88981fb9bb463970c5b98ce85c0abe", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/7e4e9d432d88981fb9bb463970c5b98ce85c0abe. equipped-FEET-vox state taken from vgstation13 at https://github.com/vgstation-coders/vgstation13/blob/31d6576ba8102135d058ef49c3cb6ecbe8db8a79/icons/mob/species/vox/shoes.dmi", "size": { "x": 32, "y": 32 @@ -14,6 +14,10 @@ "name": "equipped-FEET", "directions": 4 }, + { + "name": "equipped-FEET-vox", + "directions": 4 + }, { "name": "inhand-left", "directions": 4 diff --git a/Resources/Textures/Clothing/Shoes/Specific/bling.rsi/equipped-FEET-reptilian.png b/Resources/Textures/Clothing/Shoes/Specific/bling.rsi/equipped-FEET-reptilian.png new file mode 100644 index 0000000000..fdd0b43ae9 Binary files /dev/null and b/Resources/Textures/Clothing/Shoes/Specific/bling.rsi/equipped-FEET-reptilian.png differ diff --git a/Resources/Textures/Clothing/Shoes/Specific/bling.rsi/meta.json b/Resources/Textures/Clothing/Shoes/Specific/bling.rsi/meta.json index 56e6395348..eea8d54f5f 100644 --- a/Resources/Textures/Clothing/Shoes/Specific/bling.rsi/meta.json +++ b/Resources/Textures/Clothing/Shoes/Specific/bling.rsi/meta.json @@ -2,7 +2,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/7e4e9d432d88981fb9bb463970c5b98ce85c0abe", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/7e4e9d432d88981fb9bb463970c5b98ce85c0abe, reptilian made by kuro(388673708753027083)", "size": { "x": 32, "y": 32 @@ -15,6 +15,7 @@ "name": "equipped-FEET", "directions": 4 }, + { "name": "inhand-left", "directions": 4 @@ -24,4 +25,4 @@ "directions": 4 } ] -} \ No newline at end of file +} diff --git a/Resources/Textures/Clothing/Shoes/Specific/chef.rsi/equipped-FEET-reptilian.png b/Resources/Textures/Clothing/Shoes/Specific/chef.rsi/equipped-FEET-reptilian.png new file mode 100644 index 0000000000..c23e5508f0 Binary files /dev/null and b/Resources/Textures/Clothing/Shoes/Specific/chef.rsi/equipped-FEET-reptilian.png differ diff --git a/Resources/Textures/Clothing/Shoes/Specific/chef.rsi/meta.json b/Resources/Textures/Clothing/Shoes/Specific/chef.rsi/meta.json index 54b1191d42..f312354f38 100644 --- a/Resources/Textures/Clothing/Shoes/Specific/chef.rsi/meta.json +++ b/Resources/Textures/Clothing/Shoes/Specific/chef.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/7e4e9d432d88981fb9bb463970c5b98ce85c0abe", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/7e4e9d432d88981fb9bb463970c5b98ce85c0abe, reptilian made by kuro(388673708753027083)", "size": { "x": 32, "y": 32 @@ -14,6 +14,7 @@ "name": "equipped-FEET", "directions": 4 }, + { "name": "inhand-left", "directions": 4 diff --git a/Resources/Textures/Clothing/Shoes/Specific/clown.rsi/equipped-FEET-reptilian.png b/Resources/Textures/Clothing/Shoes/Specific/clown.rsi/equipped-FEET-reptilian.png new file mode 100644 index 0000000000..867acd10b7 Binary files /dev/null and b/Resources/Textures/Clothing/Shoes/Specific/clown.rsi/equipped-FEET-reptilian.png differ diff --git a/Resources/Textures/Clothing/Shoes/Specific/clown.rsi/equipped-FEET-vox.png b/Resources/Textures/Clothing/Shoes/Specific/clown.rsi/equipped-FEET-vox.png new file mode 100644 index 0000000000..2dc1885cd3 Binary files /dev/null and b/Resources/Textures/Clothing/Shoes/Specific/clown.rsi/equipped-FEET-vox.png differ diff --git a/Resources/Textures/Clothing/Shoes/Specific/clown.rsi/meta.json b/Resources/Textures/Clothing/Shoes/Specific/clown.rsi/meta.json index 54b1191d42..1abf6951f1 100644 --- a/Resources/Textures/Clothing/Shoes/Specific/clown.rsi/meta.json +++ b/Resources/Textures/Clothing/Shoes/Specific/clown.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/7e4e9d432d88981fb9bb463970c5b98ce85c0abe", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/7e4e9d432d88981fb9bb463970c5b98ce85c0abe. equipped-FEET-vox state taken from vgstation13 at https://github.com/vgstation-coders/vgstation13/blob/31d6576ba8102135d058ef49c3cb6ecbe8db8a79/icons/mob/species/vox/shoes.dmi", "size": { "x": 32, "y": 32 @@ -14,6 +14,10 @@ "name": "equipped-FEET", "directions": 4 }, + { + "name": "equipped-FEET-vox", + "directions": 4 + }, { "name": "inhand-left", "directions": 4 diff --git a/Resources/Textures/Clothing/Shoes/Specific/cluwne.rsi/equipped-FEET-reptilian.png b/Resources/Textures/Clothing/Shoes/Specific/cluwne.rsi/equipped-FEET-reptilian.png new file mode 100644 index 0000000000..e1517b2365 Binary files /dev/null and b/Resources/Textures/Clothing/Shoes/Specific/cluwne.rsi/equipped-FEET-reptilian.png differ diff --git a/Resources/Textures/Clothing/Shoes/Specific/cluwne.rsi/meta.json b/Resources/Textures/Clothing/Shoes/Specific/cluwne.rsi/meta.json index 2db96aba4c..f4db66aa0e 100644 --- a/Resources/Textures/Clothing/Shoes/Specific/cluwne.rsi/meta.json +++ b/Resources/Textures/Clothing/Shoes/Specific/cluwne.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Made by brainfood1183 (github) for ss14.", + "copyright": "Made by brainfood1183 (github) for ss14, reptilian made by kuro(388673708753027083)", "size": { "x": 32, "y": 32 @@ -13,6 +13,10 @@ { "name": "equipped-FEET", "directions": 4 + }, + { + "name": "equipped-FEET-reptilian", + "directions": 4 } ] } diff --git a/Resources/Textures/Clothing/Shoes/Specific/cult.rsi/equipped-FEET-reptilian.png b/Resources/Textures/Clothing/Shoes/Specific/cult.rsi/equipped-FEET-reptilian.png new file mode 100644 index 0000000000..3d9317f18c Binary files /dev/null and b/Resources/Textures/Clothing/Shoes/Specific/cult.rsi/equipped-FEET-reptilian.png differ diff --git a/Resources/Textures/Clothing/Shoes/Specific/cult.rsi/meta.json b/Resources/Textures/Clothing/Shoes/Specific/cult.rsi/meta.json index 54b1191d42..f312354f38 100644 --- a/Resources/Textures/Clothing/Shoes/Specific/cult.rsi/meta.json +++ b/Resources/Textures/Clothing/Shoes/Specific/cult.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/7e4e9d432d88981fb9bb463970c5b98ce85c0abe", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/7e4e9d432d88981fb9bb463970c5b98ce85c0abe, reptilian made by kuro(388673708753027083)", "size": { "x": 32, "y": 32 @@ -14,6 +14,7 @@ "name": "equipped-FEET", "directions": 4 }, + { "name": "inhand-left", "directions": 4 diff --git a/Resources/Textures/Clothing/Shoes/Specific/galoshes.rsi/equipped-FEET-reptilian.png b/Resources/Textures/Clothing/Shoes/Specific/galoshes.rsi/equipped-FEET-reptilian.png new file mode 100644 index 0000000000..bd005129e3 Binary files /dev/null and b/Resources/Textures/Clothing/Shoes/Specific/galoshes.rsi/equipped-FEET-reptilian.png differ diff --git a/Resources/Textures/Clothing/Shoes/Specific/galoshes.rsi/equipped-FEET.png b/Resources/Textures/Clothing/Shoes/Specific/galoshes.rsi/equipped-FEET.png index cbc8f41f50..ea4096f1d2 100644 Binary files a/Resources/Textures/Clothing/Shoes/Specific/galoshes.rsi/equipped-FEET.png and b/Resources/Textures/Clothing/Shoes/Specific/galoshes.rsi/equipped-FEET.png differ diff --git a/Resources/Textures/Clothing/Shoes/Specific/galoshes.rsi/icon.png b/Resources/Textures/Clothing/Shoes/Specific/galoshes.rsi/icon.png index 40378b7353..82a6757482 100644 Binary files a/Resources/Textures/Clothing/Shoes/Specific/galoshes.rsi/icon.png and b/Resources/Textures/Clothing/Shoes/Specific/galoshes.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Shoes/Specific/galoshes.rsi/inhand-left.png b/Resources/Textures/Clothing/Shoes/Specific/galoshes.rsi/inhand-left.png index 1ff3a792af..fb250c4ab1 100644 Binary files a/Resources/Textures/Clothing/Shoes/Specific/galoshes.rsi/inhand-left.png and b/Resources/Textures/Clothing/Shoes/Specific/galoshes.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/Shoes/Specific/galoshes.rsi/inhand-right.png b/Resources/Textures/Clothing/Shoes/Specific/galoshes.rsi/inhand-right.png index 65a7aba6c3..64169d915c 100644 Binary files a/Resources/Textures/Clothing/Shoes/Specific/galoshes.rsi/inhand-right.png and b/Resources/Textures/Clothing/Shoes/Specific/galoshes.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/Shoes/Specific/galoshes.rsi/meta.json b/Resources/Textures/Clothing/Shoes/Specific/galoshes.rsi/meta.json index 54b1191d42..2631ed8a22 100644 --- a/Resources/Textures/Clothing/Shoes/Specific/galoshes.rsi/meta.json +++ b/Resources/Textures/Clothing/Shoes/Specific/galoshes.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/7e4e9d432d88981fb9bb463970c5b98ce85c0abe", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/d0474ed3b3cc00d0e37fb4c6ec8c10009c178f2c, reptilian made by kuro(388673708753027083)", "size": { "x": 32, "y": 32 @@ -14,6 +14,7 @@ "name": "equipped-FEET", "directions": 4 }, + { "name": "inhand-left", "directions": 4 diff --git a/Resources/Textures/Clothing/Shoes/Specific/jester.rsi/equipped-FEET-reptilian.png b/Resources/Textures/Clothing/Shoes/Specific/jester.rsi/equipped-FEET-reptilian.png new file mode 100644 index 0000000000..d763a37f36 Binary files /dev/null and b/Resources/Textures/Clothing/Shoes/Specific/jester.rsi/equipped-FEET-reptilian.png differ diff --git a/Resources/Textures/Clothing/Shoes/Specific/jester.rsi/meta.json b/Resources/Textures/Clothing/Shoes/Specific/jester.rsi/meta.json index 30fd407e21..0f138e6834 100644 --- a/Resources/Textures/Clothing/Shoes/Specific/jester.rsi/meta.json +++ b/Resources/Textures/Clothing/Shoes/Specific/jester.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/3a72dd925f7d6aeec620fe83bc4f88a3d7e5f693", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/3a72dd925f7d6aeec620fe83bc4f88a3d7e5f693, reptilian made by kuro(388673708753027083)", "size": { "x": 32, "y": 32 @@ -14,6 +14,7 @@ "name": "equipped-FEET", "directions": 4 }, + { "name": "inhand-left", "directions": 4 diff --git a/Resources/Textures/Clothing/Shoes/Specific/large_clown.rsi/equipped-FEET-reptilian.png b/Resources/Textures/Clothing/Shoes/Specific/large_clown.rsi/equipped-FEET-reptilian.png new file mode 100644 index 0000000000..c859474285 Binary files /dev/null and b/Resources/Textures/Clothing/Shoes/Specific/large_clown.rsi/equipped-FEET-reptilian.png differ diff --git a/Resources/Textures/Clothing/Shoes/Specific/large_clown.rsi/meta.json b/Resources/Textures/Clothing/Shoes/Specific/large_clown.rsi/meta.json index 3c606364d8..6993999dd0 100644 --- a/Resources/Textures/Clothing/Shoes/Specific/large_clown.rsi/meta.json +++ b/Resources/Textures/Clothing/Shoes/Specific/large_clown.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Made by brainfood1183 (github)", + "copyright": "Made by brainfood1183 (github), reptilian made by kuro(388673708753027083)", "size": { "x": 32, "y": 32 @@ -14,6 +14,7 @@ "name": "equipped-FEET", "directions": 4 }, + { "name": "inhand-left", "directions": 4 diff --git a/Resources/Textures/Clothing/Shoes/Specific/spaceninja.rsi/equipped-FEET-reptilian.png b/Resources/Textures/Clothing/Shoes/Specific/spaceninja.rsi/equipped-FEET-reptilian.png new file mode 100644 index 0000000000..0e523c6704 Binary files /dev/null and b/Resources/Textures/Clothing/Shoes/Specific/spaceninja.rsi/equipped-FEET-reptilian.png differ diff --git a/Resources/Textures/Clothing/Shoes/Specific/spaceninja.rsi/equipped-FEET.png b/Resources/Textures/Clothing/Shoes/Specific/spaceninja.rsi/equipped-FEET.png index 253951ea96..9881fc227e 100644 Binary files a/Resources/Textures/Clothing/Shoes/Specific/spaceninja.rsi/equipped-FEET.png and b/Resources/Textures/Clothing/Shoes/Specific/spaceninja.rsi/equipped-FEET.png differ diff --git a/Resources/Textures/Clothing/Shoes/Specific/spaceninja.rsi/icon.png b/Resources/Textures/Clothing/Shoes/Specific/spaceninja.rsi/icon.png index 82c5f0e6d7..7e0ca2e863 100644 Binary files a/Resources/Textures/Clothing/Shoes/Specific/spaceninja.rsi/icon.png and b/Resources/Textures/Clothing/Shoes/Specific/spaceninja.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Shoes/Specific/spaceninja.rsi/meta.json b/Resources/Textures/Clothing/Shoes/Specific/spaceninja.rsi/meta.json index 54b1191d42..f312354f38 100644 --- a/Resources/Textures/Clothing/Shoes/Specific/spaceninja.rsi/meta.json +++ b/Resources/Textures/Clothing/Shoes/Specific/spaceninja.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/7e4e9d432d88981fb9bb463970c5b98ce85c0abe", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/7e4e9d432d88981fb9bb463970c5b98ce85c0abe, reptilian made by kuro(388673708753027083)", "size": { "x": 32, "y": 32 @@ -14,6 +14,7 @@ "name": "equipped-FEET", "directions": 4 }, + { "name": "inhand-left", "directions": 4 diff --git a/Resources/Textures/Clothing/Shoes/Specific/swat.rsi/equipped-FEET-reptilian.png b/Resources/Textures/Clothing/Shoes/Specific/swat.rsi/equipped-FEET-reptilian.png new file mode 100644 index 0000000000..ef90b174d7 Binary files /dev/null and b/Resources/Textures/Clothing/Shoes/Specific/swat.rsi/equipped-FEET-reptilian.png differ diff --git a/Resources/Textures/Clothing/Shoes/Specific/swat.rsi/equipped-FEET-vox.png b/Resources/Textures/Clothing/Shoes/Specific/swat.rsi/equipped-FEET-vox.png new file mode 100644 index 0000000000..73ab1326b8 Binary files /dev/null and b/Resources/Textures/Clothing/Shoes/Specific/swat.rsi/equipped-FEET-vox.png differ diff --git a/Resources/Textures/Clothing/Shoes/Specific/swat.rsi/equipped-FEET.png b/Resources/Textures/Clothing/Shoes/Specific/swat.rsi/equipped-FEET.png index e51ec2f86a..4e18d3135e 100644 Binary files a/Resources/Textures/Clothing/Shoes/Specific/swat.rsi/equipped-FEET.png and b/Resources/Textures/Clothing/Shoes/Specific/swat.rsi/equipped-FEET.png differ diff --git a/Resources/Textures/Clothing/Shoes/Specific/swat.rsi/icon.png b/Resources/Textures/Clothing/Shoes/Specific/swat.rsi/icon.png index f3fa77989f..6442f01f50 100644 Binary files a/Resources/Textures/Clothing/Shoes/Specific/swat.rsi/icon.png and b/Resources/Textures/Clothing/Shoes/Specific/swat.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Shoes/Specific/swat.rsi/meta.json b/Resources/Textures/Clothing/Shoes/Specific/swat.rsi/meta.json index 54b1191d42..1abf6951f1 100644 --- a/Resources/Textures/Clothing/Shoes/Specific/swat.rsi/meta.json +++ b/Resources/Textures/Clothing/Shoes/Specific/swat.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/7e4e9d432d88981fb9bb463970c5b98ce85c0abe", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/7e4e9d432d88981fb9bb463970c5b98ce85c0abe. equipped-FEET-vox state taken from vgstation13 at https://github.com/vgstation-coders/vgstation13/blob/31d6576ba8102135d058ef49c3cb6ecbe8db8a79/icons/mob/species/vox/shoes.dmi", "size": { "x": 32, "y": 32 @@ -14,6 +14,10 @@ "name": "equipped-FEET", "directions": 4 }, + { + "name": "equipped-FEET-vox", + "directions": 4 + }, { "name": "inhand-left", "directions": 4 diff --git a/Resources/Textures/Clothing/Shoes/Specific/wizard.rsi/equipped-FEET-reptilian.png b/Resources/Textures/Clothing/Shoes/Specific/wizard.rsi/equipped-FEET-reptilian.png new file mode 100644 index 0000000000..2b090cdfd9 Binary files /dev/null and b/Resources/Textures/Clothing/Shoes/Specific/wizard.rsi/equipped-FEET-reptilian.png differ diff --git a/Resources/Textures/Clothing/Shoes/Specific/wizard.rsi/equipped-FEET-vox.png b/Resources/Textures/Clothing/Shoes/Specific/wizard.rsi/equipped-FEET-vox.png new file mode 100644 index 0000000000..838d02bb45 Binary files /dev/null and b/Resources/Textures/Clothing/Shoes/Specific/wizard.rsi/equipped-FEET-vox.png differ diff --git a/Resources/Textures/Clothing/Shoes/Specific/wizard.rsi/meta.json b/Resources/Textures/Clothing/Shoes/Specific/wizard.rsi/meta.json index 54b1191d42..1abf6951f1 100644 --- a/Resources/Textures/Clothing/Shoes/Specific/wizard.rsi/meta.json +++ b/Resources/Textures/Clothing/Shoes/Specific/wizard.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/7e4e9d432d88981fb9bb463970c5b98ce85c0abe", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/7e4e9d432d88981fb9bb463970c5b98ce85c0abe. equipped-FEET-vox state taken from vgstation13 at https://github.com/vgstation-coders/vgstation13/blob/31d6576ba8102135d058ef49c3cb6ecbe8db8a79/icons/mob/species/vox/shoes.dmi", "size": { "x": 32, "y": 32 @@ -14,6 +14,10 @@ "name": "equipped-FEET", "directions": 4 }, + { + "name": "equipped-FEET-vox", + "directions": 4 + }, { "name": "inhand-left", "directions": 4 diff --git a/Resources/Textures/Clothing/Shoes/color.rsi/contrastedsoles-equipped-FEET-vox.png b/Resources/Textures/Clothing/Shoes/color.rsi/contrastedsoles-equipped-FEET-vox.png index a7ebf25671..5294d0cde3 100644 Binary files a/Resources/Textures/Clothing/Shoes/color.rsi/contrastedsoles-equipped-FEET-vox.png and b/Resources/Textures/Clothing/Shoes/color.rsi/contrastedsoles-equipped-FEET-vox.png differ diff --git a/Resources/Textures/Clothing/Shoes/color.rsi/equipped-FEET-vox.png b/Resources/Textures/Clothing/Shoes/color.rsi/equipped-FEET-vox.png index d81e2314b6..9ab3ec3958 100644 Binary files a/Resources/Textures/Clothing/Shoes/color.rsi/equipped-FEET-vox.png and b/Resources/Textures/Clothing/Shoes/color.rsi/equipped-FEET-vox.png differ diff --git a/Resources/Textures/Clothing/Shoes/color.rsi/equipped-FEET.png b/Resources/Textures/Clothing/Shoes/color.rsi/equipped-FEET.png index dd4df4b601..db8ec2d0bb 100644 Binary files a/Resources/Textures/Clothing/Shoes/color.rsi/equipped-FEET.png and b/Resources/Textures/Clothing/Shoes/color.rsi/equipped-FEET.png differ diff --git a/Resources/Textures/Clothing/Shoes/color.rsi/icon.png b/Resources/Textures/Clothing/Shoes/color.rsi/icon.png index 8e42e5c5ce..df678161a6 100644 Binary files a/Resources/Textures/Clothing/Shoes/color.rsi/icon.png and b/Resources/Textures/Clothing/Shoes/color.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Shoes/color.rsi/soles-equipped-FEET-vox.png b/Resources/Textures/Clothing/Shoes/color.rsi/soles-equipped-FEET-vox.png index 0255ed7b78..35b9ed4f97 100644 Binary files a/Resources/Textures/Clothing/Shoes/color.rsi/soles-equipped-FEET-vox.png and b/Resources/Textures/Clothing/Shoes/color.rsi/soles-equipped-FEET-vox.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/atmosf.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/atmosf.rsi/equipped-INNERCLOTHING.png index 6a867d0ffd..205ff59c34 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpskirt/atmosf.rsi/equipped-INNERCLOTHING.png and b/Resources/Textures/Clothing/Uniforms/Jumpskirt/atmosf.rsi/equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/atmosf.rsi/icon.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/atmosf.rsi/icon.png index 88e3456ff1..5632c57eb3 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpskirt/atmosf.rsi/icon.png and b/Resources/Textures/Clothing/Uniforms/Jumpskirt/atmosf.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/atmosf.rsi/inhand-left.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/atmosf.rsi/inhand-left.png index 0a44f2f3e9..5f31602b18 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpskirt/atmosf.rsi/inhand-left.png and b/Resources/Textures/Clothing/Uniforms/Jumpskirt/atmosf.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/atmosf.rsi/inhand-right.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/atmosf.rsi/inhand-right.png index 815b2a813c..c5df8b73fb 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpskirt/atmosf.rsi/inhand-right.png and b/Resources/Textures/Clothing/Uniforms/Jumpskirt/atmosf.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/atmosf.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/Jumpskirt/atmosf.rsi/meta.json index a0169cdcda..6e60f071a6 100644 --- a/Resources/Textures/Clothing/Uniforms/Jumpskirt/atmosf.rsi/meta.json +++ b/Resources/Textures/Clothing/Uniforms/Jumpskirt/atmosf.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "https://github.com/tgstation/tgstation/commit/beaea876ea426c0e215cee64619862dc19bd9cd8, monkey made by brainfood1183 (github) for ss14", + "copyright": "https://github.com/tgstation/tgstation/commit/2fea0a59470c476cf3f927833d3918d89cbe6af8, monkey made by brainfood1183 (github) for ss14", "size": { "x": 32, "y": 32 @@ -27,4 +27,4 @@ "directions": 4 } ] -} \ No newline at end of file +} diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/brigmedic.rsi/equipped-INNERCLOTHING-monkey.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/brigmedic.rsi/equipped-INNERCLOTHING-monkey.png index a09c68c7b9..4b3db01c33 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpskirt/brigmedic.rsi/equipped-INNERCLOTHING-monkey.png and b/Resources/Textures/Clothing/Uniforms/Jumpskirt/brigmedic.rsi/equipped-INNERCLOTHING-monkey.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/brigmedic.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/brigmedic.rsi/equipped-INNERCLOTHING.png index 081fd4fc04..1b6f755f53 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpskirt/brigmedic.rsi/equipped-INNERCLOTHING.png and b/Resources/Textures/Clothing/Uniforms/Jumpskirt/brigmedic.rsi/equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/brigmedic.rsi/icon.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/brigmedic.rsi/icon.png index d8b61ee3e0..8b70315bed 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpskirt/brigmedic.rsi/icon.png and b/Resources/Textures/Clothing/Uniforms/Jumpskirt/brigmedic.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/brigmedic.rsi/inhand-left.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/brigmedic.rsi/inhand-left.png index 580490e1d9..c473f19e70 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpskirt/brigmedic.rsi/inhand-left.png and b/Resources/Textures/Clothing/Uniforms/Jumpskirt/brigmedic.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/brigmedic.rsi/inhand-right.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/brigmedic.rsi/inhand-right.png index 19404ed83c..3b5560521e 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpskirt/brigmedic.rsi/inhand-right.png and b/Resources/Textures/Clothing/Uniforms/Jumpskirt/brigmedic.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/brigmedic.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/Jumpskirt/brigmedic.rsi/meta.json index e159206ad4..36ba443fb5 100644 --- a/Resources/Textures/Clothing/Uniforms/Jumpskirt/brigmedic.rsi/meta.json +++ b/Resources/Textures/Clothing/Uniforms/Jumpskirt/brigmedic.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Made by PuroSlavKing (github) for SS14 | Resprited by Hülle#2562 (Discord), monkey derivative made by brainfood1183 (github) for ss14", + "copyright": "Taken from Skyrat-tg https://github.com/Skyrat-SS13/Skyrat-tg/blob/735606d73c5262dcce6a5d9b9cfc797eb5a64946/modular_skyrat/master_files/icons/mob/clothing/under/security.dmi, monkey made by brainfood1183 (github) for ss14", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/capformaldress.rsi/equipped-INNERCLOTHING-monkey.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/capformaldress.rsi/equipped-INNERCLOTHING-monkey.png index 01587136da..bee6a5c79f 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpskirt/capformaldress.rsi/equipped-INNERCLOTHING-monkey.png and b/Resources/Textures/Clothing/Uniforms/Jumpskirt/capformaldress.rsi/equipped-INNERCLOTHING-monkey.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/capformaldress.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/capformaldress.rsi/equipped-INNERCLOTHING.png index f6b6d7ab04..baf608a47a 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpskirt/capformaldress.rsi/equipped-INNERCLOTHING.png and b/Resources/Textures/Clothing/Uniforms/Jumpskirt/capformaldress.rsi/equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/capformaldress.rsi/icon.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/capformaldress.rsi/icon.png index 8a65d6675e..369f23c378 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpskirt/capformaldress.rsi/icon.png and b/Resources/Textures/Clothing/Uniforms/Jumpskirt/capformaldress.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/capformaldress.rsi/inhand-left.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/capformaldress.rsi/inhand-left.png index b95ae73479..d817e762a6 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpskirt/capformaldress.rsi/inhand-left.png and b/Resources/Textures/Clothing/Uniforms/Jumpskirt/capformaldress.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/capformaldress.rsi/inhand-right.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/capformaldress.rsi/inhand-right.png index b43fd233e8..0604ee2752 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpskirt/capformaldress.rsi/inhand-right.png and b/Resources/Textures/Clothing/Uniforms/Jumpskirt/capformaldress.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/capformaldress.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/Jumpskirt/capformaldress.rsi/meta.json index 3c6f171076..75cbde9bb6 100644 --- a/Resources/Textures/Clothing/Uniforms/Jumpskirt/capformaldress.rsi/meta.json +++ b/Resources/Textures/Clothing/Uniforms/Jumpskirt/capformaldress.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation https://github.com/tgstation/tgstation/commit/30892aa892a2be846592b068ab71c606e2f0c5b7, edited by emisse for ss14, monkey derivative made by brainfood1183 (github) for ss14", + "copyright": "Taken from tgstation https://github.com/tgstation/tgstation/commit/30892aa892a2be846592b068ab71c606e2f0c5b7, monkey derivative made by brainfood1183 (github) for ss14", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/captain.rsi/equipped-INNERCLOTHING-monkey.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/captain.rsi/equipped-INNERCLOTHING-monkey.png index f7e8abd58d..aebe0827d8 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpskirt/captain.rsi/equipped-INNERCLOTHING-monkey.png and b/Resources/Textures/Clothing/Uniforms/Jumpskirt/captain.rsi/equipped-INNERCLOTHING-monkey.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/captain.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/captain.rsi/equipped-INNERCLOTHING.png index dbdb51cef9..97c0b9c511 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpskirt/captain.rsi/equipped-INNERCLOTHING.png and b/Resources/Textures/Clothing/Uniforms/Jumpskirt/captain.rsi/equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/captain.rsi/icon.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/captain.rsi/icon.png index 67fd943b4c..0891b6fd85 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpskirt/captain.rsi/icon.png and b/Resources/Textures/Clothing/Uniforms/Jumpskirt/captain.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/captain.rsi/inhand-left.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/captain.rsi/inhand-left.png index 9641f214a5..83cb923767 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpskirt/captain.rsi/inhand-left.png and b/Resources/Textures/Clothing/Uniforms/Jumpskirt/captain.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/captain.rsi/inhand-right.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/captain.rsi/inhand-right.png index 0b3d008747..b904d28005 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpskirt/captain.rsi/inhand-right.png and b/Resources/Textures/Clothing/Uniforms/Jumpskirt/captain.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/captain.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/Jumpskirt/captain.rsi/meta.json index 6eb08f0f32..0b57c04149 100644 --- a/Resources/Textures/Clothing/Uniforms/Jumpskirt/captain.rsi/meta.json +++ b/Resources/Textures/Clothing/Uniforms/Jumpskirt/captain.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "monkey derivative derived by brainfood1183 (github) for ss14 from tgstation at commit https://github.com/tgstation/tgstation/commit/dd97a0e45d904fffadd9d2caad22aedd0d09f3ab then edited by Skarletto (github). Other sprites taken from tgstation at https://github.com/tgstation/tgstation/pull/69842/commits/d8138946b0ed06fced522729ac8eaa0596864329 and edited by Skarletto (github), edited by Emisse for ss14", + "copyright": "monkey derivative derived by brainfood1183 (github) for ss14 from tgstation at commit https://github.com/tgstation/tgstation/commit/dd97a0e45d904fffadd9d2caad22aedd0d09f3ab then edited by Skarletto (github). Other sprites taken from tgstation at https://github.com/tgstation/tgstation/pull/69842/commits/d8138946b0ed06fced522729ac8eaa0596864329 and edited by Skarletto (github)", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/cargotech.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/cargotech.rsi/equipped-INNERCLOTHING.png index a8c6d46508..1165db623a 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpskirt/cargotech.rsi/equipped-INNERCLOTHING.png and b/Resources/Textures/Clothing/Uniforms/Jumpskirt/cargotech.rsi/equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/cargotech.rsi/icon.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/cargotech.rsi/icon.png index 664c857ae4..5b7874e83b 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpskirt/cargotech.rsi/icon.png and b/Resources/Textures/Clothing/Uniforms/Jumpskirt/cargotech.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/ce.rsi/equipped-INNERCLOTHING-monkey.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/ce.rsi/equipped-INNERCLOTHING-monkey.png index c0258cf199..54e1e6ec60 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpskirt/ce.rsi/equipped-INNERCLOTHING-monkey.png and b/Resources/Textures/Clothing/Uniforms/Jumpskirt/ce.rsi/equipped-INNERCLOTHING-monkey.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/ce.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/ce.rsi/equipped-INNERCLOTHING.png index 3263c54ec9..98e2ab9410 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpskirt/ce.rsi/equipped-INNERCLOTHING.png and b/Resources/Textures/Clothing/Uniforms/Jumpskirt/ce.rsi/equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/ce.rsi/icon.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/ce.rsi/icon.png index 5f662e0280..c481973514 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpskirt/ce.rsi/icon.png and b/Resources/Textures/Clothing/Uniforms/Jumpskirt/ce.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/ce.rsi/inhand-left.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/ce.rsi/inhand-left.png index 94d9ed8605..7592d065ff 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpskirt/ce.rsi/inhand-left.png and b/Resources/Textures/Clothing/Uniforms/Jumpskirt/ce.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/ce.rsi/inhand-right.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/ce.rsi/inhand-right.png index 560879a0f2..22148ba486 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpskirt/ce.rsi/inhand-right.png and b/Resources/Textures/Clothing/Uniforms/Jumpskirt/ce.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/centcomformaldress.rsi/equipped-INNERCLOTHING-monkey.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/centcomformaldress.rsi/equipped-INNERCLOTHING-monkey.png index 15605dacf8..9fbb42513f 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpskirt/centcomformaldress.rsi/equipped-INNERCLOTHING-monkey.png and b/Resources/Textures/Clothing/Uniforms/Jumpskirt/centcomformaldress.rsi/equipped-INNERCLOTHING-monkey.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/centcomformaldress.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/centcomformaldress.rsi/equipped-INNERCLOTHING.png index c4f84d4002..6ed9fcdf93 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpskirt/centcomformaldress.rsi/equipped-INNERCLOTHING.png and b/Resources/Textures/Clothing/Uniforms/Jumpskirt/centcomformaldress.rsi/equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/centcomformaldress.rsi/icon.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/centcomformaldress.rsi/icon.png index 07f2117286..7381eb9f0b 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpskirt/centcomformaldress.rsi/icon.png and b/Resources/Textures/Clothing/Uniforms/Jumpskirt/centcomformaldress.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/centcomformaldress.rsi/inhand-left.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/centcomformaldress.rsi/inhand-left.png index 66d8a01385..1a7f4190b0 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpskirt/centcomformaldress.rsi/inhand-left.png and b/Resources/Textures/Clothing/Uniforms/Jumpskirt/centcomformaldress.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/centcomformaldress.rsi/inhand-right.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/centcomformaldress.rsi/inhand-right.png index 3041ef14f7..0811254771 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpskirt/centcomformaldress.rsi/inhand-right.png and b/Resources/Textures/Clothing/Uniforms/Jumpskirt/centcomformaldress.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/chaplain.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/chaplain.rsi/equipped-INNERCLOTHING.png index 600f014582..f973da5629 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpskirt/chaplain.rsi/equipped-INNERCLOTHING.png and b/Resources/Textures/Clothing/Uniforms/Jumpskirt/chaplain.rsi/equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/chaplain.rsi/icon.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/chaplain.rsi/icon.png index a72665e993..0102558ed4 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpskirt/chaplain.rsi/icon.png and b/Resources/Textures/Clothing/Uniforms/Jumpskirt/chaplain.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/chaplain.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/Jumpskirt/chaplain.rsi/meta.json index 36ab573091..4ab97e3ef8 100644 --- a/Resources/Textures/Clothing/Uniforms/Jumpskirt/chaplain.rsi/meta.json +++ b/Resources/Textures/Clothing/Uniforms/Jumpskirt/chaplain.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c838ba21dae97db345e0113f99596decd1d66039, monkey derivative made by brainfood1183 (github) for ss14", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/, monkey made by brainfood1183 (github) for ss14", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/chef.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/chef.rsi/equipped-INNERCLOTHING.png index 37435795c5..8fd7b18c8f 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpskirt/chef.rsi/equipped-INNERCLOTHING.png and b/Resources/Textures/Clothing/Uniforms/Jumpskirt/chef.rsi/equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/chef.rsi/icon.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/chef.rsi/icon.png index 6969d40be7..3cd2bace43 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpskirt/chef.rsi/icon.png and b/Resources/Textures/Clothing/Uniforms/Jumpskirt/chef.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/chef.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/Jumpskirt/chef.rsi/meta.json index 36ab573091..1dd4e0e010 100644 --- a/Resources/Textures/Clothing/Uniforms/Jumpskirt/chef.rsi/meta.json +++ b/Resources/Textures/Clothing/Uniforms/Jumpskirt/chef.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c838ba21dae97db345e0113f99596decd1d66039, monkey derivative made by brainfood1183 (github) for ss14", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/2fea0a59470c476cf3f927833d3918d89cbe6af8, monkey made by brainfood1183 (github) for ss14", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/chemistry.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/chemistry.rsi/equipped-INNERCLOTHING.png index 5608a2451c..f36a0ad781 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpskirt/chemistry.rsi/equipped-INNERCLOTHING.png and b/Resources/Textures/Clothing/Uniforms/Jumpskirt/chemistry.rsi/equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/chemistry.rsi/icon.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/chemistry.rsi/icon.png index c5d3ad90e0..3fb69dcac1 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpskirt/chemistry.rsi/icon.png and b/Resources/Textures/Clothing/Uniforms/Jumpskirt/chemistry.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/cmo.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/cmo.rsi/equipped-INNERCLOTHING.png index 955ee298f6..31d07ff06f 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpskirt/cmo.rsi/equipped-INNERCLOTHING.png and b/Resources/Textures/Clothing/Uniforms/Jumpskirt/cmo.rsi/equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/cmo.rsi/icon.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/cmo.rsi/icon.png index 029688868d..944f6fec68 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpskirt/cmo.rsi/icon.png and b/Resources/Textures/Clothing/Uniforms/Jumpskirt/cmo.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/cmo_turtle.rsi/equipped-INNERCLOTHING-monkey.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/cmo_turtle.rsi/equipped-INNERCLOTHING-monkey.png new file mode 100644 index 0000000000..a2581dab5e Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpskirt/cmo_turtle.rsi/equipped-INNERCLOTHING-monkey.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/cmo_turtle.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/cmo_turtle.rsi/equipped-INNERCLOTHING.png new file mode 100644 index 0000000000..b4d2825f0d Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpskirt/cmo_turtle.rsi/equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/cmo_turtle.rsi/icon.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/cmo_turtle.rsi/icon.png new file mode 100644 index 0000000000..b5702f2d31 Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpskirt/cmo_turtle.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/cmo_turtle.rsi/inhand-left.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/cmo_turtle.rsi/inhand-left.png new file mode 100644 index 0000000000..921ca6fbe4 Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpskirt/cmo_turtle.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/cmo_turtle.rsi/inhand-right.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/cmo_turtle.rsi/inhand-right.png new file mode 100644 index 0000000000..ed69a45738 Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpskirt/cmo_turtle.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/cmo_turtle.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/Jumpskirt/cmo_turtle.rsi/meta.json new file mode 100644 index 0000000000..a81e5b9477 --- /dev/null +++ b/Resources/Textures/Clothing/Uniforms/Jumpskirt/cmo_turtle.rsi/meta.json @@ -0,0 +1,30 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Borrowed from QM turtleneck at https://github.com/space-wizards/space-station-14/tree/master/Resources/Textures/Clothing/Uniforms/Jumpskirt/qmturtleskirt.rsi and modified by Hanzdegloekr (github) for space station 14", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-INNERCLOTHING", + "directions": 4 + }, + { + "name": "equipped-INNERCLOTHING-monkey", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/color.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/color.rsi/equipped-INNERCLOTHING.png index 3faba7285f..46f996e848 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpskirt/color.rsi/equipped-INNERCLOTHING.png and b/Resources/Textures/Clothing/Uniforms/Jumpskirt/color.rsi/equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/color.rsi/icon.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/color.rsi/icon.png index 64642a1158..7026bf4e33 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpskirt/color.rsi/icon.png and b/Resources/Textures/Clothing/Uniforms/Jumpskirt/color.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/detective.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/detective.rsi/equipped-INNERCLOTHING.png index 567a06b8d3..0b17ad3067 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpskirt/detective.rsi/equipped-INNERCLOTHING.png and b/Resources/Textures/Clothing/Uniforms/Jumpskirt/detective.rsi/equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/detective.rsi/icon.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/detective.rsi/icon.png index 0d8ec23948..330e9e437e 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpskirt/detective.rsi/icon.png and b/Resources/Textures/Clothing/Uniforms/Jumpskirt/detective.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/detective.rsi/inhand-left.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/detective.rsi/inhand-left.png index aed8b4f025..aa9b5112d9 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpskirt/detective.rsi/inhand-left.png and b/Resources/Textures/Clothing/Uniforms/Jumpskirt/detective.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/detective.rsi/inhand-right.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/detective.rsi/inhand-right.png index fd6f60eabb..5e1581b51a 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpskirt/detective.rsi/inhand-right.png and b/Resources/Textures/Clothing/Uniforms/Jumpskirt/detective.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/detective.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/Jumpskirt/detective.rsi/meta.json index 36ab573091..e685fe5a8a 100644 --- a/Resources/Textures/Clothing/Uniforms/Jumpskirt/detective.rsi/meta.json +++ b/Resources/Textures/Clothing/Uniforms/Jumpskirt/detective.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c838ba21dae97db345e0113f99596decd1d66039, monkey derivative made by brainfood1183 (github) for ss14", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/5ea6d8b4422027d0c22cb415d1f05a08bf39aaa0, monkey made by brainfood1183 (github) for ss14", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/detective_grey.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/detective_grey.rsi/equipped-INNERCLOTHING.png index 6e576b6e40..73905b44c9 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpskirt/detective_grey.rsi/equipped-INNERCLOTHING.png and b/Resources/Textures/Clothing/Uniforms/Jumpskirt/detective_grey.rsi/equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/detective_grey.rsi/icon.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/detective_grey.rsi/icon.png index 737576e156..fc02b31eb9 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpskirt/detective_grey.rsi/icon.png and b/Resources/Textures/Clothing/Uniforms/Jumpskirt/detective_grey.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/detective_grey.rsi/inhand-left.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/detective_grey.rsi/inhand-left.png index 15c30a0491..d5ca96c85f 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpskirt/detective_grey.rsi/inhand-left.png and b/Resources/Textures/Clothing/Uniforms/Jumpskirt/detective_grey.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/detective_grey.rsi/inhand-right.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/detective_grey.rsi/inhand-right.png index 53512e6969..0fcbfbaf67 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpskirt/detective_grey.rsi/inhand-right.png and b/Resources/Textures/Clothing/Uniforms/Jumpskirt/detective_grey.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/detective_grey.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/Jumpskirt/detective_grey.rsi/meta.json index bbcef071e2..e685fe5a8a 100644 --- a/Resources/Textures/Clothing/Uniforms/Jumpskirt/detective_grey.rsi/meta.json +++ b/Resources/Textures/Clothing/Uniforms/Jumpskirt/detective_grey.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c838ba21dae97db345e0113f99596decd1d66039. In hand sprite scaled down by potato1234_x, monkey derivative made by brainfood1183 (github) for ss14", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/5ea6d8b4422027d0c22cb415d1f05a08bf39aaa0, monkey made by brainfood1183 (github) for ss14", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/dresswestern.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/dresswestern.rsi/equipped-INNERCLOTHING.png new file mode 100644 index 0000000000..b05f55716a Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpskirt/dresswestern.rsi/equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/dresswestern.rsi/icon.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/dresswestern.rsi/icon.png new file mode 100644 index 0000000000..d0e3be19d9 Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpskirt/dresswestern.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/dresswestern.rsi/inhand-left.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/dresswestern.rsi/inhand-left.png new file mode 100644 index 0000000000..345d4378e0 Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpskirt/dresswestern.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/dresswestern.rsi/inhand-right.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/dresswestern.rsi/inhand-right.png new file mode 100644 index 0000000000..224a449ba2 Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpskirt/dresswestern.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/dresswestern.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/Jumpskirt/dresswestern.rsi/meta.json new file mode 100644 index 0000000000..a6cb5521a2 --- /dev/null +++ b/Resources/Textures/Clothing/Uniforms/Jumpskirt/dresswestern.rsi/meta.json @@ -0,0 +1,26 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Add new dress by DreamlyJack", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-INNERCLOTHING", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/elegantdress.rsi/color-equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/elegantdress.rsi/color-equipped-INNERCLOTHING.png new file mode 100644 index 0000000000..b42fc9d2d5 Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpskirt/elegantdress.rsi/color-equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/elegantdress.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/elegantdress.rsi/equipped-INNERCLOTHING.png new file mode 100644 index 0000000000..88cd74f453 Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpskirt/elegantdress.rsi/equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/elegantdress.rsi/icon-color.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/elegantdress.rsi/icon-color.png new file mode 100644 index 0000000000..c7b16320f8 Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpskirt/elegantdress.rsi/icon-color.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/elegantdress.rsi/icon.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/elegantdress.rsi/icon.png new file mode 100644 index 0000000000..54635b183a Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpskirt/elegantdress.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/elegantdress.rsi/inhand-left.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/elegantdress.rsi/inhand-left.png new file mode 100644 index 0000000000..cd56f71e4d Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpskirt/elegantdress.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/elegantdress.rsi/inhand-right.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/elegantdress.rsi/inhand-right.png new file mode 100644 index 0000000000..e661218a4e Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpskirt/elegantdress.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/elegantdress.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/Jumpskirt/elegantdress.rsi/meta.json new file mode 100644 index 0000000000..4ff6d9a9f4 --- /dev/null +++ b/Resources/Textures/Clothing/Uniforms/Jumpskirt/elegantdress.rsi/meta.json @@ -0,0 +1,33 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Add new dress by DreamlyJack", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "icon-color" + }, + { + "name": "equipped-INNERCLOTHING", + "directions": 4 + }, + { + "name": "color-equipped-INNERCLOTHING", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/engineering.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/engineering.rsi/equipped-INNERCLOTHING.png index 0fe314e778..3426f0eb92 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpskirt/engineering.rsi/equipped-INNERCLOTHING.png and b/Resources/Textures/Clothing/Uniforms/Jumpskirt/engineering.rsi/equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/engineering.rsi/icon.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/engineering.rsi/icon.png index 76ea48170d..6190e526fd 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpskirt/engineering.rsi/icon.png and b/Resources/Textures/Clothing/Uniforms/Jumpskirt/engineering.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/engineering.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/Jumpskirt/engineering.rsi/meta.json index 36ab573091..1dd4e0e010 100644 --- a/Resources/Textures/Clothing/Uniforms/Jumpskirt/engineering.rsi/meta.json +++ b/Resources/Textures/Clothing/Uniforms/Jumpskirt/engineering.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c838ba21dae97db345e0113f99596decd1d66039, monkey derivative made by brainfood1183 (github) for ss14", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/2fea0a59470c476cf3f927833d3918d89cbe6af8, monkey made by brainfood1183 (github) for ss14", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/genetics.rsi/equipped-INNERCLOTHING-monkey.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/genetics.rsi/equipped-INNERCLOTHING-monkey.png index 49b52d5859..8e2b65d190 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpskirt/genetics.rsi/equipped-INNERCLOTHING-monkey.png and b/Resources/Textures/Clothing/Uniforms/Jumpskirt/genetics.rsi/equipped-INNERCLOTHING-monkey.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/genetics.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/genetics.rsi/equipped-INNERCLOTHING.png index b464902a9e..edcf21db0f 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpskirt/genetics.rsi/equipped-INNERCLOTHING.png and b/Resources/Textures/Clothing/Uniforms/Jumpskirt/genetics.rsi/equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/genetics.rsi/icon.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/genetics.rsi/icon.png index 0ee22bf147..b18595bf41 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpskirt/genetics.rsi/icon.png and b/Resources/Textures/Clothing/Uniforms/Jumpskirt/genetics.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/genetics.rsi/inhand-left.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/genetics.rsi/inhand-left.png index cfb2a8ff2b..46beecc032 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpskirt/genetics.rsi/inhand-left.png and b/Resources/Textures/Clothing/Uniforms/Jumpskirt/genetics.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/genetics.rsi/inhand-right.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/genetics.rsi/inhand-right.png index 7071a1d512..50324f3fde 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpskirt/genetics.rsi/inhand-right.png and b/Resources/Textures/Clothing/Uniforms/Jumpskirt/genetics.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/genetics.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/Jumpskirt/genetics.rsi/meta.json index bbcef071e2..92c141c806 100644 --- a/Resources/Textures/Clothing/Uniforms/Jumpskirt/genetics.rsi/meta.json +++ b/Resources/Textures/Clothing/Uniforms/Jumpskirt/genetics.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c838ba21dae97db345e0113f99596decd1d66039. In hand sprite scaled down by potato1234_x, monkey derivative made by brainfood1183 (github) for ss14", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c838ba21dae97db345e0113f99596decd1d66039. In hand sprite scaled down by potato1234_x, monkey derivative made by brainfood1183 (github) for ss14, Resprited by Mureixlol", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/hop.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/hop.rsi/equipped-INNERCLOTHING.png index cf547d1ce9..3359a44239 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpskirt/hop.rsi/equipped-INNERCLOTHING.png and b/Resources/Textures/Clothing/Uniforms/Jumpskirt/hop.rsi/equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/hop.rsi/icon.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/hop.rsi/icon.png index 69b9a2ff97..d9e02bac63 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpskirt/hop.rsi/icon.png and b/Resources/Textures/Clothing/Uniforms/Jumpskirt/hop.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/hos.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/hos.rsi/equipped-INNERCLOTHING.png index 0eff0ab3fa..08d6150503 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpskirt/hos.rsi/equipped-INNERCLOTHING.png and b/Resources/Textures/Clothing/Uniforms/Jumpskirt/hos.rsi/equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/hos.rsi/icon.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/hos.rsi/icon.png index 31ba54e8af..fcaffe8630 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpskirt/hos.rsi/icon.png and b/Resources/Textures/Clothing/Uniforms/Jumpskirt/hos.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/hos.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/Jumpskirt/hos.rsi/meta.json index bbcef071e2..2b78bcd698 100644 --- a/Resources/Textures/Clothing/Uniforms/Jumpskirt/hos.rsi/meta.json +++ b/Resources/Textures/Clothing/Uniforms/Jumpskirt/hos.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c838ba21dae97db345e0113f99596decd1d66039. In hand sprite scaled down by potato1234_x, monkey derivative made by brainfood1183 (github) for ss14", + "copyright": "Created by Flareguy using sprites from tgstation at commit https://github.com/tgstation/tgstation/commit/c838ba21dae97db345e0113f99596decd1d66039 & the jumpskirt base found in color.rsi.", "size": { "x": 32, "y": 32 @@ -13,18 +13,6 @@ { "name": "equipped-INNERCLOTHING", "directions": 4 - }, - { - "name": "equipped-INNERCLOTHING-monkey", - "directions": 4 - }, - { - "name": "inhand-left", - "directions": 4 - }, - { - "name": "inhand-right", - "directions": 4 } ] } diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/hos_alt.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/hos_alt.rsi/equipped-INNERCLOTHING.png index b8b3c25e76..dcec451a62 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpskirt/hos_alt.rsi/equipped-INNERCLOTHING.png and b/Resources/Textures/Clothing/Uniforms/Jumpskirt/hos_alt.rsi/equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/hos_alt.rsi/icon.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/hos_alt.rsi/icon.png index 682bc0ea02..3730d102e2 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpskirt/hos_alt.rsi/icon.png and b/Resources/Textures/Clothing/Uniforms/Jumpskirt/hos_alt.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/hos_alt.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/Jumpskirt/hos_alt.rsi/meta.json index 36ab573091..b217126e9b 100644 --- a/Resources/Textures/Clothing/Uniforms/Jumpskirt/hos_alt.rsi/meta.json +++ b/Resources/Textures/Clothing/Uniforms/Jumpskirt/hos_alt.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c838ba21dae97db345e0113f99596decd1d66039, monkey derivative made by brainfood1183 (github) for ss14", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/28d0be60aa8bbe1ca87a5d129487bb6f60839ac4, monkey made by brainfood1183 (github) for ss14", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/hos_parade.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/hos_parade.rsi/equipped-INNERCLOTHING.png index f27e553b99..d76f9614fe 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpskirt/hos_parade.rsi/equipped-INNERCLOTHING.png and b/Resources/Textures/Clothing/Uniforms/Jumpskirt/hos_parade.rsi/equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/hos_parade.rsi/icon.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/hos_parade.rsi/icon.png index 9f82ea7673..129a24cbd1 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpskirt/hos_parade.rsi/icon.png and b/Resources/Textures/Clothing/Uniforms/Jumpskirt/hos_parade.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/hosformaldress.rsi/equipped-INNERCLOTHING-monkey.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/hosformaldress.rsi/equipped-INNERCLOTHING-monkey.png index 8b1490a626..a2b4954cf6 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpskirt/hosformaldress.rsi/equipped-INNERCLOTHING-monkey.png and b/Resources/Textures/Clothing/Uniforms/Jumpskirt/hosformaldress.rsi/equipped-INNERCLOTHING-monkey.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/hosformaldress.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/hosformaldress.rsi/equipped-INNERCLOTHING.png index 60eecd5904..abec9b4414 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpskirt/hosformaldress.rsi/equipped-INNERCLOTHING.png and b/Resources/Textures/Clothing/Uniforms/Jumpskirt/hosformaldress.rsi/equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/hosformaldress.rsi/icon.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/hosformaldress.rsi/icon.png index 7fce6b20c5..601c196b4b 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpskirt/hosformaldress.rsi/icon.png and b/Resources/Textures/Clothing/Uniforms/Jumpskirt/hosformaldress.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/hosformaldress.rsi/inhand-left.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/hosformaldress.rsi/inhand-left.png index 9d04c2b5e9..eacb15737b 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpskirt/hosformaldress.rsi/inhand-left.png and b/Resources/Textures/Clothing/Uniforms/Jumpskirt/hosformaldress.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/hosformaldress.rsi/inhand-right.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/hosformaldress.rsi/inhand-right.png index 79424b4fea..1bde6b3799 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpskirt/hosformaldress.rsi/inhand-right.png and b/Resources/Textures/Clothing/Uniforms/Jumpskirt/hosformaldress.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/hydro.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/hydro.rsi/equipped-INNERCLOTHING.png index f38f8dd3a7..31e526f097 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpskirt/hydro.rsi/equipped-INNERCLOTHING.png and b/Resources/Textures/Clothing/Uniforms/Jumpskirt/hydro.rsi/equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/hydro.rsi/icon.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/hydro.rsi/icon.png index a377a731b1..52022a8dde 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpskirt/hydro.rsi/icon.png and b/Resources/Textures/Clothing/Uniforms/Jumpskirt/hydro.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/librarian.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/librarian.rsi/equipped-INNERCLOTHING.png index 56b9646965..8c772eee01 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpskirt/librarian.rsi/equipped-INNERCLOTHING.png and b/Resources/Textures/Clothing/Uniforms/Jumpskirt/librarian.rsi/equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/librarian.rsi/icon.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/librarian.rsi/icon.png index 2400ac8d75..41a97c9d3f 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpskirt/librarian.rsi/icon.png and b/Resources/Textures/Clothing/Uniforms/Jumpskirt/librarian.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/librarian.rsi/inhand-left.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/librarian.rsi/inhand-left.png index 9feaebdb55..dffffbc988 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpskirt/librarian.rsi/inhand-left.png and b/Resources/Textures/Clothing/Uniforms/Jumpskirt/librarian.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/librarian.rsi/inhand-right.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/librarian.rsi/inhand-right.png index 6b8fccf1f4..aa45782ecd 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpskirt/librarian.rsi/inhand-right.png and b/Resources/Textures/Clothing/Uniforms/Jumpskirt/librarian.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/librarian.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/Jumpskirt/librarian.rsi/meta.json index 0a48ac3e37..3f17e46010 100644 --- a/Resources/Textures/Clothing/Uniforms/Jumpskirt/librarian.rsi/meta.json +++ b/Resources/Textures/Clothing/Uniforms/Jumpskirt/librarian.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/47718914e47c6fbf23d6dc97f073a9daa11b23cb and modified by potato1234x (github) for ss14", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/2fea0a59470c476cf3f927833d3918d89cbe6af8", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/medical.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/medical.rsi/equipped-INNERCLOTHING.png index 3128383e68..ba9ea65cec 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpskirt/medical.rsi/equipped-INNERCLOTHING.png and b/Resources/Textures/Clothing/Uniforms/Jumpskirt/medical.rsi/equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/medical.rsi/icon.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/medical.rsi/icon.png index 5afae7d932..715401b683 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpskirt/medical.rsi/icon.png and b/Resources/Textures/Clothing/Uniforms/Jumpskirt/medical.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/mime.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/mime.rsi/equipped-INNERCLOTHING.png index e6532029e4..074f5eb50c 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpskirt/mime.rsi/equipped-INNERCLOTHING.png and b/Resources/Textures/Clothing/Uniforms/Jumpskirt/mime.rsi/equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/mime.rsi/icon.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/mime.rsi/icon.png index ae1f854292..f86b2ad0e6 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpskirt/mime.rsi/icon.png and b/Resources/Textures/Clothing/Uniforms/Jumpskirt/mime.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/mime.rsi/inhand-left.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/mime.rsi/inhand-left.png index 59518c35c3..dccaf261df 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpskirt/mime.rsi/inhand-left.png and b/Resources/Textures/Clothing/Uniforms/Jumpskirt/mime.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/mime.rsi/inhand-right.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/mime.rsi/inhand-right.png index fa96803d56..770188d6f1 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpskirt/mime.rsi/inhand-right.png and b/Resources/Textures/Clothing/Uniforms/Jumpskirt/mime.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/mime.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/Jumpskirt/mime.rsi/meta.json index 36ab573091..47966793b3 100644 --- a/Resources/Textures/Clothing/Uniforms/Jumpskirt/mime.rsi/meta.json +++ b/Resources/Textures/Clothing/Uniforms/Jumpskirt/mime.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c838ba21dae97db345e0113f99596decd1d66039, monkey derivative made by brainfood1183 (github) for ss14", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/2fea0a59470c476cf3f927833d3918d89cbe6af8, monkey made by brainfood1183 (github) for ss14, Resprited by github:DreamlyJack(624946166152298517)", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/musician.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/musician.rsi/equipped-INNERCLOTHING.png new file mode 100644 index 0000000000..78b2c2ea5d Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpskirt/musician.rsi/equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/musician.rsi/icon.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/musician.rsi/icon.png new file mode 100644 index 0000000000..48c4151632 Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpskirt/musician.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/musician.rsi/inhand-left.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/musician.rsi/inhand-left.png new file mode 100644 index 0000000000..5919ab9cff Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpskirt/musician.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/musician.rsi/inhand-right.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/musician.rsi/inhand-right.png new file mode 100644 index 0000000000..988fda91fa Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpskirt/musician.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/musician.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/Jumpskirt/musician.rsi/meta.json new file mode 100644 index 0000000000..b8ed6819b6 --- /dev/null +++ b/Resources/Textures/Clothing/Uniforms/Jumpskirt/musician.rsi/meta.json @@ -0,0 +1,26 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Sprited by github:DreamlyJack(624946166152298517)", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-INNERCLOTHING", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/olddress.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/olddress.rsi/equipped-INNERCLOTHING.png new file mode 100644 index 0000000000..145cf97b2e Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpskirt/olddress.rsi/equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/olddress.rsi/icon.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/olddress.rsi/icon.png new file mode 100644 index 0000000000..28b2de1692 Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpskirt/olddress.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/olddress.rsi/inhand-left.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/olddress.rsi/inhand-left.png new file mode 100644 index 0000000000..a85d0a11e9 Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpskirt/olddress.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/olddress.rsi/inhand-right.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/olddress.rsi/inhand-right.png new file mode 100644 index 0000000000..4d6da567de Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpskirt/olddress.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/olddress.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/Jumpskirt/olddress.rsi/meta.json new file mode 100644 index 0000000000..d4ea50d555 --- /dev/null +++ b/Resources/Textures/Clothing/Uniforms/Jumpskirt/olddress.rsi/meta.json @@ -0,0 +1,26 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "fujiwaranao", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-INNERCLOTHING", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/operative_s.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/operative_s.rsi/equipped-INNERCLOTHING.png index e38db3e03d..05de5d50b1 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpskirt/operative_s.rsi/equipped-INNERCLOTHING.png and b/Resources/Textures/Clothing/Uniforms/Jumpskirt/operative_s.rsi/equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/operative_s.rsi/icon.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/operative_s.rsi/icon.png index 26bcd5c075..5c91d2e37e 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpskirt/operative_s.rsi/icon.png and b/Resources/Textures/Clothing/Uniforms/Jumpskirt/operative_s.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/operative_s.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/Jumpskirt/operative_s.rsi/meta.json index 69bafe6d05..74a9f21f44 100644 --- a/Resources/Textures/Clothing/Uniforms/Jumpskirt/operative_s.rsi/meta.json +++ b/Resources/Textures/Clothing/Uniforms/Jumpskirt/operative_s.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/d7e905e4d5ab2b0a8ce210c6ad686aeeebbab426, monkey derivative made by brainfood1183 (github) for ss14", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/2fea0a59470c476cf3f927833d3918d89cbe6af8, monkey made by brainfood1183 (github) for ss14", "size": { "x": 32, "y": 32 @@ -27,4 +27,4 @@ "directions": 4 } ] -} \ No newline at end of file +} diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/paramedic.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/paramedic.rsi/equipped-INNERCLOTHING.png index b582d02aa8..a13937f764 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpskirt/paramedic.rsi/equipped-INNERCLOTHING.png and b/Resources/Textures/Clothing/Uniforms/Jumpskirt/paramedic.rsi/equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/paramedic.rsi/icon.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/paramedic.rsi/icon.png index 3440af11d7..7f61c958c1 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpskirt/paramedic.rsi/icon.png and b/Resources/Textures/Clothing/Uniforms/Jumpskirt/paramedic.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/qm.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/qm.rsi/equipped-INNERCLOTHING.png index 8eed62b0f7..b874dae0cc 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpskirt/qm.rsi/equipped-INNERCLOTHING.png and b/Resources/Textures/Clothing/Uniforms/Jumpskirt/qm.rsi/equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/qm.rsi/icon.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/qm.rsi/icon.png index bd94c01bba..62605c2522 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpskirt/qm.rsi/icon.png and b/Resources/Textures/Clothing/Uniforms/Jumpskirt/qm.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/scientist.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/scientist.rsi/equipped-INNERCLOTHING.png index a55307841a..6e6b2c8e2e 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpskirt/scientist.rsi/equipped-INNERCLOTHING.png and b/Resources/Textures/Clothing/Uniforms/Jumpskirt/scientist.rsi/equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/scientist.rsi/icon.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/scientist.rsi/icon.png index cf454bc23a..0580e99b2a 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpskirt/scientist.rsi/icon.png and b/Resources/Textures/Clothing/Uniforms/Jumpskirt/scientist.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/security.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/security.rsi/equipped-INNERCLOTHING.png index 8ffa6e2e94..3b8dc11904 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpskirt/security.rsi/equipped-INNERCLOTHING.png and b/Resources/Textures/Clothing/Uniforms/Jumpskirt/security.rsi/equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/security.rsi/icon.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/security.rsi/icon.png index accf74dc8f..8f89295199 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpskirt/security.rsi/icon.png and b/Resources/Textures/Clothing/Uniforms/Jumpskirt/security.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/security.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/Jumpskirt/security.rsi/meta.json index 45e0f9141c..2b78bcd698 100644 --- a/Resources/Textures/Clothing/Uniforms/Jumpskirt/security.rsi/meta.json +++ b/Resources/Textures/Clothing/Uniforms/Jumpskirt/security.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Original sec jumpsuit from tgstation at commit https://github.com/tgstation/tgstation/commit/c838ba21dae97db345e0113f99596decd1d66039, jumpskirt sprite made by Flareguy for SS14. In hand sprite scaled down by potato1234_x, monkey derivative made by brainfood1183 (github) for ss14", + "copyright": "Created by Flareguy using sprites from tgstation at commit https://github.com/tgstation/tgstation/commit/c838ba21dae97db345e0113f99596decd1d66039 & the jumpskirt base found in color.rsi.", "size": { "x": 32, "y": 32 @@ -13,18 +13,6 @@ { "name": "equipped-INNERCLOTHING", "directions": 4 - }, - { - "name": "equipped-INNERCLOTHING-monkey", - "directions": 4 - }, - { - "name": "inhand-left", - "directions": 4 - }, - { - "name": "inhand-right", - "directions": 4 } ] } diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/senior_engineer.rsi/equipped-INNERCLOTHING-monkey.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/senior_engineer.rsi/equipped-INNERCLOTHING-monkey.png index c37ef04570..7bb070857d 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpskirt/senior_engineer.rsi/equipped-INNERCLOTHING-monkey.png and b/Resources/Textures/Clothing/Uniforms/Jumpskirt/senior_engineer.rsi/equipped-INNERCLOTHING-monkey.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/senior_engineer.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/senior_engineer.rsi/equipped-INNERCLOTHING.png index 2536ec824c..172fbdda6a 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpskirt/senior_engineer.rsi/equipped-INNERCLOTHING.png and b/Resources/Textures/Clothing/Uniforms/Jumpskirt/senior_engineer.rsi/equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/senior_engineer.rsi/icon.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/senior_engineer.rsi/icon.png index 07d0b38025..7e5897e662 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpskirt/senior_engineer.rsi/icon.png and b/Resources/Textures/Clothing/Uniforms/Jumpskirt/senior_engineer.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/senior_engineer.rsi/inhand-left.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/senior_engineer.rsi/inhand-left.png index 2541991f9a..db387dfe41 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpskirt/senior_engineer.rsi/inhand-left.png and b/Resources/Textures/Clothing/Uniforms/Jumpskirt/senior_engineer.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/senior_engineer.rsi/inhand-right.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/senior_engineer.rsi/inhand-right.png index a238a7d7be..d8194eaab5 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpskirt/senior_engineer.rsi/inhand-right.png and b/Resources/Textures/Clothing/Uniforms/Jumpskirt/senior_engineer.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/senior_engineer.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/Jumpskirt/senior_engineer.rsi/meta.json index 9b15553cde..c8cd53cefe 100644 --- a/Resources/Textures/Clothing/Uniforms/Jumpskirt/senior_engineer.rsi/meta.json +++ b/Resources/Textures/Clothing/Uniforms/Jumpskirt/senior_engineer.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Edit of hazard from tgstation at commit https://github.com/tgstation/tgstation/pull/67000, by Nairod (github) for ss14", + "copyright": "Edit of hazard from tgstation at commit https://github.com/tgstation/tgstation/pull/67000, resprite by muriexlol", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/senior_officer.rsi/equipped-INNERCLOTHING-monkey.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/senior_officer.rsi/equipped-INNERCLOTHING-monkey.png index 2f8c480cb5..1e6eb63de4 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpskirt/senior_officer.rsi/equipped-INNERCLOTHING-monkey.png and b/Resources/Textures/Clothing/Uniforms/Jumpskirt/senior_officer.rsi/equipped-INNERCLOTHING-monkey.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/senior_officer.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/senior_officer.rsi/equipped-INNERCLOTHING.png index b3ecbd9712..6b303ff306 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpskirt/senior_officer.rsi/equipped-INNERCLOTHING.png and b/Resources/Textures/Clothing/Uniforms/Jumpskirt/senior_officer.rsi/equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/senior_officer.rsi/icon.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/senior_officer.rsi/icon.png index 18ab875179..50dbb8f376 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpskirt/senior_officer.rsi/icon.png and b/Resources/Textures/Clothing/Uniforms/Jumpskirt/senior_officer.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/senior_officer.rsi/inhand-left.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/senior_officer.rsi/inhand-left.png index d90b6f3c45..d331c0b8e5 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpskirt/senior_officer.rsi/inhand-left.png and b/Resources/Textures/Clothing/Uniforms/Jumpskirt/senior_officer.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/senior_officer.rsi/inhand-right.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/senior_officer.rsi/inhand-right.png index 356e2a5ec2..e1fb6de9ec 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpskirt/senior_officer.rsi/inhand-right.png and b/Resources/Textures/Clothing/Uniforms/Jumpskirt/senior_officer.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/senior_officer.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/Jumpskirt/senior_officer.rsi/meta.json index 7f498ead9b..d6abb0ec89 100644 --- a/Resources/Textures/Clothing/Uniforms/Jumpskirt/senior_officer.rsi/meta.json +++ b/Resources/Textures/Clothing/Uniforms/Jumpskirt/senior_officer.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Edit by Nairodian (github) of secskirt taken from tgstation at commit https://github.com/tgstation/tgstation/commit/7779930358ba4776575975690d2c952f0d05c6cc", + "copyright": "Edit by Nairodian (github) of secskirt taken from tgstation at commit https://github.com/tgstation/tgstation/commit/7779930358ba4776575975690d2c952f0d05c6cc, resprite by muriexlol", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/senior_physician.rsi/equipped-INNERCLOTHING-monkey.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/senior_physician.rsi/equipped-INNERCLOTHING-monkey.png index 4e98c89cc9..5fe59915ce 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpskirt/senior_physician.rsi/equipped-INNERCLOTHING-monkey.png and b/Resources/Textures/Clothing/Uniforms/Jumpskirt/senior_physician.rsi/equipped-INNERCLOTHING-monkey.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/senior_physician.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/senior_physician.rsi/equipped-INNERCLOTHING.png index 311e0aecb9..c94c6f8db7 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpskirt/senior_physician.rsi/equipped-INNERCLOTHING.png and b/Resources/Textures/Clothing/Uniforms/Jumpskirt/senior_physician.rsi/equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/senior_physician.rsi/icon.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/senior_physician.rsi/icon.png index aaee2537da..1ef2d2ad0d 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpskirt/senior_physician.rsi/icon.png and b/Resources/Textures/Clothing/Uniforms/Jumpskirt/senior_physician.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/senior_physician.rsi/inhand-left.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/senior_physician.rsi/inhand-left.png index e0b2d4759b..3671b2a450 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpskirt/senior_physician.rsi/inhand-left.png and b/Resources/Textures/Clothing/Uniforms/Jumpskirt/senior_physician.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/senior_physician.rsi/inhand-right.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/senior_physician.rsi/inhand-right.png index a2ecc2b551..b0b494d5f5 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpskirt/senior_physician.rsi/inhand-right.png and b/Resources/Textures/Clothing/Uniforms/Jumpskirt/senior_physician.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/senior_physician.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/Jumpskirt/senior_physician.rsi/meta.json index 5b8e413038..da2b6066cb 100644 --- a/Resources/Textures/Clothing/Uniforms/Jumpskirt/senior_physician.rsi/meta.json +++ b/Resources/Textures/Clothing/Uniforms/Jumpskirt/senior_physician.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Edit by Nairodian (github) of paramedic_skirt from tgstation at pull request https://github.com/tgstation/tgstation/pull/48236.", + "copyright": "Edit by Nairodian (github) of paramedic_skirt from tgstation at pull request https://github.com/tgstation/tgstation/pull/48236, resprite by muriexlol", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/senior_researcher.rsi/equipped-INNERCLOTHING-monkey.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/senior_researcher.rsi/equipped-INNERCLOTHING-monkey.png index b317451d8f..afe9c8e187 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpskirt/senior_researcher.rsi/equipped-INNERCLOTHING-monkey.png and b/Resources/Textures/Clothing/Uniforms/Jumpskirt/senior_researcher.rsi/equipped-INNERCLOTHING-monkey.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/senior_researcher.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/senior_researcher.rsi/equipped-INNERCLOTHING.png index 0d1e3b13bf..763776e4af 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpskirt/senior_researcher.rsi/equipped-INNERCLOTHING.png and b/Resources/Textures/Clothing/Uniforms/Jumpskirt/senior_researcher.rsi/equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/senior_researcher.rsi/icon.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/senior_researcher.rsi/icon.png index 8bbaf401e9..8bfc4cf7b0 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpskirt/senior_researcher.rsi/icon.png and b/Resources/Textures/Clothing/Uniforms/Jumpskirt/senior_researcher.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/senior_researcher.rsi/inhand-left.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/senior_researcher.rsi/inhand-left.png index 197f1a6af5..5c985b11ed 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpskirt/senior_researcher.rsi/inhand-left.png and b/Resources/Textures/Clothing/Uniforms/Jumpskirt/senior_researcher.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/senior_researcher.rsi/inhand-right.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/senior_researcher.rsi/inhand-right.png index edd1c6fdbb..06595802ae 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpskirt/senior_researcher.rsi/inhand-right.png and b/Resources/Textures/Clothing/Uniforms/Jumpskirt/senior_researcher.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/senior_researcher.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/Jumpskirt/senior_researcher.rsi/meta.json index c2d804360b..259724c900 100644 --- a/Resources/Textures/Clothing/Uniforms/Jumpskirt/senior_researcher.rsi/meta.json +++ b/Resources/Textures/Clothing/Uniforms/Jumpskirt/senior_researcher.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Edited by Nairodian (github) from the formal scientist jumpsuit by Flareguy for Space Station 14.", + "copyright": "Edited by Nairodian (github) from the formal scientist jumpsuit by Flareguy, resprite by muriexlol", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/stripeddress.rsi/color-equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/stripeddress.rsi/color-equipped-INNERCLOTHING.png new file mode 100644 index 0000000000..5fdda87272 Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpskirt/stripeddress.rsi/color-equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/stripeddress.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/stripeddress.rsi/equipped-INNERCLOTHING.png new file mode 100644 index 0000000000..197c68a0ff Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpskirt/stripeddress.rsi/equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/stripeddress.rsi/icon-color.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/stripeddress.rsi/icon-color.png new file mode 100644 index 0000000000..b820ea97fd Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpskirt/stripeddress.rsi/icon-color.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/stripeddress.rsi/icon.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/stripeddress.rsi/icon.png new file mode 100644 index 0000000000..dfdc270ccc Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpskirt/stripeddress.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/stripeddress.rsi/inhand-left.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/stripeddress.rsi/inhand-left.png new file mode 100644 index 0000000000..33d9c9e1ed Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpskirt/stripeddress.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/stripeddress.rsi/inhand-right.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/stripeddress.rsi/inhand-right.png new file mode 100644 index 0000000000..af99737e99 Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpskirt/stripeddress.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/stripeddress.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/Jumpskirt/stripeddress.rsi/meta.json new file mode 100644 index 0000000000..4ff6d9a9f4 --- /dev/null +++ b/Resources/Textures/Clothing/Uniforms/Jumpskirt/stripeddress.rsi/meta.json @@ -0,0 +1,33 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Add new dress by DreamlyJack", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "icon-color" + }, + { + "name": "equipped-INNERCLOTHING", + "directions": 4 + }, + { + "name": "color-equipped-INNERCLOTHING", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/turtledress.rsi/color-equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/turtledress.rsi/color-equipped-INNERCLOTHING.png new file mode 100644 index 0000000000..8146dce76e Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpskirt/turtledress.rsi/color-equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/turtledress.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/turtledress.rsi/equipped-INNERCLOTHING.png new file mode 100644 index 0000000000..71ea0285e9 Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpskirt/turtledress.rsi/equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/turtledress.rsi/icon-color.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/turtledress.rsi/icon-color.png new file mode 100644 index 0000000000..4673c4fd34 Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpskirt/turtledress.rsi/icon-color.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/turtledress.rsi/icon.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/turtledress.rsi/icon.png new file mode 100644 index 0000000000..cb2f5f98f9 Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpskirt/turtledress.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/turtledress.rsi/inhand-left.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/turtledress.rsi/inhand-left.png new file mode 100644 index 0000000000..bd61c158f5 Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpskirt/turtledress.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/turtledress.rsi/inhand-right.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/turtledress.rsi/inhand-right.png new file mode 100644 index 0000000000..c8d4e8affb Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpskirt/turtledress.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/turtledress.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/Jumpskirt/turtledress.rsi/meta.json new file mode 100644 index 0000000000..4ff6d9a9f4 --- /dev/null +++ b/Resources/Textures/Clothing/Uniforms/Jumpskirt/turtledress.rsi/meta.json @@ -0,0 +1,33 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Add new dress by DreamlyJack", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "icon-color" + }, + { + "name": "equipped-INNERCLOTHING", + "directions": 4 + }, + { + "name": "color-equipped-INNERCLOTHING", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/virology.rsi/equipped-INNERCLOTHING-monkey.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/virology.rsi/equipped-INNERCLOTHING-monkey.png index 0dbaa2e513..23e89143db 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpskirt/virology.rsi/equipped-INNERCLOTHING-monkey.png and b/Resources/Textures/Clothing/Uniforms/Jumpskirt/virology.rsi/equipped-INNERCLOTHING-monkey.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/virology.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/virology.rsi/equipped-INNERCLOTHING.png index 361a1d1e04..8aa53631d1 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpskirt/virology.rsi/equipped-INNERCLOTHING.png and b/Resources/Textures/Clothing/Uniforms/Jumpskirt/virology.rsi/equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/virology.rsi/icon.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/virology.rsi/icon.png index a93fd858b6..1ff590e327 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpskirt/virology.rsi/icon.png and b/Resources/Textures/Clothing/Uniforms/Jumpskirt/virology.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/virology.rsi/inhand-left.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/virology.rsi/inhand-left.png index 1bb069da77..00810b8b8b 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpskirt/virology.rsi/inhand-left.png and b/Resources/Textures/Clothing/Uniforms/Jumpskirt/virology.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/virology.rsi/inhand-right.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/virology.rsi/inhand-right.png index e8cfe71e97..d157d36e8d 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpskirt/virology.rsi/inhand-right.png and b/Resources/Textures/Clothing/Uniforms/Jumpskirt/virology.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/virology.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/Jumpskirt/virology.rsi/meta.json index bbcef071e2..92c141c806 100644 --- a/Resources/Textures/Clothing/Uniforms/Jumpskirt/virology.rsi/meta.json +++ b/Resources/Textures/Clothing/Uniforms/Jumpskirt/virology.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c838ba21dae97db345e0113f99596decd1d66039. In hand sprite scaled down by potato1234_x, monkey derivative made by brainfood1183 (github) for ss14", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c838ba21dae97db345e0113f99596decd1d66039. In hand sprite scaled down by potato1234_x, monkey derivative made by brainfood1183 (github) for ss14, Resprited by Mureixlol", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/warden.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/warden.rsi/equipped-INNERCLOTHING.png index 56e7e3567a..3cbdadb672 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpskirt/warden.rsi/equipped-INNERCLOTHING.png and b/Resources/Textures/Clothing/Uniforms/Jumpskirt/warden.rsi/equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/warden.rsi/icon.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/warden.rsi/icon.png index 77db2ff028..75e2558dd4 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpskirt/warden.rsi/icon.png and b/Resources/Textures/Clothing/Uniforms/Jumpskirt/warden.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/warden.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/Jumpskirt/warden.rsi/meta.json index bbcef071e2..2b78bcd698 100644 --- a/Resources/Textures/Clothing/Uniforms/Jumpskirt/warden.rsi/meta.json +++ b/Resources/Textures/Clothing/Uniforms/Jumpskirt/warden.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c838ba21dae97db345e0113f99596decd1d66039. In hand sprite scaled down by potato1234_x, monkey derivative made by brainfood1183 (github) for ss14", + "copyright": "Created by Flareguy using sprites from tgstation at commit https://github.com/tgstation/tgstation/commit/c838ba21dae97db345e0113f99596decd1d66039 & the jumpskirt base found in color.rsi.", "size": { "x": 32, "y": 32 @@ -13,18 +13,6 @@ { "name": "equipped-INNERCLOTHING", "directions": 4 - }, - { - "name": "equipped-INNERCLOTHING-monkey", - "directions": 4 - }, - { - "name": "inhand-left", - "directions": 4 - }, - { - "name": "inhand-right", - "directions": 4 } ] } diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/ancient.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/ancient.rsi/equipped-INNERCLOTHING.png index e74a13048f..3fad51040a 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/ancient.rsi/equipped-INNERCLOTHING.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/ancient.rsi/equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/ancient.rsi/icon.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/ancient.rsi/icon.png index 61b1d0694a..8c3a66b401 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/ancient.rsi/icon.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/ancient.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/ancient.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/Jumpsuit/ancient.rsi/meta.json index 2a6baf4b14..d676ecc29d 100644 --- a/Resources/Textures/Clothing/Uniforms/Jumpsuit/ancient.rsi/meta.json +++ b/Resources/Textures/Clothing/Uniforms/Jumpsuit/ancient.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit (Will update when PR'd), monkey made by brainfood1183 (github) for ss14", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/2fea0a59470c476cf3f927833d3918d89cbe6af8, monkey made by brainfood1183 (github) for ss14, reptilian made by kuro(388673708753027083)", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/atmos.rsi/equipped-INNERCLOTHING-monkey.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/atmos.rsi/equipped-INNERCLOTHING-monkey.png index 0c91885662..4fd9e0a298 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/atmos.rsi/equipped-INNERCLOTHING-monkey.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/atmos.rsi/equipped-INNERCLOTHING-monkey.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/atmos.rsi/equipped-INNERCLOTHING-reptilian.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/atmos.rsi/equipped-INNERCLOTHING-reptilian.png new file mode 100644 index 0000000000..d8960add98 Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/atmos.rsi/equipped-INNERCLOTHING-reptilian.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/atmos.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/atmos.rsi/equipped-INNERCLOTHING.png index def12bafc6..8241820827 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/atmos.rsi/equipped-INNERCLOTHING.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/atmos.rsi/equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/atmos.rsi/icon.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/atmos.rsi/icon.png index 209d9a8ab3..2929d36092 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/atmos.rsi/icon.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/atmos.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/atmos.rsi/inhand-left.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/atmos.rsi/inhand-left.png index 9cfedb2728..d2d855afad 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/atmos.rsi/inhand-left.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/atmos.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/atmos.rsi/inhand-right.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/atmos.rsi/inhand-right.png index e5035e20de..d72da5b242 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/atmos.rsi/inhand-right.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/atmos.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/atmos.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/Jumpsuit/atmos.rsi/meta.json index 9f268718cf..3a8ebd8767 100644 --- a/Resources/Textures/Clothing/Uniforms/Jumpsuit/atmos.rsi/meta.json +++ b/Resources/Textures/Clothing/Uniforms/Jumpsuit/atmos.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "https://github.com/tgstation/tgstation/commit/beaea876ea426c0e215cee64619862dc19bd9cd8, monkey made by brainfood1183 (github)", + "copyright": "https://github.com/tgstation/tgstation/commit/2fea0a59470c476cf3f927833d3918d89cbe6af8, monkey made by SonicHDC (github) for ss14, reptilian made by kuro(388673708753027083)", "size": { "x": 32, "y": 32 @@ -27,4 +27,4 @@ "directions": 4 } ] -} \ No newline at end of file +} diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/atmos_casual.rsi/equipped-INNERCLOTHING-reptilian.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/atmos_casual.rsi/equipped-INNERCLOTHING-reptilian.png new file mode 100644 index 0000000000..317f89c00f Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/atmos_casual.rsi/equipped-INNERCLOTHING-reptilian.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/atmos_casual.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/atmos_casual.rsi/equipped-INNERCLOTHING.png index 567435a374..c0a55d4d0f 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/atmos_casual.rsi/equipped-INNERCLOTHING.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/atmos_casual.rsi/equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/atmos_casual.rsi/icon.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/atmos_casual.rsi/icon.png index 0ccbcfd86b..cdd25ffc2d 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/atmos_casual.rsi/icon.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/atmos_casual.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/atmos_casual.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/Jumpsuit/atmos_casual.rsi/meta.json index 7cd0cba745..86650307e2 100644 --- a/Resources/Textures/Clothing/Uniforms/Jumpsuit/atmos_casual.rsi/meta.json +++ b/Resources/Textures/Clothing/Uniforms/Jumpsuit/atmos_casual.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Sprited by KingFroozy (github) for space station 14", + "copyright": "Sprited by KingFroozy (github) for space station 14, reptilian made by hqlle(444118014024220672)", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/bartender.rsi/equipped-INNERCLOTHING-reptilian.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/bartender.rsi/equipped-INNERCLOTHING-reptilian.png new file mode 100644 index 0000000000..cba1d28f0e Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/bartender.rsi/equipped-INNERCLOTHING-reptilian.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/bartender.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/bartender.rsi/equipped-INNERCLOTHING.png index 4b5753f792..66a84f8a3f 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/bartender.rsi/equipped-INNERCLOTHING.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/bartender.rsi/equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/bartender.rsi/icon.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/bartender.rsi/icon.png index a403b7442f..cfa17d57b9 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/bartender.rsi/icon.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/bartender.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/bartender.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/Jumpsuit/bartender.rsi/meta.json index b02e5f4b8a..9db23a03f3 100644 --- a/Resources/Textures/Clothing/Uniforms/Jumpsuit/bartender.rsi/meta.json +++ b/Resources/Textures/Clothing/Uniforms/Jumpsuit/bartender.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c838ba21dae97db345e0113f99596decd1d66039, monkey made by brainfood1183 (github), monkey made by brainfood1183 (github) for ss14, default suit edit by Skarletto (github)", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c838ba21dae97db345e0113f99596decd1d66039, monkey made by brainfood1183 (github), monkey made by brainfood1183 (github) for ss14, default suit edit by Skarletto (github), reptilian made by kuro(388673708753027083)", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/bartender_purple.rsi/equipped-INNERCLOTHING-reptilian.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/bartender_purple.rsi/equipped-INNERCLOTHING-reptilian.png new file mode 100644 index 0000000000..49851b9bb7 Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/bartender_purple.rsi/equipped-INNERCLOTHING-reptilian.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/bartender_purple.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/bartender_purple.rsi/equipped-INNERCLOTHING.png index 2a4afedac9..927ca7a34b 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/bartender_purple.rsi/equipped-INNERCLOTHING.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/bartender_purple.rsi/equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/bartender_purple.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/Jumpsuit/bartender_purple.rsi/meta.json index 3f72fb4460..234f097cb9 100644 --- a/Resources/Textures/Clothing/Uniforms/Jumpsuit/bartender_purple.rsi/meta.json +++ b/Resources/Textures/Clothing/Uniforms/Jumpsuit/bartender_purple.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c838ba21dae97db345e0113f99596decd1d66039. In hand sprite scaled down by potato1234_x, monkey made by brainfood1183 (github) for ss14", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c838ba21dae97db345e0113f99596decd1d66039. In hand sprite scaled down by potato1234_x, monkey made by brainfood1183 (github) for ss14, reptilian made by kuro(388673708753027083)", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/brigmedic.rsi/equipped-INNERCLOTHING-monkey.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/brigmedic.rsi/equipped-INNERCLOTHING-monkey.png index c4d767aaaa..3bf61f8e73 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/brigmedic.rsi/equipped-INNERCLOTHING-monkey.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/brigmedic.rsi/equipped-INNERCLOTHING-monkey.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/brigmedic.rsi/equipped-INNERCLOTHING-reptilian.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/brigmedic.rsi/equipped-INNERCLOTHING-reptilian.png new file mode 100644 index 0000000000..9255751a8e Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/brigmedic.rsi/equipped-INNERCLOTHING-reptilian.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/brigmedic.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/brigmedic.rsi/equipped-INNERCLOTHING.png index 160d5a94ab..14fd53839b 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/brigmedic.rsi/equipped-INNERCLOTHING.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/brigmedic.rsi/equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/brigmedic.rsi/icon.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/brigmedic.rsi/icon.png index c0a4aa3346..7ca2c4db1f 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/brigmedic.rsi/icon.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/brigmedic.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/brigmedic.rsi/inhand-left.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/brigmedic.rsi/inhand-left.png index fbb4b5e7a4..c473f19e70 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/brigmedic.rsi/inhand-left.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/brigmedic.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/brigmedic.rsi/inhand-right.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/brigmedic.rsi/inhand-right.png index 35244353f1..3b5560521e 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/brigmedic.rsi/inhand-right.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/brigmedic.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/brigmedic.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/Jumpsuit/brigmedic.rsi/meta.json index d2d511d517..80b47d32f7 100644 --- a/Resources/Textures/Clothing/Uniforms/Jumpsuit/brigmedic.rsi/meta.json +++ b/Resources/Textures/Clothing/Uniforms/Jumpsuit/brigmedic.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Made by PuroSlavKing (github) for SS14 | Resprited by Hülle#2562 (Discord), monkey made by brainfood1183 (github) for ss14", + "copyright": "Taken from Skyrat-tg https://github.com/Skyrat-SS13/Skyrat-tg/blob/735606d73c5262dcce6a5d9b9cfc797eb5a64946/modular_skyrat/master_files/icons/mob/clothing/under/security.dmi, monkey made by brainfood1183 (github) for ss14, reptilian made by kuro(388673708753027083)", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/capformal.rsi/equipped-INNERCLOTHING-monkey.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/capformal.rsi/equipped-INNERCLOTHING-monkey.png index f7bd08b91d..f6003b8d90 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/capformal.rsi/equipped-INNERCLOTHING-monkey.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/capformal.rsi/equipped-INNERCLOTHING-monkey.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/capformal.rsi/equipped-INNERCLOTHING-reptilian.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/capformal.rsi/equipped-INNERCLOTHING-reptilian.png new file mode 100644 index 0000000000..0391ee21e8 Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/capformal.rsi/equipped-INNERCLOTHING-reptilian.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/capformal.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/capformal.rsi/equipped-INNERCLOTHING.png index fbd1b6aea5..78488e3115 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/capformal.rsi/equipped-INNERCLOTHING.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/capformal.rsi/equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/capformal.rsi/icon.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/capformal.rsi/icon.png index 127e4ded44..b2ed39dc85 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/capformal.rsi/icon.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/capformal.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/capformal.rsi/inhand-left.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/capformal.rsi/inhand-left.png index f0dad45c99..711911f38a 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/capformal.rsi/inhand-left.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/capformal.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/capformal.rsi/inhand-right.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/capformal.rsi/inhand-right.png index 1d8ab34a20..45e1458173 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/capformal.rsi/inhand-right.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/capformal.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/capformal.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/Jumpsuit/capformal.rsi/meta.json index 3eb2f76553..d089969f67 100644 --- a/Resources/Textures/Clothing/Uniforms/Jumpsuit/capformal.rsi/meta.json +++ b/Resources/Textures/Clothing/Uniforms/Jumpsuit/capformal.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation https://github.com/tgstation/tgstation/commit/30892aa892a2be846592b068ab71c606e2f0c5b7,edited by Emisse for ss14, monkey made by brainfood1183 (github) for ss14", + "copyright": "Taken from tgstation https://github.com/tgstation/tgstation/commit/2fea0a59470c476cf3f927833d3918d89cbe6af8, monkey made by SonicHDC (github) for ss14, reptilian made by kuro(388673708753027083)", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/captain.rsi/equipped-INNERCLOTHING-monkey.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/captain.rsi/equipped-INNERCLOTHING-monkey.png index 368d24a333..b251a7e7fe 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/captain.rsi/equipped-INNERCLOTHING-monkey.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/captain.rsi/equipped-INNERCLOTHING-monkey.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/captain.rsi/equipped-INNERCLOTHING-reptilian.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/captain.rsi/equipped-INNERCLOTHING-reptilian.png new file mode 100644 index 0000000000..546b81558a Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/captain.rsi/equipped-INNERCLOTHING-reptilian.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/captain.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/captain.rsi/equipped-INNERCLOTHING.png index 5ad7eb1c1b..afd579353d 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/captain.rsi/equipped-INNERCLOTHING.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/captain.rsi/equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/captain.rsi/icon.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/captain.rsi/icon.png index 0d6dc2631b..eba93ed3c5 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/captain.rsi/icon.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/captain.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/captain.rsi/inhand-left.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/captain.rsi/inhand-left.png index 1bccf1eb46..83cb923767 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/captain.rsi/inhand-left.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/captain.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/captain.rsi/inhand-right.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/captain.rsi/inhand-right.png index e0b994af89..b904d28005 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/captain.rsi/inhand-right.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/captain.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/captain.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/Jumpsuit/captain.rsi/meta.json index 6eb08f0f32..de9a397ce5 100644 --- a/Resources/Textures/Clothing/Uniforms/Jumpsuit/captain.rsi/meta.json +++ b/Resources/Textures/Clothing/Uniforms/Jumpsuit/captain.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "monkey derivative derived by brainfood1183 (github) for ss14 from tgstation at commit https://github.com/tgstation/tgstation/commit/dd97a0e45d904fffadd9d2caad22aedd0d09f3ab then edited by Skarletto (github). Other sprites taken from tgstation at https://github.com/tgstation/tgstation/pull/69842/commits/d8138946b0ed06fced522729ac8eaa0596864329 and edited by Skarletto (github), edited by Emisse for ss14", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/d8138946b0ed06fced522729ac8eaa0596864329. In hand sprite scaled down by SonicHDC, monkey made by SonicHDC (github) for ss14, reptilian made by kuro(388673708753027083)", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/cargotech.rsi/equipped-INNERCLOTHING-monkey.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/cargotech.rsi/equipped-INNERCLOTHING-monkey.png index 12e582665b..5a4dfcc3a9 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/cargotech.rsi/equipped-INNERCLOTHING-monkey.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/cargotech.rsi/equipped-INNERCLOTHING-monkey.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/cargotech.rsi/equipped-INNERCLOTHING-reptilian.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/cargotech.rsi/equipped-INNERCLOTHING-reptilian.png new file mode 100644 index 0000000000..cc0cf452b7 Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/cargotech.rsi/equipped-INNERCLOTHING-reptilian.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/cargotech.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/cargotech.rsi/equipped-INNERCLOTHING.png index 2c4d0d5d46..2dd870b860 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/cargotech.rsi/equipped-INNERCLOTHING.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/cargotech.rsi/equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/cargotech.rsi/icon.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/cargotech.rsi/icon.png index fede092c27..d545ff8d67 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/cargotech.rsi/icon.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/cargotech.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/cargotech.rsi/inhand-left.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/cargotech.rsi/inhand-left.png index 190f71c4a5..de42943e00 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/cargotech.rsi/inhand-left.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/cargotech.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/cargotech.rsi/inhand-right.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/cargotech.rsi/inhand-right.png index 9885a2bd4a..79c0585a87 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/cargotech.rsi/inhand-right.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/cargotech.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/cargotech.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/Jumpsuit/cargotech.rsi/meta.json index 12bdb72c4a..d16fc30a0f 100644 --- a/Resources/Textures/Clothing/Uniforms/Jumpsuit/cargotech.rsi/meta.json +++ b/Resources/Textures/Clothing/Uniforms/Jumpsuit/cargotech.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c838ba21dae97db345e0113f99596decd1d66039, edited by Flareguy. In hand sprite scaled down by potato1234_x, monkey made by brainfood1183 (github) for ss14", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c838ba21dae97db345e0113f99596decd1d66039. In hand sprite scaled down by potato1234_x, monkey made by SonicHDC (github) for ss14, reptilian made by kuro(388673708753027083)", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/ce.rsi/equipped-INNERCLOTHING-monkey.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/ce.rsi/equipped-INNERCLOTHING-monkey.png index e0881f66bb..48f9bd4862 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/ce.rsi/equipped-INNERCLOTHING-monkey.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/ce.rsi/equipped-INNERCLOTHING-monkey.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/ce.rsi/equipped-INNERCLOTHING-reptilian.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/ce.rsi/equipped-INNERCLOTHING-reptilian.png new file mode 100644 index 0000000000..3f34c5be8b Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/ce.rsi/equipped-INNERCLOTHING-reptilian.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/ce.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/ce.rsi/equipped-INNERCLOTHING.png index e9165f29cc..99659bcaec 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/ce.rsi/equipped-INNERCLOTHING.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/ce.rsi/equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/ce.rsi/icon.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/ce.rsi/icon.png index e2c37a0c2c..0419be7842 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/ce.rsi/icon.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/ce.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/ce.rsi/inhand-left.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/ce.rsi/inhand-left.png index 94d9ed8605..7592d065ff 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/ce.rsi/inhand-left.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/ce.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/ce.rsi/inhand-right.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/ce.rsi/inhand-right.png index 560879a0f2..22148ba486 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/ce.rsi/inhand-right.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/ce.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/ce.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/Jumpsuit/ce.rsi/meta.json index 1d012747b8..f31829991b 100644 --- a/Resources/Textures/Clothing/Uniforms/Jumpsuit/ce.rsi/meta.json +++ b/Resources/Textures/Clothing/Uniforms/Jumpsuit/ce.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c838ba21dae97db345e0113f99596decd1d66039. In hand sprite scaled down by potato1234_x, monkey made by brainfood1183 (github) for ss14", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c838ba21dae97db345e0113f99596decd1d66039. In hand sprite scaled down by potato1234_x, monkey made by SonicHDC (github) for ss14, reptilian made by kuro(388673708753027083)", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/ce_nt.rsi/equipped-INNERCLOTHING-reptilian.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/ce_nt.rsi/equipped-INNERCLOTHING-reptilian.png new file mode 100644 index 0000000000..f4d7057e87 Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/ce_nt.rsi/equipped-INNERCLOTHING-reptilian.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/ce_nt.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/Jumpsuit/ce_nt.rsi/meta.json index 8b0bae84ea..2dcc581edf 100644 --- a/Resources/Textures/Clothing/Uniforms/Jumpsuit/ce_nt.rsi/meta.json +++ b/Resources/Textures/Clothing/Uniforms/Jumpsuit/ce_nt.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Made by Flareguy for Space Station 14, base sprite taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c838ba21dae97db345e0113f99596decd1d66039, monkey made by brainfood1183 (github) for ss14", + "copyright": "Made by Flareguy for Space Station 14, base sprite taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c838ba21dae97db345e0113f99596decd1d66039, monkey made by brainfood1183 (github) for ss14, reptilian made by hqlle(444118014024220672)", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/ce_syndie.rsi/equipped-INNERCLOTHING-reptilian.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/ce_syndie.rsi/equipped-INNERCLOTHING-reptilian.png new file mode 100644 index 0000000000..2ba22afa79 Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/ce_syndie.rsi/equipped-INNERCLOTHING-reptilian.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/ce_syndie.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/Jumpsuit/ce_syndie.rsi/meta.json index 8b0bae84ea..2dcc581edf 100644 --- a/Resources/Textures/Clothing/Uniforms/Jumpsuit/ce_syndie.rsi/meta.json +++ b/Resources/Textures/Clothing/Uniforms/Jumpsuit/ce_syndie.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Made by Flareguy for Space Station 14, base sprite taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c838ba21dae97db345e0113f99596decd1d66039, monkey made by brainfood1183 (github) for ss14", + "copyright": "Made by Flareguy for Space Station 14, base sprite taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c838ba21dae97db345e0113f99596decd1d66039, monkey made by brainfood1183 (github) for ss14, reptilian made by hqlle(444118014024220672)", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/centcom_officer.rsi/equipped-INNERCLOTHING-monkey.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/centcom_officer.rsi/equipped-INNERCLOTHING-monkey.png index ad203eb9b3..fe77eb77ef 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/centcom_officer.rsi/equipped-INNERCLOTHING-monkey.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/centcom_officer.rsi/equipped-INNERCLOTHING-monkey.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/centcom_officer.rsi/equipped-INNERCLOTHING-reptilian.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/centcom_officer.rsi/equipped-INNERCLOTHING-reptilian.png new file mode 100644 index 0000000000..b4fbf22af0 Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/centcom_officer.rsi/equipped-INNERCLOTHING-reptilian.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/centcom_officer.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/centcom_officer.rsi/equipped-INNERCLOTHING.png index 79e6727660..c509859469 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/centcom_officer.rsi/equipped-INNERCLOTHING.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/centcom_officer.rsi/equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/centcom_officer.rsi/icon.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/centcom_officer.rsi/icon.png index 3c407d9f12..dd26125b97 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/centcom_officer.rsi/icon.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/centcom_officer.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/centcom_officer.rsi/inhand-left.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/centcom_officer.rsi/inhand-left.png index 1a66d158f4..e598552bbd 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/centcom_officer.rsi/inhand-left.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/centcom_officer.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/centcom_officer.rsi/inhand-right.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/centcom_officer.rsi/inhand-right.png index 7b51b6e120..2dffdb0400 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/centcom_officer.rsi/inhand-right.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/centcom_officer.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/centcom_officer.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/Jumpsuit/centcom_officer.rsi/meta.json index d9094ea077..cd06fb48d5 100644 --- a/Resources/Textures/Clothing/Uniforms/Jumpsuit/centcom_officer.rsi/meta.json +++ b/Resources/Textures/Clothing/Uniforms/Jumpsuit/centcom_officer.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c838ba21dae97db345e0113f99596decd1d66039. In hand sprite scaled down by potato1234_x, monkey made by brainfood1183 (github) for ss14. Sprites recolored by joshepvodka", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c838ba21dae97db345e0113f99596decd1d66039. In hand sprite scaled down by potato1234_x, monkey made by SonicHDC (github) for ss14, reptilian made by kuro(388673708753027083)", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/centcom_official.rsi/equipped-INNERCLOTHING-monkey.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/centcom_official.rsi/equipped-INNERCLOTHING-monkey.png index c1aa7a7592..348f64c294 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/centcom_official.rsi/equipped-INNERCLOTHING-monkey.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/centcom_official.rsi/equipped-INNERCLOTHING-monkey.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/centcom_official.rsi/equipped-INNERCLOTHING-reptilian.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/centcom_official.rsi/equipped-INNERCLOTHING-reptilian.png new file mode 100644 index 0000000000..a26665a2c3 Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/centcom_official.rsi/equipped-INNERCLOTHING-reptilian.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/centcom_official.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/centcom_official.rsi/equipped-INNERCLOTHING.png index aef08cee2c..be50ecee1e 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/centcom_official.rsi/equipped-INNERCLOTHING.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/centcom_official.rsi/equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/centcom_official.rsi/icon.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/centcom_official.rsi/icon.png index 9fcf7ace5a..11cf6c6f98 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/centcom_official.rsi/icon.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/centcom_official.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/centcom_official.rsi/inhand-left.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/centcom_official.rsi/inhand-left.png index 942a5247ab..83174d99b5 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/centcom_official.rsi/inhand-left.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/centcom_official.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/centcom_official.rsi/inhand-right.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/centcom_official.rsi/inhand-right.png index 65f7b91a71..ba6037826b 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/centcom_official.rsi/inhand-right.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/centcom_official.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/centcom_official.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/Jumpsuit/centcom_official.rsi/meta.json index 1fb9cf1b66..0ff311dae2 100644 --- a/Resources/Textures/Clothing/Uniforms/Jumpsuit/centcom_official.rsi/meta.json +++ b/Resources/Textures/Clothing/Uniforms/Jumpsuit/centcom_official.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c838ba21dae97db345e0113f99596decd1d66039, monkey made by brainfood1183 (github) for ss14", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/2fea0a59470c476cf3f927833d3918d89cbe6af8, monkey made by SonicHDC (github) for ss14, reptilian made by kuro(388673708753027083)", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/centcomformal.rsi/equipped-INNERCLOTHING-monkey.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/centcomformal.rsi/equipped-INNERCLOTHING-monkey.png index d7cbcf3fd8..b0ea9531c9 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/centcomformal.rsi/equipped-INNERCLOTHING-monkey.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/centcomformal.rsi/equipped-INNERCLOTHING-monkey.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/centcomformal.rsi/equipped-INNERCLOTHING-reptilian.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/centcomformal.rsi/equipped-INNERCLOTHING-reptilian.png new file mode 100644 index 0000000000..8f1055ef54 Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/centcomformal.rsi/equipped-INNERCLOTHING-reptilian.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/centcomformal.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/centcomformal.rsi/equipped-INNERCLOTHING.png index b93cc6f8d9..7d8d40bbd1 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/centcomformal.rsi/equipped-INNERCLOTHING.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/centcomformal.rsi/equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/centcomformal.rsi/icon.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/centcomformal.rsi/icon.png index 2c05e0f6c4..88682feb80 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/centcomformal.rsi/icon.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/centcomformal.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/centcomformal.rsi/inhand-left.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/centcomformal.rsi/inhand-left.png index 8d3b010a94..0bb04a0d5b 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/centcomformal.rsi/inhand-left.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/centcomformal.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/centcomformal.rsi/inhand-right.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/centcomformal.rsi/inhand-right.png index 6664a7a58e..eaa13312f1 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/centcomformal.rsi/inhand-right.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/centcomformal.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/centcomformal.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/Jumpsuit/centcomformal.rsi/meta.json index e771fed56c..9f456f1d31 100644 --- a/Resources/Textures/Clothing/Uniforms/Jumpsuit/centcomformal.rsi/meta.json +++ b/Resources/Textures/Clothing/Uniforms/Jumpsuit/centcomformal.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation https://github.com/tgstation/tgstation/commit/30892aa892a2be846592b068ab71c606e2f0c5b7, monkey made by brainfood1183 (github) for ss14", + "copyright": "Taken from tgstation https://github.com/tgstation/tgstation/commit/30892aa892a2be846592b068ab71c606e2f0c5b7, monkey made by SonicHDC (github) for ss14, reptilian made by Hemo(269831232517308416)", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/chaplain.rsi/equipped-INNERCLOTHING-reptilian.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/chaplain.rsi/equipped-INNERCLOTHING-reptilian.png new file mode 100644 index 0000000000..4dddbe160b Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/chaplain.rsi/equipped-INNERCLOTHING-reptilian.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/chaplain.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/chaplain.rsi/equipped-INNERCLOTHING.png index 7423a21e65..fdb9558af6 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/chaplain.rsi/equipped-INNERCLOTHING.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/chaplain.rsi/equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/chaplain.rsi/icon.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/chaplain.rsi/icon.png index 01d31abcc8..da40d32ba0 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/chaplain.rsi/icon.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/chaplain.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/chaplain.rsi/inhand-left.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/chaplain.rsi/inhand-left.png index 3520c2732a..e992ce455e 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/chaplain.rsi/inhand-left.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/chaplain.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/chaplain.rsi/inhand-right.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/chaplain.rsi/inhand-right.png index 2c8df85d4d..177d357985 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/chaplain.rsi/inhand-right.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/chaplain.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/chaplain.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/Jumpsuit/chaplain.rsi/meta.json index 1fb9cf1b66..d676ecc29d 100644 --- a/Resources/Textures/Clothing/Uniforms/Jumpsuit/chaplain.rsi/meta.json +++ b/Resources/Textures/Clothing/Uniforms/Jumpsuit/chaplain.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c838ba21dae97db345e0113f99596decd1d66039, monkey made by brainfood1183 (github) for ss14", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/2fea0a59470c476cf3f927833d3918d89cbe6af8, monkey made by brainfood1183 (github) for ss14, reptilian made by kuro(388673708753027083)", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/chef.rsi/equipped-INNERCLOTHING-monkey.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/chef.rsi/equipped-INNERCLOTHING-monkey.png index 26af4f6afb..cd0c5c8e79 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/chef.rsi/equipped-INNERCLOTHING-monkey.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/chef.rsi/equipped-INNERCLOTHING-monkey.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/chef.rsi/equipped-INNERCLOTHING-reptilian.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/chef.rsi/equipped-INNERCLOTHING-reptilian.png new file mode 100644 index 0000000000..deaa8f3ce8 Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/chef.rsi/equipped-INNERCLOTHING-reptilian.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/chef.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/chef.rsi/equipped-INNERCLOTHING.png index de50443a1b..f5f8640075 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/chef.rsi/equipped-INNERCLOTHING.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/chef.rsi/equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/chef.rsi/icon.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/chef.rsi/icon.png index cb5599f81c..1f93c8160f 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/chef.rsi/icon.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/chef.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/chef.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/Jumpsuit/chef.rsi/meta.json index 1fb9cf1b66..0ff311dae2 100644 --- a/Resources/Textures/Clothing/Uniforms/Jumpsuit/chef.rsi/meta.json +++ b/Resources/Textures/Clothing/Uniforms/Jumpsuit/chef.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c838ba21dae97db345e0113f99596decd1d66039, monkey made by brainfood1183 (github) for ss14", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/2fea0a59470c476cf3f927833d3918d89cbe6af8, monkey made by SonicHDC (github) for ss14, reptilian made by kuro(388673708753027083)", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/chemistry.rsi/equipped-INNERCLOTHING-monkey.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/chemistry.rsi/equipped-INNERCLOTHING-monkey.png index 411661e87d..86336106db 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/chemistry.rsi/equipped-INNERCLOTHING-monkey.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/chemistry.rsi/equipped-INNERCLOTHING-monkey.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/chemistry.rsi/equipped-INNERCLOTHING-reptilian.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/chemistry.rsi/equipped-INNERCLOTHING-reptilian.png new file mode 100644 index 0000000000..8e73b8c062 Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/chemistry.rsi/equipped-INNERCLOTHING-reptilian.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/chemistry.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/chemistry.rsi/equipped-INNERCLOTHING.png index d2d87bb1b2..097f3a4be8 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/chemistry.rsi/equipped-INNERCLOTHING.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/chemistry.rsi/equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/chemistry.rsi/icon.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/chemistry.rsi/icon.png index 98cc641cd5..f83d6a7246 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/chemistry.rsi/icon.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/chemistry.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/chemistry.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/Jumpsuit/chemistry.rsi/meta.json index 3f72fb4460..19a5317c84 100644 --- a/Resources/Textures/Clothing/Uniforms/Jumpsuit/chemistry.rsi/meta.json +++ b/Resources/Textures/Clothing/Uniforms/Jumpsuit/chemistry.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c838ba21dae97db345e0113f99596decd1d66039. In hand sprite scaled down by potato1234_x, monkey made by brainfood1183 (github) for ss14", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c838ba21dae97db345e0113f99596decd1d66039. In hand sprite scaled down by potato1234_x, monkey made by SonicHDC (github) for ss14, reptilian made by kuro(388673708753027083)", "size": { "x": 32, "y": 32 @@ -17,7 +17,7 @@ { "name": "equipped-INNERCLOTHING-monkey", "directions": 4 - }, + }, { "name": "inhand-left", "directions": 4 diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/clown.rsi/equipped-INNERCLOTHING-reptilian.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/clown.rsi/equipped-INNERCLOTHING-reptilian.png new file mode 100644 index 0000000000..bf5c3aa1d9 Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/clown.rsi/equipped-INNERCLOTHING-reptilian.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/clown.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/clown.rsi/equipped-INNERCLOTHING.png index 3fe3856e33..05d7d6f4fe 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/clown.rsi/equipped-INNERCLOTHING.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/clown.rsi/equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/clown.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/Jumpsuit/clown.rsi/meta.json index 1fb9cf1b66..d1e88ef031 100644 --- a/Resources/Textures/Clothing/Uniforms/Jumpsuit/clown.rsi/meta.json +++ b/Resources/Textures/Clothing/Uniforms/Jumpsuit/clown.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c838ba21dae97db345e0113f99596decd1d66039, monkey made by brainfood1183 (github) for ss14", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/2fea0a59470c476cf3f927833d3918d89cbe6af8, monkey made by brainfood1183 (github) for ss14, reptilian made by kuro(388673708753027083)", "size": { "x": 32, "y": 32 @@ -17,7 +17,7 @@ { "name": "equipped-INNERCLOTHING-monkey", "directions": 4 - }, + }, { "name": "inhand-left", "directions": 4 diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/cluwne.rsi/equipped-INNERCLOTHING-reptilian.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/cluwne.rsi/equipped-INNERCLOTHING-reptilian.png new file mode 100644 index 0000000000..f10a193710 Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/cluwne.rsi/equipped-INNERCLOTHING-reptilian.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/cluwne.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/Jumpsuit/cluwne.rsi/meta.json index 395146ef50..c69d673f0b 100644 --- a/Resources/Textures/Clothing/Uniforms/Jumpsuit/cluwne.rsi/meta.json +++ b/Resources/Textures/Clothing/Uniforms/Jumpsuit/cluwne.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Made by brainfood1183 (github) for ss14. In hand sprite scaled down by potato1234_x", + "copyright": "Made by brainfood1183 (github) for ss14. In hand sprite scaled down by potato1234_x, reptilian made by kuro(388673708753027083)", "size": { "x": 32, "y": 32 @@ -17,7 +17,7 @@ { "name": "equipped-INNERCLOTHING-monkey", "directions": 4 - }, + }, { "name": "inhand-left", "directions": 4 diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/cmo.rsi/equipped-INNERCLOTHING-monkey.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/cmo.rsi/equipped-INNERCLOTHING-monkey.png index fc94b595b8..f3799a3754 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/cmo.rsi/equipped-INNERCLOTHING-monkey.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/cmo.rsi/equipped-INNERCLOTHING-monkey.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/cmo.rsi/equipped-INNERCLOTHING-reptilian.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/cmo.rsi/equipped-INNERCLOTHING-reptilian.png new file mode 100644 index 0000000000..4301ebaa08 Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/cmo.rsi/equipped-INNERCLOTHING-reptilian.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/cmo.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/cmo.rsi/equipped-INNERCLOTHING.png index 23e1e2bfb8..45024ef6d4 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/cmo.rsi/equipped-INNERCLOTHING.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/cmo.rsi/equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/cmo.rsi/icon.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/cmo.rsi/icon.png index 9381096adc..9ba01fecaf 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/cmo.rsi/icon.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/cmo.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/cmo.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/Jumpsuit/cmo.rsi/meta.json index 3f72fb4460..19a5317c84 100644 --- a/Resources/Textures/Clothing/Uniforms/Jumpsuit/cmo.rsi/meta.json +++ b/Resources/Textures/Clothing/Uniforms/Jumpsuit/cmo.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c838ba21dae97db345e0113f99596decd1d66039. In hand sprite scaled down by potato1234_x, monkey made by brainfood1183 (github) for ss14", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c838ba21dae97db345e0113f99596decd1d66039. In hand sprite scaled down by potato1234_x, monkey made by SonicHDC (github) for ss14, reptilian made by kuro(388673708753027083)", "size": { "x": 32, "y": 32 @@ -17,7 +17,7 @@ { "name": "equipped-INNERCLOTHING-monkey", "directions": 4 - }, + }, { "name": "inhand-left", "directions": 4 diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/cmo_turtle.rsi/equipped-INNERCLOTHING-monkey.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/cmo_turtle.rsi/equipped-INNERCLOTHING-monkey.png new file mode 100644 index 0000000000..2cc39c8894 Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/cmo_turtle.rsi/equipped-INNERCLOTHING-monkey.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/cmo_turtle.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/cmo_turtle.rsi/equipped-INNERCLOTHING.png new file mode 100644 index 0000000000..8e1557db21 Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/cmo_turtle.rsi/equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/cmo_turtle.rsi/icon.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/cmo_turtle.rsi/icon.png new file mode 100644 index 0000000000..334ef02242 Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/cmo_turtle.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/cmo_turtle.rsi/inhand-left.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/cmo_turtle.rsi/inhand-left.png new file mode 100644 index 0000000000..ad7541ea1d Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/cmo_turtle.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/cmo_turtle.rsi/inhand-right.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/cmo_turtle.rsi/inhand-right.png new file mode 100644 index 0000000000..c0133d22a2 Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/cmo_turtle.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/cmo_turtle.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/Jumpsuit/cmo_turtle.rsi/meta.json new file mode 100644 index 0000000000..58b759095d --- /dev/null +++ b/Resources/Textures/Clothing/Uniforms/Jumpsuit/cmo_turtle.rsi/meta.json @@ -0,0 +1,30 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Borrowed from QM turtleneck at https://github.com/space-wizards/space-station-14/tree/master/Resources/Textures/Clothing/Uniforms/Jumpsuit/qmturtle.rsi and modified by Hanzdegloker (github) for space station 14", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-INNERCLOTHING", + "directions": 4 + }, + { + "name": "equipped-INNERCLOTHING-monkey", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/color.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/color.rsi/equipped-INNERCLOTHING.png index 5c333dfc11..5150d22162 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/color.rsi/equipped-INNERCLOTHING.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/color.rsi/equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/color.rsi/icon.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/color.rsi/icon.png index c0087d4d25..7c7e512858 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/color.rsi/icon.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/color.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/cossack.rsi/equipped-INNERCLOTHING-reptilian.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/cossack.rsi/equipped-INNERCLOTHING-reptilian.png new file mode 100644 index 0000000000..6776388d92 Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/cossack.rsi/equipped-INNERCLOTHING-reptilian.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/cossack.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/Jumpsuit/cossack.rsi/meta.json index 691614b22b..a272eed5fb 100644 --- a/Resources/Textures/Clothing/Uniforms/Jumpsuit/cossack.rsi/meta.json +++ b/Resources/Textures/Clothing/Uniforms/Jumpsuit/cossack.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Made by Tunguso4ka (github) for SS14, monkey made by brainfood1183 (github) for ss14, edited by Alekshhh", + "copyright": "Made by Tunguso4ka (github) for SS14, monkey made by brainfood1183 (github) for ss14, edited by Alekshhh, reptilian made by kuro(388673708753027083)", "size": { "x": 32, "y": 32 @@ -17,7 +17,7 @@ { "name": "equipped-INNERCLOTHING-monkey", "directions": 4 - }, + }, { "name": "inhand-left", "directions": 4 diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/curator.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/curator.rsi/equipped-INNERCLOTHING.png index 1112b8ad75..8e0609e2c0 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/curator.rsi/equipped-INNERCLOTHING.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/curator.rsi/equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/curator.rsi/icon.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/curator.rsi/icon.png index d84a33f9e5..1ee2256247 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/curator.rsi/icon.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/curator.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/damedaneoutfit.rsi/equipped-INNERCLOTHING-reptilian.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/damedaneoutfit.rsi/equipped-INNERCLOTHING-reptilian.png new file mode 100644 index 0000000000..63a349a59f Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/damedaneoutfit.rsi/equipped-INNERCLOTHING-reptilian.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/damedaneoutfit.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/Jumpsuit/damedaneoutfit.rsi/meta.json index 891a03fd12..2bc5d054b5 100644 --- a/Resources/Textures/Clothing/Uniforms/Jumpsuit/damedaneoutfit.rsi/meta.json +++ b/Resources/Textures/Clothing/Uniforms/Jumpsuit/damedaneoutfit.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Made by Alekshhh (Github) for SS14, inspired by Kazuma Kiryu outfit, monkey made by brainfood1183 (github), monkey made by brainfood1183 (github) for ss14", + "copyright": "Made by Alekshhh (Github) for SS14, inspired by Kazuma Kiryu outfit, monkey made by brainfood1183 (github), monkey made by brainfood1183 (github) for ss14, reptilian made by kuro(388673708753027083)", "size": { "x": 32, "y": 32 @@ -17,7 +17,7 @@ { "name": "equipped-INNERCLOTHING-monkey", "directions": 4 - }, + }, { "name": "inhand-left", "directions": 4 diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/deathsquad.rsi/equipped-INNERCLOTHING-reptilian.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/deathsquad.rsi/equipped-INNERCLOTHING-reptilian.png new file mode 100644 index 0000000000..00c03e85a7 Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/deathsquad.rsi/equipped-INNERCLOTHING-reptilian.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/deathsquad.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/Jumpsuit/deathsquad.rsi/meta.json index b4ede7083e..b7f101224f 100644 --- a/Resources/Textures/Clothing/Uniforms/Jumpsuit/deathsquad.rsi/meta.json +++ b/Resources/Textures/Clothing/Uniforms/Jumpsuit/deathsquad.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Sprited by KEEYNy (Github) for Space Station 14. contacts: https://github.com/KEEYNy discord: KEEYN#3805", + "copyright": "Sprited by KEEYNy (Github) for Space Station 14. contacts: https://github.com/KEEYNy discord: KEEYN#3805, reptilian made by kuro(388673708753027083)", "size": { "x": 32, "y": 32 @@ -13,7 +13,7 @@ { "name": "equipped-INNERCLOTHING", "directions": 4 - }, + }, { "name": "inhand-left", "directions": 4 diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/detective.rsi/equipped-INNERCLOTHING-monkey.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/detective.rsi/equipped-INNERCLOTHING-monkey.png index c40a7f3bf3..f52412e54e 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/detective.rsi/equipped-INNERCLOTHING-monkey.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/detective.rsi/equipped-INNERCLOTHING-monkey.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/detective.rsi/equipped-INNERCLOTHING-reptilian.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/detective.rsi/equipped-INNERCLOTHING-reptilian.png new file mode 100644 index 0000000000..25cd1faabf Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/detective.rsi/equipped-INNERCLOTHING-reptilian.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/detective.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/detective.rsi/equipped-INNERCLOTHING.png index db9842a95e..a16eaacb45 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/detective.rsi/equipped-INNERCLOTHING.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/detective.rsi/equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/detective.rsi/icon.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/detective.rsi/icon.png index c08f4aa765..0825f3ab22 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/detective.rsi/icon.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/detective.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/detective.rsi/inhand-left.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/detective.rsi/inhand-left.png index aed8b4f025..7df372e3c8 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/detective.rsi/inhand-left.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/detective.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/detective.rsi/inhand-right.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/detective.rsi/inhand-right.png index fd6f60eabb..5e1581b51a 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/detective.rsi/inhand-right.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/detective.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/detective.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/Jumpsuit/detective.rsi/meta.json index 1fb9cf1b66..5d9dbec644 100644 --- a/Resources/Textures/Clothing/Uniforms/Jumpsuit/detective.rsi/meta.json +++ b/Resources/Textures/Clothing/Uniforms/Jumpsuit/detective.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c838ba21dae97db345e0113f99596decd1d66039, monkey made by brainfood1183 (github) for ss14", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/5ea6d8b4422027d0c22cb415d1f05a08bf39aaa0, monkey made by SonicHDC (github) for ss14, reptilian made by kuro(388673708753027083)", "size": { "x": 32, "y": 32 @@ -17,7 +17,7 @@ { "name": "equipped-INNERCLOTHING-monkey", "directions": 4 - }, + }, { "name": "inhand-left", "directions": 4 diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/detective_grey.rsi/equipped-INNERCLOTHING-monkey.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/detective_grey.rsi/equipped-INNERCLOTHING-monkey.png index 59791ed5fa..383232e5a1 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/detective_grey.rsi/equipped-INNERCLOTHING-monkey.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/detective_grey.rsi/equipped-INNERCLOTHING-monkey.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/detective_grey.rsi/equipped-INNERCLOTHING-reptilian.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/detective_grey.rsi/equipped-INNERCLOTHING-reptilian.png new file mode 100644 index 0000000000..fff9f1e87e Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/detective_grey.rsi/equipped-INNERCLOTHING-reptilian.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/detective_grey.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/detective_grey.rsi/equipped-INNERCLOTHING.png index d83f6a8b21..11efa63d45 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/detective_grey.rsi/equipped-INNERCLOTHING.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/detective_grey.rsi/equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/detective_grey.rsi/icon.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/detective_grey.rsi/icon.png index dfe4f4f8b3..bc8588057a 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/detective_grey.rsi/icon.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/detective_grey.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/detective_grey.rsi/inhand-left.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/detective_grey.rsi/inhand-left.png index 15c30a0491..d5ca96c85f 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/detective_grey.rsi/inhand-left.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/detective_grey.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/detective_grey.rsi/inhand-right.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/detective_grey.rsi/inhand-right.png index 53512e6969..0fcbfbaf67 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/detective_grey.rsi/inhand-right.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/detective_grey.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/detective_grey.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/Jumpsuit/detective_grey.rsi/meta.json index 3f72fb4460..5d9dbec644 100644 --- a/Resources/Textures/Clothing/Uniforms/Jumpsuit/detective_grey.rsi/meta.json +++ b/Resources/Textures/Clothing/Uniforms/Jumpsuit/detective_grey.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c838ba21dae97db345e0113f99596decd1d66039. In hand sprite scaled down by potato1234_x, monkey made by brainfood1183 (github) for ss14", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/5ea6d8b4422027d0c22cb415d1f05a08bf39aaa0, monkey made by SonicHDC (github) for ss14, reptilian made by kuro(388673708753027083)", "size": { "x": 32, "y": 32 @@ -17,7 +17,7 @@ { "name": "equipped-INNERCLOTHING-monkey", "directions": 4 - }, + }, { "name": "inhand-left", "directions": 4 diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/engineering.rsi/equipped-INNERCLOTHING-monkey.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/engineering.rsi/equipped-INNERCLOTHING-monkey.png index a7424bcb4d..bc138205b5 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/engineering.rsi/equipped-INNERCLOTHING-monkey.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/engineering.rsi/equipped-INNERCLOTHING-monkey.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/engineering.rsi/equipped-INNERCLOTHING-reptilian.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/engineering.rsi/equipped-INNERCLOTHING-reptilian.png new file mode 100644 index 0000000000..14a9971cab Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/engineering.rsi/equipped-INNERCLOTHING-reptilian.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/engineering.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/engineering.rsi/equipped-INNERCLOTHING.png index f3b13e1ec2..b71c63fd6e 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/engineering.rsi/equipped-INNERCLOTHING.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/engineering.rsi/equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/engineering.rsi/icon.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/engineering.rsi/icon.png index 51f8d000f6..3c6420e675 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/engineering.rsi/icon.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/engineering.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/engineering.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/Jumpsuit/engineering.rsi/meta.json index 1fb9cf1b66..8e13aca007 100644 --- a/Resources/Textures/Clothing/Uniforms/Jumpsuit/engineering.rsi/meta.json +++ b/Resources/Textures/Clothing/Uniforms/Jumpsuit/engineering.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c838ba21dae97db345e0113f99596decd1d66039, monkey made by brainfood1183 (github) for ss14", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/2fea0a59470c476cf3f927833d3918d89cbe6af8, monkey made by SonicHDC (github) for ss14, reptilian made by kuro(388673708753027083)", "size": { "x": 32, "y": 32 @@ -17,7 +17,7 @@ { "name": "equipped-INNERCLOTHING-monkey", "directions": 4 - }, + }, { "name": "inhand-left", "directions": 4 diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/engineering_hazard.rsi/equipped-INNERCLOTHING-reptilian.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/engineering_hazard.rsi/equipped-INNERCLOTHING-reptilian.png new file mode 100644 index 0000000000..24580f676c Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/engineering_hazard.rsi/equipped-INNERCLOTHING-reptilian.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/engineering_hazard.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/engineering_hazard.rsi/equipped-INNERCLOTHING.png index 1f0689cf05..abc09c9ecd 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/engineering_hazard.rsi/equipped-INNERCLOTHING.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/engineering_hazard.rsi/equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/engineering_hazard.rsi/icon.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/engineering_hazard.rsi/icon.png index 1432e6bea1..2b14937536 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/engineering_hazard.rsi/icon.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/engineering_hazard.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/engineering_hazard.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/Jumpsuit/engineering_hazard.rsi/meta.json index 1fb9cf1b66..aa80ef6992 100644 --- a/Resources/Textures/Clothing/Uniforms/Jumpsuit/engineering_hazard.rsi/meta.json +++ b/Resources/Textures/Clothing/Uniforms/Jumpsuit/engineering_hazard.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c838ba21dae97db345e0113f99596decd1d66039, monkey made by brainfood1183 (github) for ss14", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c838ba21dae97db345e0113f99596decd1d66039, monkey made by brainfood1183 (github) for ss14, reptilian made by kuro(388673708753027083)", "size": { "x": 32, "y": 32 @@ -17,7 +17,7 @@ { "name": "equipped-INNERCLOTHING-monkey", "directions": 4 - }, + }, { "name": "inhand-left", "directions": 4 diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/ert_engineer.rsi/equipped-INNERCLOTHING-reptilian.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/ert_engineer.rsi/equipped-INNERCLOTHING-reptilian.png new file mode 100644 index 0000000000..be62f857dc Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/ert_engineer.rsi/equipped-INNERCLOTHING-reptilian.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/ert_engineer.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/ert_engineer.rsi/equipped-INNERCLOTHING.png index 7e275f29e9..cc0780e81a 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/ert_engineer.rsi/equipped-INNERCLOTHING.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/ert_engineer.rsi/equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/ert_engineer.rsi/icon.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/ert_engineer.rsi/icon.png index 3e0dfb1b0f..a4bce0105e 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/ert_engineer.rsi/icon.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/ert_engineer.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/ert_engineer.rsi/inhand-left.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/ert_engineer.rsi/inhand-left.png index eb6a7d90cd..1bd77b0727 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/ert_engineer.rsi/inhand-left.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/ert_engineer.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/ert_engineer.rsi/inhand-right.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/ert_engineer.rsi/inhand-right.png index 34610a06fd..3727219206 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/ert_engineer.rsi/inhand-right.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/ert_engineer.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/ert_engineer.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/Jumpsuit/ert_engineer.rsi/meta.json index dca2585d6b..89f325a302 100644 --- a/Resources/Textures/Clothing/Uniforms/Jumpsuit/ert_engineer.rsi/meta.json +++ b/Resources/Textures/Clothing/Uniforms/Jumpsuit/ert_engineer.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from TGstation: https://github.com/tgstation/tgstation/blob/c838ba21dae97db345e0113f99596decd1d66039/icons/mob/clothing/under/security.dmi. Modified and recolored by Nairodian (github) for SS14, monkey made by brainfood1183 (github) for ss14", + "copyright": "Created by discord:SOL(Артур)#8162, monkey made by brainfood1183 (github) for ss14, reptilian made by kuro(388673708753027083)", "size": { "x": 32, "y": 32 @@ -17,7 +17,7 @@ { "name": "equipped-INNERCLOTHING-monkey", "directions": 4 - }, + }, { "name": "inhand-left", "directions": 4 diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/ert_janitor.rsi/equipped-INNERCLOTHING-reptilian.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/ert_janitor.rsi/equipped-INNERCLOTHING-reptilian.png new file mode 100644 index 0000000000..dc75131489 Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/ert_janitor.rsi/equipped-INNERCLOTHING-reptilian.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/ert_janitor.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/ert_janitor.rsi/equipped-INNERCLOTHING.png index 882d9f813a..f606f8c8a8 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/ert_janitor.rsi/equipped-INNERCLOTHING.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/ert_janitor.rsi/equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/ert_janitor.rsi/icon.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/ert_janitor.rsi/icon.png index 34d28c744a..efa1a34103 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/ert_janitor.rsi/icon.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/ert_janitor.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/ert_janitor.rsi/inhand-left.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/ert_janitor.rsi/inhand-left.png index 88240bf0c1..03484bee5e 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/ert_janitor.rsi/inhand-left.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/ert_janitor.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/ert_janitor.rsi/inhand-right.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/ert_janitor.rsi/inhand-right.png index b1ba7c7289..c4ee3900d7 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/ert_janitor.rsi/inhand-right.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/ert_janitor.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/ert_janitor.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/Jumpsuit/ert_janitor.rsi/meta.json index dca2585d6b..f9e0b3552e 100644 --- a/Resources/Textures/Clothing/Uniforms/Jumpsuit/ert_janitor.rsi/meta.json +++ b/Resources/Textures/Clothing/Uniforms/Jumpsuit/ert_janitor.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from TGstation: https://github.com/tgstation/tgstation/blob/c838ba21dae97db345e0113f99596decd1d66039/icons/mob/clothing/under/security.dmi. Modified and recolored by Nairodian (github) for SS14, monkey made by brainfood1183 (github) for ss14", + "copyright": "Created by discord:SOL(Артур)#8162, monkey made by brainfood1183 (github) for ss14, reptilian made by KREKS(1042144875602268200)", "size": { "x": 32, "y": 32 @@ -17,7 +17,7 @@ { "name": "equipped-INNERCLOTHING-monkey", "directions": 4 - }, + }, { "name": "inhand-left", "directions": 4 diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/ert_leader.rsi/equipped-INNERCLOTHING-reptilian.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/ert_leader.rsi/equipped-INNERCLOTHING-reptilian.png new file mode 100644 index 0000000000..4e04083a25 Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/ert_leader.rsi/equipped-INNERCLOTHING-reptilian.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/ert_leader.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/ert_leader.rsi/equipped-INNERCLOTHING.png index 8e67a880df..3101e4f366 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/ert_leader.rsi/equipped-INNERCLOTHING.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/ert_leader.rsi/equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/ert_leader.rsi/icon.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/ert_leader.rsi/icon.png index 7b4f7f7a47..391ecd7735 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/ert_leader.rsi/icon.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/ert_leader.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/ert_leader.rsi/inhand-left.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/ert_leader.rsi/inhand-left.png index 8cbca5d1d4..dce81c0c7b 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/ert_leader.rsi/inhand-left.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/ert_leader.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/ert_leader.rsi/inhand-right.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/ert_leader.rsi/inhand-right.png index 0f20b7f88a..6e207b7ce3 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/ert_leader.rsi/inhand-right.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/ert_leader.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/ert_leader.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/Jumpsuit/ert_leader.rsi/meta.json index dca2585d6b..f9e0b3552e 100644 --- a/Resources/Textures/Clothing/Uniforms/Jumpsuit/ert_leader.rsi/meta.json +++ b/Resources/Textures/Clothing/Uniforms/Jumpsuit/ert_leader.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from TGstation: https://github.com/tgstation/tgstation/blob/c838ba21dae97db345e0113f99596decd1d66039/icons/mob/clothing/under/security.dmi. Modified and recolored by Nairodian (github) for SS14, monkey made by brainfood1183 (github) for ss14", + "copyright": "Created by discord:SOL(Артур)#8162, monkey made by brainfood1183 (github) for ss14, reptilian made by KREKS(1042144875602268200)", "size": { "x": 32, "y": 32 @@ -17,7 +17,7 @@ { "name": "equipped-INNERCLOTHING-monkey", "directions": 4 - }, + }, { "name": "inhand-left", "directions": 4 diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/ert_medic.rsi/equipped-INNERCLOTHING-reptilian.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/ert_medic.rsi/equipped-INNERCLOTHING-reptilian.png new file mode 100644 index 0000000000..a0e52e41f0 Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/ert_medic.rsi/equipped-INNERCLOTHING-reptilian.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/ert_medic.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/ert_medic.rsi/equipped-INNERCLOTHING.png index 3a8e6e6d6f..12049e9261 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/ert_medic.rsi/equipped-INNERCLOTHING.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/ert_medic.rsi/equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/ert_medic.rsi/icon.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/ert_medic.rsi/icon.png index 4646a0948d..f288313282 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/ert_medic.rsi/icon.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/ert_medic.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/ert_medic.rsi/inhand-left.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/ert_medic.rsi/inhand-left.png index e6accaed55..1408e38138 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/ert_medic.rsi/inhand-left.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/ert_medic.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/ert_medic.rsi/inhand-right.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/ert_medic.rsi/inhand-right.png index e75e0297eb..16d731380b 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/ert_medic.rsi/inhand-right.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/ert_medic.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/ert_medic.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/Jumpsuit/ert_medic.rsi/meta.json index dca2585d6b..f9e0b3552e 100644 --- a/Resources/Textures/Clothing/Uniforms/Jumpsuit/ert_medic.rsi/meta.json +++ b/Resources/Textures/Clothing/Uniforms/Jumpsuit/ert_medic.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from TGstation: https://github.com/tgstation/tgstation/blob/c838ba21dae97db345e0113f99596decd1d66039/icons/mob/clothing/under/security.dmi. Modified and recolored by Nairodian (github) for SS14, monkey made by brainfood1183 (github) for ss14", + "copyright": "Created by discord:SOL(Артур)#8162, monkey made by brainfood1183 (github) for ss14, reptilian made by KREKS(1042144875602268200)", "size": { "x": 32, "y": 32 @@ -17,7 +17,7 @@ { "name": "equipped-INNERCLOTHING-monkey", "directions": 4 - }, + }, { "name": "inhand-left", "directions": 4 diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/ert_security.rsi/equipped-INNERCLOTHING-reptilian.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/ert_security.rsi/equipped-INNERCLOTHING-reptilian.png new file mode 100644 index 0000000000..e748677ae1 Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/ert_security.rsi/equipped-INNERCLOTHING-reptilian.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/ert_security.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/ert_security.rsi/equipped-INNERCLOTHING.png index d8c6fa6239..ea08a9adf0 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/ert_security.rsi/equipped-INNERCLOTHING.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/ert_security.rsi/equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/ert_security.rsi/icon.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/ert_security.rsi/icon.png index 6a58be3f40..8f6c37acea 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/ert_security.rsi/icon.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/ert_security.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/ert_security.rsi/inhand-left.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/ert_security.rsi/inhand-left.png index f01dd8232e..def7e063bc 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/ert_security.rsi/inhand-left.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/ert_security.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/ert_security.rsi/inhand-right.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/ert_security.rsi/inhand-right.png index a73a7cd466..5359f363ca 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/ert_security.rsi/inhand-right.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/ert_security.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/ert_security.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/Jumpsuit/ert_security.rsi/meta.json index dca2585d6b..f9e0b3552e 100644 --- a/Resources/Textures/Clothing/Uniforms/Jumpsuit/ert_security.rsi/meta.json +++ b/Resources/Textures/Clothing/Uniforms/Jumpsuit/ert_security.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from TGstation: https://github.com/tgstation/tgstation/blob/c838ba21dae97db345e0113f99596decd1d66039/icons/mob/clothing/under/security.dmi. Modified and recolored by Nairodian (github) for SS14, monkey made by brainfood1183 (github) for ss14", + "copyright": "Created by discord:SOL(Артур)#8162, monkey made by brainfood1183 (github) for ss14, reptilian made by KREKS(1042144875602268200)", "size": { "x": 32, "y": 32 @@ -17,7 +17,7 @@ { "name": "equipped-INNERCLOTHING-monkey", "directions": 4 - }, + }, { "name": "inhand-left", "directions": 4 diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/flannel.rsi/equipped-INNERCLOTHING-monkey.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/flannel.rsi/equipped-INNERCLOTHING-monkey.png new file mode 100644 index 0000000000..cda54e513f Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/flannel.rsi/equipped-INNERCLOTHING-monkey.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/flannel.rsi/equipped-INNERCLOTHING-reptilian.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/flannel.rsi/equipped-INNERCLOTHING-reptilian.png new file mode 100644 index 0000000000..6d943fcc54 Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/flannel.rsi/equipped-INNERCLOTHING-reptilian.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/flannel.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/flannel.rsi/equipped-INNERCLOTHING.png index 80a966b0ce..380aae92b5 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/flannel.rsi/equipped-INNERCLOTHING.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/flannel.rsi/equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/flannel.rsi/icon.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/flannel.rsi/icon.png index 38eb1021c4..4fcbcfcee3 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/flannel.rsi/icon.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/flannel.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/flannel.rsi/inhand-left.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/flannel.rsi/inhand-left.png index 7850e6a676..1f6c279dae 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/flannel.rsi/inhand-left.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/flannel.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/flannel.rsi/inhand-right.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/flannel.rsi/inhand-right.png index 8cbbfad26b..d24e67b444 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/flannel.rsi/inhand-right.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/flannel.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/flannel.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/Jumpsuit/flannel.rsi/meta.json index d54e5e2985..9235d22fb2 100644 --- a/Resources/Textures/Clothing/Uniforms/Jumpsuit/flannel.rsi/meta.json +++ b/Resources/Textures/Clothing/Uniforms/Jumpsuit/flannel.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Sprited by MrGreen06#0618 (discord)", + "copyright": "Sprited by MrGreen06#0618 (discord), reptilian made by kuro(388673708753027083)", "size": { "x": 32, "y": 32 @@ -13,7 +13,7 @@ { "name": "equipped-INNERCLOTHING", "directions": 4 - }, + }, { "name": "inhand-left", "directions": 4 diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/genetics.rsi/equipped-INNERCLOTHING-monkey.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/genetics.rsi/equipped-INNERCLOTHING-monkey.png index 8867a95aea..5bcb3ed4f3 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/genetics.rsi/equipped-INNERCLOTHING-monkey.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/genetics.rsi/equipped-INNERCLOTHING-monkey.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/genetics.rsi/equipped-INNERCLOTHING-reptilian.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/genetics.rsi/equipped-INNERCLOTHING-reptilian.png new file mode 100644 index 0000000000..777e7bab93 Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/genetics.rsi/equipped-INNERCLOTHING-reptilian.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/genetics.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/genetics.rsi/equipped-INNERCLOTHING.png index 04e4612cfc..0a1c0065ba 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/genetics.rsi/equipped-INNERCLOTHING.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/genetics.rsi/equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/genetics.rsi/icon.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/genetics.rsi/icon.png index 83fa7d679b..8289a47131 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/genetics.rsi/icon.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/genetics.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/genetics.rsi/inhand-left.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/genetics.rsi/inhand-left.png index cfb2a8ff2b..301465e828 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/genetics.rsi/inhand-left.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/genetics.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/genetics.rsi/inhand-right.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/genetics.rsi/inhand-right.png index 7071a1d512..c414199341 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/genetics.rsi/inhand-right.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/genetics.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/genetics.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/Jumpsuit/genetics.rsi/meta.json index 3f72fb4460..e3aed30132 100644 --- a/Resources/Textures/Clothing/Uniforms/Jumpsuit/genetics.rsi/meta.json +++ b/Resources/Textures/Clothing/Uniforms/Jumpsuit/genetics.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c838ba21dae97db345e0113f99596decd1d66039. In hand sprite scaled down by potato1234_x, monkey made by brainfood1183 (github) for ss14", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c838ba21dae97db345e0113f99596decd1d66039. In hand sprite scaled down by potato1234_x, monkey made by brainfood1183 (github) for ss14, reptilian made by kuro(388673708753027083), Resprited by Mureixlol", "size": { "x": 32, "y": 32 @@ -17,7 +17,7 @@ { "name": "equipped-INNERCLOTHING-monkey", "directions": 4 - }, + }, { "name": "inhand-left", "directions": 4 diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/hawaiblack.rsi/equipped-INNERCLOTHING-reptilian.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/hawaiblack.rsi/equipped-INNERCLOTHING-reptilian.png new file mode 100644 index 0000000000..34418d86b8 Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/hawaiblack.rsi/equipped-INNERCLOTHING-reptilian.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/hawaiblack.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/hawaiblack.rsi/equipped-INNERCLOTHING.png index a35da374d4..f9cc4efd64 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/hawaiblack.rsi/equipped-INNERCLOTHING.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/hawaiblack.rsi/equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/hawaiblack.rsi/icon.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/hawaiblack.rsi/icon.png index 4471de10bc..00ba534155 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/hawaiblack.rsi/icon.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/hawaiblack.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/hawaiblack.rsi/inhand-left.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/hawaiblack.rsi/inhand-left.png index 8f213061c2..75c281d292 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/hawaiblack.rsi/inhand-left.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/hawaiblack.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/hawaiblack.rsi/inhand-right.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/hawaiblack.rsi/inhand-right.png index f7ccaf7d97..aad5a6bba9 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/hawaiblack.rsi/inhand-right.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/hawaiblack.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/hawaiblack.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/Jumpsuit/hawaiblack.rsi/meta.json index 27e3fb18c6..3db64e25f1 100644 --- a/Resources/Textures/Clothing/Uniforms/Jumpsuit/hawaiblack.rsi/meta.json +++ b/Resources/Textures/Clothing/Uniforms/Jumpsuit/hawaiblack.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Made by ;3#1161, monkey derivative made by brainfoodd183 (github)", + "copyright": "Made by ;3#1161, monkey derivative made by brainfoodd183 (github), reptilian made by SonicDC(821343860961706054), resprited by DreamlyJack(624946166152298517), fix sprite by DreamlyJack(624946166152298517)", "size": { "x": 32, "y": 32 @@ -17,7 +17,7 @@ { "name": "equipped-INNERCLOTHING-monkey", "directions": 4 - }, + }, { "name": "inhand-left", "directions": 4 diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/hawaiblue.rsi/equipped-INNERCLOTHING-monkey.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/hawaiblue.rsi/equipped-INNERCLOTHING-monkey.png index 8bc241ecaa..3986d7b82e 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/hawaiblue.rsi/equipped-INNERCLOTHING-monkey.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/hawaiblue.rsi/equipped-INNERCLOTHING-monkey.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/hawaiblue.rsi/equipped-INNERCLOTHING-reptilian.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/hawaiblue.rsi/equipped-INNERCLOTHING-reptilian.png new file mode 100644 index 0000000000..1bd7b93004 Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/hawaiblue.rsi/equipped-INNERCLOTHING-reptilian.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/hawaiblue.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/hawaiblue.rsi/equipped-INNERCLOTHING.png index 0de6ae1401..6cf1860d48 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/hawaiblue.rsi/equipped-INNERCLOTHING.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/hawaiblue.rsi/equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/hawaiblue.rsi/icon.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/hawaiblue.rsi/icon.png index 9b7cc65ebe..586b73b4f2 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/hawaiblue.rsi/icon.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/hawaiblue.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/hawaiblue.rsi/inhand-left.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/hawaiblue.rsi/inhand-left.png index 46c5d6229b..ec0d7ec1ca 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/hawaiblue.rsi/inhand-left.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/hawaiblue.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/hawaiblue.rsi/inhand-right.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/hawaiblue.rsi/inhand-right.png index 8db1985cb8..3628f39100 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/hawaiblue.rsi/inhand-right.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/hawaiblue.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/hawaiblue.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/Jumpsuit/hawaiblue.rsi/meta.json index 27e3fb18c6..39e0a23cc3 100644 --- a/Resources/Textures/Clothing/Uniforms/Jumpsuit/hawaiblue.rsi/meta.json +++ b/Resources/Textures/Clothing/Uniforms/Jumpsuit/hawaiblue.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Made by ;3#1161, monkey derivative made by brainfoodd183 (github)", + "copyright": "Made by ;3#1161, monkey derivative made by brainfoodd183 (github), reptilian made by kuro(388673708753027083), resprited by DreamlyJack(624946166152298517), fix sprite by DreamlyJack(624946166152298517)", "size": { "x": 32, "y": 32 @@ -17,7 +17,7 @@ { "name": "equipped-INNERCLOTHING-monkey", "directions": 4 - }, + }, { "name": "inhand-left", "directions": 4 diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/hawaired.rsi/equipped-INNERCLOTHING-monkey.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/hawaired.rsi/equipped-INNERCLOTHING-monkey.png index 8cc377d268..f26ae173d6 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/hawaired.rsi/equipped-INNERCLOTHING-monkey.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/hawaired.rsi/equipped-INNERCLOTHING-monkey.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/hawaired.rsi/equipped-INNERCLOTHING-reptilian.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/hawaired.rsi/equipped-INNERCLOTHING-reptilian.png new file mode 100644 index 0000000000..a1f7b446dd Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/hawaired.rsi/equipped-INNERCLOTHING-reptilian.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/hawaired.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/hawaired.rsi/equipped-INNERCLOTHING.png index 0f906e2c71..65095fe26c 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/hawaired.rsi/equipped-INNERCLOTHING.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/hawaired.rsi/equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/hawaired.rsi/icon.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/hawaired.rsi/icon.png index 79f247bf01..4f5c4b3748 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/hawaired.rsi/icon.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/hawaired.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/hawaired.rsi/inhand-left.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/hawaired.rsi/inhand-left.png index 75be7de7be..dc9d095a3d 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/hawaired.rsi/inhand-left.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/hawaired.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/hawaired.rsi/inhand-right.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/hawaired.rsi/inhand-right.png index bb96e022b1..1dd8ea8d7c 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/hawaired.rsi/inhand-right.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/hawaired.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/hawaired.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/Jumpsuit/hawaired.rsi/meta.json index 27e3fb18c6..3db64e25f1 100644 --- a/Resources/Textures/Clothing/Uniforms/Jumpsuit/hawaired.rsi/meta.json +++ b/Resources/Textures/Clothing/Uniforms/Jumpsuit/hawaired.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Made by ;3#1161, monkey derivative made by brainfoodd183 (github)", + "copyright": "Made by ;3#1161, monkey derivative made by brainfoodd183 (github), reptilian made by SonicDC(821343860961706054), resprited by DreamlyJack(624946166152298517), fix sprite by DreamlyJack(624946166152298517)", "size": { "x": 32, "y": 32 @@ -17,7 +17,7 @@ { "name": "equipped-INNERCLOTHING-monkey", "directions": 4 - }, + }, { "name": "inhand-left", "directions": 4 diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/hawaiyellow.rsi/equipped-INNERCLOTHING-monkey.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/hawaiyellow.rsi/equipped-INNERCLOTHING-monkey.png index 44f6f4f113..2094c441e6 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/hawaiyellow.rsi/equipped-INNERCLOTHING-monkey.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/hawaiyellow.rsi/equipped-INNERCLOTHING-monkey.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/hawaiyellow.rsi/equipped-INNERCLOTHING-reptilian.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/hawaiyellow.rsi/equipped-INNERCLOTHING-reptilian.png new file mode 100644 index 0000000000..46f37517fc Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/hawaiyellow.rsi/equipped-INNERCLOTHING-reptilian.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/hawaiyellow.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/hawaiyellow.rsi/equipped-INNERCLOTHING.png index 1b49813ca2..68a65104a1 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/hawaiyellow.rsi/equipped-INNERCLOTHING.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/hawaiyellow.rsi/equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/hawaiyellow.rsi/icon.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/hawaiyellow.rsi/icon.png index 4bb5883cf1..9bbd839400 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/hawaiyellow.rsi/icon.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/hawaiyellow.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/hawaiyellow.rsi/inhand-left.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/hawaiyellow.rsi/inhand-left.png index 2499e79677..709af38d6a 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/hawaiyellow.rsi/inhand-left.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/hawaiyellow.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/hawaiyellow.rsi/inhand-right.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/hawaiyellow.rsi/inhand-right.png index f31cab9aeb..0b036a9011 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/hawaiyellow.rsi/inhand-right.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/hawaiyellow.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/hawaiyellow.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/Jumpsuit/hawaiyellow.rsi/meta.json index 27e3fb18c6..3db64e25f1 100644 --- a/Resources/Textures/Clothing/Uniforms/Jumpsuit/hawaiyellow.rsi/meta.json +++ b/Resources/Textures/Clothing/Uniforms/Jumpsuit/hawaiyellow.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Made by ;3#1161, monkey derivative made by brainfoodd183 (github)", + "copyright": "Made by ;3#1161, monkey derivative made by brainfoodd183 (github), reptilian made by SonicDC(821343860961706054), resprited by DreamlyJack(624946166152298517), fix sprite by DreamlyJack(624946166152298517)", "size": { "x": 32, "y": 32 @@ -17,7 +17,7 @@ { "name": "equipped-INNERCLOTHING-monkey", "directions": 4 - }, + }, { "name": "inhand-left", "directions": 4 diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/hop.rsi/equipped-INNERCLOTHING-monkey.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/hop.rsi/equipped-INNERCLOTHING-monkey.png index 8210e84110..29f255cef0 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/hop.rsi/equipped-INNERCLOTHING-monkey.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/hop.rsi/equipped-INNERCLOTHING-monkey.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/hop.rsi/equipped-INNERCLOTHING-reptilian.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/hop.rsi/equipped-INNERCLOTHING-reptilian.png new file mode 100644 index 0000000000..d7e3353385 Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/hop.rsi/equipped-INNERCLOTHING-reptilian.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/hop.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/hop.rsi/equipped-INNERCLOTHING.png index 807f99fc7d..4482c7ecc3 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/hop.rsi/equipped-INNERCLOTHING.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/hop.rsi/equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/hop.rsi/icon.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/hop.rsi/icon.png index f65a93f00d..72cd698b80 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/hop.rsi/icon.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/hop.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/hop.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/Jumpsuit/hop.rsi/meta.json index 3f72fb4460..19a5317c84 100644 --- a/Resources/Textures/Clothing/Uniforms/Jumpsuit/hop.rsi/meta.json +++ b/Resources/Textures/Clothing/Uniforms/Jumpsuit/hop.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c838ba21dae97db345e0113f99596decd1d66039. In hand sprite scaled down by potato1234_x, monkey made by brainfood1183 (github) for ss14", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c838ba21dae97db345e0113f99596decd1d66039. In hand sprite scaled down by potato1234_x, monkey made by SonicHDC (github) for ss14, reptilian made by kuro(388673708753027083)", "size": { "x": 32, "y": 32 @@ -17,7 +17,7 @@ { "name": "equipped-INNERCLOTHING-monkey", "directions": 4 - }, + }, { "name": "inhand-left", "directions": 4 diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/hos.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/hos.rsi/equipped-INNERCLOTHING.png index 80984c51c1..0c1fab7c7b 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/hos.rsi/equipped-INNERCLOTHING.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/hos.rsi/equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/hos.rsi/icon.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/hos.rsi/icon.png index 9400796353..d806293ab2 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/hos.rsi/icon.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/hos.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/hos.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/Jumpsuit/hos.rsi/meta.json index 3f72fb4460..8fe98eacbe 100644 --- a/Resources/Textures/Clothing/Uniforms/Jumpsuit/hos.rsi/meta.json +++ b/Resources/Textures/Clothing/Uniforms/Jumpsuit/hos.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c838ba21dae97db345e0113f99596decd1d66039. In hand sprite scaled down by potato1234_x, monkey made by brainfood1183 (github) for ss14", + "copyright": "Created by Flareguy using sprites from tgstation at commit https://github.com/tgstation/tgstation/commit/c838ba21dae97db345e0113f99596decd1d66039 & the jumpsuit base found in color.rsi.", "size": { "x": 32, "y": 32 @@ -15,15 +15,11 @@ "directions": 4 }, { - "name": "equipped-INNERCLOTHING-monkey", + "name": "overlay-inhand-left", "directions": 4 }, { - "name": "inhand-left", - "directions": 4 - }, - { - "name": "inhand-right", + "name": "overlay-inhand-right", "directions": 4 } ] diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/hos.rsi/overlay-inhand-left.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/hos.rsi/overlay-inhand-left.png new file mode 100644 index 0000000000..cedb1942e7 Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/hos.rsi/overlay-inhand-left.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/hos.rsi/overlay-inhand-right.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/hos.rsi/overlay-inhand-right.png new file mode 100644 index 0000000000..8a353cc390 Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/hos.rsi/overlay-inhand-right.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/hos_alt.rsi/equipped-INNERCLOTHING-monkey.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/hos_alt.rsi/equipped-INNERCLOTHING-monkey.png index 0d26aebd26..ffe264e7e9 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/hos_alt.rsi/equipped-INNERCLOTHING-monkey.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/hos_alt.rsi/equipped-INNERCLOTHING-monkey.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/hos_alt.rsi/equipped-INNERCLOTHING-reptilian.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/hos_alt.rsi/equipped-INNERCLOTHING-reptilian.png new file mode 100644 index 0000000000..b653b9098e Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/hos_alt.rsi/equipped-INNERCLOTHING-reptilian.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/hos_alt.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/hos_alt.rsi/equipped-INNERCLOTHING.png index d034a9fbb8..871a1ab7fd 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/hos_alt.rsi/equipped-INNERCLOTHING.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/hos_alt.rsi/equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/hos_alt.rsi/icon.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/hos_alt.rsi/icon.png index 6dde5c525b..b318f04b3b 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/hos_alt.rsi/icon.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/hos_alt.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/hos_alt.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/Jumpsuit/hos_alt.rsi/meta.json index 1fb9cf1b66..22ccca8b9d 100644 --- a/Resources/Textures/Clothing/Uniforms/Jumpsuit/hos_alt.rsi/meta.json +++ b/Resources/Textures/Clothing/Uniforms/Jumpsuit/hos_alt.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c838ba21dae97db345e0113f99596decd1d66039, monkey made by brainfood1183 (github) for ss14", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/2fea0a59470c476cf3f927833d3918d89cbe6af8, monkey made by SonicHDC (github) for ss14", "size": { "x": 32, "y": 32 @@ -17,7 +17,7 @@ { "name": "equipped-INNERCLOTHING-monkey", "directions": 4 - }, + }, { "name": "inhand-left", "directions": 4 diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/hos_blue.rsi/equipped-INNERCLOTHING-reptilian.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/hos_blue.rsi/equipped-INNERCLOTHING-reptilian.png new file mode 100644 index 0000000000..6f3f702482 Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/hos_blue.rsi/equipped-INNERCLOTHING-reptilian.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/hos_blue.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/hos_blue.rsi/equipped-INNERCLOTHING.png index 98f4d7093c..6c5aa4a64b 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/hos_blue.rsi/equipped-INNERCLOTHING.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/hos_blue.rsi/equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/hos_blue.rsi/icon.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/hos_blue.rsi/icon.png index 6c0ef8efe3..f4f23bf01c 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/hos_blue.rsi/icon.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/hos_blue.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/hos_blue.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/Jumpsuit/hos_blue.rsi/meta.json index 3f72fb4460..97b6fad015 100644 --- a/Resources/Textures/Clothing/Uniforms/Jumpsuit/hos_blue.rsi/meta.json +++ b/Resources/Textures/Clothing/Uniforms/Jumpsuit/hos_blue.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c838ba21dae97db345e0113f99596decd1d66039. In hand sprite scaled down by potato1234_x, monkey made by brainfood1183 (github) for ss14", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/28d0be60aa8bbe1ca87a5d129487bb6f60839ac4. In hand sprite scaled down by potato1234_x, monkey made by brainfood1183 (github) for ss14, reptilian made by kuro(388673708753027083)", "size": { "x": 32, "y": 32 @@ -17,7 +17,7 @@ { "name": "equipped-INNERCLOTHING-monkey", "directions": 4 - }, + }, { "name": "inhand-left", "directions": 4 diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/hos_grey.rsi/equipped-INNERCLOTHING-reptilian.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/hos_grey.rsi/equipped-INNERCLOTHING-reptilian.png new file mode 100644 index 0000000000..18c92442de Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/hos_grey.rsi/equipped-INNERCLOTHING-reptilian.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/hos_grey.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/hos_grey.rsi/equipped-INNERCLOTHING.png index 8863e61992..72988492b2 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/hos_grey.rsi/equipped-INNERCLOTHING.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/hos_grey.rsi/equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/hos_grey.rsi/icon.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/hos_grey.rsi/icon.png index 547aab783b..438da17f58 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/hos_grey.rsi/icon.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/hos_grey.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/hos_grey.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/Jumpsuit/hos_grey.rsi/meta.json index 3f72fb4460..97b6fad015 100644 --- a/Resources/Textures/Clothing/Uniforms/Jumpsuit/hos_grey.rsi/meta.json +++ b/Resources/Textures/Clothing/Uniforms/Jumpsuit/hos_grey.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c838ba21dae97db345e0113f99596decd1d66039. In hand sprite scaled down by potato1234_x, monkey made by brainfood1183 (github) for ss14", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/28d0be60aa8bbe1ca87a5d129487bb6f60839ac4. In hand sprite scaled down by potato1234_x, monkey made by brainfood1183 (github) for ss14, reptilian made by kuro(388673708753027083)", "size": { "x": 32, "y": 32 @@ -17,7 +17,7 @@ { "name": "equipped-INNERCLOTHING-monkey", "directions": 4 - }, + }, { "name": "inhand-left", "directions": 4 diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/hos_parade.rsi/equipped-INNERCLOTHING-reptilian.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/hos_parade.rsi/equipped-INNERCLOTHING-reptilian.png new file mode 100644 index 0000000000..4719a7a743 Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/hos_parade.rsi/equipped-INNERCLOTHING-reptilian.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/hos_parade.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/hos_parade.rsi/equipped-INNERCLOTHING.png index c9cb8ac622..5649656063 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/hos_parade.rsi/equipped-INNERCLOTHING.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/hos_parade.rsi/equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/hos_parade.rsi/icon.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/hos_parade.rsi/icon.png index c947c630e7..b2d7256ef0 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/hos_parade.rsi/icon.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/hos_parade.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/hos_parade.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/Jumpsuit/hos_parade.rsi/meta.json index 3f72fb4460..38c3ba6f04 100644 --- a/Resources/Textures/Clothing/Uniforms/Jumpsuit/hos_parade.rsi/meta.json +++ b/Resources/Textures/Clothing/Uniforms/Jumpsuit/hos_parade.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c838ba21dae97db345e0113f99596decd1d66039. In hand sprite scaled down by potato1234_x, monkey made by brainfood1183 (github) for ss14", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c838ba21dae97db345e0113f99596decd1d66039. In hand sprite scaled down by potato1234_x, monkey made by brainfood1183 (github) for ss14, reptilian made by kuro(388673708753027083)", "size": { "x": 32, "y": 32 @@ -17,7 +17,7 @@ { "name": "equipped-INNERCLOTHING-monkey", "directions": 4 - }, + }, { "name": "inhand-left", "directions": 4 diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/hosformal.rsi/equipped-INNERCLOTHING-monkey.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/hosformal.rsi/equipped-INNERCLOTHING-monkey.png index c5e714670e..ed984f875b 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/hosformal.rsi/equipped-INNERCLOTHING-monkey.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/hosformal.rsi/equipped-INNERCLOTHING-monkey.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/hosformal.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/hosformal.rsi/equipped-INNERCLOTHING.png index cd74f815a9..77dd42c270 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/hosformal.rsi/equipped-INNERCLOTHING.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/hosformal.rsi/equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/hosformal.rsi/icon.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/hosformal.rsi/icon.png index 6235db0a08..d48a05708c 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/hosformal.rsi/icon.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/hosformal.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/hosformal.rsi/inhand-left.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/hosformal.rsi/inhand-left.png index b3d694d2e3..6d6bf0a0d6 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/hosformal.rsi/inhand-left.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/hosformal.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/hosformal.rsi/inhand-right.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/hosformal.rsi/inhand-right.png index add9dfcbb2..b34c478be3 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/hosformal.rsi/inhand-right.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/hosformal.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/hosformal.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/Jumpsuit/hosformal.rsi/meta.json index e771fed56c..3d490cefa4 100644 --- a/Resources/Textures/Clothing/Uniforms/Jumpsuit/hosformal.rsi/meta.json +++ b/Resources/Textures/Clothing/Uniforms/Jumpsuit/hosformal.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation https://github.com/tgstation/tgstation/commit/30892aa892a2be846592b068ab71c606e2f0c5b7, monkey made by brainfood1183 (github) for ss14", + "copyright": "Taken from tgstation https://github.com/tgstation/tgstation/commit/30892aa892a2be846592b068ab71c606e2f0c5b7, monkey made by brainfood1183 (github) for ss14, reptilian made by SonicDC(821343860961706054)", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/hydro.rsi/equipped-INNERCLOTHING-reptilian.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/hydro.rsi/equipped-INNERCLOTHING-reptilian.png new file mode 100644 index 0000000000..c531ba4c59 Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/hydro.rsi/equipped-INNERCLOTHING-reptilian.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/hydro.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/hydro.rsi/equipped-INNERCLOTHING.png index bf66e84ec6..bc5241b7d5 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/hydro.rsi/equipped-INNERCLOTHING.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/hydro.rsi/equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/hydro.rsi/icon.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/hydro.rsi/icon.png index 5393fcdf4b..a2d0eea503 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/hydro.rsi/icon.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/hydro.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/hydro.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/Jumpsuit/hydro.rsi/meta.json index 3f72fb4460..38c3ba6f04 100644 --- a/Resources/Textures/Clothing/Uniforms/Jumpsuit/hydro.rsi/meta.json +++ b/Resources/Textures/Clothing/Uniforms/Jumpsuit/hydro.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c838ba21dae97db345e0113f99596decd1d66039. In hand sprite scaled down by potato1234_x, monkey made by brainfood1183 (github) for ss14", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c838ba21dae97db345e0113f99596decd1d66039. In hand sprite scaled down by potato1234_x, monkey made by brainfood1183 (github) for ss14, reptilian made by kuro(388673708753027083)", "size": { "x": 32, "y": 32 @@ -17,7 +17,7 @@ { "name": "equipped-INNERCLOTHING-monkey", "directions": 4 - }, + }, { "name": "inhand-left", "directions": 4 diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/janitor.rsi/equipped-INNERCLOTHING-reptilian.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/janitor.rsi/equipped-INNERCLOTHING-reptilian.png new file mode 100644 index 0000000000..25cc127d5f Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/janitor.rsi/equipped-INNERCLOTHING-reptilian.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/janitor.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/janitor.rsi/equipped-INNERCLOTHING.png index c8ea12d1b7..1ab2057b54 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/janitor.rsi/equipped-INNERCLOTHING.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/janitor.rsi/equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/janitor.rsi/icon.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/janitor.rsi/icon.png index 1a0adb6f1a..7e6261c004 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/janitor.rsi/icon.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/janitor.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/janitor.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/Jumpsuit/janitor.rsi/meta.json index 1fb9cf1b66..aa80ef6992 100644 --- a/Resources/Textures/Clothing/Uniforms/Jumpsuit/janitor.rsi/meta.json +++ b/Resources/Textures/Clothing/Uniforms/Jumpsuit/janitor.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c838ba21dae97db345e0113f99596decd1d66039, monkey made by brainfood1183 (github) for ss14", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c838ba21dae97db345e0113f99596decd1d66039, monkey made by brainfood1183 (github) for ss14, reptilian made by kuro(388673708753027083)", "size": { "x": 32, "y": 32 @@ -17,7 +17,7 @@ { "name": "equipped-INNERCLOTHING-monkey", "directions": 4 - }, + }, { "name": "inhand-left", "directions": 4 diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/jester.rsi/equipped-INNERCLOTHING-reptilian.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/jester.rsi/equipped-INNERCLOTHING-reptilian.png new file mode 100644 index 0000000000..a55e3438e7 Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/jester.rsi/equipped-INNERCLOTHING-reptilian.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/jester.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/Jumpsuit/jester.rsi/meta.json index a869e2d92d..30c5df0365 100644 --- a/Resources/Textures/Clothing/Uniforms/Jumpsuit/jester.rsi/meta.json +++ b/Resources/Textures/Clothing/Uniforms/Jumpsuit/jester.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/3a72dd925f7d6aeec620fe83bc4f88a3d7e5f693. In hand sprite scaled down by potato1234_x, monkey made by brainfood1183 (github) for ss14, edited by Alekshhh", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/3a72dd925f7d6aeec620fe83bc4f88a3d7e5f693. In hand sprite scaled down by potato1234_x, monkey made by brainfood1183 (github) for ss14, reptilian made by kuro(388673708753027083), edited by Alekshhh", "size": { "x": 32, "y": 32 @@ -17,7 +17,7 @@ { "name": "equipped-INNERCLOTHING-monkey", "directions": 4 - }, + }, { "name": "inhand-left", "directions": 4 diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/jester2.rsi/equipped-INNERCLOTHING-reptilian.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/jester2.rsi/equipped-INNERCLOTHING-reptilian.png new file mode 100644 index 0000000000..d0d66766d8 Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/jester2.rsi/equipped-INNERCLOTHING-reptilian.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/jester2.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/Jumpsuit/jester2.rsi/meta.json index 5b9a00d1b2..5a8c34b580 100644 --- a/Resources/Textures/Clothing/Uniforms/Jumpsuit/jester2.rsi/meta.json +++ b/Resources/Textures/Clothing/Uniforms/Jumpsuit/jester2.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/3a72dd925f7d6aeec620fe83bc4f88a3d7e5f693. In hand sprite scaled down by potato1234_x, monkey made by brainfood1183 (github) for ss14", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/3a72dd925f7d6aeec620fe83bc4f88a3d7e5f693. In hand sprite scaled down by potato1234_x, monkey made by brainfood1183 (github) for ss14, reptilian made by kuro(388673708753027083)", "size": { "x": 32, "y": 32 @@ -17,7 +17,7 @@ { "name": "equipped-INNERCLOTHING-monkey", "directions": 4 - }, + }, { "name": "inhand-left", "directions": 4 diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/journalist.rsi/equipped-INNERCLOTHING-reptilian.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/journalist.rsi/equipped-INNERCLOTHING-reptilian.png new file mode 100644 index 0000000000..d867c165bc Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/journalist.rsi/equipped-INNERCLOTHING-reptilian.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/journalist.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/journalist.rsi/equipped-INNERCLOTHING.png index 379ca3bce8..ae37a10376 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/journalist.rsi/equipped-INNERCLOTHING.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/journalist.rsi/equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/journalist.rsi/icon.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/journalist.rsi/icon.png index 70f76a475b..b6ea0e536e 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/journalist.rsi/icon.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/journalist.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/journalist.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/Jumpsuit/journalist.rsi/meta.json index 5dd83ef6e2..3066ebf111 100644 --- a/Resources/Textures/Clothing/Uniforms/Jumpsuit/journalist.rsi/meta.json +++ b/Resources/Textures/Clothing/Uniforms/Jumpsuit/journalist.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from vgstation at commit https://github.com/vgstation-coders/vgstation13/commit/78a56e1a22ba1d8d6023ed9bdae55a6de7fe8a39 and modified by emisse, monkey made by brainfood1183 (github) for ss14", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/2fea0a59470c476cf3f927833d3918d89cbe6af8 and inhand modified by emisse, monkey made by brainfood1183 (github) for ss14, reptilian made by kuro(388673708753027083)", "size": { "x": 32, "y": 32 @@ -17,7 +17,7 @@ { "name": "equipped-INNERCLOTHING-monkey", "directions": 4 - }, + }, { "name": "inhand-left", "directions": 4 @@ -27,4 +27,4 @@ "directions": 4 } ] -} \ No newline at end of file +} diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/kimono.rsi/equipped-INNERCLOTHING-reptilian.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/kimono.rsi/equipped-INNERCLOTHING-reptilian.png new file mode 100644 index 0000000000..c06401e4c0 Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/kimono.rsi/equipped-INNERCLOTHING-reptilian.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/kimono.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/Jumpsuit/kimono.rsi/meta.json index 541eeb740f..78245531ca 100644 --- a/Resources/Textures/Clothing/Uniforms/Jumpsuit/kimono.rsi/meta.json +++ b/Resources/Textures/Clothing/Uniforms/Jumpsuit/kimono.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Sprite by joestarguy, code by kxvvv", + "copyright": "Sprite by joestarguy, code by kxvvv, reptilian made by SonicDC(821343860961706054)", "size": { "x": 32, "y": 32 @@ -13,7 +13,7 @@ { "name": "equipped-INNERCLOTHING", "directions": 4 - }, + }, { "name": "inhand-left", "directions": 4 diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/lawyerblack.rsi/equipped-INNERCLOTHING-reptilian.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/lawyerblack.rsi/equipped-INNERCLOTHING-reptilian.png new file mode 100644 index 0000000000..e87050158f Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/lawyerblack.rsi/equipped-INNERCLOTHING-reptilian.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/lawyerblack.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/lawyerblack.rsi/equipped-INNERCLOTHING.png index e81317b7e2..16866ba85b 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/lawyerblack.rsi/equipped-INNERCLOTHING.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/lawyerblack.rsi/equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/lawyerblack.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/Jumpsuit/lawyerblack.rsi/meta.json index 138aaf3905..5dcd644600 100644 --- a/Resources/Textures/Clothing/Uniforms/Jumpsuit/lawyerblack.rsi/meta.json +++ b/Resources/Textures/Clothing/Uniforms/Jumpsuit/lawyerblack.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/3a72dd925f7d6aeec620fe83bc4f88a3d7e5f693, monkey made by brainfood1183 (github) for ss14", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/3a72dd925f7d6aeec620fe83bc4f88a3d7e5f693, monkey made by brainfood1183 (github) for ss14, reptilian made by kuro(388673708753027083)", "size": { "x": 32, "y": 32 @@ -17,7 +17,7 @@ { "name": "equipped-INNERCLOTHING-monkey", "directions": 4 - }, + }, { "name": "inhand-left", "directions": 4 diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/lawyerblue.rsi/equipped-INNERCLOTHING-reptilian.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/lawyerblue.rsi/equipped-INNERCLOTHING-reptilian.png new file mode 100644 index 0000000000..39ded499d7 Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/lawyerblue.rsi/equipped-INNERCLOTHING-reptilian.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/lawyerblue.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/lawyerblue.rsi/equipped-INNERCLOTHING.png index 484aeba84b..37116d41ee 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/lawyerblue.rsi/equipped-INNERCLOTHING.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/lawyerblue.rsi/equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/lawyerblue.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/Jumpsuit/lawyerblue.rsi/meta.json index 138aaf3905..5dcd644600 100644 --- a/Resources/Textures/Clothing/Uniforms/Jumpsuit/lawyerblue.rsi/meta.json +++ b/Resources/Textures/Clothing/Uniforms/Jumpsuit/lawyerblue.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/3a72dd925f7d6aeec620fe83bc4f88a3d7e5f693, monkey made by brainfood1183 (github) for ss14", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/3a72dd925f7d6aeec620fe83bc4f88a3d7e5f693, monkey made by brainfood1183 (github) for ss14, reptilian made by kuro(388673708753027083)", "size": { "x": 32, "y": 32 @@ -17,7 +17,7 @@ { "name": "equipped-INNERCLOTHING-monkey", "directions": 4 - }, + }, { "name": "inhand-left", "directions": 4 diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/lawyergood.rsi/equipped-INNERCLOTHING-reptilian.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/lawyergood.rsi/equipped-INNERCLOTHING-reptilian.png new file mode 100644 index 0000000000..29774ea42f Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/lawyergood.rsi/equipped-INNERCLOTHING-reptilian.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/lawyergood.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/lawyergood.rsi/equipped-INNERCLOTHING.png index 71a9d19cb1..0c178aebee 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/lawyergood.rsi/equipped-INNERCLOTHING.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/lawyergood.rsi/equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/lawyergood.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/Jumpsuit/lawyergood.rsi/meta.json index 98f1cf18e2..666633123d 100644 --- a/Resources/Textures/Clothing/Uniforms/Jumpsuit/lawyergood.rsi/meta.json +++ b/Resources/Textures/Clothing/Uniforms/Jumpsuit/lawyergood.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/305131e20cfe53eb41de61db79a99aa12c2925b0, monkey made by brainfood1183 (github) for ss14", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/305131e20cfe53eb41de61db79a99aa12c2925b0, reptilian made by github:Morb0, monkey made by brainfood1183 (github) for ss14, reptilian made by kuro(388673708753027083)", "size": { "x": 32, "y": 32 @@ -17,7 +17,7 @@ { "name": "equipped-INNERCLOTHING-monkey", "directions": 4 - }, + }, { "name": "inhand-left", "directions": 4 diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/lawyerpurple.rsi/equipped-INNERCLOTHING-reptilian.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/lawyerpurple.rsi/equipped-INNERCLOTHING-reptilian.png new file mode 100644 index 0000000000..8bc1e48d5f Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/lawyerpurple.rsi/equipped-INNERCLOTHING-reptilian.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/lawyerpurple.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/Jumpsuit/lawyerpurple.rsi/meta.json index 50c6aadaa6..b65dce1171 100644 --- a/Resources/Textures/Clothing/Uniforms/Jumpsuit/lawyerpurple.rsi/meta.json +++ b/Resources/Textures/Clothing/Uniforms/Jumpsuit/lawyerpurple.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/3a72dd925f7d6aeec620fe83bc4f88a3d7e5f693, inhands by github:Morb0, monkey made by brainfood1183 (github) for ss14", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/3a72dd925f7d6aeec620fe83bc4f88a3d7e5f693, inhands by github:Morb0, monkey made by brainfood1183 (github) for ss14, reptilian made by kuro(388673708753027083)", "size": { "x": 32, "y": 32 @@ -17,7 +17,7 @@ { "name": "equipped-INNERCLOTHING-monkey", "directions": 4 - }, + }, { "name": "inhand-left", "directions": 4 diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/lawyerred.rsi/equipped-INNERCLOTHING-reptilian.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/lawyerred.rsi/equipped-INNERCLOTHING-reptilian.png new file mode 100644 index 0000000000..f6bef563e2 Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/lawyerred.rsi/equipped-INNERCLOTHING-reptilian.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/lawyerred.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/lawyerred.rsi/equipped-INNERCLOTHING.png index 53a5c7393c..8406878464 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/lawyerred.rsi/equipped-INNERCLOTHING.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/lawyerred.rsi/equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/lawyerred.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/Jumpsuit/lawyerred.rsi/meta.json index 138aaf3905..5dcd644600 100644 --- a/Resources/Textures/Clothing/Uniforms/Jumpsuit/lawyerred.rsi/meta.json +++ b/Resources/Textures/Clothing/Uniforms/Jumpsuit/lawyerred.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/3a72dd925f7d6aeec620fe83bc4f88a3d7e5f693, monkey made by brainfood1183 (github) for ss14", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/3a72dd925f7d6aeec620fe83bc4f88a3d7e5f693, monkey made by brainfood1183 (github) for ss14, reptilian made by kuro(388673708753027083)", "size": { "x": 32, "y": 32 @@ -17,7 +17,7 @@ { "name": "equipped-INNERCLOTHING-monkey", "directions": 4 - }, + }, { "name": "inhand-left", "directions": 4 diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/librarian.rsi/equipped-INNERCLOTHING-reptilian.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/librarian.rsi/equipped-INNERCLOTHING-reptilian.png new file mode 100644 index 0000000000..cbfa0a9076 Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/librarian.rsi/equipped-INNERCLOTHING-reptilian.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/librarian.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/librarian.rsi/equipped-INNERCLOTHING.png index 8aa89ef44e..fadf3a2e31 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/librarian.rsi/equipped-INNERCLOTHING.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/librarian.rsi/equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/librarian.rsi/icon.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/librarian.rsi/icon.png index 36cb47ba89..8b3720ec10 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/librarian.rsi/icon.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/librarian.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/librarian.rsi/inhand-left.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/librarian.rsi/inhand-left.png index 9feaebdb55..dffffbc988 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/librarian.rsi/inhand-left.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/librarian.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/librarian.rsi/inhand-right.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/librarian.rsi/inhand-right.png index 6b8fccf1f4..aa45782ecd 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/librarian.rsi/inhand-right.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/librarian.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/librarian.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/Jumpsuit/librarian.rsi/meta.json index 0a48ac3e37..ad9f405297 100644 --- a/Resources/Textures/Clothing/Uniforms/Jumpsuit/librarian.rsi/meta.json +++ b/Resources/Textures/Clothing/Uniforms/Jumpsuit/librarian.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/47718914e47c6fbf23d6dc97f073a9daa11b23cb and modified by potato1234x (github) for ss14", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/2fea0a59470c476cf3f927833d3918d89cbe6af8, monkey made by brainfood1183 (github) for ss14, reptilian made by Hemo(269831232517308416)", "size": { "x": 32, "y": 32 @@ -17,7 +17,7 @@ { "name": "equipped-INNERCLOTHING-monkey", "directions": 4 - }, + }, { "name": "inhand-left", "directions": 4 diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/medical.rsi/equipped-INNERCLOTHING-monkey.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/medical.rsi/equipped-INNERCLOTHING-monkey.png index ad9d4cf8b8..517e523f1e 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/medical.rsi/equipped-INNERCLOTHING-monkey.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/medical.rsi/equipped-INNERCLOTHING-monkey.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/medical.rsi/equipped-INNERCLOTHING-reptilian.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/medical.rsi/equipped-INNERCLOTHING-reptilian.png new file mode 100644 index 0000000000..d790925131 Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/medical.rsi/equipped-INNERCLOTHING-reptilian.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/medical.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/medical.rsi/equipped-INNERCLOTHING.png index d87ca22a54..f2ac23c948 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/medical.rsi/equipped-INNERCLOTHING.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/medical.rsi/equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/medical.rsi/icon.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/medical.rsi/icon.png index 26920f2469..662450d980 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/medical.rsi/icon.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/medical.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/medical.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/Jumpsuit/medical.rsi/meta.json index 3f72fb4460..19a5317c84 100644 --- a/Resources/Textures/Clothing/Uniforms/Jumpsuit/medical.rsi/meta.json +++ b/Resources/Textures/Clothing/Uniforms/Jumpsuit/medical.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c838ba21dae97db345e0113f99596decd1d66039. In hand sprite scaled down by potato1234_x, monkey made by brainfood1183 (github) for ss14", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c838ba21dae97db345e0113f99596decd1d66039. In hand sprite scaled down by potato1234_x, monkey made by SonicHDC (github) for ss14, reptilian made by kuro(388673708753027083)", "size": { "x": 32, "y": 32 @@ -17,7 +17,7 @@ { "name": "equipped-INNERCLOTHING-monkey", "directions": 4 - }, + }, { "name": "inhand-left", "directions": 4 diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/mercenary.rsi/equipped-INNERCLOTHING-reptilian.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/mercenary.rsi/equipped-INNERCLOTHING-reptilian.png new file mode 100644 index 0000000000..871b47e6b5 Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/mercenary.rsi/equipped-INNERCLOTHING-reptilian.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/mercenary.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/mercenary.rsi/equipped-INNERCLOTHING.png index 28e67ab9f5..9002d15e96 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/mercenary.rsi/equipped-INNERCLOTHING.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/mercenary.rsi/equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/mercenary.rsi/icon.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/mercenary.rsi/icon.png index d4e4613b65..f1b4277e74 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/mercenary.rsi/icon.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/mercenary.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/mercenary.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/Jumpsuit/mercenary.rsi/meta.json index c5682d0a19..f11ccc2b06 100644 --- a/Resources/Textures/Clothing/Uniforms/Jumpsuit/mercenary.rsi/meta.json +++ b/Resources/Textures/Clothing/Uniforms/Jumpsuit/mercenary.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "modified sprite from Jackal298 based on the sprite from tgstation at commit https://github.com/tgstation/tgstation/commit/d7e905e4d5ab2b0a8ce210c6ad686aeeebbab426, monkey made by Jackal298 for ss14", + "copyright": "modified sprite from Jackal298 based on the sprite from tgstation at commit https://github.com/tgstation/tgstation/commit/d7e905e4d5ab2b0a8ce210c6ad686aeeebbab426, monkey made by Jackal298 for ss14, reptilian made by kuro(388673708753027083)", "size": { "x": 32, "y": 32 @@ -17,7 +17,7 @@ { "name": "equipped-INNERCLOTHING-monkey", "directions": 4 - }, + }, { "name": "inhand-left", "directions": 4 @@ -27,4 +27,4 @@ "directions": 4 } ] -} \ No newline at end of file +} diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/mime.rsi/equipped-INNERCLOTHING-reptilian.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/mime.rsi/equipped-INNERCLOTHING-reptilian.png new file mode 100644 index 0000000000..3660f96127 Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/mime.rsi/equipped-INNERCLOTHING-reptilian.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/mime.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/mime.rsi/equipped-INNERCLOTHING.png index 436ebe0bdb..bf08dbb636 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/mime.rsi/equipped-INNERCLOTHING.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/mime.rsi/equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/mime.rsi/icon.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/mime.rsi/icon.png index 3c6f4de6e5..6a3801bb2d 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/mime.rsi/icon.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/mime.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/mime.rsi/inhand-left.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/mime.rsi/inhand-left.png index 59518c35c3..9808c1255d 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/mime.rsi/inhand-left.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/mime.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/mime.rsi/inhand-right.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/mime.rsi/inhand-right.png index fa96803d56..37b205768e 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/mime.rsi/inhand-right.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/mime.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/mime.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/Jumpsuit/mime.rsi/meta.json index 1fb9cf1b66..64913d72ed 100644 --- a/Resources/Textures/Clothing/Uniforms/Jumpsuit/mime.rsi/meta.json +++ b/Resources/Textures/Clothing/Uniforms/Jumpsuit/mime.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c838ba21dae97db345e0113f99596decd1d66039, monkey made by brainfood1183 (github) for ss14", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/2fea0a59470c476cf3f927833d3918d89cbe6af8, monkey made by brainfood1183 (github) for ss14, reptilian made by kuro(388673708753027083), Resprited by github:DreamlyJack(624946166152298517)", "size": { "x": 32, "y": 32 @@ -17,7 +17,7 @@ { "name": "equipped-INNERCLOTHING-monkey", "directions": 4 - }, + }, { "name": "inhand-left", "directions": 4 diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/monastic_robe_dark.rsi/equipped-INNERCLOTHING-reptilian.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/monastic_robe_dark.rsi/equipped-INNERCLOTHING-reptilian.png new file mode 100644 index 0000000000..0647feb1d2 Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/monastic_robe_dark.rsi/equipped-INNERCLOTHING-reptilian.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/monastic_robe_dark.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/Jumpsuit/monastic_robe_dark.rsi/meta.json index 71cec7ae40..b2ada5d42c 100644 --- a/Resources/Textures/Clothing/Uniforms/Jumpsuit/monastic_robe_dark.rsi/meta.json +++ b/Resources/Textures/Clothing/Uniforms/Jumpsuit/monastic_robe_dark.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from TauCetiStation at commit https://github.com/TauCetiStation/TauCetiClassic/commit/2d40b6331f588fb26c571a47edda0110184dc938, monkey made by brainfood1183 (github) for ss14", + "copyright": "Taken from TauCetiStation at commit https://github.com/TauCetiStation/TauCetiClassic/commit/2d40b6331f588fb26c571a47edda0110184dc938, monkey made by brainfood1183 (github) for ss14, reptilian made by murouxlul(705433554602950793)", "size": { "x": 32, "y": 32 @@ -17,7 +17,7 @@ { "name": "equipped-INNERCLOTHING-monkey", "directions": 4 - }, + }, { "name": "inhand-left", "directions": 4 diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/monastic_robe_light.rsi/equipped-INNERCLOTHING-reptilian.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/monastic_robe_light.rsi/equipped-INNERCLOTHING-reptilian.png new file mode 100644 index 0000000000..9adb7abaa5 Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/monastic_robe_light.rsi/equipped-INNERCLOTHING-reptilian.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/monastic_robe_light.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/Jumpsuit/monastic_robe_light.rsi/meta.json index 71cec7ae40..b2ada5d42c 100644 --- a/Resources/Textures/Clothing/Uniforms/Jumpsuit/monastic_robe_light.rsi/meta.json +++ b/Resources/Textures/Clothing/Uniforms/Jumpsuit/monastic_robe_light.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from TauCetiStation at commit https://github.com/TauCetiStation/TauCetiClassic/commit/2d40b6331f588fb26c571a47edda0110184dc938, monkey made by brainfood1183 (github) for ss14", + "copyright": "Taken from TauCetiStation at commit https://github.com/TauCetiStation/TauCetiClassic/commit/2d40b6331f588fb26c571a47edda0110184dc938, monkey made by brainfood1183 (github) for ss14, reptilian made by murouxlul(705433554602950793)", "size": { "x": 32, "y": 32 @@ -17,7 +17,7 @@ { "name": "equipped-INNERCLOTHING-monkey", "directions": 4 - }, + }, { "name": "inhand-left", "directions": 4 diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/musician.rsi/equipped-INNERCLOTHING-monkey.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/musician.rsi/equipped-INNERCLOTHING-monkey.png index e7acf1f3ca..8f7f1d7ac9 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/musician.rsi/equipped-INNERCLOTHING-monkey.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/musician.rsi/equipped-INNERCLOTHING-monkey.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/musician.rsi/equipped-INNERCLOTHING-reptilian.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/musician.rsi/equipped-INNERCLOTHING-reptilian.png new file mode 100644 index 0000000000..132e70f822 Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/musician.rsi/equipped-INNERCLOTHING-reptilian.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/musician.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/musician.rsi/equipped-INNERCLOTHING.png index 23329b7245..2298442eae 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/musician.rsi/equipped-INNERCLOTHING.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/musician.rsi/equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/musician.rsi/icon.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/musician.rsi/icon.png index c69974d2e7..9a646591da 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/musician.rsi/icon.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/musician.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/musician.rsi/inhand-left.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/musician.rsi/inhand-left.png index 4896ed18ac..b52064a8e2 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/musician.rsi/inhand-left.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/musician.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/musician.rsi/inhand-right.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/musician.rsi/inhand-right.png index 60005dc4d1..cc7abcf400 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/musician.rsi/inhand-right.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/musician.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/musician.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/Jumpsuit/musician.rsi/meta.json index d54d2f9c88..3364bcf803 100644 --- a/Resources/Textures/Clothing/Uniforms/Jumpsuit/musician.rsi/meta.json +++ b/Resources/Textures/Clothing/Uniforms/Jumpsuit/musician.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from paradisestation at commit https://github.com/ParadiseSS13/Paradise/commit/4daf5d1a1b45fc3fcc4fd9703222159e6c1f38c8, inhands and icon by peptide, edited further by Ian M. Burton, monkey made by brainfood1183 (github) for ss14", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/2fea0a59470c476cf3f927833d3918d89cbe6af8, inhands and icon by peptide, edited further by Ian M. Burton, recolored by github:Morb0, monkey made by SonicHDC (github) for ss14, reptilian made by kuro(388673708753027083)", "size": { "x": 32, "y": 32 @@ -17,7 +17,7 @@ { "name": "equipped-INNERCLOTHING-monkey", "directions": 4 - }, + }, { "name": "inhand-left", "directions": 4 diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/nanotrasen.rsi/equipped-INNERCLOTHING-reptilian.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/nanotrasen.rsi/equipped-INNERCLOTHING-reptilian.png new file mode 100644 index 0000000000..b2f938c3f7 Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/nanotrasen.rsi/equipped-INNERCLOTHING-reptilian.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/nanotrasen.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/nanotrasen.rsi/equipped-INNERCLOTHING.png index da232a94f6..dc0f5a66c8 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/nanotrasen.rsi/equipped-INNERCLOTHING.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/nanotrasen.rsi/equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/nanotrasen.rsi/icon.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/nanotrasen.rsi/icon.png index cab8a57bff..4378f97438 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/nanotrasen.rsi/icon.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/nanotrasen.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/nanotrasen.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/Jumpsuit/nanotrasen.rsi/meta.json index 9fcf5f6f05..a447b836df 100644 --- a/Resources/Textures/Clothing/Uniforms/Jumpsuit/nanotrasen.rsi/meta.json +++ b/Resources/Textures/Clothing/Uniforms/Jumpsuit/nanotrasen.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Created by You#1818. In hand sprite scaled down by potato1234_x, monkey made by brainfood1183 (github) for ss14", + "copyright": "Created by You#1818. In hand sprite scaled down by potato1234_x, monkey made by brainfood1183 (github) for ss14, reptilian made by denlemp(692533587760906270)", "size": { "x": 32, "y": 32 @@ -17,7 +17,7 @@ { "name": "equipped-INNERCLOTHING-monkey", "directions": 4 - }, + }, { "name": "inhand-left", "directions": 4 diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/ninja.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/ninja.rsi/equipped-INNERCLOTHING.png index 9c8f0d020d..87282ec842 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/ninja.rsi/equipped-INNERCLOTHING.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/ninja.rsi/equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/ninja.rsi/icon.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/ninja.rsi/icon.png index be42d7ae7e..447174a09e 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/ninja.rsi/icon.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/ninja.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/ninja.rsi/inhand-left.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/ninja.rsi/inhand-left.png index 24dfb6da1f..558124e55c 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/ninja.rsi/inhand-left.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/ninja.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/ninja.rsi/inhand-right.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/ninja.rsi/inhand-right.png index 38b78db1e1..e1db9b0bda 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/ninja.rsi/inhand-right.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/ninja.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/ninja.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/Jumpsuit/ninja.rsi/meta.json index 35a7a9f9df..b503d4acde 100644 --- a/Resources/Textures/Clothing/Uniforms/Jumpsuit/ninja.rsi/meta.json +++ b/Resources/Textures/Clothing/Uniforms/Jumpsuit/ninja.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "sprite by prazat911 and modified by jackal298", + "copyright": "Modified by Jackal298 (github), based on paradise station at https://github.com/ParadiseSS13/Paradise/blob/ede55cc8f5b50abcd4f51d37779b56853a440a9a/icons/obj/clothing/uniforms.dmi", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/operative.rsi/equipped-INNERCLOTHING-reptilian.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/operative.rsi/equipped-INNERCLOTHING-reptilian.png new file mode 100644 index 0000000000..bba33b69ed Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/operative.rsi/equipped-INNERCLOTHING-reptilian.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/operative.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/operative.rsi/equipped-INNERCLOTHING.png index 412c768774..1ca22155f7 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/operative.rsi/equipped-INNERCLOTHING.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/operative.rsi/equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/operative.rsi/icon.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/operative.rsi/icon.png index e648d2e6c5..5f8f62440c 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/operative.rsi/icon.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/operative.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/operative.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/Jumpsuit/operative.rsi/meta.json index bb86428a94..e2dc5d5e9d 100644 --- a/Resources/Textures/Clothing/Uniforms/Jumpsuit/operative.rsi/meta.json +++ b/Resources/Textures/Clothing/Uniforms/Jumpsuit/operative.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/d7e905e4d5ab2b0a8ce210c6ad686aeeebbab426, monkey made by brainfood1183 (github) for ss14", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/2fea0a59470c476cf3f927833d3918d89cbe6af8, monkey made by brainfood1183 (github) for ss14, reptilian made by kuro(388673708753027083)", "size": { "x": 32, "y": 32 @@ -17,7 +17,7 @@ { "name": "equipped-INNERCLOTHING-monkey", "directions": 4 - }, + }, { "name": "inhand-left", "directions": 4 @@ -27,4 +27,4 @@ "directions": 4 } ] -} \ No newline at end of file +} diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/overalls.rsi/equipped-INNERCLOTHING-monkey.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/overalls.rsi/equipped-INNERCLOTHING-monkey.png index 22e7771794..5275587027 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/overalls.rsi/equipped-INNERCLOTHING-monkey.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/overalls.rsi/equipped-INNERCLOTHING-monkey.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/overalls.rsi/equipped-INNERCLOTHING-reptilian.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/overalls.rsi/equipped-INNERCLOTHING-reptilian.png new file mode 100644 index 0000000000..6842498c43 Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/overalls.rsi/equipped-INNERCLOTHING-reptilian.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/overalls.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/overalls.rsi/equipped-INNERCLOTHING.png index 42ea220dba..b06a0ba966 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/overalls.rsi/equipped-INNERCLOTHING.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/overalls.rsi/equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/overalls.rsi/icon.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/overalls.rsi/icon.png index 6f2f21e14b..a33436676d 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/overalls.rsi/icon.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/overalls.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/overalls.rsi/inhand-left.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/overalls.rsi/inhand-left.png index ef474f95ad..edefcb343b 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/overalls.rsi/inhand-left.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/overalls.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/overalls.rsi/inhand-right.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/overalls.rsi/inhand-right.png index 79468f3b60..6012de163e 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/overalls.rsi/inhand-right.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/overalls.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/overalls.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/Jumpsuit/overalls.rsi/meta.json index e5e880415c..b1110c2f72 100644 --- a/Resources/Textures/Clothing/Uniforms/Jumpsuit/overalls.rsi/meta.json +++ b/Resources/Textures/Clothing/Uniforms/Jumpsuit/overalls.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation and modified by Swept at commit https://github.com/tgstation/tgstation/commit/ac792e3226d48e5b3aaccff165ce100f7636a040, monkey made by brainfood1183 (github) for ss14", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/2fea0a59470c476cf3f927833d3918d89cbe6af8 and inhand modified by github:Morb0, monkey made by brainfood1183 (github) for ss14, reptilian made by kuro(388673708753027083)", "size": { "x": 32, "y": 32 @@ -17,7 +17,7 @@ { "name": "equipped-INNERCLOTHING-monkey", "directions": 4 - }, + }, { "name": "inhand-left", "directions": 4 diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/paramedic.rsi/equipped-INNERCLOTHING-monkey.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/paramedic.rsi/equipped-INNERCLOTHING-monkey.png index dca763bcea..81c2e53036 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/paramedic.rsi/equipped-INNERCLOTHING-monkey.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/paramedic.rsi/equipped-INNERCLOTHING-monkey.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/paramedic.rsi/equipped-INNERCLOTHING-reptilian.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/paramedic.rsi/equipped-INNERCLOTHING-reptilian.png new file mode 100644 index 0000000000..f895a9776d Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/paramedic.rsi/equipped-INNERCLOTHING-reptilian.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/paramedic.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/paramedic.rsi/equipped-INNERCLOTHING.png index 33fafb9ea9..ec9299f9f3 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/paramedic.rsi/equipped-INNERCLOTHING.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/paramedic.rsi/equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/paramedic.rsi/icon.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/paramedic.rsi/icon.png index d5f5151370..7b21801944 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/paramedic.rsi/icon.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/paramedic.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/paramedic.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/Jumpsuit/paramedic.rsi/meta.json index 3f72fb4460..19a5317c84 100644 --- a/Resources/Textures/Clothing/Uniforms/Jumpsuit/paramedic.rsi/meta.json +++ b/Resources/Textures/Clothing/Uniforms/Jumpsuit/paramedic.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c838ba21dae97db345e0113f99596decd1d66039. In hand sprite scaled down by potato1234_x, monkey made by brainfood1183 (github) for ss14", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c838ba21dae97db345e0113f99596decd1d66039. In hand sprite scaled down by potato1234_x, monkey made by SonicHDC (github) for ss14, reptilian made by kuro(388673708753027083)", "size": { "x": 32, "y": 32 @@ -17,7 +17,7 @@ { "name": "equipped-INNERCLOTHING-monkey", "directions": 4 - }, + }, { "name": "inhand-left", "directions": 4 diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/paramedic_nt.rsi/equipped-INNERCLOTHING-reptilian.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/paramedic_nt.rsi/equipped-INNERCLOTHING-reptilian.png new file mode 100644 index 0000000000..7a22c7020a Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/paramedic_nt.rsi/equipped-INNERCLOTHING-reptilian.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/paramedic_nt.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/Jumpsuit/paramedic_nt.rsi/meta.json index 8b0bae84ea..19f2de1948 100644 --- a/Resources/Textures/Clothing/Uniforms/Jumpsuit/paramedic_nt.rsi/meta.json +++ b/Resources/Textures/Clothing/Uniforms/Jumpsuit/paramedic_nt.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Made by Flareguy for Space Station 14, base sprite taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c838ba21dae97db345e0113f99596decd1d66039, monkey made by brainfood1183 (github) for ss14", + "copyright": "Made by Flareguy for Space Station 14, base sprite taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c838ba21dae97db345e0113f99596decd1d66039, monkey made by brainfood1183 (github) for ss14, reptilian made by kuro(388673708753027083)", "size": { "x": 32, "y": 32 @@ -13,7 +13,7 @@ { "name": "equipped-INNERCLOTHING", "directions": 4 - }, + }, { "name": "inhand-left", "directions": 4 diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/paramedic_syndie.rsi/equipped-INNERCLOTHING-reptilian.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/paramedic_syndie.rsi/equipped-INNERCLOTHING-reptilian.png new file mode 100644 index 0000000000..76d8c46426 Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/paramedic_syndie.rsi/equipped-INNERCLOTHING-reptilian.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/paramedic_syndie.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/paramedic_syndie.rsi/equipped-INNERCLOTHING.png index 7ca069b33f..f8d684307e 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/paramedic_syndie.rsi/equipped-INNERCLOTHING.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/paramedic_syndie.rsi/equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/paramedic_syndie.rsi/icon.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/paramedic_syndie.rsi/icon.png index a6b4935b58..3d718ee0cd 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/paramedic_syndie.rsi/icon.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/paramedic_syndie.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/paramedic_syndie.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/Jumpsuit/paramedic_syndie.rsi/meta.json index 8b0bae84ea..19f2de1948 100644 --- a/Resources/Textures/Clothing/Uniforms/Jumpsuit/paramedic_syndie.rsi/meta.json +++ b/Resources/Textures/Clothing/Uniforms/Jumpsuit/paramedic_syndie.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Made by Flareguy for Space Station 14, base sprite taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c838ba21dae97db345e0113f99596decd1d66039, monkey made by brainfood1183 (github) for ss14", + "copyright": "Made by Flareguy for Space Station 14, base sprite taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c838ba21dae97db345e0113f99596decd1d66039, monkey made by brainfood1183 (github) for ss14, reptilian made by kuro(388673708753027083)", "size": { "x": 32, "y": 32 @@ -13,7 +13,7 @@ { "name": "equipped-INNERCLOTHING", "directions": 4 - }, + }, { "name": "inhand-left", "directions": 4 diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/pirate.rsi/equipped-INNERCLOTHING-reptilian.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/pirate.rsi/equipped-INNERCLOTHING-reptilian.png new file mode 100644 index 0000000000..ca780d602e Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/pirate.rsi/equipped-INNERCLOTHING-reptilian.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/pirate.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/Jumpsuit/pirate.rsi/meta.json index 0e56b63681..a7af7d640e 100644 --- a/Resources/Textures/Clothing/Uniforms/Jumpsuit/pirate.rsi/meta.json +++ b/Resources/Textures/Clothing/Uniforms/Jumpsuit/pirate.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Made by brainfood1183 (Github) for ss14, monkey made by brainfood1183 (github) for ss14", + "copyright": "Made by brainfood1183 (Github) for ss14, monkey made by brainfood1183 (github) for ss14, reptilian made by kuro(388673708753027083)", "size": { "x": 32, "y": 32 @@ -17,7 +17,7 @@ { "name": "equipped-INNERCLOTHING-monkey", "directions": 4 - }, + }, { "name": "inhand-left", "directions": 4 diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/prisoner.rsi/equipped-INNERCLOTHING-reptilian.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/prisoner.rsi/equipped-INNERCLOTHING-reptilian.png new file mode 100644 index 0000000000..33367d7b8a Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/prisoner.rsi/equipped-INNERCLOTHING-reptilian.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/psychologist.rsi/equipped-INNERCLOTHING-reptilian.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/psychologist.rsi/equipped-INNERCLOTHING-reptilian.png new file mode 100644 index 0000000000..36b904794e Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/psychologist.rsi/equipped-INNERCLOTHING-reptilian.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/psychologist.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/psychologist.rsi/equipped-INNERCLOTHING.png index 2b83e34216..8757c83813 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/psychologist.rsi/equipped-INNERCLOTHING.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/psychologist.rsi/equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/psychologist.rsi/icon.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/psychologist.rsi/icon.png index e6d91f6afb..31a1a06958 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/psychologist.rsi/icon.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/psychologist.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/psychologist.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/Jumpsuit/psychologist.rsi/meta.json index 5dd83ef6e2..3066ebf111 100644 --- a/Resources/Textures/Clothing/Uniforms/Jumpsuit/psychologist.rsi/meta.json +++ b/Resources/Textures/Clothing/Uniforms/Jumpsuit/psychologist.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from vgstation at commit https://github.com/vgstation-coders/vgstation13/commit/78a56e1a22ba1d8d6023ed9bdae55a6de7fe8a39 and modified by emisse, monkey made by brainfood1183 (github) for ss14", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/2fea0a59470c476cf3f927833d3918d89cbe6af8 and inhand modified by emisse, monkey made by brainfood1183 (github) for ss14, reptilian made by kuro(388673708753027083)", "size": { "x": 32, "y": 32 @@ -17,7 +17,7 @@ { "name": "equipped-INNERCLOTHING-monkey", "directions": 4 - }, + }, { "name": "inhand-left", "directions": 4 @@ -27,4 +27,4 @@ "directions": 4 } ] -} \ No newline at end of file +} diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/pyjamasyndicateblack.rsi/equipped-INNERCLOTHING-reptilian.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/pyjamasyndicateblack.rsi/equipped-INNERCLOTHING-reptilian.png new file mode 100644 index 0000000000..5fb74c2e39 Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/pyjamasyndicateblack.rsi/equipped-INNERCLOTHING-reptilian.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/pyjamasyndicateblack.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/pyjamasyndicateblack.rsi/equipped-INNERCLOTHING.png index 1039694d4d..db7a73c881 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/pyjamasyndicateblack.rsi/equipped-INNERCLOTHING.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/pyjamasyndicateblack.rsi/equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/pyjamasyndicateblack.rsi/icon.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/pyjamasyndicateblack.rsi/icon.png index 891c44e7a5..7cd011c8d0 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/pyjamasyndicateblack.rsi/icon.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/pyjamasyndicateblack.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/pyjamasyndicateblack.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/Jumpsuit/pyjamasyndicateblack.rsi/meta.json index 1fb9cf1b66..aa8ca700aa 100644 --- a/Resources/Textures/Clothing/Uniforms/Jumpsuit/pyjamasyndicateblack.rsi/meta.json +++ b/Resources/Textures/Clothing/Uniforms/Jumpsuit/pyjamasyndicateblack.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c838ba21dae97db345e0113f99596decd1d66039, monkey made by brainfood1183 (github) for ss14", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c838ba21dae97db345e0113f99596decd1d66039, monkey made by brainfood1183 (github) for ss14, reptilian made by ravage123321(606387928297635852)", "size": { "x": 32, "y": 32 @@ -17,7 +17,7 @@ { "name": "equipped-INNERCLOTHING-monkey", "directions": 4 - }, + }, { "name": "inhand-left", "directions": 4 diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/pyjamasyndicatepink.rsi/equipped-INNERCLOTHING-reptilian.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/pyjamasyndicatepink.rsi/equipped-INNERCLOTHING-reptilian.png new file mode 100644 index 0000000000..51c23ec028 Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/pyjamasyndicatepink.rsi/equipped-INNERCLOTHING-reptilian.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/pyjamasyndicatepink.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/pyjamasyndicatepink.rsi/equipped-INNERCLOTHING.png index c632b4f3b4..0c38703a16 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/pyjamasyndicatepink.rsi/equipped-INNERCLOTHING.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/pyjamasyndicatepink.rsi/equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/pyjamasyndicatepink.rsi/icon.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/pyjamasyndicatepink.rsi/icon.png index 7ac046c62a..98ea841034 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/pyjamasyndicatepink.rsi/icon.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/pyjamasyndicatepink.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/pyjamasyndicatepink.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/Jumpsuit/pyjamasyndicatepink.rsi/meta.json index 1fb9cf1b66..aa8ca700aa 100644 --- a/Resources/Textures/Clothing/Uniforms/Jumpsuit/pyjamasyndicatepink.rsi/meta.json +++ b/Resources/Textures/Clothing/Uniforms/Jumpsuit/pyjamasyndicatepink.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c838ba21dae97db345e0113f99596decd1d66039, monkey made by brainfood1183 (github) for ss14", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c838ba21dae97db345e0113f99596decd1d66039, monkey made by brainfood1183 (github) for ss14, reptilian made by ravage123321(606387928297635852)", "size": { "x": 32, "y": 32 @@ -17,7 +17,7 @@ { "name": "equipped-INNERCLOTHING-monkey", "directions": 4 - }, + }, { "name": "inhand-left", "directions": 4 diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/pyjamasyndicatered.rsi/equipped-INNERCLOTHING-reptilian.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/pyjamasyndicatered.rsi/equipped-INNERCLOTHING-reptilian.png new file mode 100644 index 0000000000..e77a48829f Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/pyjamasyndicatered.rsi/equipped-INNERCLOTHING-reptilian.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/pyjamasyndicatered.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/pyjamasyndicatered.rsi/equipped-INNERCLOTHING.png index b1c38e4bd1..03e957f4fb 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/pyjamasyndicatered.rsi/equipped-INNERCLOTHING.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/pyjamasyndicatered.rsi/equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/pyjamasyndicatered.rsi/icon.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/pyjamasyndicatered.rsi/icon.png index 1490a9590b..cb43387d5f 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/pyjamasyndicatered.rsi/icon.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/pyjamasyndicatered.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/pyjamasyndicatered.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/Jumpsuit/pyjamasyndicatered.rsi/meta.json index 1fb9cf1b66..aa8ca700aa 100644 --- a/Resources/Textures/Clothing/Uniforms/Jumpsuit/pyjamasyndicatered.rsi/meta.json +++ b/Resources/Textures/Clothing/Uniforms/Jumpsuit/pyjamasyndicatered.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c838ba21dae97db345e0113f99596decd1d66039, monkey made by brainfood1183 (github) for ss14", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c838ba21dae97db345e0113f99596decd1d66039, monkey made by brainfood1183 (github) for ss14, reptilian made by ravage123321(606387928297635852)", "size": { "x": 32, "y": 32 @@ -17,7 +17,7 @@ { "name": "equipped-INNERCLOTHING-monkey", "directions": 4 - }, + }, { "name": "inhand-left", "directions": 4 diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/qm.rsi/equipped-INNERCLOTHING-reptilian.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/qm.rsi/equipped-INNERCLOTHING-reptilian.png new file mode 100644 index 0000000000..9dec46b1ee Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/qm.rsi/equipped-INNERCLOTHING-reptilian.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/qm.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/qm.rsi/equipped-INNERCLOTHING.png index 98d51e2638..2fb1b2e939 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/qm.rsi/equipped-INNERCLOTHING.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/qm.rsi/equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/qm.rsi/icon.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/qm.rsi/icon.png index da4d765219..bcea405d4d 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/qm.rsi/icon.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/qm.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/qm.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/Jumpsuit/qm.rsi/meta.json index 12bdb72c4a..38c26c2bcb 100644 --- a/Resources/Textures/Clothing/Uniforms/Jumpsuit/qm.rsi/meta.json +++ b/Resources/Textures/Clothing/Uniforms/Jumpsuit/qm.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c838ba21dae97db345e0113f99596decd1d66039, edited by Flareguy. In hand sprite scaled down by potato1234_x, monkey made by brainfood1183 (github) for ss14", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c838ba21dae97db345e0113f99596decd1d66039, edited by Flareguy. In hand sprite scaled down by potato1234_x, monkey made by brainfood1183 (github) for ss14, reptilian made by kuro(388673708753027083)", "size": { "x": 32, "y": 32 @@ -17,7 +17,7 @@ { "name": "equipped-INNERCLOTHING-monkey", "directions": 4 - }, + }, { "name": "inhand-left", "directions": 4 diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/rainbow.rsi/equipped-INNERCLOTHING-reptilian.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/rainbow.rsi/equipped-INNERCLOTHING-reptilian.png new file mode 100644 index 0000000000..6346716b45 Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/rainbow.rsi/equipped-INNERCLOTHING-reptilian.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/rainbow.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/rainbow.rsi/equipped-INNERCLOTHING.png index e89ff84ba5..e11fab0274 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/rainbow.rsi/equipped-INNERCLOTHING.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/rainbow.rsi/equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/rainbow.rsi/icon.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/rainbow.rsi/icon.png index ed407d3fcc..4fe28a9746 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/rainbow.rsi/icon.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/rainbow.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/rainbow.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/Jumpsuit/rainbow.rsi/meta.json index cb7720cb85..d8b09428dc 100644 --- a/Resources/Textures/Clothing/Uniforms/Jumpsuit/rainbow.rsi/meta.json +++ b/Resources/Textures/Clothing/Uniforms/Jumpsuit/rainbow.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-NC-SA-3.0", - "copyright": "Taken from goonstation at commit https://github.com/goonstation/goonstation/commit/4059e4be90832b02b1228b1bee3db342094e4f1e. In hand sprite scaled down by potato1234_x, monkey made by brainfood1183 (github) for ss14", + "copyright": "Taken from goonstation at commit https://github.com/goonstation/goonstation/commit/4059e4be90832b02b1228b1bee3db342094e4f1e. In hand sprite scaled down by potato1234_x, monkey made by brainfood1183 (github) for ss14, reptilian made by kuro(388673708753027083)", "size": { "x": 32, "y": 32 @@ -17,7 +17,7 @@ { "name": "equipped-INNERCLOTHING-monkey", "directions": 4 - }, + }, { "name": "inhand-left", "directions": 4 diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/recruit_nt.rsi/equipped-INNERCLOTHING-reptilian.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/recruit_nt.rsi/equipped-INNERCLOTHING-reptilian.png new file mode 100644 index 0000000000..b83d03df51 Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/recruit_nt.rsi/equipped-INNERCLOTHING-reptilian.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/recruit_nt.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/Jumpsuit/recruit_nt.rsi/meta.json index c20fa3e004..5a2cfd363a 100644 --- a/Resources/Textures/Clothing/Uniforms/Jumpsuit/recruit_nt.rsi/meta.json +++ b/Resources/Textures/Clothing/Uniforms/Jumpsuit/recruit_nt.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Made by Flareguy for Space Station 14, base sprite taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c838ba21dae97db345e0113f99596decd1d66039, monkey made by brainfood1183 (github) for ss14", + "copyright": "Made by Flareguy for Space Station 14, base sprite taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c838ba21dae97db345e0113f99596decd1d66039, monkey made by brainfood1183 (github) for ss14, reptilian made by ravage123321(606387928297635852)", "size": { "x": 32, "y": 32 @@ -17,7 +17,7 @@ { "name": "equipped-INNERCLOTHING-monkey", "directions": 4 - }, + }, { "name": "inhand-left", "directions": 4 diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/recruit_syndie.rsi/equipped-INNERCLOTHING-reptilian.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/recruit_syndie.rsi/equipped-INNERCLOTHING-reptilian.png new file mode 100644 index 0000000000..eb0e370471 Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/recruit_syndie.rsi/equipped-INNERCLOTHING-reptilian.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/recruit_syndie.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/Jumpsuit/recruit_syndie.rsi/meta.json index c20fa3e004..5a2cfd363a 100644 --- a/Resources/Textures/Clothing/Uniforms/Jumpsuit/recruit_syndie.rsi/meta.json +++ b/Resources/Textures/Clothing/Uniforms/Jumpsuit/recruit_syndie.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Made by Flareguy for Space Station 14, base sprite taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c838ba21dae97db345e0113f99596decd1d66039, monkey made by brainfood1183 (github) for ss14", + "copyright": "Made by Flareguy for Space Station 14, base sprite taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c838ba21dae97db345e0113f99596decd1d66039, monkey made by brainfood1183 (github) for ss14, reptilian made by ravage123321(606387928297635852)", "size": { "x": 32, "y": 32 @@ -17,7 +17,7 @@ { "name": "equipped-INNERCLOTHING-monkey", "directions": 4 - }, + }, { "name": "inhand-left", "directions": 4 diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/repairman_nt.rsi/equipped-INNERCLOTHING-reptilian.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/repairman_nt.rsi/equipped-INNERCLOTHING-reptilian.png new file mode 100644 index 0000000000..038a02fe1b Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/repairman_nt.rsi/equipped-INNERCLOTHING-reptilian.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/repairman_nt.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/Jumpsuit/repairman_nt.rsi/meta.json index 8b0bae84ea..19f2de1948 100644 --- a/Resources/Textures/Clothing/Uniforms/Jumpsuit/repairman_nt.rsi/meta.json +++ b/Resources/Textures/Clothing/Uniforms/Jumpsuit/repairman_nt.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Made by Flareguy for Space Station 14, base sprite taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c838ba21dae97db345e0113f99596decd1d66039, monkey made by brainfood1183 (github) for ss14", + "copyright": "Made by Flareguy for Space Station 14, base sprite taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c838ba21dae97db345e0113f99596decd1d66039, monkey made by brainfood1183 (github) for ss14, reptilian made by kuro(388673708753027083)", "size": { "x": 32, "y": 32 @@ -13,7 +13,7 @@ { "name": "equipped-INNERCLOTHING", "directions": 4 - }, + }, { "name": "inhand-left", "directions": 4 diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/repairman_syndie.rsi/equipped-INNERCLOTHING-reptilian.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/repairman_syndie.rsi/equipped-INNERCLOTHING-reptilian.png new file mode 100644 index 0000000000..11da9384bd Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/repairman_syndie.rsi/equipped-INNERCLOTHING-reptilian.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/repairman_syndie.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/Jumpsuit/repairman_syndie.rsi/meta.json index 8b0bae84ea..19f2de1948 100644 --- a/Resources/Textures/Clothing/Uniforms/Jumpsuit/repairman_syndie.rsi/meta.json +++ b/Resources/Textures/Clothing/Uniforms/Jumpsuit/repairman_syndie.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Made by Flareguy for Space Station 14, base sprite taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c838ba21dae97db345e0113f99596decd1d66039, monkey made by brainfood1183 (github) for ss14", + "copyright": "Made by Flareguy for Space Station 14, base sprite taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c838ba21dae97db345e0113f99596decd1d66039, monkey made by brainfood1183 (github) for ss14, reptilian made by kuro(388673708753027083)", "size": { "x": 32, "y": 32 @@ -13,7 +13,7 @@ { "name": "equipped-INNERCLOTHING", "directions": 4 - }, + }, { "name": "inhand-left", "directions": 4 diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/reporter.rsi/equipped-INNERCLOTHING-reptilian.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/reporter.rsi/equipped-INNERCLOTHING-reptilian.png new file mode 100644 index 0000000000..e33e2de670 Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/reporter.rsi/equipped-INNERCLOTHING-reptilian.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/reporter.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/reporter.rsi/equipped-INNERCLOTHING.png index 88f006a555..14aba72496 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/reporter.rsi/equipped-INNERCLOTHING.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/reporter.rsi/equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/reporter.rsi/icon.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/reporter.rsi/icon.png index f7ab944b20..76a00c1771 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/reporter.rsi/icon.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/reporter.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/reporter.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/Jumpsuit/reporter.rsi/meta.json index 5dd83ef6e2..3066ebf111 100644 --- a/Resources/Textures/Clothing/Uniforms/Jumpsuit/reporter.rsi/meta.json +++ b/Resources/Textures/Clothing/Uniforms/Jumpsuit/reporter.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from vgstation at commit https://github.com/vgstation-coders/vgstation13/commit/78a56e1a22ba1d8d6023ed9bdae55a6de7fe8a39 and modified by emisse, monkey made by brainfood1183 (github) for ss14", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/2fea0a59470c476cf3f927833d3918d89cbe6af8 and inhand modified by emisse, monkey made by brainfood1183 (github) for ss14, reptilian made by kuro(388673708753027083)", "size": { "x": 32, "y": 32 @@ -17,7 +17,7 @@ { "name": "equipped-INNERCLOTHING-monkey", "directions": 4 - }, + }, { "name": "inhand-left", "directions": 4 @@ -27,4 +27,4 @@ "directions": 4 } ] -} \ No newline at end of file +} diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/rnd.rsi/equipped-INNERCLOTHING-reptilian.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/rnd.rsi/equipped-INNERCLOTHING-reptilian.png new file mode 100644 index 0000000000..a91e1ee91b Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/rnd.rsi/equipped-INNERCLOTHING-reptilian.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/rnd.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/Jumpsuit/rnd.rsi/meta.json index 3f72fb4460..38c3ba6f04 100644 --- a/Resources/Textures/Clothing/Uniforms/Jumpsuit/rnd.rsi/meta.json +++ b/Resources/Textures/Clothing/Uniforms/Jumpsuit/rnd.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c838ba21dae97db345e0113f99596decd1d66039. In hand sprite scaled down by potato1234_x, monkey made by brainfood1183 (github) for ss14", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c838ba21dae97db345e0113f99596decd1d66039. In hand sprite scaled down by potato1234_x, monkey made by brainfood1183 (github) for ss14, reptilian made by kuro(388673708753027083)", "size": { "x": 32, "y": 32 @@ -17,7 +17,7 @@ { "name": "equipped-INNERCLOTHING-monkey", "directions": 4 - }, + }, { "name": "inhand-left", "directions": 4 diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/roboticist.rsi/equipped-INNERCLOTHING-reptilian.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/roboticist.rsi/equipped-INNERCLOTHING-reptilian.png new file mode 100644 index 0000000000..f873addd83 Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/roboticist.rsi/equipped-INNERCLOTHING-reptilian.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/roboticist.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/Jumpsuit/roboticist.rsi/meta.json index 16b45eec87..d09b8a7004 100644 --- a/Resources/Textures/Clothing/Uniforms/Jumpsuit/roboticist.rsi/meta.json +++ b/Resources/Textures/Clothing/Uniforms/Jumpsuit/roboticist.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/a5da269bf8615c7d645ab85556a0a658c20baa74, monkey derivative made by brainfood1183 (github)", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/7ccbb310e0f1e37758ac6bf50d4a6ce0e2347933, monkey derivative made by brainfood1183 (github), reptilian made by kuro(388673708753027083)", "size": { "x": 32, "y": 32 @@ -18,6 +18,10 @@ "name": "equipped-INNERCLOTHING-monkey", "directions": 4 }, + { + "name": "equipped-INNERCLOTHING-reptilian", + "directions": 4 + }, { "name": "inhand-left", "directions": 4 @@ -27,4 +31,4 @@ "directions": 4 } ] -} \ No newline at end of file +} diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/safari.rsi/equipped-INNERCLOTHING-reptilian.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/safari.rsi/equipped-INNERCLOTHING-reptilian.png new file mode 100644 index 0000000000..e6126fdabe Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/safari.rsi/equipped-INNERCLOTHING-reptilian.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/safari.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/Jumpsuit/safari.rsi/meta.json index c83128c103..6217b87765 100644 --- a/Resources/Textures/Clothing/Uniforms/Jumpsuit/safari.rsi/meta.json +++ b/Resources/Textures/Clothing/Uniforms/Jumpsuit/safari.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC0-1.0", - "copyright": "Created by EmoGarbage404, monkey made by brainfood1183 (github) for ss14", + "copyright": "Created by EmoGarbage404, monkey made by brainfood1183 (github) for ss14, reptilian made by kuro(388673708753027083)", "size": { "x": 32, "y": 32 @@ -17,7 +17,7 @@ { "name": "equipped-INNERCLOTHING-monkey", "directions": 4 - }, + }, { "name": "inhand-left", "directions": 4 diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/salvage.rsi/equipped-INNERCLOTHING-monkey.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/salvage.rsi/equipped-INNERCLOTHING-monkey.png index 49970c3495..866066c158 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/salvage.rsi/equipped-INNERCLOTHING-monkey.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/salvage.rsi/equipped-INNERCLOTHING-monkey.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/salvage.rsi/equipped-INNERCLOTHING-reptilian.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/salvage.rsi/equipped-INNERCLOTHING-reptilian.png new file mode 100644 index 0000000000..84702a9ceb Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/salvage.rsi/equipped-INNERCLOTHING-reptilian.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/salvage.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/salvage.rsi/equipped-INNERCLOTHING.png index 31b0d774d3..b26932b120 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/salvage.rsi/equipped-INNERCLOTHING.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/salvage.rsi/equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/salvage.rsi/icon.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/salvage.rsi/icon.png index f7ff607b25..9d4616050e 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/salvage.rsi/icon.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/salvage.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/salvage.rsi/inhand-left.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/salvage.rsi/inhand-left.png index d456f94f0f..00b555f484 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/salvage.rsi/inhand-left.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/salvage.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/salvage.rsi/inhand-right.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/salvage.rsi/inhand-right.png index 24602b7b37..65bec902ed 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/salvage.rsi/inhand-right.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/salvage.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/salvage.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/Jumpsuit/salvage.rsi/meta.json index da8e85d0a1..022e3b0e22 100644 --- a/Resources/Textures/Clothing/Uniforms/Jumpsuit/salvage.rsi/meta.json +++ b/Resources/Textures/Clothing/Uniforms/Jumpsuit/salvage.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/0a1ae39f0fb7353b0704f27d1599a567891f727c, edited by Flareguy. In hand sprite scaled down by potato1234_x, monkey made by brainfood1183 (github) for ss14", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/0a1ae39f0fb7353b0704f27d1599a567891f727c, edited by Flareguy. In hand sprite scaled down by potato1234_x, monkey made by brainfood1183 (github) for ss14, reptilian made by kuro(388673708753027083)", "size": { "x": 32, "y": 32 @@ -17,7 +17,7 @@ { "name": "equipped-INNERCLOTHING-monkey", "directions": 4 - }, + }, { "name": "inhand-left", "directions": 4 diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/scientist.rsi/equipped-INNERCLOTHING-monkey.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/scientist.rsi/equipped-INNERCLOTHING-monkey.png index 99678ec7de..215a7020d9 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/scientist.rsi/equipped-INNERCLOTHING-monkey.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/scientist.rsi/equipped-INNERCLOTHING-monkey.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/scientist.rsi/equipped-INNERCLOTHING-reptilian.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/scientist.rsi/equipped-INNERCLOTHING-reptilian.png new file mode 100644 index 0000000000..e47e18d589 Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/scientist.rsi/equipped-INNERCLOTHING-reptilian.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/scientist.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/scientist.rsi/equipped-INNERCLOTHING.png index 04e9223e76..9188d68ea5 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/scientist.rsi/equipped-INNERCLOTHING.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/scientist.rsi/equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/scientist.rsi/icon.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/scientist.rsi/icon.png index e21589c6dd..62aad21b71 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/scientist.rsi/icon.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/scientist.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/scientist.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/Jumpsuit/scientist.rsi/meta.json index 3f72fb4460..19a5317c84 100644 --- a/Resources/Textures/Clothing/Uniforms/Jumpsuit/scientist.rsi/meta.json +++ b/Resources/Textures/Clothing/Uniforms/Jumpsuit/scientist.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c838ba21dae97db345e0113f99596decd1d66039. In hand sprite scaled down by potato1234_x, monkey made by brainfood1183 (github) for ss14", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c838ba21dae97db345e0113f99596decd1d66039. In hand sprite scaled down by potato1234_x, monkey made by SonicHDC (github) for ss14, reptilian made by kuro(388673708753027083)", "size": { "x": 32, "y": 32 @@ -17,7 +17,7 @@ { "name": "equipped-INNERCLOTHING-monkey", "directions": 4 - }, + }, { "name": "inhand-left", "directions": 4 diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/scientist_formal.rsi/equipped-INNERCLOTHING-reptilian.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/scientist_formal.rsi/equipped-INNERCLOTHING-reptilian.png new file mode 100644 index 0000000000..fdf5e0f005 Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/scientist_formal.rsi/equipped-INNERCLOTHING-reptilian.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/scientist_formal.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/Jumpsuit/scientist_formal.rsi/meta.json index ef2dfd5434..c1e46c12ed 100644 --- a/Resources/Textures/Clothing/Uniforms/Jumpsuit/scientist_formal.rsi/meta.json +++ b/Resources/Textures/Clothing/Uniforms/Jumpsuit/scientist_formal.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Edited from the scientist jumpsuit by Flareguy for Space Station 14. In hand sprite scaled down by potato1234_x, monkey made by brainfood1183 (github) for ss14", + "copyright": "Edited from the scientist jumpsuit by Flareguy for Space Station 14. In hand sprite scaled down by potato1234_x, monkey made by brainfood1183 (github) for ss14, reptilian made by kuro(388673708753027083)", "size": { "x": 32, "y": 32 @@ -17,7 +17,7 @@ { "name": "equipped-INNERCLOTHING-monkey", "directions": 4 - }, + }, { "name": "inhand-left", "directions": 4 diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/security.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/security.rsi/equipped-INNERCLOTHING.png index b3977c9748..a1c64aa4c6 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/security.rsi/equipped-INNERCLOTHING.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/security.rsi/equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/security.rsi/icon.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/security.rsi/icon.png index a3186ba4c1..8728919a7e 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/security.rsi/icon.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/security.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/security.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/Jumpsuit/security.rsi/meta.json index 3f72fb4460..8fe98eacbe 100644 --- a/Resources/Textures/Clothing/Uniforms/Jumpsuit/security.rsi/meta.json +++ b/Resources/Textures/Clothing/Uniforms/Jumpsuit/security.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c838ba21dae97db345e0113f99596decd1d66039. In hand sprite scaled down by potato1234_x, monkey made by brainfood1183 (github) for ss14", + "copyright": "Created by Flareguy using sprites from tgstation at commit https://github.com/tgstation/tgstation/commit/c838ba21dae97db345e0113f99596decd1d66039 & the jumpsuit base found in color.rsi.", "size": { "x": 32, "y": 32 @@ -15,15 +15,11 @@ "directions": 4 }, { - "name": "equipped-INNERCLOTHING-monkey", + "name": "overlay-inhand-left", "directions": 4 }, { - "name": "inhand-left", - "directions": 4 - }, - { - "name": "inhand-right", + "name": "overlay-inhand-right", "directions": 4 } ] diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/security.rsi/overlay-inhand-left.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/security.rsi/overlay-inhand-left.png new file mode 100644 index 0000000000..f6bb7be725 Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/security.rsi/overlay-inhand-left.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/security.rsi/overlay-inhand-right.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/security.rsi/overlay-inhand-right.png new file mode 100644 index 0000000000..139eaee057 Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/security.rsi/overlay-inhand-right.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/security_blue.rsi/equipped-INNERCLOTHING-reptilian.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/security_blue.rsi/equipped-INNERCLOTHING-reptilian.png new file mode 100644 index 0000000000..260b3f8506 Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/security_blue.rsi/equipped-INNERCLOTHING-reptilian.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/security_blue.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/security_blue.rsi/equipped-INNERCLOTHING.png index b5676f523e..913d3bf76e 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/security_blue.rsi/equipped-INNERCLOTHING.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/security_blue.rsi/equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/security_blue.rsi/icon.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/security_blue.rsi/icon.png index 9265834ae3..813e0aa040 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/security_blue.rsi/icon.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/security_blue.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/security_blue.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/Jumpsuit/security_blue.rsi/meta.json index 3f72fb4460..f1486ea6c7 100644 --- a/Resources/Textures/Clothing/Uniforms/Jumpsuit/security_blue.rsi/meta.json +++ b/Resources/Textures/Clothing/Uniforms/Jumpsuit/security_blue.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c838ba21dae97db345e0113f99596decd1d66039. In hand sprite scaled down by potato1234_x, monkey made by brainfood1183 (github) for ss14", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/28d0be60aa8bbe1ca87a5d129487bb6f60839ac4. In hand sprite scaled down by potato1234_x, monkey made by brainfood1183 (github) for , reptilian made by kuro(388673708753027083)", "size": { "x": 32, "y": 32 @@ -17,7 +17,7 @@ { "name": "equipped-INNERCLOTHING-monkey", "directions": 4 - }, + }, { "name": "inhand-left", "directions": 4 diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/security_grey.rsi/equipped-INNERCLOTHING-reptilian.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/security_grey.rsi/equipped-INNERCLOTHING-reptilian.png new file mode 100644 index 0000000000..cce036889c Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/security_grey.rsi/equipped-INNERCLOTHING-reptilian.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/security_grey.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/security_grey.rsi/equipped-INNERCLOTHING.png index fac0c0156d..cbd34f89ac 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/security_grey.rsi/equipped-INNERCLOTHING.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/security_grey.rsi/equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/security_grey.rsi/icon.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/security_grey.rsi/icon.png index 51510a908f..473145cf07 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/security_grey.rsi/icon.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/security_grey.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/security_grey.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/Jumpsuit/security_grey.rsi/meta.json index 3f72fb4460..97b6fad015 100644 --- a/Resources/Textures/Clothing/Uniforms/Jumpsuit/security_grey.rsi/meta.json +++ b/Resources/Textures/Clothing/Uniforms/Jumpsuit/security_grey.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c838ba21dae97db345e0113f99596decd1d66039. In hand sprite scaled down by potato1234_x, monkey made by brainfood1183 (github) for ss14", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/28d0be60aa8bbe1ca87a5d129487bb6f60839ac4. In hand sprite scaled down by potato1234_x, monkey made by brainfood1183 (github) for ss14, reptilian made by kuro(388673708753027083)", "size": { "x": 32, "y": 32 @@ -17,7 +17,7 @@ { "name": "equipped-INNERCLOTHING-monkey", "directions": 4 - }, + }, { "name": "inhand-left", "directions": 4 diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/senior_engineer.rsi/equipped-INNERCLOTHING-monkey.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/senior_engineer.rsi/equipped-INNERCLOTHING-monkey.png index 7113bbf3ec..d2bf1add19 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/senior_engineer.rsi/equipped-INNERCLOTHING-monkey.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/senior_engineer.rsi/equipped-INNERCLOTHING-monkey.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/senior_engineer.rsi/equipped-INNERCLOTHING-reptilian.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/senior_engineer.rsi/equipped-INNERCLOTHING-reptilian.png new file mode 100644 index 0000000000..41b388bc1d Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/senior_engineer.rsi/equipped-INNERCLOTHING-reptilian.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/senior_engineer.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/senior_engineer.rsi/equipped-INNERCLOTHING.png index 5b19cb2dc7..b3139003b0 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/senior_engineer.rsi/equipped-INNERCLOTHING.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/senior_engineer.rsi/equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/senior_engineer.rsi/icon.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/senior_engineer.rsi/icon.png index fba921db3a..27505e3080 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/senior_engineer.rsi/icon.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/senior_engineer.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/senior_engineer.rsi/inhand-left.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/senior_engineer.rsi/inhand-left.png index 2541991f9a..b0fc8982f6 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/senior_engineer.rsi/inhand-left.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/senior_engineer.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/senior_engineer.rsi/inhand-right.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/senior_engineer.rsi/inhand-right.png index a238a7d7be..cd00bfd1a6 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/senior_engineer.rsi/inhand-right.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/senior_engineer.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/senior_engineer.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/Jumpsuit/senior_engineer.rsi/meta.json index 9b15553cde..65afad4c03 100644 --- a/Resources/Textures/Clothing/Uniforms/Jumpsuit/senior_engineer.rsi/meta.json +++ b/Resources/Textures/Clothing/Uniforms/Jumpsuit/senior_engineer.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Edit of hazard from tgstation at commit https://github.com/tgstation/tgstation/pull/67000, by Nairod (github) for ss14", + "copyright": "Edit of hazard from tgstation at commit https://github.com/tgstation/tgstation/pull/67000, resprite by muriexlol, reptilian made by kuro(388673708753027083)", "size": { "x": 32, "y": 32 @@ -17,7 +17,7 @@ { "name": "equipped-INNERCLOTHING-monkey", "directions": 4 - }, + }, { "name": "inhand-left", "directions": 4 diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/senior_officer.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/senior_officer.rsi/equipped-INNERCLOTHING.png index 463828936c..02386668b4 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/senior_officer.rsi/equipped-INNERCLOTHING.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/senior_officer.rsi/equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/senior_officer.rsi/icon.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/senior_officer.rsi/icon.png index 5f1d7e7506..4aa45edab3 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/senior_officer.rsi/icon.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/senior_officer.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/senior_officer.rsi/inhand-left.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/senior_officer.rsi/inhand-left.png index d90b6f3c45..d75e52eda9 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/senior_officer.rsi/inhand-left.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/senior_officer.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/senior_officer.rsi/inhand-right.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/senior_officer.rsi/inhand-right.png index 356e2a5ec2..c96f2f1007 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/senior_officer.rsi/inhand-right.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/senior_officer.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/senior_officer.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/Jumpsuit/senior_officer.rsi/meta.json index 913d940881..77a81ca75e 100644 --- a/Resources/Textures/Clothing/Uniforms/Jumpsuit/senior_officer.rsi/meta.json +++ b/Resources/Textures/Clothing/Uniforms/Jumpsuit/senior_officer.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Edit by Nairodian (github) of secred_s taken from tgstation at pull request https://github.com/tgstation/tgstation/pull/2984", + "copyright": "Edit by Nairodian (github) of secred_s taken from tgstation at pull request https://github.com/tgstation/tgstation/pull/2984, jumpskirt sprite made by Flareguy and edited by Dutch-VanDerLinde.", "size": { "x": 32, "y": 32 @@ -14,10 +14,6 @@ "name": "equipped-INNERCLOTHING", "directions": 4 }, - { - "name": "equipped-INNERCLOTHING-monkey", - "directions": 4 - }, { "name": "inhand-left", "directions": 4 diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/senior_physician.rsi/equipped-INNERCLOTHING-monkey.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/senior_physician.rsi/equipped-INNERCLOTHING-monkey.png index 5248c1b09f..e91c3e8fc3 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/senior_physician.rsi/equipped-INNERCLOTHING-monkey.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/senior_physician.rsi/equipped-INNERCLOTHING-monkey.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/senior_physician.rsi/equipped-INNERCLOTHING-reptilian.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/senior_physician.rsi/equipped-INNERCLOTHING-reptilian.png new file mode 100644 index 0000000000..5061c7cfd1 Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/senior_physician.rsi/equipped-INNERCLOTHING-reptilian.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/senior_physician.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/senior_physician.rsi/equipped-INNERCLOTHING.png index f67f3c67bf..d5dad0037b 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/senior_physician.rsi/equipped-INNERCLOTHING.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/senior_physician.rsi/equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/senior_physician.rsi/icon.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/senior_physician.rsi/icon.png index d5d956c4e5..55221ce58c 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/senior_physician.rsi/icon.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/senior_physician.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/senior_physician.rsi/inhand-left.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/senior_physician.rsi/inhand-left.png index e0b2d4759b..e00bcbbd50 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/senior_physician.rsi/inhand-left.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/senior_physician.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/senior_physician.rsi/inhand-right.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/senior_physician.rsi/inhand-right.png index a2ecc2b551..5a38a8333d 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/senior_physician.rsi/inhand-right.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/senior_physician.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/senior_physician.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/Jumpsuit/senior_physician.rsi/meta.json index 1e67f97187..9b7fc0e46f 100644 --- a/Resources/Textures/Clothing/Uniforms/Jumpsuit/senior_physician.rsi/meta.json +++ b/Resources/Textures/Clothing/Uniforms/Jumpsuit/senior_physician.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Edit by Nairodian (github) of paramedic from tgstation at pull request https://github.com/tgstation/tgstation/pull/48236.", + "copyright": "Edit by Nairodian (github) of paramedic from tgstation at pull request https://github.com/tgstation/tgstation/pull/48236, reptilian made by kuro(388673708753027083)", "size": { "x": 32, "y": 32 @@ -17,7 +17,7 @@ { "name": "equipped-INNERCLOTHING-monkey", "directions": 4 - }, + }, { "name": "inhand-left", "directions": 4 diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/senior_researcher.rsi/equipped-INNERCLOTHING-monkey.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/senior_researcher.rsi/equipped-INNERCLOTHING-monkey.png index 9a1392a5b5..872add5ae2 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/senior_researcher.rsi/equipped-INNERCLOTHING-monkey.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/senior_researcher.rsi/equipped-INNERCLOTHING-monkey.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/senior_researcher.rsi/equipped-INNERCLOTHING-reptilian.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/senior_researcher.rsi/equipped-INNERCLOTHING-reptilian.png new file mode 100644 index 0000000000..44f7070114 Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/senior_researcher.rsi/equipped-INNERCLOTHING-reptilian.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/senior_researcher.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/senior_researcher.rsi/equipped-INNERCLOTHING.png index a70cd6f5bc..857c3c6f70 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/senior_researcher.rsi/equipped-INNERCLOTHING.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/senior_researcher.rsi/equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/senior_researcher.rsi/icon.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/senior_researcher.rsi/icon.png index b8425e6ff6..e49f7c1cc3 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/senior_researcher.rsi/icon.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/senior_researcher.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/senior_researcher.rsi/inhand-left.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/senior_researcher.rsi/inhand-left.png index 197f1a6af5..2b5f21e6e6 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/senior_researcher.rsi/inhand-left.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/senior_researcher.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/senior_researcher.rsi/inhand-right.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/senior_researcher.rsi/inhand-right.png index edd1c6fdbb..921304fe75 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/senior_researcher.rsi/inhand-right.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/senior_researcher.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/senior_researcher.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/Jumpsuit/senior_researcher.rsi/meta.json index c2d804360b..6de1c6325f 100644 --- a/Resources/Textures/Clothing/Uniforms/Jumpsuit/senior_researcher.rsi/meta.json +++ b/Resources/Textures/Clothing/Uniforms/Jumpsuit/senior_researcher.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Edited by Nairodian (github) from the formal scientist jumpsuit by Flareguy for Space Station 14.", + "copyright": "Edited by Nairodian (github) from the formal scientist jumpsuit by Flareguy for Space Station 14, reptilian made by kuro(388673708753027083), resprite by muriexlol", "size": { "x": 32, "y": 32 @@ -17,7 +17,7 @@ { "name": "equipped-INNERCLOTHING-monkey", "directions": 4 - }, + }, { "name": "inhand-left", "directions": 4 diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/syndieformal.rsi/equipped-INNERCLOTHING-reptilian.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/syndieformal.rsi/equipped-INNERCLOTHING-reptilian.png new file mode 100644 index 0000000000..41e3359f1c Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/syndieformal.rsi/equipped-INNERCLOTHING-reptilian.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/syndieformal.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/Jumpsuit/syndieformal.rsi/meta.json index 1af9e0836f..ab5ee48d78 100644 --- a/Resources/Textures/Clothing/Uniforms/Jumpsuit/syndieformal.rsi/meta.json +++ b/Resources/Textures/Clothing/Uniforms/Jumpsuit/syndieformal.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Sprited by belay5 (Discord) | equipped-INNERCLOTHING-monkey sprited by Puro (Github)", + "copyright": "Sprited by belay5 (Discord) | equipped-INNERCLOTHING-monkey sprited by Puro (Github), reptilian made by kuro(388673708753027083)", "size": { "x": 32, "y": 32 @@ -17,7 +17,7 @@ { "name": "equipped-INNERCLOTHING-monkey", "directions": 4 - }, + }, { "name": "inhand-left", "directions": 4 diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/tacticool.rsi/equipped-INNERCLOTHING-reptilian.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/tacticool.rsi/equipped-INNERCLOTHING-reptilian.png new file mode 100644 index 0000000000..01d359edce Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/tacticool.rsi/equipped-INNERCLOTHING-reptilian.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/tacticool.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/Jumpsuit/tacticool.rsi/meta.json index 1a3bbef77b..436693a1f1 100644 --- a/Resources/Textures/Clothing/Uniforms/Jumpsuit/tacticool.rsi/meta.json +++ b/Resources/Textures/Clothing/Uniforms/Jumpsuit/tacticool.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/d7e905e4d5ab2b0a8ce210c6ad686aeeebbab426, monkey made by brainfood1183 (github) for ss14", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/d7e905e4d5ab2b0a8ce210c6ad686aeeebbab426, monkey made by brainfood1183 (github) for ss14, reptilian made by kuro(388673708753027083)", "size": { "x": 32, "y": 32 @@ -17,7 +17,7 @@ { "name": "equipped-INNERCLOTHING-monkey", "directions": 4 - }, + }, { "name": "inhand-left", "directions": 4 @@ -27,4 +27,4 @@ "directions": 4 } ] -} \ No newline at end of file +} diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/virology.rsi/equipped-INNERCLOTHING-monkey.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/virology.rsi/equipped-INNERCLOTHING-monkey.png index e8d03f1fd3..c6eba7571b 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/virology.rsi/equipped-INNERCLOTHING-monkey.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/virology.rsi/equipped-INNERCLOTHING-monkey.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/virology.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/virology.rsi/equipped-INNERCLOTHING.png index 3898432b87..541f71e81d 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/virology.rsi/equipped-INNERCLOTHING.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/virology.rsi/equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/virology.rsi/icon.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/virology.rsi/icon.png index 8e647ef78f..af7aafb7e1 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/virology.rsi/icon.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/virology.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/virology.rsi/inhand-left.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/virology.rsi/inhand-left.png index 1bb069da77..5b2a90226d 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/virology.rsi/inhand-left.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/virology.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/virology.rsi/inhand-right.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/virology.rsi/inhand-right.png index e8cfe71e97..b18e7d4d8e 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/virology.rsi/inhand-right.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/virology.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/virology.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/Jumpsuit/virology.rsi/meta.json index 3f72fb4460..9e95027c6b 100644 --- a/Resources/Textures/Clothing/Uniforms/Jumpsuit/virology.rsi/meta.json +++ b/Resources/Textures/Clothing/Uniforms/Jumpsuit/virology.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c838ba21dae97db345e0113f99596decd1d66039. In hand sprite scaled down by potato1234_x, monkey made by brainfood1183 (github) for ss14", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c838ba21dae97db345e0113f99596decd1d66039. In hand sprite scaled down by potato1234_x, monkey made by brainfood1183 (github) for ss14, reptilian made by kuro(388673708753027083), Resprited by Mureixlol", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/warden.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/warden.rsi/equipped-INNERCLOTHING.png index a912ead177..1a3744b01a 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/warden.rsi/equipped-INNERCLOTHING.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/warden.rsi/equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/warden.rsi/icon.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/warden.rsi/icon.png index 331203e531..2ea7068b00 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/warden.rsi/icon.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/warden.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/warden.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/Jumpsuit/warden.rsi/meta.json index 3f72fb4460..8fe98eacbe 100644 --- a/Resources/Textures/Clothing/Uniforms/Jumpsuit/warden.rsi/meta.json +++ b/Resources/Textures/Clothing/Uniforms/Jumpsuit/warden.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c838ba21dae97db345e0113f99596decd1d66039. In hand sprite scaled down by potato1234_x, monkey made by brainfood1183 (github) for ss14", + "copyright": "Created by Flareguy using sprites from tgstation at commit https://github.com/tgstation/tgstation/commit/c838ba21dae97db345e0113f99596decd1d66039 & the jumpsuit base found in color.rsi.", "size": { "x": 32, "y": 32 @@ -15,15 +15,11 @@ "directions": 4 }, { - "name": "equipped-INNERCLOTHING-monkey", + "name": "overlay-inhand-left", "directions": 4 }, { - "name": "inhand-left", - "directions": 4 - }, - { - "name": "inhand-right", + "name": "overlay-inhand-right", "directions": 4 } ] diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/warden.rsi/overlay-inhand-left.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/warden.rsi/overlay-inhand-left.png new file mode 100644 index 0000000000..d3a01e1a6c Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/warden.rsi/overlay-inhand-left.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/warden.rsi/overlay-inhand-right.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/warden.rsi/overlay-inhand-right.png new file mode 100644 index 0000000000..ffe5f93eba Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/warden.rsi/overlay-inhand-right.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Projectiles/projectiles.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Projectiles/projectiles.rsi/meta.json index 0a835a14d7..8cb46cce43 100644 --- a/Resources/Textures/Objects/Weapons/Guns/Projectiles/projectiles.rsi/meta.json +++ b/Resources/Textures/Objects/Weapons/Guns/Projectiles/projectiles.rsi/meta.json @@ -318,6 +318,15 @@ ] ] }, + { + "name": "scatterlaser", + "delays": [ + [ + 0.060000002, + 0.060000002 + ] + ] + }, { "name": "impact_xray", "delays": [ diff --git a/Resources/Textures/Objects/Weapons/Guns/Projectiles/projectiles.rsi/scatterlaser.png b/Resources/Textures/Objects/Weapons/Guns/Projectiles/projectiles.rsi/scatterlaser.png new file mode 100644 index 0000000000..1d30df48f4 Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Projectiles/projectiles.rsi/scatterlaser.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Snipers/heavy_sniper.rsi/inhand-left.png b/Resources/Textures/Objects/Weapons/Guns/Snipers/heavy_sniper.rsi/inhand-left.png index 32798d6bbf..d373352b9f 100644 Binary files a/Resources/Textures/Objects/Weapons/Guns/Snipers/heavy_sniper.rsi/inhand-left.png and b/Resources/Textures/Objects/Weapons/Guns/Snipers/heavy_sniper.rsi/inhand-left.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Snipers/heavy_sniper.rsi/inhand-right.png b/Resources/Textures/Objects/Weapons/Guns/Snipers/heavy_sniper.rsi/inhand-right.png index bf24324363..03625930c8 100644 Binary files a/Resources/Textures/Objects/Weapons/Guns/Snipers/heavy_sniper.rsi/inhand-right.png and b/Resources/Textures/Objects/Weapons/Guns/Snipers/heavy_sniper.rsi/inhand-right.png differ diff --git a/Resources/Textures/Structures/Storage/closet.rsi/meta.json b/Resources/Textures/Structures/Storage/closet.rsi/meta.json index d3802637c0..2e0e57735d 100644 --- a/Resources/Textures/Structures/Storage/closet.rsi/meta.json +++ b/Resources/Textures/Structures/Storage/closet.rsi/meta.json @@ -570,6 +570,12 @@ }, { "name": "representative_door" + }, + { + "name": "sec_engi" + }, + { + "name": "sec_eng_door" } ] } diff --git a/Resources/Textures/Structures/Storage/closet.rsi/sec_eng_door.png b/Resources/Textures/Structures/Storage/closet.rsi/sec_eng_door.png new file mode 100644 index 0000000000..db8915d99d Binary files /dev/null and b/Resources/Textures/Structures/Storage/closet.rsi/sec_eng_door.png differ diff --git a/Resources/Textures/Structures/Storage/closet.rsi/sec_engi.png b/Resources/Textures/Structures/Storage/closet.rsi/sec_engi.png new file mode 100644 index 0000000000..b3c821667f Binary files /dev/null and b/Resources/Textures/Structures/Storage/closet.rsi/sec_engi.png differ diff --git a/Resources/Textures/_LostParadise/Clothing/Head/Hats/maidencap.rsi/icon.png b/Resources/Textures/_LostParadise/Clothing/Head/Hats/maidencap.rsi/icon.png index 8f5da020f9..62fc89118a 100644 Binary files a/Resources/Textures/_LostParadise/Clothing/Head/Hats/maidencap.rsi/icon.png and b/Resources/Textures/_LostParadise/Clothing/Head/Hats/maidencap.rsi/icon.png differ diff --git a/Resources/Textures/_LostParadise/Clothing/Head/Helmets/NPZ/NPZhelm.rsi/equipped-HELMET.png b/Resources/Textures/_LostParadise/Clothing/Head/Helmets/NPZ/NPZhelm.rsi/equipped-HELMET.png new file mode 100644 index 0000000000..72fb559e15 Binary files /dev/null and b/Resources/Textures/_LostParadise/Clothing/Head/Helmets/NPZ/NPZhelm.rsi/equipped-HELMET.png differ diff --git a/Resources/Textures/_LostParadise/Clothing/Head/Helmets/NPZ/NPZhelm.rsi/icon.png b/Resources/Textures/_LostParadise/Clothing/Head/Helmets/NPZ/NPZhelm.rsi/icon.png new file mode 100644 index 0000000000..8cd22502a4 Binary files /dev/null and b/Resources/Textures/_LostParadise/Clothing/Head/Helmets/NPZ/NPZhelm.rsi/icon.png differ diff --git a/Resources/Textures/_LostParadise/Clothing/Head/Helmets/NPZ/NPZhelm.rsi/inhand-left.png b/Resources/Textures/_LostParadise/Clothing/Head/Helmets/NPZ/NPZhelm.rsi/inhand-left.png new file mode 100644 index 0000000000..8e529eefea Binary files /dev/null and b/Resources/Textures/_LostParadise/Clothing/Head/Helmets/NPZ/NPZhelm.rsi/inhand-left.png differ diff --git a/Resources/Textures/_LostParadise/Clothing/Head/Helmets/NPZ/NPZhelm.rsi/inhand-right.png b/Resources/Textures/_LostParadise/Clothing/Head/Helmets/NPZ/NPZhelm.rsi/inhand-right.png new file mode 100644 index 0000000000..d4326f3814 Binary files /dev/null and b/Resources/Textures/_LostParadise/Clothing/Head/Helmets/NPZ/NPZhelm.rsi/inhand-right.png differ diff --git a/Resources/Textures/_LostParadise/Clothing/Head/Helmets/NPZ/NPZhelm.rsi/meta.json b/Resources/Textures/_LostParadise/Clothing/Head/Helmets/NPZ/NPZhelm.rsi/meta.json new file mode 100644 index 0000000000..30b929b939 --- /dev/null +++ b/Resources/Textures/_LostParadise/Clothing/Head/Helmets/NPZ/NPZhelm.rsi/meta.json @@ -0,0 +1,26 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Sprited by MegaDaimond", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-HELMET", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/_LostParadise/Clothing/Mask/widebalaclava.rsi/equipped-MASK.png b/Resources/Textures/_LostParadise/Clothing/Mask/widebalaclava.rsi/equipped-MASK.png new file mode 100644 index 0000000000..7a44b2df3e Binary files /dev/null and b/Resources/Textures/_LostParadise/Clothing/Mask/widebalaclava.rsi/equipped-MASK.png differ diff --git a/Resources/Textures/_LostParadise/Clothing/Mask/widebalaclava.rsi/icon.png b/Resources/Textures/_LostParadise/Clothing/Mask/widebalaclava.rsi/icon.png new file mode 100644 index 0000000000..f9a45de89a Binary files /dev/null and b/Resources/Textures/_LostParadise/Clothing/Mask/widebalaclava.rsi/icon.png differ diff --git a/Resources/Textures/_LostParadise/Clothing/Mask/widebalaclava.rsi/meta.json b/Resources/Textures/_LostParadise/Clothing/Mask/widebalaclava.rsi/meta.json new file mode 100644 index 0000000000..5948faa29b --- /dev/null +++ b/Resources/Textures/_LostParadise/Clothing/Mask/widebalaclava.rsi/meta.json @@ -0,0 +1,18 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from BlueMoon SS13 https://github.com/BlueMoon-Labs/MOLOT-BlueMoon-Station", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-MASK", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/_LostParadise/Clothing/Neck/Cloaks/Monorich.rsi/equipped-NECK.png b/Resources/Textures/_LostParadise/Clothing/Neck/Cloaks/Monorich.rsi/equipped-NECK.png new file mode 100644 index 0000000000..2f0956fcc3 Binary files /dev/null and b/Resources/Textures/_LostParadise/Clothing/Neck/Cloaks/Monorich.rsi/equipped-NECK.png differ diff --git a/Resources/Textures/_LostParadise/Clothing/Neck/Cloaks/Monorich.rsi/icon.png b/Resources/Textures/_LostParadise/Clothing/Neck/Cloaks/Monorich.rsi/icon.png new file mode 100644 index 0000000000..1161a626de Binary files /dev/null and b/Resources/Textures/_LostParadise/Clothing/Neck/Cloaks/Monorich.rsi/icon.png differ diff --git a/Resources/Textures/_LostParadise/Clothing/Neck/Cloaks/Monorich.rsi/inhand-left.png b/Resources/Textures/_LostParadise/Clothing/Neck/Cloaks/Monorich.rsi/inhand-left.png new file mode 100644 index 0000000000..11f003313b Binary files /dev/null and b/Resources/Textures/_LostParadise/Clothing/Neck/Cloaks/Monorich.rsi/inhand-left.png differ diff --git a/Resources/Textures/_LostParadise/Clothing/Neck/Cloaks/Monorich.rsi/inhand-right.png b/Resources/Textures/_LostParadise/Clothing/Neck/Cloaks/Monorich.rsi/inhand-right.png new file mode 100644 index 0000000000..b6da823ba0 Binary files /dev/null and b/Resources/Textures/_LostParadise/Clothing/Neck/Cloaks/Monorich.rsi/inhand-right.png differ diff --git a/Resources/Textures/_LostParadise/Clothing/Neck/Cloaks/Monorich.rsi/meta.json b/Resources/Textures/_LostParadise/Clothing/Neck/Cloaks/Monorich.rsi/meta.json new file mode 100644 index 0000000000..fb7b3bbc33 --- /dev/null +++ b/Resources/Textures/_LostParadise/Clothing/Neck/Cloaks/Monorich.rsi/meta.json @@ -0,0 +1,26 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Made by Plaga & MegaDaimond", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-NECK", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} \ No newline at end of file diff --git a/Resources/Textures/_LostParadise/Clothing/Neck/NPZ/upgneckadmiral.rsi/equipped-NECK.png b/Resources/Textures/_LostParadise/Clothing/Neck/NPZ/upgneckadmiral.rsi/equipped-NECK.png index 9e30db0398..b1b027392e 100644 Binary files a/Resources/Textures/_LostParadise/Clothing/Neck/NPZ/upgneckadmiral.rsi/equipped-NECK.png and b/Resources/Textures/_LostParadise/Clothing/Neck/NPZ/upgneckadmiral.rsi/equipped-NECK.png differ diff --git a/Resources/Textures/_LostParadise/Clothing/Neck/shemags/bluedown.rsi/equipped-NECK.png b/Resources/Textures/_LostParadise/Clothing/Neck/shemags/bluedown.rsi/equipped-NECK.png new file mode 100644 index 0000000000..10144c5b96 Binary files /dev/null and b/Resources/Textures/_LostParadise/Clothing/Neck/shemags/bluedown.rsi/equipped-NECK.png differ diff --git a/Resources/Textures/_LostParadise/Clothing/Neck/shemags/bluedown.rsi/icon.png b/Resources/Textures/_LostParadise/Clothing/Neck/shemags/bluedown.rsi/icon.png new file mode 100644 index 0000000000..754d16883d Binary files /dev/null and b/Resources/Textures/_LostParadise/Clothing/Neck/shemags/bluedown.rsi/icon.png differ diff --git a/Resources/Textures/_LostParadise/Clothing/Neck/shemags/bluedown.rsi/meta.json b/Resources/Textures/_LostParadise/Clothing/Neck/shemags/bluedown.rsi/meta.json new file mode 100644 index 0000000000..e8ed079623 --- /dev/null +++ b/Resources/Textures/_LostParadise/Clothing/Neck/shemags/bluedown.rsi/meta.json @@ -0,0 +1,18 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from Bluemoon https://github.com/BlueMoon-Labs/MOLOT-BlueMoon-Station", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-NECK", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/_LostParadise/Clothing/Neck/shemags/blueup.rsi/equipped-MASK.png b/Resources/Textures/_LostParadise/Clothing/Neck/shemags/blueup.rsi/equipped-MASK.png new file mode 100644 index 0000000000..b6d9c56286 Binary files /dev/null and b/Resources/Textures/_LostParadise/Clothing/Neck/shemags/blueup.rsi/equipped-MASK.png differ diff --git a/Resources/Textures/_LostParadise/Clothing/Neck/shemags/blueup.rsi/icon.png b/Resources/Textures/_LostParadise/Clothing/Neck/shemags/blueup.rsi/icon.png new file mode 100644 index 0000000000..754d16883d Binary files /dev/null and b/Resources/Textures/_LostParadise/Clothing/Neck/shemags/blueup.rsi/icon.png differ diff --git a/Resources/Textures/_LostParadise/Clothing/Neck/shemags/blueup.rsi/meta.json b/Resources/Textures/_LostParadise/Clothing/Neck/shemags/blueup.rsi/meta.json new file mode 100644 index 0000000000..28729e502b --- /dev/null +++ b/Resources/Textures/_LostParadise/Clothing/Neck/shemags/blueup.rsi/meta.json @@ -0,0 +1,18 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "evgen99, Spac__", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-MASK", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/_LostParadise/Clothing/Neck/shemags/browndown.rsi/equipped-NECK.png b/Resources/Textures/_LostParadise/Clothing/Neck/shemags/browndown.rsi/equipped-NECK.png new file mode 100644 index 0000000000..794a36161e Binary files /dev/null and b/Resources/Textures/_LostParadise/Clothing/Neck/shemags/browndown.rsi/equipped-NECK.png differ diff --git a/Resources/Textures/_LostParadise/Clothing/Neck/shemags/browndown.rsi/icon.png b/Resources/Textures/_LostParadise/Clothing/Neck/shemags/browndown.rsi/icon.png new file mode 100644 index 0000000000..8781357b65 Binary files /dev/null and b/Resources/Textures/_LostParadise/Clothing/Neck/shemags/browndown.rsi/icon.png differ diff --git a/Resources/Textures/_LostParadise/Clothing/Neck/shemags/browndown.rsi/meta.json b/Resources/Textures/_LostParadise/Clothing/Neck/shemags/browndown.rsi/meta.json new file mode 100644 index 0000000000..e8ed079623 --- /dev/null +++ b/Resources/Textures/_LostParadise/Clothing/Neck/shemags/browndown.rsi/meta.json @@ -0,0 +1,18 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from Bluemoon https://github.com/BlueMoon-Labs/MOLOT-BlueMoon-Station", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-NECK", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/_LostParadise/Clothing/Neck/shemags/brownup.rsi/equipped-MASK.png b/Resources/Textures/_LostParadise/Clothing/Neck/shemags/brownup.rsi/equipped-MASK.png new file mode 100644 index 0000000000..8a715e549a Binary files /dev/null and b/Resources/Textures/_LostParadise/Clothing/Neck/shemags/brownup.rsi/equipped-MASK.png differ diff --git a/Resources/Textures/_LostParadise/Clothing/Neck/shemags/brownup.rsi/icon.png b/Resources/Textures/_LostParadise/Clothing/Neck/shemags/brownup.rsi/icon.png new file mode 100644 index 0000000000..8781357b65 Binary files /dev/null and b/Resources/Textures/_LostParadise/Clothing/Neck/shemags/brownup.rsi/icon.png differ diff --git a/Resources/Textures/_LostParadise/Clothing/Neck/shemags/brownup.rsi/meta.json b/Resources/Textures/_LostParadise/Clothing/Neck/shemags/brownup.rsi/meta.json new file mode 100644 index 0000000000..28729e502b --- /dev/null +++ b/Resources/Textures/_LostParadise/Clothing/Neck/shemags/brownup.rsi/meta.json @@ -0,0 +1,18 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "evgen99, Spac__", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-MASK", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/_LostParadise/Clothing/Neck/shemags/greendown.rsi/equipped-NECK.png b/Resources/Textures/_LostParadise/Clothing/Neck/shemags/greendown.rsi/equipped-NECK.png new file mode 100644 index 0000000000..702903413f Binary files /dev/null and b/Resources/Textures/_LostParadise/Clothing/Neck/shemags/greendown.rsi/equipped-NECK.png differ diff --git a/Resources/Textures/_LostParadise/Clothing/Neck/shemags/greendown.rsi/icon.png b/Resources/Textures/_LostParadise/Clothing/Neck/shemags/greendown.rsi/icon.png new file mode 100644 index 0000000000..ff842614d2 Binary files /dev/null and b/Resources/Textures/_LostParadise/Clothing/Neck/shemags/greendown.rsi/icon.png differ diff --git a/Resources/Textures/_LostParadise/Clothing/Neck/shemags/greendown.rsi/meta.json b/Resources/Textures/_LostParadise/Clothing/Neck/shemags/greendown.rsi/meta.json new file mode 100644 index 0000000000..e8ed079623 --- /dev/null +++ b/Resources/Textures/_LostParadise/Clothing/Neck/shemags/greendown.rsi/meta.json @@ -0,0 +1,18 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from Bluemoon https://github.com/BlueMoon-Labs/MOLOT-BlueMoon-Station", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-NECK", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/_LostParadise/Clothing/Neck/shemags/greenup.rsi/equipped-MASK.png b/Resources/Textures/_LostParadise/Clothing/Neck/shemags/greenup.rsi/equipped-MASK.png new file mode 100644 index 0000000000..c1455fee3d Binary files /dev/null and b/Resources/Textures/_LostParadise/Clothing/Neck/shemags/greenup.rsi/equipped-MASK.png differ diff --git a/Resources/Textures/_LostParadise/Clothing/Neck/shemags/greenup.rsi/icon.png b/Resources/Textures/_LostParadise/Clothing/Neck/shemags/greenup.rsi/icon.png new file mode 100644 index 0000000000..ff842614d2 Binary files /dev/null and b/Resources/Textures/_LostParadise/Clothing/Neck/shemags/greenup.rsi/icon.png differ diff --git a/Resources/Textures/_LostParadise/Clothing/Neck/shemags/greenup.rsi/meta.json b/Resources/Textures/_LostParadise/Clothing/Neck/shemags/greenup.rsi/meta.json new file mode 100644 index 0000000000..28729e502b --- /dev/null +++ b/Resources/Textures/_LostParadise/Clothing/Neck/shemags/greenup.rsi/meta.json @@ -0,0 +1,18 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "evgen99, Spac__", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-MASK", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/_LostParadise/Clothing/Neck/shemags/purpledown.rsi/equipped-NECK.png b/Resources/Textures/_LostParadise/Clothing/Neck/shemags/purpledown.rsi/equipped-NECK.png new file mode 100644 index 0000000000..ca73cbbf47 Binary files /dev/null and b/Resources/Textures/_LostParadise/Clothing/Neck/shemags/purpledown.rsi/equipped-NECK.png differ diff --git a/Resources/Textures/_LostParadise/Clothing/Neck/shemags/purpledown.rsi/icon.png b/Resources/Textures/_LostParadise/Clothing/Neck/shemags/purpledown.rsi/icon.png new file mode 100644 index 0000000000..dd162e8b9a Binary files /dev/null and b/Resources/Textures/_LostParadise/Clothing/Neck/shemags/purpledown.rsi/icon.png differ diff --git a/Resources/Textures/_LostParadise/Clothing/Neck/shemags/purpledown.rsi/meta.json b/Resources/Textures/_LostParadise/Clothing/Neck/shemags/purpledown.rsi/meta.json new file mode 100644 index 0000000000..e8ed079623 --- /dev/null +++ b/Resources/Textures/_LostParadise/Clothing/Neck/shemags/purpledown.rsi/meta.json @@ -0,0 +1,18 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from Bluemoon https://github.com/BlueMoon-Labs/MOLOT-BlueMoon-Station", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-NECK", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/_LostParadise/Clothing/Neck/shemags/purpleup.rsi/equipped-MASK.png b/Resources/Textures/_LostParadise/Clothing/Neck/shemags/purpleup.rsi/equipped-MASK.png new file mode 100644 index 0000000000..bb24f866c2 Binary files /dev/null and b/Resources/Textures/_LostParadise/Clothing/Neck/shemags/purpleup.rsi/equipped-MASK.png differ diff --git a/Resources/Textures/_LostParadise/Clothing/Neck/shemags/purpleup.rsi/icon.png b/Resources/Textures/_LostParadise/Clothing/Neck/shemags/purpleup.rsi/icon.png new file mode 100644 index 0000000000..dd162e8b9a Binary files /dev/null and b/Resources/Textures/_LostParadise/Clothing/Neck/shemags/purpleup.rsi/icon.png differ diff --git a/Resources/Textures/_LostParadise/Clothing/Neck/shemags/purpleup.rsi/meta.json b/Resources/Textures/_LostParadise/Clothing/Neck/shemags/purpleup.rsi/meta.json new file mode 100644 index 0000000000..28729e502b --- /dev/null +++ b/Resources/Textures/_LostParadise/Clothing/Neck/shemags/purpleup.rsi/meta.json @@ -0,0 +1,18 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "evgen99, Spac__", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-MASK", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/_LostParadise/Clothing/Neck/shemags/reddown.rsi/equipped-NECK.png b/Resources/Textures/_LostParadise/Clothing/Neck/shemags/reddown.rsi/equipped-NECK.png new file mode 100644 index 0000000000..c2342e4c8e Binary files /dev/null and b/Resources/Textures/_LostParadise/Clothing/Neck/shemags/reddown.rsi/equipped-NECK.png differ diff --git a/Resources/Textures/_LostParadise/Clothing/Neck/shemags/reddown.rsi/icon.png b/Resources/Textures/_LostParadise/Clothing/Neck/shemags/reddown.rsi/icon.png new file mode 100644 index 0000000000..33f4d4be35 Binary files /dev/null and b/Resources/Textures/_LostParadise/Clothing/Neck/shemags/reddown.rsi/icon.png differ diff --git a/Resources/Textures/_LostParadise/Clothing/Neck/shemags/reddown.rsi/meta.json b/Resources/Textures/_LostParadise/Clothing/Neck/shemags/reddown.rsi/meta.json new file mode 100644 index 0000000000..e8ed079623 --- /dev/null +++ b/Resources/Textures/_LostParadise/Clothing/Neck/shemags/reddown.rsi/meta.json @@ -0,0 +1,18 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from Bluemoon https://github.com/BlueMoon-Labs/MOLOT-BlueMoon-Station", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-NECK", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/_LostParadise/Clothing/Neck/shemags/redup.rsi/equipped-MASK.png b/Resources/Textures/_LostParadise/Clothing/Neck/shemags/redup.rsi/equipped-MASK.png new file mode 100644 index 0000000000..2f86a31741 Binary files /dev/null and b/Resources/Textures/_LostParadise/Clothing/Neck/shemags/redup.rsi/equipped-MASK.png differ diff --git a/Resources/Textures/_LostParadise/Clothing/Neck/shemags/redup.rsi/icon.png b/Resources/Textures/_LostParadise/Clothing/Neck/shemags/redup.rsi/icon.png new file mode 100644 index 0000000000..33f4d4be35 Binary files /dev/null and b/Resources/Textures/_LostParadise/Clothing/Neck/shemags/redup.rsi/icon.png differ diff --git a/Resources/Textures/_LostParadise/Clothing/Neck/shemags/redup.rsi/meta.json b/Resources/Textures/_LostParadise/Clothing/Neck/shemags/redup.rsi/meta.json new file mode 100644 index 0000000000..28729e502b --- /dev/null +++ b/Resources/Textures/_LostParadise/Clothing/Neck/shemags/redup.rsi/meta.json @@ -0,0 +1,18 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "evgen99, Spac__", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-MASK", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/_LostParadise/Clothing/OuterClothing/Armor/NPZarmorvest.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/_LostParadise/Clothing/OuterClothing/Armor/NPZarmorvest.rsi/equipped-OUTERCLOTHING.png new file mode 100644 index 0000000000..d498dcdb4b Binary files /dev/null and b/Resources/Textures/_LostParadise/Clothing/OuterClothing/Armor/NPZarmorvest.rsi/equipped-OUTERCLOTHING.png differ diff --git a/Resources/Textures/_LostParadise/Clothing/OuterClothing/Armor/NPZarmorvest.rsi/icon.png b/Resources/Textures/_LostParadise/Clothing/OuterClothing/Armor/NPZarmorvest.rsi/icon.png new file mode 100644 index 0000000000..b401c26b14 Binary files /dev/null and b/Resources/Textures/_LostParadise/Clothing/OuterClothing/Armor/NPZarmorvest.rsi/icon.png differ diff --git a/Resources/Textures/_LostParadise/Clothing/OuterClothing/Armor/NPZarmorvest.rsi/inhand-left.png b/Resources/Textures/_LostParadise/Clothing/OuterClothing/Armor/NPZarmorvest.rsi/inhand-left.png new file mode 100644 index 0000000000..aea0f39676 Binary files /dev/null and b/Resources/Textures/_LostParadise/Clothing/OuterClothing/Armor/NPZarmorvest.rsi/inhand-left.png differ diff --git a/Resources/Textures/_LostParadise/Clothing/OuterClothing/Armor/NPZarmorvest.rsi/inhand-right.png b/Resources/Textures/_LostParadise/Clothing/OuterClothing/Armor/NPZarmorvest.rsi/inhand-right.png new file mode 100644 index 0000000000..cef6f162c7 Binary files /dev/null and b/Resources/Textures/_LostParadise/Clothing/OuterClothing/Armor/NPZarmorvest.rsi/inhand-right.png differ diff --git a/Resources/Textures/_LostParadise/Clothing/OuterClothing/Armor/NPZarmorvest.rsi/meta.json b/Resources/Textures/_LostParadise/Clothing/OuterClothing/Armor/NPZarmorvest.rsi/meta.json new file mode 100644 index 0000000000..d45b473678 --- /dev/null +++ b/Resources/Textures/_LostParadise/Clothing/OuterClothing/Armor/NPZarmorvest.rsi/meta.json @@ -0,0 +1,26 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Resprited by MegaDaimond", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-OUTERCLOTHING", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/_LostParadise/Clothing/OuterClothing/Coats/NPZcoat.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/_LostParadise/Clothing/OuterClothing/Coats/NPZcoat.rsi/equipped-OUTERCLOTHING.png new file mode 100644 index 0000000000..6ad387d4bf Binary files /dev/null and b/Resources/Textures/_LostParadise/Clothing/OuterClothing/Coats/NPZcoat.rsi/equipped-OUTERCLOTHING.png differ diff --git a/Resources/Textures/_LostParadise/Clothing/OuterClothing/Coats/NPZcoat.rsi/icon.png b/Resources/Textures/_LostParadise/Clothing/OuterClothing/Coats/NPZcoat.rsi/icon.png new file mode 100644 index 0000000000..0f2a5942e5 Binary files /dev/null and b/Resources/Textures/_LostParadise/Clothing/OuterClothing/Coats/NPZcoat.rsi/icon.png differ diff --git a/Resources/Textures/_LostParadise/Clothing/OuterClothing/Coats/NPZcoat.rsi/inhand-left.png b/Resources/Textures/_LostParadise/Clothing/OuterClothing/Coats/NPZcoat.rsi/inhand-left.png new file mode 100644 index 0000000000..5af252c1ac Binary files /dev/null and b/Resources/Textures/_LostParadise/Clothing/OuterClothing/Coats/NPZcoat.rsi/inhand-left.png differ diff --git a/Resources/Textures/_LostParadise/Clothing/OuterClothing/Coats/NPZcoat.rsi/inhand-right.png b/Resources/Textures/_LostParadise/Clothing/OuterClothing/Coats/NPZcoat.rsi/inhand-right.png new file mode 100644 index 0000000000..9c94a18fb4 Binary files /dev/null and b/Resources/Textures/_LostParadise/Clothing/OuterClothing/Coats/NPZcoat.rsi/inhand-right.png differ diff --git a/Resources/Textures/_LostParadise/Clothing/OuterClothing/Coats/NPZcoat.rsi/meta.json b/Resources/Textures/_LostParadise/Clothing/OuterClothing/Coats/NPZcoat.rsi/meta.json new file mode 100644 index 0000000000..b58025ed54 --- /dev/null +++ b/Resources/Textures/_LostParadise/Clothing/OuterClothing/Coats/NPZcoat.rsi/meta.json @@ -0,0 +1,26 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "By Kyburka", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-OUTERCLOTHING", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/_LostParadise/Clothing/OuterClothing/Hardsuits/NPZsciense/body.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/_LostParadise/Clothing/OuterClothing/Hardsuits/NPZsciense/body.rsi/equipped-OUTERCLOTHING.png new file mode 100644 index 0000000000..df94228245 Binary files /dev/null and b/Resources/Textures/_LostParadise/Clothing/OuterClothing/Hardsuits/NPZsciense/body.rsi/equipped-OUTERCLOTHING.png differ diff --git a/Resources/Textures/_LostParadise/Clothing/OuterClothing/Hardsuits/NPZsciense/body.rsi/icon.png b/Resources/Textures/_LostParadise/Clothing/OuterClothing/Hardsuits/NPZsciense/body.rsi/icon.png new file mode 100644 index 0000000000..9da65da214 Binary files /dev/null and b/Resources/Textures/_LostParadise/Clothing/OuterClothing/Hardsuits/NPZsciense/body.rsi/icon.png differ diff --git a/Resources/Textures/_LostParadise/Clothing/OuterClothing/Hardsuits/NPZsciense/body.rsi/inhand-left.png b/Resources/Textures/_LostParadise/Clothing/OuterClothing/Hardsuits/NPZsciense/body.rsi/inhand-left.png new file mode 100644 index 0000000000..a3edf405e1 Binary files /dev/null and b/Resources/Textures/_LostParadise/Clothing/OuterClothing/Hardsuits/NPZsciense/body.rsi/inhand-left.png differ diff --git a/Resources/Textures/_LostParadise/Clothing/OuterClothing/Hardsuits/NPZsciense/body.rsi/inhand-right.png b/Resources/Textures/_LostParadise/Clothing/OuterClothing/Hardsuits/NPZsciense/body.rsi/inhand-right.png new file mode 100644 index 0000000000..78f787838e Binary files /dev/null and b/Resources/Textures/_LostParadise/Clothing/OuterClothing/Hardsuits/NPZsciense/body.rsi/inhand-right.png differ diff --git a/Resources/Textures/_LostParadise/Clothing/OuterClothing/Hardsuits/NPZsciense/body.rsi/meta.json b/Resources/Textures/_LostParadise/Clothing/OuterClothing/Hardsuits/NPZsciense/body.rsi/meta.json new file mode 100644 index 0000000000..60f31c0b1d --- /dev/null +++ b/Resources/Textures/_LostParadise/Clothing/OuterClothing/Hardsuits/NPZsciense/body.rsi/meta.json @@ -0,0 +1,26 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "By Mr Diamond and as Little by Miss Kira :3 for Lost Paradise", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-OUTERCLOTHING", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/_LostParadise/Clothing/OuterClothing/Hardsuits/NPZsciense/head.rsi/equipped-HELMET.png b/Resources/Textures/_LostParadise/Clothing/OuterClothing/Hardsuits/NPZsciense/head.rsi/equipped-HELMET.png new file mode 100644 index 0000000000..2c610bc600 Binary files /dev/null and b/Resources/Textures/_LostParadise/Clothing/OuterClothing/Hardsuits/NPZsciense/head.rsi/equipped-HELMET.png differ diff --git a/Resources/Textures/_LostParadise/Clothing/OuterClothing/Hardsuits/NPZsciense/head.rsi/icon.png b/Resources/Textures/_LostParadise/Clothing/OuterClothing/Hardsuits/NPZsciense/head.rsi/icon.png new file mode 100644 index 0000000000..13b94f5fad Binary files /dev/null and b/Resources/Textures/_LostParadise/Clothing/OuterClothing/Hardsuits/NPZsciense/head.rsi/icon.png differ diff --git a/Resources/Textures/_LostParadise/Clothing/OuterClothing/Hardsuits/NPZsciense/head.rsi/meta.json b/Resources/Textures/_LostParadise/Clothing/OuterClothing/Hardsuits/NPZsciense/head.rsi/meta.json new file mode 100644 index 0000000000..77e2a7a2ae --- /dev/null +++ b/Resources/Textures/_LostParadise/Clothing/OuterClothing/Hardsuits/NPZsciense/head.rsi/meta.json @@ -0,0 +1,19 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Made by MegaDaimond", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-HELMET", + "directions": 4 + } + } + ] +} diff --git a/Resources/Textures/_LostParadise/Clothing/OuterClothing/Hardsuits/NPZspecops/hard.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/_LostParadise/Clothing/OuterClothing/Hardsuits/NPZspecops/hard.rsi/equipped-OUTERCLOTHING.png new file mode 100644 index 0000000000..55998a00c1 Binary files /dev/null and b/Resources/Textures/_LostParadise/Clothing/OuterClothing/Hardsuits/NPZspecops/hard.rsi/equipped-OUTERCLOTHING.png differ diff --git a/Resources/Textures/_LostParadise/Clothing/OuterClothing/Hardsuits/NPZspecops/hard.rsi/icon.png b/Resources/Textures/_LostParadise/Clothing/OuterClothing/Hardsuits/NPZspecops/hard.rsi/icon.png new file mode 100644 index 0000000000..8049a3fd31 Binary files /dev/null and b/Resources/Textures/_LostParadise/Clothing/OuterClothing/Hardsuits/NPZspecops/hard.rsi/icon.png differ diff --git a/Resources/Textures/_LostParadise/Clothing/OuterClothing/Hardsuits/NPZspecops/hard.rsi/inhand-left.png b/Resources/Textures/_LostParadise/Clothing/OuterClothing/Hardsuits/NPZspecops/hard.rsi/inhand-left.png new file mode 100644 index 0000000000..6763b53db7 Binary files /dev/null and b/Resources/Textures/_LostParadise/Clothing/OuterClothing/Hardsuits/NPZspecops/hard.rsi/inhand-left.png differ diff --git a/Resources/Textures/_LostParadise/Clothing/OuterClothing/Hardsuits/NPZspecops/hard.rsi/inhand-right.png b/Resources/Textures/_LostParadise/Clothing/OuterClothing/Hardsuits/NPZspecops/hard.rsi/inhand-right.png new file mode 100644 index 0000000000..541b91b0c1 Binary files /dev/null and b/Resources/Textures/_LostParadise/Clothing/OuterClothing/Hardsuits/NPZspecops/hard.rsi/inhand-right.png differ diff --git a/Resources/Textures/_LostParadise/Clothing/OuterClothing/Hardsuits/NPZspecops/hard.rsi/meta.json b/Resources/Textures/_LostParadise/Clothing/OuterClothing/Hardsuits/NPZspecops/hard.rsi/meta.json new file mode 100644 index 0000000000..56eeccadfc --- /dev/null +++ b/Resources/Textures/_LostParadise/Clothing/OuterClothing/Hardsuits/NPZspecops/hard.rsi/meta.json @@ -0,0 +1,26 @@ +{ + "version": 1, + "license": "CC-BY-SA-4.0", + "copyright": "Made by MegaDaimond", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-OUTERCLOTHING", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/_LostParadise/Clothing/OuterClothing/Hardsuits/NPZspecops/helm.rsi/icon-flash.png b/Resources/Textures/_LostParadise/Clothing/OuterClothing/Hardsuits/NPZspecops/helm.rsi/icon-flash.png new file mode 100644 index 0000000000..0adcd07c95 Binary files /dev/null and b/Resources/Textures/_LostParadise/Clothing/OuterClothing/Hardsuits/NPZspecops/helm.rsi/icon-flash.png differ diff --git a/Resources/Textures/_LostParadise/Clothing/OuterClothing/Hardsuits/NPZspecops/helm.rsi/icon.png b/Resources/Textures/_LostParadise/Clothing/OuterClothing/Hardsuits/NPZspecops/helm.rsi/icon.png new file mode 100644 index 0000000000..73c737799e Binary files /dev/null and b/Resources/Textures/_LostParadise/Clothing/OuterClothing/Hardsuits/NPZspecops/helm.rsi/icon.png differ diff --git a/Resources/Textures/_LostParadise/Clothing/OuterClothing/Hardsuits/NPZspecops/helm.rsi/meta.json b/Resources/Textures/_LostParadise/Clothing/OuterClothing/Hardsuits/NPZspecops/helm.rsi/meta.json new file mode 100644 index 0000000000..e5b897a708 --- /dev/null +++ b/Resources/Textures/_LostParadise/Clothing/OuterClothing/Hardsuits/NPZspecops/helm.rsi/meta.json @@ -0,0 +1,41 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Made by MegaDaimond", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "icon-flash" + }, + { + "name": "off-equipped-HELMET", + "directions": 4 + }, + { + "name": "off-inhand-left", + "directions": 4 + }, + { + "name": "off-inhand-right", + "directions": 4 + }, + { + "name": "on-equipped-HELMET", + "directions": 4 + }, + { + "name": "on-inhand-left", + "directions": 4 + }, + { + "name": "on-inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/_LostParadise/Clothing/OuterClothing/Hardsuits/NPZspecops/helm.rsi/off-equipped-HELMET.png b/Resources/Textures/_LostParadise/Clothing/OuterClothing/Hardsuits/NPZspecops/helm.rsi/off-equipped-HELMET.png new file mode 100644 index 0000000000..3274ae8eef Binary files /dev/null and b/Resources/Textures/_LostParadise/Clothing/OuterClothing/Hardsuits/NPZspecops/helm.rsi/off-equipped-HELMET.png differ diff --git a/Resources/Textures/_LostParadise/Clothing/OuterClothing/Hardsuits/NPZspecops/helm.rsi/off-inhand-left.png b/Resources/Textures/_LostParadise/Clothing/OuterClothing/Hardsuits/NPZspecops/helm.rsi/off-inhand-left.png new file mode 100644 index 0000000000..c81cf30dc9 Binary files /dev/null and b/Resources/Textures/_LostParadise/Clothing/OuterClothing/Hardsuits/NPZspecops/helm.rsi/off-inhand-left.png differ diff --git a/Resources/Textures/_LostParadise/Clothing/OuterClothing/Hardsuits/NPZspecops/helm.rsi/off-inhand-right.png b/Resources/Textures/_LostParadise/Clothing/OuterClothing/Hardsuits/NPZspecops/helm.rsi/off-inhand-right.png new file mode 100644 index 0000000000..f5b449d7b9 Binary files /dev/null and b/Resources/Textures/_LostParadise/Clothing/OuterClothing/Hardsuits/NPZspecops/helm.rsi/off-inhand-right.png differ diff --git a/Resources/Textures/_LostParadise/Clothing/OuterClothing/Hardsuits/NPZspecops/helm.rsi/on-equipped-HELMET.png b/Resources/Textures/_LostParadise/Clothing/OuterClothing/Hardsuits/NPZspecops/helm.rsi/on-equipped-HELMET.png new file mode 100644 index 0000000000..81996d1232 Binary files /dev/null and b/Resources/Textures/_LostParadise/Clothing/OuterClothing/Hardsuits/NPZspecops/helm.rsi/on-equipped-HELMET.png differ diff --git a/Resources/Textures/_LostParadise/Clothing/OuterClothing/Hardsuits/NPZspecops/helm.rsi/on-inhand-left.png b/Resources/Textures/_LostParadise/Clothing/OuterClothing/Hardsuits/NPZspecops/helm.rsi/on-inhand-left.png new file mode 100644 index 0000000000..32f699cb47 Binary files /dev/null and b/Resources/Textures/_LostParadise/Clothing/OuterClothing/Hardsuits/NPZspecops/helm.rsi/on-inhand-left.png differ diff --git a/Resources/Textures/_LostParadise/Clothing/OuterClothing/Hardsuits/NPZspecops/helm.rsi/on-inhand-right.png b/Resources/Textures/_LostParadise/Clothing/OuterClothing/Hardsuits/NPZspecops/helm.rsi/on-inhand-right.png new file mode 100644 index 0000000000..71d2a09325 Binary files /dev/null and b/Resources/Textures/_LostParadise/Clothing/OuterClothing/Hardsuits/NPZspecops/helm.rsi/on-inhand-right.png differ diff --git a/Resources/Textures/_LostParadise/Clothing/OuterClothing/Hardsuits/NPZtrooper/hard.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/_LostParadise/Clothing/OuterClothing/Hardsuits/NPZtrooper/hard.rsi/equipped-OUTERCLOTHING.png new file mode 100644 index 0000000000..1e2914129b Binary files /dev/null and b/Resources/Textures/_LostParadise/Clothing/OuterClothing/Hardsuits/NPZtrooper/hard.rsi/equipped-OUTERCLOTHING.png differ diff --git a/Resources/Textures/_LostParadise/Clothing/OuterClothing/Hardsuits/NPZtrooper/hard.rsi/icon.png b/Resources/Textures/_LostParadise/Clothing/OuterClothing/Hardsuits/NPZtrooper/hard.rsi/icon.png new file mode 100644 index 0000000000..341e959641 Binary files /dev/null and b/Resources/Textures/_LostParadise/Clothing/OuterClothing/Hardsuits/NPZtrooper/hard.rsi/icon.png differ diff --git a/Resources/Textures/_LostParadise/Clothing/OuterClothing/Hardsuits/NPZtrooper/hard.rsi/inhand-left.png b/Resources/Textures/_LostParadise/Clothing/OuterClothing/Hardsuits/NPZtrooper/hard.rsi/inhand-left.png new file mode 100644 index 0000000000..6763b53db7 Binary files /dev/null and b/Resources/Textures/_LostParadise/Clothing/OuterClothing/Hardsuits/NPZtrooper/hard.rsi/inhand-left.png differ diff --git a/Resources/Textures/_LostParadise/Clothing/OuterClothing/Hardsuits/NPZtrooper/hard.rsi/inhand-right.png b/Resources/Textures/_LostParadise/Clothing/OuterClothing/Hardsuits/NPZtrooper/hard.rsi/inhand-right.png new file mode 100644 index 0000000000..541b91b0c1 Binary files /dev/null and b/Resources/Textures/_LostParadise/Clothing/OuterClothing/Hardsuits/NPZtrooper/hard.rsi/inhand-right.png differ diff --git a/Resources/Textures/_LostParadise/Clothing/OuterClothing/Hardsuits/NPZtrooper/hard.rsi/meta.json b/Resources/Textures/_LostParadise/Clothing/OuterClothing/Hardsuits/NPZtrooper/hard.rsi/meta.json new file mode 100644 index 0000000000..56eeccadfc --- /dev/null +++ b/Resources/Textures/_LostParadise/Clothing/OuterClothing/Hardsuits/NPZtrooper/hard.rsi/meta.json @@ -0,0 +1,26 @@ +{ + "version": 1, + "license": "CC-BY-SA-4.0", + "copyright": "Made by MegaDaimond", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-OUTERCLOTHING", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/_LostParadise/Clothing/OuterClothing/Hardsuits/NPZtrooper/helm.rsi/icon-flash.png b/Resources/Textures/_LostParadise/Clothing/OuterClothing/Hardsuits/NPZtrooper/helm.rsi/icon-flash.png new file mode 100644 index 0000000000..212b48baaf Binary files /dev/null and b/Resources/Textures/_LostParadise/Clothing/OuterClothing/Hardsuits/NPZtrooper/helm.rsi/icon-flash.png differ diff --git a/Resources/Textures/_LostParadise/Clothing/OuterClothing/Hardsuits/NPZtrooper/helm.rsi/icon.png b/Resources/Textures/_LostParadise/Clothing/OuterClothing/Hardsuits/NPZtrooper/helm.rsi/icon.png new file mode 100644 index 0000000000..b4e87de031 Binary files /dev/null and b/Resources/Textures/_LostParadise/Clothing/OuterClothing/Hardsuits/NPZtrooper/helm.rsi/icon.png differ diff --git a/Resources/Textures/_LostParadise/Clothing/OuterClothing/Hardsuits/NPZtrooper/helm.rsi/meta.json b/Resources/Textures/_LostParadise/Clothing/OuterClothing/Hardsuits/NPZtrooper/helm.rsi/meta.json new file mode 100644 index 0000000000..e5b897a708 --- /dev/null +++ b/Resources/Textures/_LostParadise/Clothing/OuterClothing/Hardsuits/NPZtrooper/helm.rsi/meta.json @@ -0,0 +1,41 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Made by MegaDaimond", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "icon-flash" + }, + { + "name": "off-equipped-HELMET", + "directions": 4 + }, + { + "name": "off-inhand-left", + "directions": 4 + }, + { + "name": "off-inhand-right", + "directions": 4 + }, + { + "name": "on-equipped-HELMET", + "directions": 4 + }, + { + "name": "on-inhand-left", + "directions": 4 + }, + { + "name": "on-inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/_LostParadise/Clothing/OuterClothing/Hardsuits/NPZtrooper/helm.rsi/off-equipped-HELMET.png b/Resources/Textures/_LostParadise/Clothing/OuterClothing/Hardsuits/NPZtrooper/helm.rsi/off-equipped-HELMET.png new file mode 100644 index 0000000000..e17f81c712 Binary files /dev/null and b/Resources/Textures/_LostParadise/Clothing/OuterClothing/Hardsuits/NPZtrooper/helm.rsi/off-equipped-HELMET.png differ diff --git a/Resources/Textures/_LostParadise/Clothing/OuterClothing/Hardsuits/NPZtrooper/helm.rsi/off-inhand-left.png b/Resources/Textures/_LostParadise/Clothing/OuterClothing/Hardsuits/NPZtrooper/helm.rsi/off-inhand-left.png new file mode 100644 index 0000000000..c81cf30dc9 Binary files /dev/null and b/Resources/Textures/_LostParadise/Clothing/OuterClothing/Hardsuits/NPZtrooper/helm.rsi/off-inhand-left.png differ diff --git a/Resources/Textures/_LostParadise/Clothing/OuterClothing/Hardsuits/NPZtrooper/helm.rsi/off-inhand-right.png b/Resources/Textures/_LostParadise/Clothing/OuterClothing/Hardsuits/NPZtrooper/helm.rsi/off-inhand-right.png new file mode 100644 index 0000000000..f5b449d7b9 Binary files /dev/null and b/Resources/Textures/_LostParadise/Clothing/OuterClothing/Hardsuits/NPZtrooper/helm.rsi/off-inhand-right.png differ diff --git a/Resources/Textures/_LostParadise/Clothing/OuterClothing/Hardsuits/NPZtrooper/helm.rsi/on-equipped-HELMET.png b/Resources/Textures/_LostParadise/Clothing/OuterClothing/Hardsuits/NPZtrooper/helm.rsi/on-equipped-HELMET.png new file mode 100644 index 0000000000..12130c4ada Binary files /dev/null and b/Resources/Textures/_LostParadise/Clothing/OuterClothing/Hardsuits/NPZtrooper/helm.rsi/on-equipped-HELMET.png differ diff --git a/Resources/Textures/_LostParadise/Clothing/OuterClothing/Hardsuits/NPZtrooper/helm.rsi/on-inhand-left.png b/Resources/Textures/_LostParadise/Clothing/OuterClothing/Hardsuits/NPZtrooper/helm.rsi/on-inhand-left.png new file mode 100644 index 0000000000..32f699cb47 Binary files /dev/null and b/Resources/Textures/_LostParadise/Clothing/OuterClothing/Hardsuits/NPZtrooper/helm.rsi/on-inhand-left.png differ diff --git a/Resources/Textures/_LostParadise/Clothing/OuterClothing/Hardsuits/NPZtrooper/helm.rsi/on-inhand-right.png b/Resources/Textures/_LostParadise/Clothing/OuterClothing/Hardsuits/NPZtrooper/helm.rsi/on-inhand-right.png new file mode 100644 index 0000000000..71d2a09325 Binary files /dev/null and b/Resources/Textures/_LostParadise/Clothing/OuterClothing/Hardsuits/NPZtrooper/helm.rsi/on-inhand-right.png differ diff --git a/Resources/Textures/_LostParadise/Clothing/OuterClothing/Hardsuits/miksuit.rsi/meta.json b/Resources/Textures/_LostParadise/Clothing/OuterClothing/Hardsuits/miksuit.rsi/meta.json index 60f31c0b1d..2ca75d8f8b 100644 --- a/Resources/Textures/_LostParadise/Clothing/OuterClothing/Hardsuits/miksuit.rsi/meta.json +++ b/Resources/Textures/_LostParadise/Clothing/OuterClothing/Hardsuits/miksuit.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "By Mr Diamond and as Little by Miss Kira :3 for Lost Paradise", + "copyright": "By Daimond and as Little by Miss Kira :3 for Lost Paradise", "size": { "x": 32, "y": 32 @@ -14,6 +14,22 @@ "name": "equipped-OUTERCLOTHING", "directions": 4 }, + { + "name": "equipped-OUTERCLOTHING-vulpkanin", + "directions": 4 + }, + { + "name": "equipped-OUTERCLOTHING-tajaran", + "directions": 4 + }, + { + "name": "equipped-OUTERCLOTHING-reptilian", + "directions": 4 + }, + { + "name": "equipped-OUTERCLOTHING-shark", + "directions": 4 + }, { "name": "inhand-left", "directions": 4 diff --git a/Resources/Textures/_LostParadise/Clothing/Underwear/buttplugtail/big.rsi/equipped-NECK.png b/Resources/Textures/_LostParadise/Clothing/Underwear/buttplugtail/big.rsi/equipped-UNDERWEAR.png similarity index 100% rename from Resources/Textures/_LostParadise/Clothing/Underwear/buttplugtail/big.rsi/equipped-NECK.png rename to Resources/Textures/_LostParadise/Clothing/Underwear/buttplugtail/big.rsi/equipped-UNDERWEAR.png diff --git a/Resources/Textures/_LostParadise/Clothing/Underwear/buttplugtail/big.rsi/meta.json b/Resources/Textures/_LostParadise/Clothing/Underwear/buttplugtail/big.rsi/meta.json index 8f7e171b0f..69a0c5d62f 100644 --- a/Resources/Textures/_LostParadise/Clothing/Underwear/buttplugtail/big.rsi/meta.json +++ b/Resources/Textures/_LostParadise/Clothing/Underwear/buttplugtail/big.rsi/meta.json @@ -11,7 +11,7 @@ "name": "icon" }, { - "name": "equipped-NECK", + "name": "equipped-UNDERWEAR", "directions": 4 } ] diff --git a/Resources/Textures/_LostParadise/Clothing/Underwear/buttplugtail/medium.rsi/equipped-NECK.png b/Resources/Textures/_LostParadise/Clothing/Underwear/buttplugtail/medium.rsi/equipped-UNDERWEAR.png similarity index 100% rename from Resources/Textures/_LostParadise/Clothing/Underwear/buttplugtail/medium.rsi/equipped-NECK.png rename to Resources/Textures/_LostParadise/Clothing/Underwear/buttplugtail/medium.rsi/equipped-UNDERWEAR.png diff --git a/Resources/Textures/_LostParadise/Clothing/Underwear/buttplugtail/medium.rsi/meta.json b/Resources/Textures/_LostParadise/Clothing/Underwear/buttplugtail/medium.rsi/meta.json index 8f7e171b0f..69a0c5d62f 100644 --- a/Resources/Textures/_LostParadise/Clothing/Underwear/buttplugtail/medium.rsi/meta.json +++ b/Resources/Textures/_LostParadise/Clothing/Underwear/buttplugtail/medium.rsi/meta.json @@ -11,7 +11,7 @@ "name": "icon" }, { - "name": "equipped-NECK", + "name": "equipped-UNDERWEAR", "directions": 4 } ] diff --git a/Resources/Textures/_LostParadise/Clothing/Underwear/buttplugtail/small.rsi/equipped-NECK.png b/Resources/Textures/_LostParadise/Clothing/Underwear/buttplugtail/small.rsi/equipped-UNDERWEAR.png similarity index 100% rename from Resources/Textures/_LostParadise/Clothing/Underwear/buttplugtail/small.rsi/equipped-NECK.png rename to Resources/Textures/_LostParadise/Clothing/Underwear/buttplugtail/small.rsi/equipped-UNDERWEAR.png diff --git a/Resources/Textures/_LostParadise/Clothing/Underwear/buttplugtail/small.rsi/meta.json b/Resources/Textures/_LostParadise/Clothing/Underwear/buttplugtail/small.rsi/meta.json index 8f7e171b0f..69a0c5d62f 100644 --- a/Resources/Textures/_LostParadise/Clothing/Underwear/buttplugtail/small.rsi/meta.json +++ b/Resources/Textures/_LostParadise/Clothing/Underwear/buttplugtail/small.rsi/meta.json @@ -11,7 +11,7 @@ "name": "icon" }, { - "name": "equipped-NECK", + "name": "equipped-UNDERWEAR", "directions": 4 } ] diff --git a/Resources/Textures/_LostParadise/Clothing/Uniforms/NPZ/NPZoverall.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/_LostParadise/Clothing/Uniforms/NPZ/NPZoverall.rsi/equipped-INNERCLOTHING.png new file mode 100644 index 0000000000..c69c44565c Binary files /dev/null and b/Resources/Textures/_LostParadise/Clothing/Uniforms/NPZ/NPZoverall.rsi/equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/_LostParadise/Clothing/Uniforms/NPZ/NPZoverall.rsi/icon.png b/Resources/Textures/_LostParadise/Clothing/Uniforms/NPZ/NPZoverall.rsi/icon.png new file mode 100644 index 0000000000..ab087752d2 Binary files /dev/null and b/Resources/Textures/_LostParadise/Clothing/Uniforms/NPZ/NPZoverall.rsi/icon.png differ diff --git a/Resources/Textures/_LostParadise/Clothing/Uniforms/NPZ/NPZoverall.rsi/inhand-left.png b/Resources/Textures/_LostParadise/Clothing/Uniforms/NPZ/NPZoverall.rsi/inhand-left.png new file mode 100644 index 0000000000..7c0ff91eaa Binary files /dev/null and b/Resources/Textures/_LostParadise/Clothing/Uniforms/NPZ/NPZoverall.rsi/inhand-left.png differ diff --git a/Resources/Textures/_LostParadise/Clothing/Uniforms/NPZ/NPZoverall.rsi/inhand-right.png b/Resources/Textures/_LostParadise/Clothing/Uniforms/NPZ/NPZoverall.rsi/inhand-right.png new file mode 100644 index 0000000000..7c61297755 Binary files /dev/null and b/Resources/Textures/_LostParadise/Clothing/Uniforms/NPZ/NPZoverall.rsi/inhand-right.png differ diff --git a/Resources/Textures/_LostParadise/Clothing/Uniforms/NPZ/NPZoverall.rsi/meta.json b/Resources/Textures/_LostParadise/Clothing/Uniforms/NPZ/NPZoverall.rsi/meta.json new file mode 100644 index 0000000000..6aa3bdecde --- /dev/null +++ b/Resources/Textures/_LostParadise/Clothing/Uniforms/NPZ/NPZoverall.rsi/meta.json @@ -0,0 +1,26 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Sprited by MegaDaimond", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-INNERCLOTHING", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/_LostParadise/Supermatter/supermatter.rsi/meta.json b/Resources/Textures/_LostParadise/Supermatter/supermatter.rsi/meta.json deleted file mode 100644 index 3c25e1a830..0000000000 --- a/Resources/Textures/_LostParadise/Supermatter/supermatter.rsi/meta.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "version": 1, - "copyright": "Taken from https://github.com/tgstation/tgstation/blob/master/icons/obj/supermatter.dmi", - "license": "CC-BY-SA-3.0", - "size": { - "x": 32, - "y": 48 - }, - "states": [ - { - "name": "supermatter" - } - ] -} diff --git a/Resources/Textures/_LostParadise/Supermatter/supermatter.rsi/supermatter.png b/Resources/Textures/_LostParadise/Supermatter/supermatter.rsi/supermatter.png deleted file mode 100644 index b8fa4defeb..0000000000 Binary files a/Resources/Textures/_LostParadise/Supermatter/supermatter.rsi/supermatter.png and /dev/null differ