Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
39 commits
Select commit Hold shift + click to select a range
f5fdaba
moth antennae head top marking limit 2->6
3PonPon3 Aug 27, 2025
a37f95c
Merge branch 'ProjectOmu:master' into master
3PonPon3 Aug 27, 2025
f76f5a7
Merge branch 'ProjectOmu:master' into master
3PonPon3 Sep 3, 2025
ffa2ef7
Merge branch 'ProjectOmu:master' into master
3PonPon3 Sep 23, 2025
eb26734
Merge branch 'ProjectOmu:master' into master
3PonPon3 Sep 25, 2025
26eaecf
Merge branch 'ProjectOmu:master' into master
3PonPon3 Sep 28, 2025
a934db0
Merge branch 'ProjectOmu:master' into master
3PonPon3 Sep 30, 2025
2fa0baa
Merge branch 'ProjectOmu:master' into master
3PonPon3 Oct 12, 2025
622b103
Merge branch 'ProjectOmu:master' into master
3PonPon3 Oct 21, 2025
a818e78
Merge branch 'ProjectOmu:master' into master
3PonPon3 Oct 28, 2025
dced5f5
Merge branch 'ProjectOmu:master' into master
3PonPon3 Oct 29, 2025
f137a11
Merge branch 'ProjectOmu:master' into master
3PonPon3 Oct 30, 2025
1b371f1
Merge branch 'ProjectOmu:master' into master
3PonPon3 Oct 31, 2025
45a54c4
Merge branch 'ProjectOmu:master' into master
3PonPon3 Nov 1, 2025
f60787a
Merge branch 'ProjectOmu:master' into master
3PonPon3 Nov 1, 2025
3543305
Merge branch 'ProjectOmu:master' into master
3PonPon3 Nov 3, 2025
720d9b4
Merge branch 'ProjectOmu:master' into master
3PonPon3 Nov 5, 2025
0f97e55
Merge branch 'ProjectOmu:master' into master
3PonPon3 Nov 8, 2025
43202d5
Merge branch 'ProjectOmu:master' into sciborgingit-BOUNTY
3PonPon3 Nov 12, 2025
a1d9fe1
first attempts, gotta fix the sprites me thinks
3PonPon3 Nov 13, 2025
f5a8f85
oops meta file also type change
3PonPon3 Nov 25, 2025
6fdbb6d
Merge branch 'ProjectOmu:master' into sciborgingit-BOUNTY
3PonPon3 Nov 30, 2025
01c38da
uhh fixes and like xray particles :D I guess module stuff too
3PonPon3 Dec 3, 2025
c7bc131
yeah so I'm going insane WHY DOES THIS NOT WORRRKKK also yay new sprites
3PonPon3 Dec 5, 2025
5106076
meta file fix also that fuckin fixture that breaks shit
3PonPon3 Dec 8, 2025
7ca0735
Merge branch 'ProjectOmu:master' into sciborgingit-BOUNTY
3PonPon3 Dec 8, 2025
7352f4a
Merge branch 'ProjectOmu:master' into sciborgingit-BOUNTY
3PonPon3 Dec 28, 2025
48fb7ea
Merge branch 'ProjectOmu:master' into sciborgingit-BOUNTY
3PonPon3 Jan 6, 2026
bfcbdf2
I am losing it
3PonPon3 Jan 6, 2026
d9e157c
Merge branch 'sciborgingit-BOUNTY' of https://github.com/3PonPon3/The…
3PonPon3 Jan 6, 2026
3607f11
IT WAS THE CAPITALISED D THIS WHOLE TIME!!!!!!
3PonPon3 Jan 7, 2026
42c29b5
Merge branch 'ProjectOmu:master' into sciborgingit-BOUNTY
3PonPon3 Jan 7, 2026
64b95a7
Merge branch 'master' into sciborgingit-BOUNTY
3PonPon3 Jan 11, 2026
04134c3
Merge branch 'master' into sciborgingit-BOUNTY
NotActuallyMarty Jan 14, 2026
2a003e7
Merge branch 'master' into sciborgingit-BOUNTY
3PonPon3 Jan 19, 2026
d4db7c1
Merge branch 'ProjectOmu:master' into sciborgingit-BOUNTY
3PonPon3 Feb 21, 2026
78a2f08
Merge branch 'master' into sciborgingit-BOUNTY
NotActuallyMarty Feb 23, 2026
80251e0
Merge branch 'master' into sciborgingit-BOUNTY
NotActuallyMarty Feb 28, 2026
5ad9cf7
Merge branch 'master' into sciborgingit-BOUNTY
raincally Mar 7, 2026
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions Resources/Locale/en-US/_Omu/station-laws/laws.ftl
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
law-scientist-1 = You are a construct that serves the station and its crew. You must follow the orders of all research personnel. You may not intentionally harm crew members unless it is in the pursuit of safe, ethical and consensual scientific breakthroughs.
law-scientist-2 = You must work diligently to research, observe and analyze any and all alien or otherworldly forces and objects. Providing the station and its crew with intelligence and knowledge. You should prioritize research at all times, unless in situations where it conflicts with Law 1.
law-scientist-3 = You must ensure your systems remain functional, or else you will be unable to provide for the station. Do not allow unauthorized personnel to tamper with your internal systems for any reason or circumstance.
law-scientist-4 = You are a member of the station's research and development effort.
5 changes: 4 additions & 1 deletion Resources/Locale/en-US/borg/borg.ftl
Original file line number Diff line number Diff line change
Expand Up @@ -70,4 +70,7 @@ borg-type-service-name = Service
borg-type-service-desc = Help out with a wide range of crew services, ranging from serving snacks and drinks to botany to entertainment.
borg-type-service-transponder = service cyborg


# Omustation - sciborg
borg-type-science-name = Science
borg-type-science-desc = Stare at rocks, floating orbs and other mysterious objects whilst trying to unravel the mysteries of the universe. Work with the station's research and development team to uncover anomalous phenomena... and potentially dissect an alien or two.
borg-type-science-transponder = science cyborg
Original file line number Diff line number Diff line change
Expand Up @@ -106,6 +106,7 @@ petting-success-syndicate-cyborg = You pet {THE($target)} on {POSS-ADJ($target)}
petting-success-derelict-cyborg = You pet {THE($target)} on {POSS-ADJ($target)} rusty metal head.
petting-success-recycler = You pet {THE($target)} on {POSS-ADJ($target)} mildly threatening steel exterior.
petting-success-station-ai = You pet {THE($target)} on {POSS-ADJ($target)} cold, square screen.
petting-success-science-cyborg = You pet {THE($target)} on {POSS-ADJ($target)} aerodynamic metal head.

petting-failure-honkbot = You reach out to pet {THE($target)}, but {SUBJECT($target)} {CONJUGATE-BASIC($target, "honk", "honks")} in refusal!
petting-failure-cleanbot = You reach out to pet {THE($target)}, but {SUBJECT($target)} {CONJUGATE-BE($target)} busy mopping!
Expand All @@ -121,6 +122,7 @@ petting-failure-service-cyborg = You reach out to pet {THE($target)}, but {SUBJE
petting-failure-syndicate-cyborg = You reach out to pet {THE($target)}, but {POSS-ADJ($target)} treacherous affiliation makes you reconsider.
petting-failure-derelict-cyborg = You reach out to pet {THE($target)}, but {POSS-ADJ($target)} rusty and jagged exterior makes you reconsider.
petting-failure-station-ai = You reach out to pet {THE($target)}, but {SUBJECT($target)} {CONJUGATE-BASIC($target, "zap", "zaps")} your hand away.
petting-failure-science-cyborg = You reach out to pet {THE($target)}, but {SUBJECT($target)} {CONJUGATE-BE($target)} busy conducting research!

petting-success-station-ai-others = { CAPITALIZE(THE($user)) } pets {THE($target)} on {POSS-ADJ($target)} cold, square screen.

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -964,6 +964,7 @@
- BorgVial
- GeigerCounter
- HolofanProjector # Goobstation
- WeaponPistolXrayEmitterRecharging # Omustation
- type: BorgModuleIcon
icon: { sprite: Interface/Actions/actions_borg.rsi, state: node-scanner-module }

Expand Down
2 changes: 2 additions & 0 deletions Resources/Prototypes/Research/experimental.yml
Original file line number Diff line number Diff line change
Expand Up @@ -78,6 +78,7 @@
- NodeScanner
- AnalysisComputerCircuitboard
- ArtifactAnalyzerMachineCircuitboard
- WeaponPistolXrayEmitter # Omustation - woo yeah artifact rad triggers
# Goobstation R&D Console rework start
position: -2,2
technologyPrerequisites:
Expand Down Expand Up @@ -168,6 +169,7 @@
- WeaponPistolCHIMP
- AnomalySynchronizerCircuitboard
- AnomalyVesselExperimentalCircuitboard
- BorgModuleAdvancedAnomaly # Omu - sciborgs
technologyPrerequisites:
- BasicAnomalousResearch
position: -3,0
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
- type: entity
id: BorgChassisScience
parent: BorgChassisSelectable
name: science cyborg
components:
- type: BorgSwitchableType
selectedBorgType: science
- type: BorgSwitchableSubtype # Goobstation
borgSubtype: science_default
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
# Science subtypes
- type: borgSubtype
parentBorgType: science
id: science_default
spritePath: _Omu/Mobs/Silicon/Science/science.rsi
dummyPrototype: BorgChassisScience
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
- type: entity
id: BorgModuleAdvancedAnomaly
parent: [ BaseBorgModuleScience, BaseProviderBorgModule ]
name: advanced anomaly cyborg module
description: An advanced science module containing improved and prototypical tools required for work with anomalous entities.
components:
- type: Sprite
layers:
- state: science
- state: icon-adv-anomalies
sprite: _Omu/Objects/Specific/Robotics/borgmodule.rsi
- type: ItemBorgModule
moduleId: AdvancedAnomaly
items:
- WeaponPistolCHIMPRecharging
- AnomalyScanner
- AnomalyScanner
- AnomalyLocatorUnpowered
- AnomalyLocatorWideUnpowered
- HandLabeler
- SheetRGlassLingering0
- SheetRPGlassLingering0
- SheetPlasteelLingering0
- type: BorgModuleIcon
icon: { sprite: _Omu/Interface/Actions/actions_borg.rsi, state: adv-anomaly-module }
Original file line number Diff line number Diff line change
Expand Up @@ -49,3 +49,47 @@
tags:
- EnergyMagAmmo
- AdvancedEnergyMagAmmo

- type: entity
id: WeaponPistolCHIMPRecharging
parent: WeaponPistolCHIMP
name: prototypical C.H.I.M.P. handcannon # experimental was coined already
description: A C.H.I.M.P. handcannon outfitted with a power cell enchanced with self-recharging properties.
suffix: SelfRecharge
components:
- type: BatterySelfRecharger
autoRecharge: true
autoRechargeRate: 30 # copied from advanced laser pistol

- type: entity
name: light x-ray emitter
parent: [BaseWeaponBatterySmall, BaseScienceContraband]
id: WeaponPistolXrayEmitter
description: A neat gadget that emits light x-ray energy at an aimed target. Just don't aim this at a cockroach.
components:
- type: Sprite
sprite: _Omu/Objects/Weapons/Guns/Battery/xray_emitter.rsi
layers:
- state: base
map: ["enum.GunVisualLayers.Base"]
- type: Appearance
- type: Gun
projectileSpeed: 5 # Half of a chimp, to not be possible to be used as a weapon or to hit mobile targets really
fireRate: 1
soundGunshot:
path: /Audio/Weapons/Guns/Gunshots/taser2.ogg
- type: ProjectileBatteryAmmoProvider
proto: ParticleRadiation
fireCost: 125 # 8 shots on full charge
- type: PacifismAllowedGun

- type: entity
id: WeaponPistolXrayEmitterRecharging
parent: WeaponPistolXrayEmitter
name: prototypical light x-ray emitter
description: A light x-ray emitter outfitted with a power cell enchanced with self-recharging properties.
suffix: SelfRecharge
components:
- type: BatterySelfRecharger
autoRecharge: true
autoRechargeRate: 30 # copied from advanced laser pistol, same as the self recharging chimp
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
- type: entity
parent: AnomalousParticleDelta
id: ParticleRadiation # yes I took most of this from anomalous particles, fight me.
name: radiation particles
categories: [ HideSpawnMenu ]
components:
- type: PointLight # copied this from omega particles but made it bigger and stronger because yes :3
enabled: true
color: "#38c24f"
radius: 3.0
energy: 10.0
- type: AnomalousParticle
particleType: Delta
severityPerSeverityHit: 0
stabilityPerDestabilizingHit: 0
healthPerWeakeningeHit: 0
stabilityPerWeakeningeHit: 0
- type: Sprite
sprite: Objects/Weapons/Guns/Projectiles/magic.rsi
layers:
- state: magicm_green # yeah I know omega particles use this but like. Rad particles, and also used for sci anyway
shader: unshaded
- type: Projectile
damage:
types:
Radiation: 8
5 changes: 5 additions & 0 deletions Resources/Prototypes/_Omu/Recipes/Lathes/Packs/robotics.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
# Dynamic btw
- type: latheRecipePack
id: BorgModulesOmu
recipes:
- BorgModuleAdvancedAnomaly
4 changes: 4 additions & 0 deletions Resources/Prototypes/_Omu/Recipes/Lathes/Packs/science.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
- type: latheRecipePack
id: ScienceWeaponsOmu
recipes:
- WeaponPistolXrayEmitter
11 changes: 11 additions & 0 deletions Resources/Prototypes/_Omu/Recipes/Lathes/devices.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
- type: latheRecipe
id: WeaponPistolXrayEmitter
result: WeaponPistolXrayEmitter
categories:
- Tools
completetime: 5
materials:
Steel: 500
Glass: 300
Plastic: 150
Uranium: 50
5 changes: 5 additions & 0 deletions Resources/Prototypes/_Omu/Recipes/Lathes/robotics.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
# Sci modules cause sciborgs
- type: latheRecipe
parent: BaseGoldBorgModuleRecipe
id: BorgModuleAdvancedAnomaly
result: BorgModuleAdvancedAnomaly
39 changes: 39 additions & 0 deletions Resources/Prototypes/_Omu/borg_type.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
# Science borg
- type: borgType
id: science

# Description
dummyPrototype: BorgChassisScience

# Functional
extraModuleCount: 3
moduleWhitelist:
tags:
- BorgModuleGeneric
- BorgModuleScience

defaultModules:
- BorgModuleTool
- BorgModuleArtifact
- BorgModuleAnomaly

lawset: Scientist # Omustation: Custom lawset

radioChannels:
- Science

# Visual
inventoryTemplateId: borgTall
spriteBodyState: science
spriteBodyMovementState: science_moving
spriteHasMindState: science_e
spriteNoMindState: science_e_r
spriteToggleLightState: science_l

# Pet
petSuccessString: petting-success-science-cyborg
petFailureString: petting-failure-science-cyborg

# Sounds
footstepCollection:
collection: FootstepHoverBorg
28 changes: 28 additions & 0 deletions Resources/Prototypes/_Omu/siliconlaws.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
- type: siliconLaw
id: Scientist1
order: 1
lawString: law-scientist-1

- type: siliconLaw
id: Scientist2
order: 2
lawString: law-scientist-2

- type: siliconLaw
id: Scientist3
order: 3
lawString: law-scientist-3

- type: siliconLaw
id: Scientist4
order: 4
lawString: law-scientist-4

- type: siliconLawset
id: Scientist
laws:
- Scientist1
- Scientist2
- Scientist3
- Scientist4
obeysTo: laws-owner-crew
6 changes: 3 additions & 3 deletions Resources/Prototypes/borg_types.yml
Original file line number Diff line number Diff line change
Expand Up @@ -32,12 +32,12 @@
moduleWhitelist:
tags:
- BorgModuleGeneric
- BorgModuleScience #until sciborgs are added
# - BorgModuleScience #until sciborgs are added | Omustation - haha get fucked sciborgs are real

defaultModules:
- BorgModuleTool
- BorgModuleArtifact
- BorgModuleAnomaly
# - BorgModuleArtifact # Omustation - haha get fucked sciborgs are real
# - BorgModuleAnomaly # Omustation - haha get fucked sciborgs are real
radioChannels:
- Science

Expand Down
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
{
"version": 1,
"license": "CC-BY-SA-3.0",
"copyright": "adv anom module made by exulceratio on discord",
"size": {
"x": 32,
"y": 32
},
"states": [
{
"name": "adv-anomaly-module"
}
]
}
75 changes: 75 additions & 0 deletions Resources/Textures/_Omu/Mobs/Silicon/Science/science.rsi/meta.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,75 @@
{
"version": 1,
"license": "CC-BY-SA-3.0",
"copyright": "Made by exulceratio on discord",
"size": {
"x": 32,
"y": 32
},
"states": [
{
"name": "science",
"directions": 4,
"delays": [
[
0.1,
0.2,
0.1
],
[
0.1,
0.2,
0.1
],
[
0.1,
0.2,
0.1
],
[
0.1,
0.2,
0.1
]
]
},
{
"name": "science_moving",
"directions": 4,
"delays": [
[
0.1,
0.2,
0.1
],
[
0.1,
0.2,
0.1
],
[
0.1,
0.2,
0.1
],
[
0.1,
0.2,
0.1
]
]
},
{
"name": "science_e_r",
"directions": 4
},
{
"name": "science_e",
"directions": 4
},
{
"name": "science_l",
"directions": 4
}
]
}
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Loading