Rinary
591a3c4a50
Новые предметы, фикс супер материи, правки ( #515 )
...
* permission changes
* super matter changes
* NT backpack energy dome
* energy dome is contraband
* fix singularity
* upd
* upd supermatter
* reflector
* upd
* upd
* add meta.json
* fix announcement
* upd
* fix rsi
* fix ids
* return checking for double actions
* fix hydro assembly
* fix x2 hydroponics and chemistry airlock
* upd
* У всех хардсьютов временно забран пнв(переработка хардсьютов под пнв момент)
* peace parts
* clown parts
* upd parts meta
* akms bigger price
* fix
* fix x2
* add clown, peace parts
---------
Co-authored-by: darkrell <rc-alh@outlook.com>
2024-10-30 10:19:36 +03:00
Rinary
42f9ac0dbd
Ребаланс Мехов ( #482 )
...
* Initial commit
* mechs has reflect
* all mechs has powercagehigh
* mechs can only powered by power cages
* powercages on protolathes
* magboots on mechs
* fire cost upped x2
* battery on guns has 200 energy by basic, adds ion gun
* mecha x-ray gun add
* mecha vindictor here
* added amlg 90
* added uvm31
* localization
* burst fire on Ultra
* fix vindictor no desc
* mech has prying
* add scale 1.08
* add scale 1.08 to combat mechs
* Mechs has collision
* buff chain sword
* upd
* some fixes
* fix weapon charging
* Fix UVM-31 "Drake" Sound and Proto particle
* Fix Mech collision, mechs can't stop peoples any more(some thing issues creates if collision is on)
* AMLG90 Has bigger damage
* Stunner uses hos stun spread
---------
Co-authored-by: SlamBamActionman <slambamactionman@gmail.com>
2024-10-10 20:11:43 +03:00
VigersRay
c8e9b7bbf4
Merge remote-tracking branch 'refs/remotes/wizards/master'
...
# Conflicts:
# Content.Server/GameTicking/GameTicker.Spawning.cs
# Content.Server/Players/PlayTimeTracking/PlayTimeTrackingSystem.cs
# Content.Server/Roles/RoleSystem.cs
# Content.Server/Silicons/Laws/SiliconLawSystem.cs
# Content.Server/Station/Systems/StationSpawningSystem.cs
# Resources/Prototypes/Entities/Objects/Fun/pai.yml
# Resources/Prototypes/GameRules/midround.yml
# RobustToolbox
2024-10-10 19:09:17 +03:00
beck-thompson
384ff7e8f6
Add pumpkin pie! ( #32623 )
...
* first commit
* Licence fix
* rosysyntax licence change (permission granted!)
* simplify
* Better wording
2024-10-09 10:29:41 +11:00
VigersRay
940710da9e
Merge remote-tracking branch 'refs/remotes/wizards/master'
...
# Conflicts:
# Resources/Prototypes/Catalog/Fills/Lockers/heads.yml
# Resources/Textures/Tiles/attributions.yml
# Resources/Textures/Tiles/green_circuit.png
# Resources/Textures/Tiles/steel.png
2024-10-02 15:50:00 +03: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
TakoDragon
542817807d
Red circuit floor ( #32557 )
...
* red circuit added
* index colour begone
2024-10-01 23:35:48 -06:00
VigersRay
b1cac7e781
Merge remote-tracking branch 'refs/remotes/wizards/master'
...
# Conflicts:
# Content.Client/Chat/Managers/IChatManager.cs
# Content.Client/IoC/ClientContentIoC.cs
# Content.Server/Administration/Systems/BwoinkSystem.cs
# Content.Server/Chat/Managers/ChatManager.cs
# Content.Server/GameTicking/GameTicker.Player.cs
# Resources/Audio/Machines/attributions.yml
# Resources/Locale/en-US/_strings/administration/commands/custom-vote-command.ftl
# Resources/Locale/en-US/_strings/discord/vote-notifications.ftl
# Resources/Locale/en-US/_strings/npc/firebot.ftl
# Resources/Locale/en-US/_strings/paper/syndicate-business-card.ftl
# Resources/Locale/en-US/_strings/store/uplink-catalog.ftl
# Resources/Prototypes/Entities/Objects/Specific/Robotics/borg_modules.yml
# Resources/Prototypes/Recipes/Crafting/bots.yml
# Resources/Textures/Objects/Misc/bureaucracy.rsi/meta.json
# Resources/Textures/Structures/Walls/solid.rsi/reinf_over0.png
2024-10-02 06:45:10 +03:00
Rinary
e39dfe9e64
Мехи ( #415 )
...
* initial commit
* some sprites
* mech weapons
* syndi mechs to nuke ops uplink
* some loadouts to Nanotrasen mechs
* spawn mark filled mechs
* construction graphs
* researchable mechs
* i forgor
* locale changes
* aaa
* minor translate(big, later)
* fix items in hands
* fix
* upd translate
* translate electronics
* translate mech weapons
* translate
* translate const
* fix rsi
* fix
* fix
---------
Co-authored-by: NULL882 <gost6865@yandex.ru>
Co-authored-by: VigersRay <vigersray@gmail.com>
2024-10-02 06:39:12 +03: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
pofitlo
2f286afd95
Syndicate business card ( #32162 )
...
* add card
* Update Resources/Locale/en-US/paper/syndicate-business-card.ftl
Co-authored-by: lzk <124214523+lzk228@users.noreply.github.com>
* fix
* Update Resources/Prototypes/Entities/Objects/Misc/business card.yml
Co-authored-by: Эдуард <36124833+Ertanic@users.noreply.github.com>
* add logo
* swap the "funny 'c'"
* improve logo (a little) and also fight with the funny 'c'
* fix
* oh... i think... mabe i done with this?...
* add
* smaller cards
* fix
* Update synicate_card.png
* fix typo
* fix
* fix
* Update Resources/Prototypes/Entities/Objects/Misc/business_card.yml
---------
Co-authored-by: lzk <124214523+lzk228@users.noreply.github.com>
Co-authored-by: Эдуард <36124833+Ertanic@users.noreply.github.com>
Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>
2024-09-30 22:44:44 +02:00
VigersRay
0a91b468b4
Merge remote-tracking branch 'refs/remotes/wizards/master'
...
# Conflicts:
# Content.Client/VoiceMask/VoiceMaskNameChangeWindow.xaml.cs
# Content.Client/Voting/UI/VotePopup.xaml.cs
# Content.Client/Voting/VoteManager.cs
# Content.Server/Chat/Systems/ChatSystem.cs
# Content.Server/Power/EntitySystems/BatterySystem.cs
# Content.Server/Radio/EntitySystems/RadioSystem.cs
# Content.Server/VoiceMask/VoiceMaskComponent.cs
# Content.Server/VoiceMask/VoiceMaskSystem.Equip.cs
# Content.Server/VoiceMask/VoiceMaskSystem.cs
# Content.Server/VoiceMask/VoiceMaskerComponent.cs
# Content.Server/Voting/Managers/VoteManager.DefaultVotes.cs
# Content.Server/Voting/Managers/VoteManager.cs
# Content.Shared/VendingMachines/SharedVendingMachineSystem.cs
# Content.Shared/Voting/MsgVoteData.cs
# Resources/Prototypes/Catalog/Fills/Lockers/heads.yml
# Resources/Prototypes/Recipes/Crafting/crates.yml
# Resources/Prototypes/Recipes/Crafting/improvised.yml
2024-09-26 20:17:14 +03:00
Rinary
0690d5c781
Генератор Супер материи ( #399 )
...
* init
* Stupid shit code here
* upd locale
* upd loc
* fix announcements
* fix traitor loc
2024-09-26 20:09:27 +03:00
Rinary
c826b076bb
Энергетические щиты ( #404 )
...
* setup codebase
* add content
* cococontent!
* i try to understand git, and fix merge conflict.
* clean up
* fix attribution
* wtf?
* reuse PowerCellDraw
* reuse UseDelay
* minor clean up
* fix ugly hack
* change bad sound license
* integrate devicenetwork system, some fixes
* add medium-size circle barrier
* deltanedas 3/4 fix
* check fixes
* check fix 2
* remove HoS barrier, add CE barrier. sorted some function
* increase craft cost turtle, remove CE barrier, add Maxim barrier, move syndie barrier to Nuke uplink only
* Shitcode update! Add support to wire network energy shield
* some clean up + BIG dome sprite
* just checking slowdown field
* translate
* refactoring to current ver
* Я даун
* buff energy shields
* fix linter
---------
Co-authored-by: Ed <edwardxperia2000@gmail.com>
Co-authored-by: Ed <96445749+TheShuEd@users.noreply.github.com>
2024-09-26 20:09:00 +03: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
Cojoke
3d2aadde1f
L6 Fits in the Suit Storage Slot ( #30525 )
...
* L6 Fits in the Suit Storage Slot
* 5x4 item
2024-09-23 16:48:58 +10:00
Ed
2ea54b1913
Flora anomaly seeds ( #31987 )
...
* content
* Update meta.json
* Update mobspawn.yml
* Update mobspawn.yml
* Update Resources/Prototypes/Entities/Objects/Consumable/Food/produce.yml
* Update Resources/Prototypes/Entities/Objects/Consumable/Food/produce.yml
* Update Resources/Prototypes/Entities/Objects/Specific/Hydroponics/seeds.yml
* Update Resources/Prototypes/Entities/Effects/mobspawn.yml
---------
Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>
2024-09-21 21:54:56 +02:00
VigersRay
73c323bd9a
Merge remote-tracking branch 'refs/remotes/wizards/master'
...
# Conflicts:
# Content.Client/Lobby/UI/LobbyGui.xaml
# Resources/Textures/Objects/Misc/bureaucracy.rsi/meta.json
# Resources/Textures/Objects/Misc/bureaucracy.rsi/paper_stamp-psychologist.png
2024-09-21 06:29:09 +03:00
cohanna
e964e9c98e
Psychologist's Stamp ( #31881 )
...
* added sprite and began implementation
* fixed sprite name, fixed meta files
* silly whitespace
* added paper-stamp file
* figured out where to add the componet, added 'credits'
* spelling is hard
* hmm
* GAHHHHH
* how did i do this again
2024-09-20 16:42:57 +02:00
VigersRay
47cdabdaed
Merge remote-tracking branch 'refs/remotes/wizards/master'
...
# Conflicts:
# Content.Shared/StatusEffect/StatusEffectsSystem.cs
# Resources/Audio/Effects/attributions.yml
# Resources/Locale/en-US/_strings/anomaly/inner_anomaly.ftl
# Resources/Prototypes/Catalog/Fills/Lockers/heads.yml
# Resources/Prototypes/Entities/Mobs/Species/base.yml
# Resources/Prototypes/Entities/Objects/Devices/Syndicate_Gadgets/reinforcement_teleporter.yml
# Resources/ServerInfo/Guidebook/Service/FoodRecipes.xml
2024-09-19 16:09:00 +03: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
Rinary
64f1aed90c
Большие изменения ( #345 )
...
* init
* мать масштаба тарабанил
* fix
* upd
* upd
* upd
* upd
* upd
* console spam fix
* hohohohohohohooooonkeeeeeeeeeeeeeerrrrrrrrrrrsssssssss........
* fix
* fix
* upd
* upd
* some fixes
* fix
* upd
* upd translation for steal obj
* teg translate
* upd
* fix locale + add advertisements
* translate configurator
* Fully translate
* upd
* Я манал это переводить, позже переведу
* upd en-US
* fix Linter
* upd
* fix
* upd
* fix
* fix
* fix
* Возврат ПНТ
* remove agent non silent equipment
* add acid to uplink
* carrySystem new popups
* fix
* fix
* fix disease locale
* add Disease Guide
* upd locale
* upd
* Revert "Merge branch 'master' of https://github.com/space-wizards/space-station-14 into misc"
This reverts commit 4130d241fc47fb80924c0dd3b9c9a2db85af8a25, reversing
changes made to 30abf7341ecce404f61f64e2000ad327964fcb00.
* Revert "Merge branch 'master' of https://github.com/space-wizards/space-station-14 into misc"
This reverts commit 4e5a50d21c29be8482f31e49db253b1ed17a0ae4, reversing
changes made to 449cd7bfd50f29eb653e68ba60e3f0b9310f0443.
* Revert "Merge branch 'master' of https://github.com/space-wizards/space-station-14 into misc"
This reverts commit a4679665ef441d4b63a92dc3c4e217e2cdedbc16, reversing
changes made to a80ef96cfbbc3cc737045e41a2f063a0910bf1ce.
* Revert "Merge branch 'master' of https://github.com/space-wizards/space-station-14 into misc"
This reverts commit 94f585756bb27d10a1be7fab1f340d79b7c0a213, reversing
changes made to 906d18a3f66eaed73f3a894d70971872904fad4e.
* Revert "Merge branch 'master' of https://github.com/space-wizards/space-station-14 into misc"
This reverts commit d0a7c6436ba5c175b0e00d69f495ba51f9aac645, reversing
changes made to e7933332274b336af1fc2a960264bc546c95d208.
# Conflicts:
# Resources/Prototypes/Entities/Objects/Misc/identification_cards.yml
# Resources/Prototypes/Roles/Jobs/departments.yml
* fix
* upd
* upd
* Reapply "Merge branch 'master' of https://github.com/space-wizards/space-station-14 into misc"
This reverts commit 042a3f112bbc32a622108475ac28081eb0bbbf9f.
# Conflicts:
# Content.Server/Dragon/DragonRiftSystem.cs
# Content.Server/GameTicking/GameTicker.Spawning.cs
# Content.Server/Shuttles/Systems/EmergencyShuttleSystem.cs
# Content.Server/Shuttles/Systems/ShuttleSystem.FasterThanLight.cs
# Content.Server/Spawners/EntitySystems/ContainerSpawnPointSystem.cs
# Content.Server/Zombies/ZombieSystem.cs
# Content.Server/_Sunrise/NPCSleep/NPCSleepSystem.cs
# Resources/Changelog/Changelog.yml
# Resources/Locale/en-US/_strings/store/uplink-catalog.ftl
# Resources/Prototypes/Catalog/VendingMachines/Inventories/secdrobe.yml
# Resources/Prototypes/Entities/Clothing/Head/hardsuit-helmets.yml
# Resources/Prototypes/Entities/Clothing/Head/helmets.yml
# Resources/Prototypes/Entities/Mobs/Player/silicon.yml
# Resources/Prototypes/Entities/Objects/Misc/identification_cards.yml
# Resources/Prototypes/Entities/Stations/base.yml
# Resources/Prototypes/Loadouts/Jobs/Security/security_officer.yml
# Resources/Prototypes/Loadouts/loadout_groups.yml
# Resources/Prototypes/Maps/box.yml
# Resources/Prototypes/Maps/core.yml
# Resources/Prototypes/Maps/fland.yml
# Resources/Prototypes/Maps/marathon.yml
# Resources/Prototypes/Maps/meta.yml
# Resources/Prototypes/Maps/packed.yml
# Resources/Prototypes/Roles/Jobs/departments.yml
# Resources/Prototypes/Store/categories.yml
# Resources/ServerInfo/Guidebook/Engineering/PortableGenerator.xml
# Resources/ServerInfo/Guidebook/Security/Defusal.xml
# Resources/ServerInfo/Guidebook/Security/Forensics.xml
# Resources/migration.yml
* Reapply "Merge branch 'master' of https://github.com/space-wizards/space-station-14 into misc"
This reverts commit 2860e1d217a71be0c29684e020b2278c3f08685f.
# Conflicts:
# Resources/Changelog/Changelog.yml
* Reapply "Merge branch 'master' of https://github.com/space-wizards/space-station-14 into misc"
This reverts commit 0dc7ea17e23d844ce93118db7812b844e36dda4f.
# Conflicts:
# Resources/Changelog/Changelog.yml
# Resources/Prototypes/Hydroponics/randomMutations.yml
* Reapply "Merge branch 'master' of https://github.com/space-wizards/space-station-14 into misc"
This reverts commit 439926b3c60e95cc2e701d84a032b17471a7c18e.
* Reapply "Merge branch 'master' of https://github.com/space-wizards/space-station-14 into misc"
This reverts commit 14160ab99909bf6b6f996f415d9dcfd5d4addbba.
# Conflicts:
# Resources/Changelog/Changelog.yml
* fix
* upd
* upd uplink
* upd
* fix linter
2024-09-16 19:05:38 +03:00
VigersRay
37974216d5
Merge remote-tracking branch 'refs/remotes/wizards/master'
...
# Conflicts:
# Resources/Prototypes/Catalog/uplink_catalog.yml
2024-09-16 15:21:56 +03: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
VigersRay
aa38c32b65
upstream
2024-09-16 12:40:23 +03:00
pofitlo
ffc3912863
Syndicate teleporter ( #376 )
2024-09-16 11:09:57 +03:00
xprospero
aa6d5f9573
Rubber chicken toy ( #29637 )
...
* -added rubber chicken toy
* -Removed faulty SolutionContainerManager type
-Replaced default toy squeak sound with rubber chicken sound for on-trigger and on-collide.
* fixed raw material cost
* adjusted material composition
* - Added rubber chicken to CrateFunToyBox
- Added rubber chicken to MaintFluffTable under "uncommon group" so that it will spawn in maintenance
* Update Resources/Prototypes/Entities/Objects/Fun/toys.yml
---------
Co-authored-by: gambesun <116504990+gambesun@users.noreply.github.com>
Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>
2024-09-16 01:57:53 +02:00
slarticodefast
0d40b0b3e0
Add extradimensional orange, holymelon, meatwheat, worldpeas mutations ( #27624 )
...
* new mutations
* translation string fix
* add haloperidol to plant
* fix
* add FoodSequence
* food sequence fixes
2024-09-14 00:02:54 +10:00
Nemanja
e510504596
Hivelord mob ( #31322 )
...
* Hivelord
* make it longah
2024-09-11 09:52:27 -04:00
IProduceWidgets
62f268cbb0
Impliment visitor ID, reorganize shuttle event and ghost role yml, standardize many visitor roles, add more unknown shuttles. ( #28098 )
...
* Add Protagonists
* Give visitors the right PDA at least, we need that RP value.
* tidy up
* spell check my beloved
* Everything about jobs have the same id names ahhhh!
* s
* rarity scarity.
* Update Resources/Locale/en-US/ghost/roles/ghost-role-component.ftl
Co-authored-by: Tayrtahn <tayrtahn@gmail.com>
* cargo event now no has cargo access doors.
* break everything.
* still WIP, please excuse.
* finish all role loadouts
* extra roles, fix up grids, special pdas.
* Ghost role descriptions and mime powers
* rest of the fucking owl
* I tripped.
* I also fell.
* Fix the broken entity storage?
* hide mess under rug
* Stuff the rest of the mess into a closet.
* I forgor a spinny majig.
* a small lighting tweak.
* 1984 shuttles to new pr.
* 1984 shuttles to new pr 2 electric boogaloo
* poke the tests
* Revert "1984 shuttles to new pr 2 electric boogaloo"
This reverts commit b2ea7053b73cb17b59f8a80b23978a04a6a45a56.
* cowboy boot cleanup
* tableify
* antagimmunities
* Should be functional.
* vox safing
* un1984 clowns I guess
* oops forgor one
* misplaced file
* misplaced file v2
* weird test fail but okay
* Shuttles rarer
* Shuttle testing, fans, and power sanity. Also return of the syndie evac.
* le balance
* no write over fancy paper
* rerun tests
---------
Co-authored-by: Tayrtahn <tayrtahn@gmail.com>
2024-09-10 00:40:00 -06:00
Ed
230ea9be46
Metamorphosis - FoodSequence 3 ( #31012 )
...
* setup some data
* cheeseburger recipe
* Update FoodSequenceSystem.cs
* finalize cheseburger recipe
* remove fun
* return old taco sprites
* full foodsequence data refactor
* return tacos
* well done
* add cutlets to burger
* chickenburger recipe
* +2 burger recipes
* more fun
* Update brain.png
* some slice produce added
* documentation
* watermelon
* skewer work
* flipping
* tomato
* skewer watermelon
* Update skewer.yml
* oopsie, ok, im go to sleep
* fix checks
* Update produce.yml
* screwed
* cheeeeeeeese
* all cooked meat added
* produce added
* aaaaand suppermatter
* key to Tag
* More
* proto string remove
* raw snail
* fix
* Update FoodMetamorphableByAddingComponent.cs
* fixes
* fix3
* fififififx
2024-09-08 02:22:27 -04:00
Ps3Moira
45b252e1b6
fix pump shotgun wielded sprite ( #31885 )
...
* fix shotgun sprite
* fix take 2
2024-09-06 17:26:46 -06:00
Nemanja
8599251825
Mineral Scanner ( #31390 )
...
* Mineral Scanner
* doink
* review
* sunday funday
* review and fix bugs i think?
* Update MiningOverlay.cs
2024-09-07 00:05:53 +10:00
drakewill-CRL
511d759a70
A kit to help new botanists discover chemistry ( #31738 )
...
* Add a kit for botanists to do some limited chemistry to the NutriMax. Intended to help new botanists learn in-game about chemistry.
* remove exclamation marks from names
* naming fix
* Rejected trademark application for 'Farmers Helper'.
---------
Co-authored-by: PraxisMapper <praxismapper@gmail.com>
2024-09-05 18:43:00 +02:00
IProduceWidgets
c8e59ebdd5
Add Snails ( #30765 )
...
* add snails
* scuffix
* migrate
* mo-grate
* oopsied the ftls
* Revert "oopsied the ftls"
This reverts commit 0d3c6c17f31ec904679d6a48799cea71e77c1f99.
* the curse of staging the wrong file, resolved.
* Snoth
* fix my dumbs
* reviews 1
* anti space technology
* salt hurty
* spelling
* Its a slotherhouse out here
* sequencing
* cooked snail
* volfix
* speed reversal
2024-09-03 12:33:44 +02:00
Nemanja
f710b34573
Roundstart Grappling Gun ( #31737 )
...
Roundstart grappling hook
2024-09-01 22:33:25 -06:00
VigersRay
c705713fb0
Merge remote-tracking branch 'refs/remotes/wizards/master'
...
# Conflicts:
# Content.Server/GameTicking/Rules/NukeopsRuleSystem.cs
# Resources/Prototypes/Catalog/Fills/Lockers/heads.yml
# Resources/Prototypes/Entities/Structures/Machines/lathe.yml
# Resources/Textures/Clothing/Belt/securitywebbing.rsi/icon.png
# Resources/Textures/Clothing/Belt/securitywebbing.rsi/meta.json
# Resources/Textures/Clothing/Eyes/Glasses/outlawglasses.rsi/meta.json
# Resources/Textures/Objects/Specific/Chemistry/chem_bag.rsi/meta.json
# Resources/Textures/Objects/Specific/Hydroponics/Equipment/plant_bag.rsi/meta.json
# Resources/Textures/Objects/Specific/Mining/ore_bag.rsi/meta.json
2024-08-29 16:01:10 +03:00
RumiTiger
d9b1369dae
Cherry ( #28962 )
...
* Add files via upload
* Update produce.yml
* Update produce.yml
* Update seeds.yml
* Update flavor-profiles.ftl
* Update flavors.yml
* Update meal_recipes.yml
* Update food_produce.yml
* Update meta.json
* Update seeds.yml
* Update botany.yml
* Delete Resources/Textures/Objects/Specific/Hydroponics/cherry.rsi/meta.json
* Create meta.json
* Delete Resources/Textures/Objects/Specific/Hydroponics/cherry.rsi/meta.json
* Create meta.json
* Update produce.yml
* Update produce.yml
* Update produce.yml
* Update food_produce.yml
* Update food_produce.yml
* Update produce.yml
* Apply suggestions from code review
Co-authored-by: Tayrtahn <tayrtahn@gmail.com>
* Update seeds.yml
* Update juice.yml
* Update juice.ftl
* Update seeds.ftl
* Update seeds.yml
* Update cargo_botany.yml
* Update cargo_botany.yml
* Update cargo_botany.yml
* Update cargo_vending.yml
* Update cargo_vending.yml
* Update seeds.yml
* Update seeds.yml
* Update meta.json
* Update produce.yml
* Cherry Tree
* Alphabetical order
* Update food_produce.yml
* Update food-sequence.ftl
* Update food-sequence.ftl
* Update produce.yml
* Update produce.yml
* Update food-sequence.ftl
---------
Co-authored-by: Tayrtahn <tayrtahn@gmail.com>
2024-08-29 11:30:58 +10:00
lzk
98680ce0f2
Change my copyright ( #31599 )
2024-08-28 21:12:09 +02:00
VigersRay
9328f4d9cb
Merge remote-tracking branch 'refs/remotes/wizards/master'
...
# Conflicts:
# Content.Client/Lobby/UI/Loadouts/LoadoutWindow.xaml.cs
# Content.Server/Connection/ConnectionManager.cs
# Content.Server/GameTicking/GameTicker.Spawning.cs
# Content.Server/Shuttles/Systems/ArrivalsSystem.cs
# Content.Server/Shuttles/Systems/DockingSystem.Shuttle.cs
# Content.Server/Shuttles/Systems/EmergencyShuttleSystem.cs
# Content.Server/Station/Systems/StationSpawningSystem.cs
# Content.Shared/Chat/SharedChatSystem.cs
# Content.Shared/UserInterface/ActivatableUIComponent.cs
# Resources/Prototypes/Datasets/Names/ai.yml
# Resources/Prototypes/Datasets/adjectives.yml
# Resources/Prototypes/Datasets/verbs.yml
# Resources/Prototypes/Entities/Clothing/Shoes/boots.yml
# Resources/Prototypes/Entities/Clothing/Shoes/specific.yml
# Resources/Prototypes/Entities/Mobs/NPCs/revenant.yml
# Resources/Prototypes/Entities/Objects/Specific/Robotics/mmi.yml
# Resources/Prototypes/Entities/Stations/base.yml
# Resources/Prototypes/Entities/Structures/Machines/lathe.yml
# Resources/Prototypes/Maps/bagel.yml
# Resources/Prototypes/Roles/Jobs/Science/borg.yml
# Resources/Prototypes/Roles/Jobs/Security/security_cadet.yml
# Resources/Textures/Clothing/Head/Helmets/light_riot.rsi/equipped-HELMET.png
# Resources/Textures/Clothing/Head/Helmets/light_riot.rsi/icon.png
# Resources/Textures/Clothing/Head/Helmets/light_riot.rsi/meta.json
# Resources/Textures/Interface/Misc/job_icons.rsi/meta.json
# Resources/Textures/Objects/Misc/bureaucracy.rsi/meta.json
# Resources/Textures/Structures/Wallmounts/barsign.rsi/officerbeersky.png
# Resources/Textures/Structures/Wallmounts/signs.rsi/anomaly.png
# Resources/Textures/Structures/Wallmounts/signs.rsi/meta.json
# SpaceStation14.sln
2024-08-28 19:12:01 +03:00
pacable
c71b0c37b6
Spray paint ( #321 )
...
* paints
Signed-off-by: JDtrimble <igor.mamaev1@gmail.com>
* review changes
Signed-off-by: JDtrimble <igor.mamaev1@gmail.com>
---------
Signed-off-by: JDtrimble <igor.mamaev1@gmail.com>
2024-08-28 18:15:38 +03: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
lzk
2871e69268
Moff cooking. Part one. ( #30668 )
...
* yml part
* guidebook
* commit
* some fixes
* a little
* change
2024-08-26 12:46:16 +10:00
Nemanja
85b7d183bd
Blueprints ( #31138 )
...
* Blueprints
* Update tables_loot.yml
* doink
* mark as required
2024-08-25 22:06:50 +10:00
ArtisticRoomba
adea4c91de
Adds the Head of Greytide stamp ( #30189 )
...
suggested changes from discord discussion, sprite change, add to refactored loot table
2024-08-25 20:35:22 +10:00
lzk
a49a5195ab
Fix crowbars sprites ( #2505 )
...
(cherry picked from commit 891e2d2d758a199aa0fa39551199ea2479c8f90b)
2024-08-22 07:47:31 +03:00
VigersRay
0441b8b814
Merge remote-tracking branch 'refs/remotes/wizards/master'
...
# Conflicts:
# Content.Client/Launcher/LauncherConnecting.cs
# Content.Client/Launcher/LauncherConnectingGui.xaml
# Content.Client/Launcher/LauncherConnectingGui.xaml.cs
# Content.Server/Administration/Managers/BanManager.cs
# Content.Server/Medical/Components/HealthAnalyzerComponent.cs
# Content.Server/Medical/HealthAnalyzerSystem.cs
# Content.Server/Nutrition/EntitySystems/CreamPieSystem.cs
# Content.Server/StationEvents/Events/RandomSentienceRule.cs
# Content.Shared/Interaction/Components/BlockMovementComponent.cs
# Content.Shared/Interaction/SharedInteractionSystem.Blocking.cs
# Content.Shared/Materials/SharedMaterialReclaimerSystem.cs
# Resources/Prototypes/Accents/word_replacements.yml
# Resources/Prototypes/Catalog/Fills/Books/bookshelf.yml
# Resources/Prototypes/Entities/Mobs/Customization/Markings/cat_parts.yml
# Resources/Prototypes/Entities/Mobs/NPCs/silicon.yml
# Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml
# Resources/Prototypes/Entities/Structures/Machines/lathe.yml
# Resources/Prototypes/Objectives/objectiveGroups.yml
# Resources/Prototypes/Objectives/stealTargetGroups.yml
# Resources/Prototypes/Roles/Jobs/Security/detective.yml
# Resources/Prototypes/Species/human.yml
# Resources/Prototypes/Voice/speech_emotes.yml
# Resources/ServerInfo/Guidebook/Antagonist/Antagonists.xml
# Resources/ServerInfo/Guidebook/Antagonist/MinorAntagonists.xml
# Resources/ServerInfo/Guidebook/Antagonist/Nuclear Operatives.xml
# Resources/ServerInfo/Guidebook/Antagonist/Revolutionaries.xml
# Resources/ServerInfo/Guidebook/Antagonist/SpaceNinja.xml
# Resources/ServerInfo/Guidebook/Antagonist/Traitors.xml
# Resources/ServerInfo/Guidebook/Antagonist/Zombies.xml
# Resources/migration.yml
2024-08-22 06:50:04 +03:00
beck-thompson
d44bbec05d
Fix nukies not getting station codes ( #31272 )
...
First commit
2024-08-21 12:53:04 -06:00
themias
6ba7d268b0
Uplink: Combat Bakery Kit ( #31179 )
...
* save
* sprites
* mime survival kit has baguette
* add weapon/uplink
* cherry-pick croissant changes
* uplink
* Switch baguette to slashing damage
* fixes
* update attribution
* fix typos
* review comments
* reduce TC cost
* switch to regular box
* fix regular baguette rotation
2024-08-19 12:57:29 -06:00
