Nim
|
41f33bf005
|
Potions pouch (#1026)
* pouch
* loadout
* fix
* fix name
* fix name duo
* loadouts2
|
2025-03-15 16:30:40 +02:00 |
|
creamybag
|
b5edb27623
|
Working with armor sprites. (#1028)
* ChainMail
* fix
|
2025-03-15 15:54:19 +03:00 |
|
Ed
|
f989980df3
|
Carcats species [Draft] (#1023)
* body parts
* proto setup
* inhand displacements
* carcat cloak
* eyes
* gloves
* pants carcat
* pants
* shirt
* markings nose + ears
* Update 5.png
* shoes + naming
* helmet adapt
* carcat sounds
* Update sewing_table.yml
* s
* Update comoss.yml
* Update factoria.yml
* s
|
2025-03-14 14:11:41 +03:00 |
|
creamybag
|
44c9897893
|
dress (#1022)
|
2025-03-13 15:30:18 +03:00 |
|
Ed
|
0616d552f2
|
demiplane hints (#1011)
* demiplane hints
* lava update
* water resprite
* Update demiplane_hint.yml
|
2025-03-12 15:22:14 +03:00 |
|
Ed
|
93ed28d34c
|
Trading content (#1010)
* reroll positions
* more trading content
* bugfixes
* more content
* guidebook uodate
* Update buy.yml
|
2025-03-12 00:51:58 +03:00 |
|
Ed
|
56f4012a49
|
Lava + Chest resprite (#1007)
* simple lava
* add into demiplanes
* Update meta.json
* wooden chest update
* Update migration.yml
* Update dev_map.yml
* manual migration
* Update factoria.yml
|
2025-03-11 17:39:46 +03:00 |
|
Nim
|
74fa1251c7
|
Modular armour 1 (#936)
* armor
* fix
* fix color
* migra
* + *
* balance
* caustic
* presets
* migr2
* plate
* chainmail
* fix speed
* ehh
* ehh2
* ehh3
* fix layers
* mask craft
---------
Co-authored-by: Ed <96445749+TheShuEd@users.noreply.github.com>
|
2025-03-10 16:24:10 +03:00 |
|
Nim
|
391cc8e7a5
|
Green salad (#999)
* green salad
* maxvol
* duplicate
|
2025-03-10 15:18:36 +03:00 |
|
Ed
|
10b38f04ce
|
129 Dinazewwr hairstyles (#717)
* first pass
* Sync new sprites
* ru loc
* chatgpt moment
* clean up
* Update human-hair.ftl
|
2025-03-10 13:06:18 +03:00 |
|
Ed
|
978f9cf4b9
|
vampire buff
|
2025-03-08 14:46:13 +03:00 |
|
creamybag
|
d0602d7d1d
|
Jaster update! (#990)
* hihihi
* hihihi 32x32
|
2025-03-07 17:13:52 +03:00 |
|
Nim
|
228258e575
|
Dice (#989)
* dice
* wallet
* crate
|
2025-03-07 15:36:58 +03:00 |
|
Ed
|
0b5712ce97
|
Vampire antag (#988)
* new blood types
* vampire systems setup
* death under sun
* vampire blood nutrition
* alerts
* autolearn skills
* base bite actions
* suck blood spell
* polish
* Update blood.yml
* unshitcode
* vampire hunger visual
* nerf speed
* hypnosis + map update
* darkness demiplane warning
|
2025-03-07 14:52:43 +03:00 |
|
Ed
|
c1acf81541
|
NewTrade (#969)
* trading portal replace traveling storeship
* clean up content
* clean up content 2
* seel and buy realization
* fixes
* Update migration.yml
* Update migration.yml
* Update dev_map.yml
* Update dev_map.yml
* thats work correctly now
* bugfies and visual
* factions
* faction restruct + name reduce
* unnesting sell cargo positions
* unnesting cargo positions
* more cargo content
* Update buy.yml
* improve tradeportal visual
* Update migration.yml
* Bank ad Commandant removal
* merchant objectives
* finish
* clean up content
* Update migration.yml
* fix goal calculation
* Update comoss.yml
* Update dev_map.yml
|
2025-03-06 12:01:43 +03:00 |
|
Nim
|
e54e8a95ee
|
Sheep (#972)
* sheep
* demi mod
|
2025-03-05 17:30:06 +03:00 |
|
creamybag
|
d9a5869504
|
Merge pull request #973 from creamybag/GuildmasterHat
Guildmaster hat
|
2025-03-05 17:28:41 +03:00 |
|
Ed
|
acc9886242
|
Merge remote-tracking branch 'upstream/stable' into ed-2025-03-03-upstream-stable-2
# Conflicts:
# Content.Client/Options/UI/OptionsMenu.xaml
# Content.IntegrationTests/Tests/PostMapInitTest.cs
|
2025-03-03 23:23:40 +03:00 |
|
Ed
|
bef78c62c0
|
Alchemical bomb (#965)
* smoke bomb system
* collector fixes
* bomb integration
* fix
* tweak
|
2025-03-03 14:06:50 +03:00 |
|
creamybag
|
a16dd2fd3e
|
Shirts in pants #2 (#934)
* New shirt, all fix
* merchant,chainmail
|
2025-03-02 22:16:34 +03:00 |
|
creamybag
|
8bbb0dad84
|
lute (#962)
|
2025-03-02 17:03:40 +03:00 |
|
Ed
|
8652e71b39
|
Essence nodes (#961)
* essence nodes
* Update essence_nodes.yml
|
2025-03-02 15:13:21 +03:00 |
|
Ed
|
9a787bc7b8
|
Thaumaturgic alchemy refactor WIP (#955)
* essences thaumaturgy refactor
* migrate structure crystals
* shard migrate
* bruh
* fix migration
* fixes
* 1 combining
* Create essence_brewing.yml
* Update magic.yml
* stack essence support
* FUCK THIIA ALL, DELETE ALL
* redesign counter spell
* Update precurser.yml
* magic splitting solution
* precurser splitting
* Praecantatio
* Update cleaner.yml
* add potions recipe
* fuck alchemy guidebook
* guidebook update
* fixes
* energia fix
* Update migration.yml
* fixes
* Update Alchemy.xml
* fix
* medium vial
* fixes?
* Update essence_combining.yml
* Update target_effect_creation_water.yml
* alchemist Comoss update
* Update closets.yml
* mana opertion glove
* Update migration.yml
* Update vials.yml
* Update GuideReagentReaction.xaml
* try to fix
* manual migration
* Update comoss_d.yml
* fix
* manual migration 2
* precursor admixture
* Update heater.yml
|
2025-03-02 13:28:13 +03:00 |
|
Nim
|
2d4ace0b10
|
Tip sprite (#954)
* tip sprite
* fix
* heh
* solution
|
2025-03-01 01:26:36 +03:00 |
|
Ed
|
3fd47443ae
|
Essence collector (#952)
* collector attract essence
* collector
* Update magic-essence.yml
* Update essence_collelctor.yml
|
2025-02-28 15:55:47 +03:00 |
|
Nim
|
15d9657139
|
Invisible whistler (#941)
* invisible whistler
* Parts
* spike
* flavor
* flavor
* filter
* sprite
* demiplan
|
2025-02-27 14:02:30 +03:00 |
|
Ed
|
5524e029f4
|
Essence splitter (#948)
* disable rotting
* pipipi
* essence storage
* energy splitter
* Update essence_splitter.yml
* Update impact.png
* visual fixes
* sound fix
* Update twoHandedStaffs.yml
* unhardcode
* Update meta.json
* fix
|
2025-02-27 13:48:38 +03:00 |
|
Brassica Prime
|
f850b69e89
|
Wizard Stamp (#35552)
* First go around adds everything necessary to work
* fixes issues with attribution and a whitespace
* Update Resources/Textures/Objects/Misc/bureaucracy.rsi/meta.json
Co-authored-by: ArtisticRoomba <145879011+ArtisticRoomba@users.noreply.github.com>
* Update Resources/Textures/Objects/Misc/stamps.rsi/meta.json
Co-authored-by: ArtisticRoomba <145879011+ArtisticRoomba@users.noreply.github.com>
---------
Co-authored-by: Pumkin69 <judeb@DESKTOP-M4B8G5D>
Co-authored-by: ArtisticRoomba <145879011+ArtisticRoomba@users.noreply.github.com>
|
2025-02-27 11:26:30 +03:00 |
|
Ed
|
c6cc4daa3f
|
Magical ballade (#946)
* mana ballade
* mana gift + consume merged in 1 loadout option
* Update T0_mana_gift.yml
|
2025-02-26 17:23:53 +03:00 |
|
ScarKy0
|
7c6028bc80
|
Wizard ID (#35530)
* init
* comment
* agentless
* sprite changes
|
2025-02-26 15:06:18 +01:00 |
|
Ed
|
9440115087
|
Fire ballade (#945)
|
2025-02-26 14:49:32 +03:00 |
|
Ed
|
1542459864
|
Books and bookshelf (#944)
* guidebooks
* guard spawns
* books restruct
* bookshelf
* Update crates.yml
|
2025-02-26 14:38:22 +03:00 |
|
Ed
|
aed7e0994a
|
pax bard (#943)
|
2025-02-26 12:01:14 +03:00 |
|
Ed
|
d0f1bba9d8
|
speed up ballade (#942)
|
2025-02-26 10:51:23 +03:00 |
|
Momo
|
f65ff0bd37
|
Lizard Plushie Slippers (#35381)
* added the lizard plushie slippers yippeegit status
* fixed attributions so that the links arent broken
* update meta.json links
Co-authored-by: ArtisticRoomba <145879011+ArtisticRoomba@users.noreply.github.com>
* four spacing in meta.json
---------
Co-authored-by: ArtisticRoomba <145879011+ArtisticRoomba@users.noreply.github.com>
|
2025-02-25 18:18:42 -08:00 |
|
Ed
|
ba901d5e0e
|
Crystals Update (#925)
* portal frame
* resprited sharpening stone
* portal frame entity
* darkness -> dimension magic type
* thaumaturgy platforms, some refactor
* magic energy refactor
* Update AirlockPryingTest.cs
* transfering tweaks
* fixed magic manipulation
|
2025-02-25 23:37:05 +03:00 |
|
Ed
|
4e62a0efcc
|
Update gob_way.webp
|
2025-02-25 18:14:47 +03:00 |
|
Ed
|
a370182cb6
|
Spell icons folder restruct (#940)
* spell icon sprite restruct
* proto edit
* Update T1_fire_rune.yml
|
2025-02-25 17:33:20 +03:00 |
|
creamybag
|
ba6ceac7ef
|
DismasHair (#939)
* DismasHair
* new rsi, new meta, new name
|
2025-02-25 17:32:45 +03:00 |
|
Ed
|
3e26334c53
|
healing bard spell (#938)
|
2025-02-25 15:44:22 +03:00 |
|
Ed
|
07e0606ecf
|
Merge remote-tracking branch 'upstream/master' into ed-23-02-2025-upstream
# Conflicts:
# Content.Server/Damage/Systems/DamageOtherOnHitSystem.cs
# Content.Server/Nutrition/EntitySystems/CreamPieSystem.cs
# Resources/Prototypes/Entities/Mobs/Player/admin_ghost.yml
|
2025-02-23 23:07:55 +03:00 |
|
keronshb
|
c922b4f843
|
Wizard: Smoke Spell (#35403)
* Adds smoke spell for wizard
* Adds the actual sprites oops
* Removes repulse attract change
* Removes change again?
|
2025-02-22 15:04:42 -08:00 |
|
keronshb
|
ee31a1f293
|
Wizard: Repulse Spell (#35377)
|
2025-02-22 10:56:54 -05:00 |
|
keronshb
|
a9054c5e9c
|
Mjollnir and Singularity Hammer for Wizard (#34446)
|
2025-02-20 18:38:52 -05:00 |
|
creamybag
|
d32ed931b3
|
lightgreendress (#919)
Co-authored-by: Ed <96445749+TheShuEd@users.noreply.github.com>
|
2025-02-20 15:44:45 +03:00 |
|
creamybag
|
b29cfaf2a8
|
Winter is coming... (#918)
|
2025-02-20 02:12:17 +03:00 |
|
Nim
|
88462e5a1b
|
Modular arrows (#906)
* arrow
* sprite
* slots
* migration
* fix
* fix2
* del
---------
Co-authored-by: Ed <96445749+TheShuEd@users.noreply.github.com>
|
2025-02-19 22:36:21 +03:00 |
|
SeamLesss
|
33b9149a56
|
Space Lizard Plushie In-hands (#35295)
* space lizard
* attributions
* attribution fix
|
2025-02-19 20:27:57 +01:00 |
|
robinthedragon
|
22254a14e6
|
ports two barsigns from frontier (#35296)
* adds two new barsigns
* webedit to fix a typo
* the typo was in two locations
* reformatted meta.json and added attribution links
|
2025-02-19 20:25:17 +01:00 |
|
creamybag
|
fa21ad93ff
|
added (#914)
Co-authored-by: Ed <96445749+TheShuEd@users.noreply.github.com>
|
2025-02-18 17:41:41 +03:00 |
|