Commit Graph

109 Commits

Author SHA1 Message Date
ScarKy0
bfe739e0af Hydroponic trays can now be bought (#36630) 2025-04-16 16:51:00 -07:00
Flareguy
92b0f62500 New Experimental Science T3: Desynchronizer (#35752)
* desynchronizer real

* yaml stuff from slarti branch

* C# stuff

* oops

* review

* improve

---------

Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>
2025-04-16 11:33:39 +10:00
Tiniest Shark
bfac77b53f Add inhands for Holoprojectors, labelers, cone, brb sign, fartbag (#36036)
* Add inhands for Holoprojectors, labelers, cone, brb sign, whoopie cushion

* Update Resources/Textures/Objects/Devices/Holoprojectors/atmos.rsi/meta.json

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

---------

Co-authored-by: ArtisticRoomba <145879011+ArtisticRoomba@users.noreply.github.com>
2025-04-08 23:27:07 +02:00
āda
1b74de6dbb Fix Wizard/Librarian PDA flashlight visual (#36064)
the other light
2025-03-25 02:21:59 +01:00
āda
2bc3561868 Fix misplaced pixel on Wizard/Librarian PDA (#36060)
* nudge that pixel

* new base

* whoops, leftovers
2025-03-25 01:11:04 +01:00
SeamLesss
4bb1a62f22 Add In-hand Sprites for miscellaneous items (#35433)
* guh???

* Merge branch 'master' of https://github.com/SeamLesss/space-station-14

* incomplete baseball bat

* bling

* attribution

* camera bug

* damp rag

* cap cap

* centcom cap

* Update Resources/Textures/Clothing/Head/Hats/capcap.rsi/meta.json
2025-03-19 21:04:41 -04:00
onesch
b3482fd737 Tools/Devices: In-hand Sprites (#33689)
* Adds in-hand sprites to the barber scissors.

* adds in-hand sprites to the floodlight.

* adds in-hand sprites to the gas analyzer.

* adds in-hand sprites to the gps.

* Update copyright wording, linting

* resprite gps inhand sprites.

* adds in-hand sprites to the mass scanner.

* adds in-hand sprites to the spray_painter.

* resprite in-hand sprites to the mass_scanner.

* fix in-hand sprites to the mass_scanner.

* Resprite mass_scanner in-hand sprites.
2025-03-13 01:46:58 +03:00
hivehum
a926c53979 Give the station map inhand sprites (#35605)
map has inhands
2025-03-01 21:31:44 +01:00
Velken
30a6ebdb26 Wizard PDA (#35572)
* wizard PDA

* colour change to brown
2025-03-01 03:12:24 +01:00
Ps3Moira
b2a6d5c1b0 Cabinetification (#34293)
* Resprite Boxes and Icons + Remove Boxes

* Update Meta

* Update Flatpacks

* Update Shotgun Ammo Boxes

* Remove Leftover Ammo Box Icons

* Update Donk Pocket Boxes

* Update Briefcase

* Update Happyhonk + Remove Open Sprites

* Update Medal Case

* Update Cigarette Packs

* Update Cigarette Cartons

* Update Medkits

* fix positioning for medkits

* Update Junk Medkit

* Update Present

* Tweak Rad and Burn Medkits

* Tweak Briefcase

* Update Toolboxes

* Update Decoy Boxes

* Fix Meta for Healing toolbox

* Update Cow tool box

* Update Donut Box

* Removal of left over rubber bullet sprites and duplicate ammo box sprites

* Removal of Duplicate Ammo Boxes

* Update .20 rifle ammo box

* Update .35 ammo box + fix meta

* Update .45 magnum ammo box Sprites

* Update .25 caseless ammo

* Remove leftover box

* Update cargo_service.yml

* Fix Icon Cigs

* fix big .20 ammo box

* Update Black Cigs Pack

* Update Cig Placement

* Update Blue Cigs

* Update Cig Packs

* Re-Add Big Ammo box for the USA guns vending machine lol

* Remove 10x24 mention in migration.yml

* Update Big Cig Cartons

* Remove Toolbox Changes
2025-02-04 00:52:10 -07:00
SlamBamActionman
95328dab68 Add Holy damage (#32755)
* Initial commit

* hoili moili

* now to add sherlock and doctor who

* funny stick

* Oops it was meant to be called metaphysical

* Attribution

* Even BETTER attribution
2024-12-16 16:33:32 +01:00
0tito
de19418126 Add Sprite changes to Logic Gates to show the input/output state (#33277) 2024-12-06 16:35:48 +01:00
Flareguy
3d70cdf23c Various Vaugely Connected Sprite Updates™: Encryption Keys, Station Map, Brig Timer (#32786)
* various resprites (encryption keys + signal screens + station map)

* brig timer update

* fixes n shit
2024-10-30 14:12:49 +11:00
ScarKy0
9873efd514 Adding intellicard functionality. (#32347)
* init

* im so confused

* clean

* sprite update

* :|

* further attempts

* be blessed for it works

* Very prestigious pAI

* cleaning up

* Intellicard in RD locker

* PAIn't

* .Clear()n't

* .Clear()n't for real this time

* Cleaning up

* Whoopsie Daisy
2024-10-22 15:49:39 +02:00
ArchRBX
dd12ac1f8a MedTek Cartridge (#32450)
* initial commit

* adds cartridge to cmo's locker

* tidies up yml, adds default scanner sound, makes it so the silent property silences the scanner sound too

* fixes ert medic pda not having it preinstalled

* adds attribution

* removes redundant dependencies

* fix agent pda

---------

Co-authored-by: archrbx <punk.gear5260@fastmail.com>
2024-10-01 23:17:57 -07:00
ScarKy0
ba68fb2ddb Update binary key to use AI icon (#32327)
* Init

* uplink icon
2024-10-01 14:03:37 +10:00
pofitlo
bad7359aeb Add camera bug (#30250)
* Add camera bug

* Update camera_bug.png

* fix

* change

* Update Resources/Prototypes/Entities/Objects/Devices/Syndicate_Gadgets/camera_bug.yml

Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>

* Update Resources/Prototypes/Catalog/uplink_catalog.yml

---------

Co-authored-by: Ed <96445749+TheShuEd@users.noreply.github.com>
Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>
2024-10-01 00:24:36 +02:00
ArchRBX
241be37185 AstroNav GPS Cartridge (#32194)
* initial commit

* adds astronav cartridge to QM locker

* changes requested in review

* fix merge conflicts

* fixes the statuscontrol disappearing if you eject the cartridge but still have it installed

* fix notificationsenabled on salv pda proto

* fixes lingering statuscontrol on eject while held

---------

Co-authored-by: archrbx <punk.gear5260@fastmail.com>
2024-09-24 19:02:51 +02:00
Эдуард
1468cbdb8a Wanted list cartridge (#31223)
* WantedListCartridge has been added

* WantedListCartridge user interface works

* WantedListCartridge is added as standard in some PDAs

* The CriminalRecordsSystem can now also take into account who created the record

* Added offense history table

* Fix of missing loaderUid for a cartridge without installing the program

* Added personalized information about the target

* The crime history has been finalized

* Added StatusList

* The officer's name has been added to the automatic history

* WantedListCartridge has been added to the HOS locker

* WantedListCartridge has been removed from brigmedic's preset programs

* The StealConditionSystem now takes into account whether a cartridge is inserted or installed

* Added target to thief on WantedListCartridge

* Merge fix

* Removing copypaste

* Fix merge 2

* The sprite of WantedListCartridge has been changed

* Update pda.yml

* Fix scrollbar in the history table

* Upstream localization fix

* `StatusList` has been replaced by `ListContainer` with `TextureRect`

* Margin fix
2024-09-19 12:22:02 +02:00
ArtisticRoomba
65329ab38d Change the binary translator key's contraband designation to syndicate contraband + minor sprite change for consistency (#32193)
* adds new icon, changes binary key icon and frame, changes contraband designation

* added back the regular key as admeme because it makes sense (why am I not thinking about these things)

* hehe I cannot read!
2024-09-16 12:01:49 +02:00
metalgearsloth
afd0618a60 Station AI (#30944)
* Station AI overlay

* implement

* Bunch of ports

* Fix a heap of bugs and basic scouting

* helldivers

* Shuffle interactions a bit

* navmap stuff

* Revert "navmap stuff"

This reverts commit d1f89dd4be83233e22cf5dd062b2581f3c6da062.

* AI wires implemented

* Fix examines

* Optimise the overlay significantly

* Back to old static

* BUI radial working

* lots of work

* Saving work

* thanks fork

* alright

* pc

* AI upload console

* AI upload

* stuff

* Fix copy-paste shitcode

* AI actions

* navmap work

* Fixes

* first impressions

* a

* reh

* Revert "navmap work"

This reverts commit 6f63fea6e9245e189f368f97be3e32e9b210580e.

# Conflicts:
#	Content.Client/Silicons/StationAi/StationAiOverlay.cs

* OD

* radar

* weh

* Fix examines

* scoop mine eyes

* fixes

* reh

* Optimise

* Final round of optimisations

* Fixes

* fixes
2024-08-28 10:57:12 +10:00
deltanedas
ad691931c6 add memory cell and rework logic construction (#24983)
* rework construction to be deconstructable, add memory cell

* update textures

* add code

* add memory cell and ports, empty circuit

* d

---------

Co-authored-by: deltanedas <@deltanedas:kde.org>
2024-08-18 16:34:43 -06:00
slarticodefast
448f3804e6 Remove duplicate cartridge rsi (#30498)
remove duplicate cartridge rsi
2024-08-02 16:14:50 +10:00
Ilya246
d5236d8236 give nukie reinforcements full operative gear (#30173)
* rebase master

* free fish

* introduce recommended changes

* fix prototypes

* fix protos yet again

* fkhsdjbhehbo;ehb

* rafle
2024-07-25 16:37:54 -07:00
Nemanja
49096cf14f Watches (#29550)
* watches

* rename

* add it into loot pools
2024-07-13 16:09:19 +10:00
Pieter-Jan Briers
c1ad5cded0 Fix gay nuke layering (#29410)
I fucked up while exporting from aseprite whoops.
2024-06-24 20:01:24 +02:00
Verm
68807cb25e Changes all the uplink ally icons to be a combination of the mob + radio (#28954)
* New Icons!

* Better meta info
2024-06-14 17:44:23 -04:00
Pieter-Jan Briers
ba6853d386 It is pride month, nukies. You know what that means. (#28992)
* Make the nuke gay

* I forgot to commit the gay

* Add pride month

* Use holiday visualizer for nuke

* Fix pride month

* Trans too
2024-06-14 19:22:01 +02:00
Moomoobeef
adad6b2b04 cargo can now order fax machines (#28968)
* cargo can now order fax machines

* removed fax manual
2024-06-14 16:24:18 +10:00
Ramlik
db555a7c79 Add a handy security radio (#25913)
* Add a handy security radio

I've always wanted to have a handy security radio in game and I thought it would be cool to have one in game.

Demonstation can be found in here: https://youtu.be/VQOLiTQAmKc

* Merged radio files and changed sprite location

* Fixed RSI not having license and copyright

* Added a chance to spawn in security closets

All security closets will have 50% chance to spawn a handy security radio in it

* Update radio id

Co-authored-by: lzk <124214523+lzk228@users.noreply.github.com>

* Change id in locker spawn

* Change id in locker spawn

* Changed id to RadioHandheldSecurity as suggested

* Add radio to vending machine instead of locker

Removed radio from lockers and added it to security vending machine

* Fixed radio not having a sprite

---------

Co-authored-by: lzk <124214523+lzk228@users.noreply.github.com>
2024-04-27 23:27:18 +10:00
beck-thompson
d3b1178428 Radio jammer update! (#25912)
* Added selectable power level to radio jammer

* Cleaned up OnGetVerb

* Settings are now stored in the .yml file. Simplified stuff a lot!

* Minor fixes!

* Small little baby fix :)

* Added the power level switch to the examine menu and also removed the ftl file as it was in the incorrect location.

* Minor code cleanup

* Changed byte -> int

* Update sprite

* Fixed licence

* Added power LED that changes if the jammer is on low power.

* Removed tabs

* Changed github link to the commit

* Changed all the RemComp to RemComDeferred

* Moved NetworkedComponent to shared

* Changed radio jammer textures back with minor edits

* Added a space because it was annoying me

* Jammer now updates range for suit sensors properly! Thanks nikthechampiongr :)

* Removed useless comment

* Cleaned up code that updates the range of tracking devices.

* Fixed client namespace and removed newline

* Cleaned up ChangeLEDState and ChangeChargeLevel.

* Added comments

* Read only

* Fixed another comment

* Locked in

* Made server inherit shared

* Update Content.Shared/Radio/EntitySystems/SharedJammerSystem.cs

* Update Content.Shared/Radio/EntitySystems/SharedJammerSystem.cs

* review fixes

---------

Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>
2024-04-25 12:19:16 +10:00
pigeonpeas
c129bb177c Allow the purchase of emitters from cargo. (#27229)
add emitter crates back to cargo + changes the contents of an emittercrate from emitter to emitterflatpack

👍
2024-04-23 21:34:09 +10:00
Flareguy
66f32d4289 Partially reverts the remote signaller resprite (#27073)
de-sprites the remote signaller
2024-04-17 21:16:48 -04:00
deltanedas
395c33024c prop hunt ss14 (real) (#26691)
* texture appropriation

* add code for projector

* add chameleon projector yml

* damage and actions

* prevent small props being killed round removing you (700 damage from a single shot)

* tweak default

* oop

* do appearance properly, need engine update

* fix bugs, blacklist pda

* remove status icons

* amou

* sus

* fix test + make props fast

* amouuuung

* remove funny log

---------

Co-authored-by: deltanedas <@deltanedas:kde.org>
2024-04-17 14:48:35 -07:00
Pieter-Jan Briers
89db4409a4 Remove CRLF, enforce with workflow (#26401)
* Check for CRLF in actions workflow

Make emisse weep

* Copy paste bottom text

* I would like to thank StackOverflow for this spite PR.

* Mention file name in message because the workflow tab doesn't display it.

* dos2unix everything
2024-03-24 22:06:17 +01:00
lzk
ec28e777c1 Remake cargo orders to contains flatpacks (#25647)
* Remake cargo orders to contains flatpacks

* whoop

* grounging plamsa
2024-02-28 17:02:02 -05:00
lzk
326b890318 Little rework of existing yaml flatpacks (#24814)
* Little rework of existing yaml flatpacks

* comit 2

* 55

* 66

* 77

* WRAAAA

* done mr sloth

* Update flatpack.yml

* fix??
2024-02-21 21:44:22 -05:00
Pieter-Jan Briers
71713fdebf Fix missing line in nuke exploding sprite (#25351)
I could've sworn I corrected this before committing but guess not ???
2024-02-17 15:46:38 -05:00
Pieter-Jan Briers
3a45d519dc Nuke fancification (#25297)
Actually use more icon states for deployed/armed/about to explode

Also unlit layer.

Also examine text
2024-02-15 16:26:45 -08:00
Ed
4d7fd1cace Anomaly Synchronizer + Signallers tweaks (#24461)
* content

* nerf

* fix rsi
2024-02-13 17:19:22 -05:00
Pieter-Jan Briers
c25ddfd638 Health analyzers now show if somebody is starving (#24789)
"why are they getting cold damage" THERE YOU GO
2024-02-01 17:28:17 +11:00
Nemanja
fdd18c9ae4 Quantum Spin Inverter (#23756) 2024-01-09 00:37:55 -07:00
Ilya246
154416787e add syndicate singularity beacon (#18486)
* implement singulo attraction

* add attractor syndie item

* cleanup

* fix name/desc

* actually fix name

* singulo toolbox no longer whitelisted

* add custom sprite, overhaul prototype

* address review

* beacon real

* webedit 1

* webedit 2

* webedit 3

* permalink to copyright

---------

Co-authored-by: deltanedas <39013340+deltanedas@users.noreply.github.com>
2024-01-06 00:21:24 -08:00
Ed
0f8c004a2f Teslaloose and Singuloose counterplay (#23444)
* add tesla dissapear mechanic
add field holobarrier

* add PD

* add crafting

* spacing

* added to cargo

* Fix

* resprite + damageable

* oopsie

* Update Resources/Prototypes/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml

Co-authored-by: Kara <lunarautomaton6@gmail.com>

* Update Resources/Prototypes/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml

Co-authored-by: Kara <lunarautomaton6@gmail.com>

* Update Resources/Locale/en-US/research/technologies.ftl

Co-authored-by: Kara <lunarautomaton6@gmail.com>

---------

Co-authored-by: Kara <lunarautomaton6@gmail.com>
2024-01-04 18:48:09 -08:00
Nemanja
1c11332fa4 Flatpacks and the Flatpacker 1001 (#23338)
* Flatpacker and flatpacks

* ok that's good enough

* convert solars/AME to flatpacks

* mats, mats, we are the mats

* basic mechanics are DONE

* thing

* final UI

* sloth

* rped jumpscare

* rename
2024-01-03 17:16:02 +11:00
Ubaser
c154f0bf29 Darken equipped PDA sprites (#23197)
add
2023-12-29 21:22:29 -05:00
Nemanja
99d78c4b97 Station beacons (#23136)
* Station beacons

* crate

* remove navmap from warp points

* ack

* oh damn

* okay emisser
2023-12-28 17:02:21 -07:00
Chief-Engineer
476ea14e8a Add access logs (IC ones) (#17810) 2023-12-26 18:24:53 -04:00
Nemanja
00813171c1 Automatic holiday sprites (#22929) 2023-12-24 23:52:43 -07:00
Ed
144af233c4 New Thief minor antagonist (#21520)
* start working

* add right-click thief antagins
some architecture restruct

* add meh thief greeting audio

* add thief subgamemode to Traitors gamemode

* add late join thief (not tested yet)
add briefing

* add pacifism

* add Steal tasks to thief

* fix crash thief+traitor on person

* add new condition: collection steal

* add tracking of succes collection objective

* add stamp collection target
remove some boring steal target
add check pulling entity to collection target

* finalize first 2 group objective

* start merging stealing objective systems

* merging

* finish merging. Now traitor steal objective work better

* we don't check the items of pullable sentient entity

* clear naming, enable thief signle item objective start

* objective pack add

* finish with steal item objectives

* convert string to ProtoId<>

* some clean up

* add thieves to revolution game mode

* Update Resources/Locale/en-US/game-ticking/game-presets/preset-thief.ftl

Co-authored-by: Flareguy <78941145+Flareguy@users.noreply.github.com>

* Update Resources/Locale/en-US/game-ticking/game-presets/preset-thief.ftl

Co-authored-by: Flareguy <78941145+Flareguy@users.noreply.github.com>

* update pacifism: fix crashing, monkey-thief without pacified

* adaptive animal briefing, cleaning locales

* add structure steal objectives

* remove RCD target

* add thiefs to manifest, but bug with traitor duplications

* add escape objective

* add chat briefing

* setup animal objective group system

* add animal steal objectives

* add animal objectives notroleconditions

* add morty

* now thief mode has a chance of not launching Now there are a random number of thieves per round from 1 to 3

* 6 hours of trying to fix duplicate tasks. Failure

* added thief pinpointer (buggy)

* start thief backpack UI work

* revert pinpointer for scope reason

* UI continue work

* add thief starter kits content

* remove ERP kit :trollface:

* finally! giving starting items to thief. Now it playable, but still need more work

* clean up

* fix

* fox

* add merged items into thief
new Starting Kit (buggy)

* fix YES antag menu

* objection tweaks

* remove hearts objective, working on spawning things from toolbox

* smug

* fixes

* add race specifier objective condition LAMPS

* meh

* fix fix fix

* the alive

* Adding stamps

* Update backpack.ftl

* Revert1

* Revert ftl

* add voice mask to communicator kit

* Update Resources/Locale/en-US/administration/antag.ftl

Co-authored-by: Colin-Tel <113523727+Colin-Tel@users.noreply.github.com>

* Update Resources/Locale/en-US/game-ticking/game-presets/preset-thief.ftl

Co-authored-by: Colin-Tel <113523727+Colin-Tel@users.noreply.github.com>

* Update Resources/Locale/en-US/thief/backpack.ftl

Co-authored-by: Colin-Tel <113523727+Colin-Tel@users.noreply.github.com>

* Update Resources/Locale/en-US/objectives/conditions/steal.ftl

Co-authored-by: Colin-Tel <113523727+Colin-Tel@users.noreply.github.com>

* Update Resources/Locale/en-US/thief/backpack.ftl

Co-authored-by: Colin-Tel <113523727+Colin-Tel@users.noreply.github.com>

* Update Resources/Locale/en-US/thief/backpack.ftl

Co-authored-by: Colin-Tel <113523727+Colin-Tel@users.noreply.github.com>

* Update Resources/Locale/en-US/thief/backpack.ftl

Co-authored-by: Colin-Tel <113523727+Colin-Tel@users.noreply.github.com>

* Update Resources/Locale/en-US/thief/backpack.ftl

Co-authored-by: Colin-Tel <113523727+Colin-Tel@users.noreply.github.com>

* Update Resources/Locale/en-US/prototypes/roles/antags.ftl

Co-authored-by: Colin-Tel <113523727+Colin-Tel@users.noreply.github.com>

* Update Resources/Locale/en-US/thief/backpack.ftl

Co-authored-by: Colin-Tel <113523727+Colin-Tel@users.noreply.github.com>

* update

* fix

* more reusable function, add documentation

* fix doc

* faint fixes

---------

Co-authored-by: Flareguy <78941145+Flareguy@users.noreply.github.com>
Co-authored-by: Colin-Tel <113523727+Colin-Tel@users.noreply.github.com>
2023-12-24 02:58:28 -07:00