* uncomment grappling gun
* Remove rest of Geras files (#30912)
remove remaining geras stuff
* tweak(AgeRequirement): Make the requiredAge more sensible (#30913)
* chrore(ageRequirement): fix grammar. atleast -> at least (#30914)
* Minor sprite fix to inhand med hardsuits and HoS turtleneck jumpsuit (#30918)
* Fixes inhand hardsuit cross color from https://github.com/space-wizards/space-station-14/issues/26516#issue-2213917971
* Fixed HoS Turtle not covering all butt pixels
---------
Co-authored-by: Zachary Yona <magicalusf@gmail.com>
* Add execution component to all energy sword weapons (#30909)
Co-authored-by: plykiya <plykiya@protonmail.com>
* Automatic changelog update
* chore(grammar): correct some mistakes (#30916)
* Add diamond mining drills, buff regular mining drills (#30814)
* why do I have to change so much just to add drills
* diamon
* Automatic changelog update
* give trash a reusable entity table (#30921)
* Contraband marking & examining (#28688)
* System & loc strings
* pass over syndie contraband
* fixes
* grand theft pass
* contrabandexamine -> contraband
* examine text generation update
* all composition parents necessary
* bring back minor contra so it has a less confusing message
* minor
* weapon pass
* jumpsuit pass
* feet pass
* AUUUUUUUUUGHHHHHHHHHHHHHHHHHH
* head
* AUUUUGH
* ear
* belt
* back
* fix
* bro
* rename for more clarity
* do da review
* add cvar for contraband examine
---------
Co-authored-by: EmoGarbage404 <retron404@gmail.com>
Co-authored-by: Nemanja <98561806+EmoGarbage404@users.noreply.github.com>
* Automatic changelog update
* Automatic changelog update
* Removes variant cube migration (#30934)
add
* First Review Pass Contraband Fixes (#30930)
* First pass contra fix
* bam
* More
* Security crates are now marked as security restricted
* Syndicate raid suit is contra
* damn I forgot gatfruit
* Add conducting gloves to the maintenance loot table (#30904)
* add
* lower weight
* Fix DoDrop to DropNextTo in container cases (#30911)
* Fix DoDrop to DropNextTo in container cases
DoDrop is too heavy to calculation. In any other case we should use alternatives, for example DropNextTo helper method
* codestyle change
* Fix Reagent Fire Stacks (#30766)
* Fix Reagent Fire Stacks
* Comments on code
* little nicer wording?
* Lines 88 and 89, updated 'narsie' and 'ratvar' to 'Nar'Sie' and Ratva… (#30954)
Lines 88 and 89, updated 'narsie' and 'ratvar' to 'Nar'Sie' and Ratvar, per issue #30719.
* Automatic changelog update
* Fix permission check for whitelists in player panel (#30948)
* Automatic changelog update
* Grey mantle in winterdrobe (#29774)
* add the mantle
* fix a few things
* fix merge conflict stuff, remove from winterdrobe and lathe.
* Add mantle to loadouts (20 hour requirement)
* Automatic changelog update
* Sliceable doAfter (#30824)
* init
* wtf git
* Automatic changelog update
* Add capfruit, a gatfruit mutation. (#30850)
* add base
* add fake suffix and flavor fix
* address some reviews
* parent it
* fix test fail
* add FoodSequence support and address small review
* Automatic changelog update
* Fixes the grey mantle (#30971)
add the thing i missed
* Add keybinds for rotating and flipping objects (#30540)
* add keybinds for rotating and flipping objects
* no popup for verbs
* Automatic changelog update
* tweak(Shuttle_honki): Remove DeviceQuantumSpinInverter from honki shuttle. (#30618)
* Make the Borgs Names Appear When they Make an Announcement (#30107)
* Make the Borgs Names Appear When they Make an Announcement
* bwomp
* re-order
* Use Name instead of metadata
* goiup
* Automatic changelog update
* disable contraband examine
* rename our SliceFoodEvent
* Throngler Plushie Sprite (#30969)
Throngonkler Plush sprite
* Fix bug with rotating shelves (#30978)
* Main
* Update shelfs.yml
* Little bug fix
* No weather on concrete tiles (#30952)
* concrete weather
* miss
* development build ghostrole lottery changes (#30980)
debug ghostrole lottery changes
* Automatic changelog update
* Add a saline syringe to the combat medical kit (#29954)
saline
* Automatic changelog update
* fix the admin verbs trying to kill players by filling their lungs with plasma (#30991)
fix the admin tools trying to kill players by filling their lungs with plasma
* Custom Taco & Kebabs - FoodSequence 2 (#30905)
* control layer ordering
* sprite update
* taco!
* taco naming gen
* fix separator naming
* some proto fixes
* default naming separation
* fix taco naming
* rat update
* hamsterburger
* organs taco
* remove from spawners
* fixes
* fix separators and lemons
* Update food-sequence.ftl
* randomization offset
* fix
* kebabs refactor
* fix
* skewer weapon
* Update food_single.yml
* Update migration.yml
* suppermatter
* hamlet centered
* hamsburger
* Update dead-0.png
* 20 -> 4 burger layers max
* Update burger.yml
* canReact: false
* capfruit update
* Update burger.yml
* Update burger.yml
* Update produce.yml
* some fixes
* Update Resources/Textures/Objects/Consumable/Food/taco.rsi/meta.json
Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>
* Update Content.Shared/Nutrition/Components/FoodSequenceStartPointComponent.cs
Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>
* Update Content.Shared/Nutrition/Components/FoodSequenceStartPointComponent.cs
Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>
* chicken
* Update food-sequence.ftl
* documentation
* fixes
* Update meat.yml
* Update meat.yml
---------
Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>
* Automatic changelog update
* Fix popups not working properly with an eye offset (#30990)
* Adds a random smokable spawner (#30870)
* Textures to make lamps mappable to East/West.
* Adds a random smokable spawner
* remove double derma
* Increase chance for just basic cig
* Update to enitity tables
* Tweak values
* Remove space
---------
Co-authored-by: Jeff <velcroboy333@hotmail.com>
* Fix lizards being unable to eat custom burgers (#31005)
* Fix lizards being unable to eat custom burgers
* ensure tag comp
* Automatic changelog update
* Sedin (#27110)
* Sedin
* almost forgot this.
* what
* Did a few fixes, tried to readd popup
* Fix popup, ready for merge
* minor change
* Generalize seed removal/destruction system, add popups in general.
* fix
* fix (again)
* deadcode is no more
* Sedin buff (nerfing the recipe soon)
* godont
* webedit moment
ok listen I had to nuke my setup because my computer was being Dumb As Shit so let me do this ONE webedit
* CRIKEY
* Revert "CRIKEY"
This reverts commit 1c6959ffd9ba8bb1e97ccf2eb0b37b3ff4ec82ee.
I was not supposed to commit that >:/
* Alright, it should be good now but I havent tested it
* ready for merge/review
* prob -> probability
* Requested changes nodoc
* Review nodoc
* documento
* thumb up emoji
* Automatic changelog update
* Adds a Dinky Star Sticker for security officers (#29767)
* Sec-Star-TASTIC
* fix license
* now counts as trash
* Sticks to people + wearable
* no more sticky
* no more sticky
* mystery-space
* Update Loadout Yaml
* Automatic changelog update
* tweak(hospital): Reduce diamond stack from 30 to 1 (#31027)
* tweak(experiment): Reduce diamond stack from 30 to 1 (#31025)
* replace mapped diamond stacks with single
* Figurine voicelines (#30865)
* initial commit
* tweaks to the new voice lines
capitalizations of I's and the Y on hos 3 voice lines
also changed the captain figuring voice line 2 to something completely different
* capitalized one letter
man i really suck at capitalization
* more capitalization
i never thought this pr would need so many changes
* changed one comma to a dot
* Update Resources/Locale/en-US/datasets/figurines.ftl
Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>
---------
Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>
* Automatic changelog update
* Adding shock collar and electropack (#30529)
* Adding shock collar with the new ShockOnTrigger
* Cleaning and updating the shock collar
* Add StripDelay datafield to ClothingComponent
* Adding SelfUnremovableClothingComponent
* ShockCollar Update
* Correction of the shock collar
* Correction of the shock collar 2
* Renaming the DamageSpecifier DataField to Damage
* Fixing the damage field in ShockCollar
* Cleaning the ShockCollar
* Renaming ShockCollar to ClothingNeckShockCollar
* Adding ClothingNeckShockCollar as a stealTarget to a thief
* Fixing a typo of the sprite path in ClothingNeckShockCollar
* Cleaning the ShockOnTriggerComponent
* Revision of SelfUnremovableClothing
* Adding a ClothingBackpackElectropack
* Sprite fix
* Code review
* Shock Collar sprite update
* add commit hash
---------
Co-authored-by: Nemanja <98561806+EmoGarbage404@users.noreply.github.com>
* Automatic changelog update
* Greatly improve the usability of the Gas Analyzer. (#30763)
* greatly improve how the gas analyzer behaves
* don't close the analyzer when the object goes out of range
* cleanup
* always switch to the device tab when a new device is analyzed
* modern api part one
* modern api part 2
* modern api part three
* file scope namespace
* Automatic changelog update
* Fix false and true in player-panel.ftl (#31043)
Fix false and true in player-panel
Add a new True string
* Contra Review Passs - Round 2 (#30942)
* Contra pass round two
* command too
* Stamps
* oopsied a bracket
* Namespace cleanup around Mind Roles (#30965)
* namespaces
* Comment does not need a semicolon
---------
Co-authored-by: Vasilis <vascreeper@yahoo.com>
* Contraband Review Pass - The Threequel (#30970)
Contraband pass number three
* Golden toilet (#31049)
* golden toilet
* Destructible
* sprite
* fix
* copyright
* Automatic changelog update
* Salvage Spawners (#31020)
* treasure entities and spawners
* no more smiles
* remove nyano shock collar code
* Event scheduler setting tweaks (#31018)
tweaks
* Automatic changelog update
* remove meteor swarms rule for a moment
* Revamped Meteor Swarm (#28974)
* meteor code and balanced values
* Meteor Swarms
* Update meteors.yml
* Update meteors.yml
* HOO! (fix overkill bug and buff space dust)
* undo BloodstreamComponent.cs changes
* DamageDistribution -> DamageTypes
* part 2.
* Missing meteor presets (#29044)
* add meteors into missing game presets
* changes for real
* implement code
* this too
* Meteors now leave behind a bit of ore (#30419)
* Meteors that leave behind asteroid ore
* bigger offset
* Bit more generic
* Better defaults
* hrm?
* I HATE CUSTOM SERIALIZERS
* More comments
* renamed a variable
---------
Co-authored-by: plykiya <plykiya@protonmail.com>
* refactor event schedulers to use explicit game rules (#29320)
* works, still has testing values, im sure I did stupid shit.
* shitvent crapfactor
* snap extra word out of existence
* shit I died of old
* remove useless inaccurate design comments
* Oopsie, handle requirement params in RandomRuleSystem too
* I'm a slash slinging hasher
* Address reviews, add admin alerts I forgor
* EntityMan saves the day
* address reviews 1
* eh, I actually don't care about the cargo gifts thing.
* started
* Do reviews
* you actually meant 1.2 lmao
* dependency inheritance is a fickle bitch
* I have no idea.
* Threads are for sheets not computers.
* fix traitor rule test
* fix round type tattling
* break things
* It worky
* Toolshed makes we want to drink depresso.
* Finished?
* remove debug values
* timings
* use defaults
* alphabetize
* bobby drop tables
* Float required fr fr
* continue
* more continence
* uno mas
* obsolution
* cleanup and documentations
* Yell at self
* use the right value defaults
* housekeeping
* Event scheduler setting tweaks (#31018)
tweaks
* Automatic changelog update
* remove(NukeopsRuleComponent): Remove a trap from the component file (#31029)
ah
* Fix bug with holding objects (#31009)
Main
* Automatic changelog update
* Replace obsolete map functions in IconSmoothSystem (#30958)
* first part
* second part
* Automatic changelog update
* Fix reagents with ReagentData being duplicated (#30983)
Initial commit
* :trollface:
* :trollface:
* actually untroll
* a
* 50 burger
* add back old meteor code
* fix
* use some live config options in dev
* remove old shock collar icon
* make ammo more consistent and work more
* clean up lathes diff to upstream
* a
* move rubber bullets to deltav folder
* a
* untroll
* more untrolls
* more untrolls
* untroll
* :trollface:
* a
* b
* remove it for real
* add missing lathe recipes
* replace cvars with component field
* remove taco from roboisseur
* migrate cardboard box with smg mags
* remove kebabs
* a
---------
Co-authored-by: deltanedas <@deltanedas:kde.org>
Co-authored-by: Killerqu00 <47712032+Killerqu00@users.noreply.github.com>
Co-authored-by: Brandon Hu <103440971+Brandon-Huu@users.noreply.github.com>
Co-authored-by: Zachary Yona <58833995+Magicalus@users.noreply.github.com>
Co-authored-by: Zachary Yona <magicalusf@gmail.com>
Co-authored-by: Plykiya <58439124+Plykiya@users.noreply.github.com>
Co-authored-by: plykiya <plykiya@protonmail.com>
Co-authored-by: PJBot <pieterjan.briers+bot@gmail.com>
Co-authored-by: Alzore <140123969+Blackern5000@users.noreply.github.com>
Co-authored-by: Nemanja <98561806+EmoGarbage404@users.noreply.github.com>
Co-authored-by: Kara <lunarautomaton6@gmail.com>
Co-authored-by: EmoGarbage404 <retron404@gmail.com>
Co-authored-by: Ubaser <134914314+UbaserB@users.noreply.github.com>
Co-authored-by: Token <esil.bektay@yandex.com>
Co-authored-by: Cojoke <83733158+Cojoke-dot@users.noreply.github.com>
Co-authored-by: LeoSantich <108027402+LeoSantich@users.noreply.github.com>
Co-authored-by: nikthechampiongr <32041239+nikthechampiongr@users.noreply.github.com>
Co-authored-by: pigeonpeas <147350443+pigeonpeas@users.noreply.github.com>
Co-authored-by: Ed <96445749+TheShuEd@users.noreply.github.com>
Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>
Co-authored-by: PoorMansDreams <150595537+PoorMansDreams@users.noreply.github.com>
Co-authored-by: IgorAnt028 <118114530+IgorAnt028@users.noreply.github.com>
Co-authored-by: NotSoDamn <75203942+NotSoDana@users.noreply.github.com>
Co-authored-by: Errant <35878406+Errant-4@users.noreply.github.com>
Co-authored-by: DrSmugleaf <10968691+DrSmugleaf@users.noreply.github.com>
Co-authored-by: Velcroboy <107660393+IamVelcroboy@users.noreply.github.com>
Co-authored-by: Jeff <velcroboy333@hotmail.com>
Co-authored-by: themias <89101928+themias@users.noreply.github.com>
Co-authored-by: Eris <eris@erisws.com>
Co-authored-by: FATFSAAM2 <saamboroujerdi@gmail.com>
Co-authored-by: to4no_fix <156101927+chavonadelal@users.noreply.github.com>
Co-authored-by: Mervill <mervills.email@gmail.com>
Co-authored-by: Vasilis <vascreeper@yahoo.com>
Co-authored-by: Nim <128169402+Nimfar11@users.noreply.github.com>
Co-authored-by: IProduceWidgets <107586145+IProduceWidgets@users.noreply.github.com>
Co-authored-by: SlamBamActionman <83650252+SlamBamActionman@users.noreply.github.com>
* Reinforced tile can we welded back into metal rod
* more changes
* weh
* fix
---------
Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
* most basic door sprites, basic wall and window sprites
* most tiles, secret door and windoors
* rest of door stuff, undoes windoor sprites
* decals
* decals
* corners
* corners
* resprite directions and fix spelling error
"Detla" V :blunt:
* adjust glass tile strength
* tile and sprite adjustments
* new tiles
* windows and decals
* Fixes glaring test issues
* Fix test fail
* Noct please 😭
You can run tests local
---------
Co-authored-by: Null <56081759+NullWanderer@users.noreply.github.com>
* sprites
something something strength and certainty of steel (except this is brass)
* test1
* commas it was commas
* commas and brackets
* LET THERE BE BRASS
* brass-glass-etc-windows-thindows-floors-lattice
* ALL THE STRUCTURES!!
"Which structures did you add?"
"all."
* buyable brass
and on the first day the quartermaster said "let there be brass" and all the cargo techs stopped inve$ting in awe
* Update windoor.yml
i forgor 💀
* Update tiles.ftl
* i hate random capital letters
* linter fix 1
whew, thank god for linters
* fix 2
* maybe this
shot in the dark, idk what the hell i'm doing hopefully this fixes it?
* fix attempt 1
weather to true, maybe the thingy got confused?
* remove clockwork lattice
it's fixed the test fail... but at what cost?
* changes 1
* fix clockwork windoor
* FLOORS
HAHAHA LET THERE BE FLOORS
* try linter fix 1
i love linters they find things i'd never catch myself
* tweaks fixes 1
fixes merge conflict and does more stuff part two later because i'm tired
* tweaks fixes 2
i should probably do this stuff during the day when i have more energy but eh
* Update assembly.yml
* Update chairs.yml
* fix door sprites
somehow the deny_unlit was broken for all the clockwork doors
* fix glass.yml
(cherry picked from commit f0e8695a91b787c8107ebf198309d92159463dc0)
* Velcroboy changes
* Fix compilation errors
* Fix borked path
* Fix
* Moved to shared, fixed some problems with code
* Cleanup
* Fix paths
* Fix
* Move files around
* Moved DiggingSystem to Server
* Add snow tile edges
* Changes for edge tile prio
* Add support for tile weightlessness
* Add weightlessness to ice
* snow duggy moments
* fix ice thing yeah
* actually why even use weightless movement
* upd8 nukieplanet
* i have no idea what im doing
* sprite modifications
* makes asteroid tiles and snow use weighted variantize, adds snow plating
* GO FUCK YOURSELF!!!!
* hello? boner department, id like to order a DINNER. make it MAMA LUIGI
* test fix. hopefully. boner. boobies.
* did he know? (no)
* Merge before I fuck up anything again
* craft whitelist
* Sericulture
* Spider
* gone
* quickly fixed
* and coders taketh away
* And we take more away
* sericulture improvements
* arachnid
* better webbed
* OH WAIT
* test fail
- Set some of the defaults in the definition to what we use for most prototypes
- Added planet variant for dirt to avoid black space
- Dirt looks like literal poop but will have another sprite for it soon
* Planetmap tiles
Biomes etc etc
* a
* oop
* Chunk-based rendering
* funny
* Less allocations
* Fix overdraw
* Content tile edge support
Also updated grass to use it as a POC.
* Kindly revert
* Update for variant edges
* fixes
* Use fastnoise
* Remove redundant group
* a
* refactor a fair bit
* Prototype data instead
* tweaks
* a
* fix maths
* working
* a
* Slightly better empty support
* a
* flowers
* sounds
* lewd
* Networking
* more fixes
* better
* colours
* Some chunk loading
* Proper loading and unloading
* Better loading
* Fix parallax and movement sounds
* Anchoring support + decal setup
* Most of the way to load and unload
* Decal loading kinda werkin
* large trees
* started diffing
* a
* Variant support and deserts
* a
* snow
* agony, even
* working again
* todo
* a
* laba tiles
* aeiou
* a
# Conflicts:
# Resources/Prototypes/Entities/Tiles/planet.yml
# Resources/Prototypes/Tiles/planet.yml
# Resources/Textures/Tiles/Planet/Lava/lava.rsi/meta.json
* laba
* Add lava
* Initial ignition
* triggers
* a
* a
* y
* Add basalt tiles
Did some unconventional things for the animation + rocks.
* fixies
* mergies
* promotion
* lava biome
* Lava planet start
* cleanup and more lava
* laba
* maccas
* biome stuf
* weh
* bongflicts
* aeaeae
* More fixes
* a
* these too
Milon
deltanedas
Ko4ergaPunk
Nemanja
lzk
null
noctis
Flareguy
IProduceWidgets
MACMAN2003
Ps3Moira
Ed
themias
Kara
Ygg01
NULL882
Velcroboy
Fluffiest Floofers
DrSmugleaf
Emisse
potato1234_x
PixelTK
Vordenburg
Ilya246
I.K
Kit0vras
20kdc
metalgearsloth