]> git.smokeofanarchy.ru Git - space-station-14.git/commit
Xenoborgs part 2 (#36844)
authorSamuka-C <47865393+Samuka-C@users.noreply.github.com>
Mon, 28 Apr 2025 22:10:35 +0000 (19:10 -0300)
committerGitHub <noreply@github.com>
Mon, 28 Apr 2025 22:10:35 +0000 (18:10 -0400)
commit02b5592d6975858bb0e117a855b2b484859b6089
treef0069d5b908eb497285af4183501bb9f6c96bdfa
parent46b030df4572e79e59bfb674da4cedb048af6803
Xenoborgs part 2 (#36844)

* add lawsets for the xenoborgs and mothership core

* add xenoborg names

* add xenoborg radio

* add xenoborg device frequency

* add xenoborg access

* add xenoborg contraband

* Update Resources/Locale/en-US/station-laws/laws.ftl

Co-authored-by: ScarKy0 <106310278+ScarKy0@users.noreply.github.com>
* add xenoborg access to the universal Id card and universal access config

* remove 6th law of xenoborg and mothership lawset (got jointed into the 5th law)

* added xenoborg and mothership law boards

* add more names

* add Xenoborg faction

* moved all lawboards into a separate yml file

* removed custom xenoborg contraband severity

* add Xenoborg and Mothership components

* add xenoborg laser guns

* add self recharging fire extinguisher

* add mothership pinpointer

* add material bag

* add infinite jetpack

* add a only blue energy dagger

* add xenoborg jammer

* add refueling welding tool

* add nocturine hypo

* add nuclear small power cell

* add cloaking device

* add xenoborg door remote

* add custom sprites for xenoborg modules

* add custom sprites for xenoborg module actions

* removed Xenoborg Comp until is actually needed

* add xenoborg module tags

* spelling

* add xenoborg module bases

* organazied xenoborg modules sprites better

* add generic xenoborg modules

* add heavy xenoborg modules

* add engi xenoborg modules

* small fix to meta file in actions_borg.rsi

* renamed mothership comp to XenoborgMothership

* fixed the base for the xenoborg engi modules

* add scout xenoborg modules

* add stealth xenoborg modules

* localization for names and descriptions of the xenoborg modules

* fixed issues related to the XenoborgMothership component

* revert localization (it wasn't working for some reason)

* fixes

* fixed issue with container slot in the cloaking device

* Update description of small capacity nuclear power cell

Co-authored-by: ArtisticRoomba <145879011+ArtisticRoomba@users.noreply.github.com>
* Fix indentation in material bag

Co-authored-by: ArtisticRoomba <145879011+ArtisticRoomba@users.noreply.github.com>
* Spelling

Co-authored-by: ArtisticRoomba <145879011+ArtisticRoomba@users.noreply.github.com>
* fix parameter order in some prototypes

* rename proto id InfiniteJetpack to JetpackXenoborg

* localize pinpointer targets

* Revert "localize pinpointer targets"

doesn't work

* added lines in the end of files (and in the middle of one)

* reorder paramenter in some entities

* fixed some descriptions

* minor fixes

---------

Co-authored-by: ScarKy0 <106310278+ScarKy0@users.noreply.github.com>
Co-authored-by: ArtisticRoomba <145879011+ArtisticRoomba@users.noreply.github.com>
48 files changed:
Content.Shared/Xenoborgs/Components/XenoborgComponent.cs [new file with mode: 0644]
Resources/Prototypes/Entities/Objects/Devices/door_remote.yml
Resources/Prototypes/Entities/Objects/Devices/pinpointer.yml
Resources/Prototypes/Entities/Objects/Misc/fire_extinguisher.yml
Resources/Prototypes/Entities/Objects/Power/powercells.yml
Resources/Prototypes/Entities/Objects/Specific/Robotics/borg_modules.yml
Resources/Prototypes/Entities/Objects/Specific/Xenoborg/cloaking_device.yml [new file with mode: 0644]
Resources/Prototypes/Entities/Objects/Specific/Xenoborg/material_bag.yml [new file with mode: 0644]
Resources/Prototypes/Entities/Objects/Specific/Xenoborg/nocturine_hypo.yml [new file with mode: 0644]
Resources/Prototypes/Entities/Objects/Tools/jammer.yml
Resources/Prototypes/Entities/Objects/Tools/jetpacks.yml
Resources/Prototypes/Entities/Objects/Tools/welders.yml
Resources/Prototypes/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml
Resources/Prototypes/Entities/Objects/Weapons/Melee/e_sword.yml
Resources/Prototypes/tags.yml
Resources/Textures/Interface/Actions/actions_borg.rsi/meta.json
Resources/Textures/Interface/Actions/actions_borg.rsi/xenoborg-access-breaker-module.png [new file with mode: 0644]
Resources/Textures/Interface/Actions/actions_borg.rsi/xenoborg-basic-module.png [new file with mode: 0644]
Resources/Textures/Interface/Actions/actions_borg.rsi/xenoborg-extinguisher-module.png [new file with mode: 0644]
Resources/Textures/Interface/Actions/actions_borg.rsi/xenoborg-eye-module.png [new file with mode: 0644]
Resources/Textures/Interface/Actions/actions_borg.rsi/xenoborg-hypo-module.png [new file with mode: 0644]
Resources/Textures/Interface/Actions/actions_borg.rsi/xenoborg-jammer-module.png [new file with mode: 0644]
Resources/Textures/Interface/Actions/actions_borg.rsi/xenoborg-laser-module.png [new file with mode: 0644]
Resources/Textures/Interface/Actions/actions_borg.rsi/xenoborg-laser2-module.png [new file with mode: 0644]
Resources/Textures/Interface/Actions/actions_borg.rsi/xenoborg-projector-module.png [new file with mode: 0644]
Resources/Textures/Interface/Actions/actions_borg.rsi/xenoborg-space-movement-module.png [new file with mode: 0644]
Resources/Textures/Interface/Actions/actions_borg.rsi/xenoborg-sword-module.png [new file with mode: 0644]
Resources/Textures/Interface/Actions/actions_borg.rsi/xenoborg-sword2-module.png [new file with mode: 0644]
Resources/Textures/Interface/Actions/actions_borg.rsi/xenoborg-tool-module.png [new file with mode: 0644]
Resources/Textures/Objects/Specific/Robotics/borgmodule.rsi/icon-xenoborg-access-breaker.png [new file with mode: 0644]
Resources/Textures/Objects/Specific/Robotics/borgmodule.rsi/icon-xenoborg-basic.png [new file with mode: 0644]
Resources/Textures/Objects/Specific/Robotics/borgmodule.rsi/icon-xenoborg-cloak.png [new file with mode: 0644]
Resources/Textures/Objects/Specific/Robotics/borgmodule.rsi/icon-xenoborg-fire-extinguisher.png [new file with mode: 0644]
Resources/Textures/Objects/Specific/Robotics/borgmodule.rsi/icon-xenoborg-hypo.png [new file with mode: 0644]
Resources/Textures/Objects/Specific/Robotics/borgmodule.rsi/icon-xenoborg-jammer.png [new file with mode: 0644]
Resources/Textures/Objects/Specific/Robotics/borgmodule.rsi/icon-xenoborg-laser.png [new file with mode: 0644]
Resources/Textures/Objects/Specific/Robotics/borgmodule.rsi/icon-xenoborg-laser2.png [new file with mode: 0644]
Resources/Textures/Objects/Specific/Robotics/borgmodule.rsi/icon-xenoborg-projector.png [new file with mode: 0644]
Resources/Textures/Objects/Specific/Robotics/borgmodule.rsi/icon-xenoborg-space-movement.png [new file with mode: 0644]
Resources/Textures/Objects/Specific/Robotics/borgmodule.rsi/icon-xenoborg-sword.png [new file with mode: 0644]
Resources/Textures/Objects/Specific/Robotics/borgmodule.rsi/icon-xenoborg-sword2.png [new file with mode: 0644]
Resources/Textures/Objects/Specific/Robotics/borgmodule.rsi/icon-xenoborg-tools.png [new file with mode: 0644]
Resources/Textures/Objects/Specific/Robotics/borgmodule.rsi/meta.json
Resources/Textures/Objects/Specific/Robotics/borgmodule.rsi/xenoborg_engi.png [new file with mode: 0644]
Resources/Textures/Objects/Specific/Robotics/borgmodule.rsi/xenoborg_generic.png [new file with mode: 0644]
Resources/Textures/Objects/Specific/Robotics/borgmodule.rsi/xenoborg_heavy.png [new file with mode: 0644]
Resources/Textures/Objects/Specific/Robotics/borgmodule.rsi/xenoborg_scout.png [new file with mode: 0644]
Resources/Textures/Objects/Specific/Robotics/borgmodule.rsi/xenoborg_stealth.png [new file with mode: 0644]