Commit Graph

51674 Commits

Author SHA1 Message Date
DeityLink
c6bb199ffe fix typo in colors.dm (#35573) 2023-12-12 20:01:48 -06:00
D3athrow-Issues
dec8bd6f3d [ci skip] Automatic changelog update. 2023-12-12 21:01:33 -05:00
DeityLink
a38ded5f91 Fix Nano Paint (#35575) 2023-12-12 20:01:23 -06:00
D3athrow-Issues
f6488ac0ce [ci skip] Automatic changelog update. 2023-12-12 13:34:19 -05:00
DeityLink
576109bd6c Fixes High Roller Wield (#35563) 2023-12-12 12:34:11 -06:00
D3athrow-Issues
8631989aad [ci skip] Automatic changelog update. 2023-12-12 13:33:45 -05:00
Kurfursten
34ea4d1392 Library Sprites (#35557)
* Library Sprites

* missing /
2023-12-12 12:33:37 -06:00
DeityLink
6a8a088a61 rejuvenate (#35568) 2023-12-12 12:33:27 -06:00
D3athrow-Issues
216222d90d [ci skip] Automatic changelog update. 2023-12-11 19:49:16 -05:00
DeityLink
b1bdecb88b Fixes spaceacillin (and possibly other reagents) not working properly (#35567) 2023-12-12 00:49:08 +00:00
D3athrow-Issues
bb8c1c3999 [ci skip] Automatic changelog update. 2023-12-11 15:57:21 -05:00
DeityLink
2a089573ea Bottle Cap tweaks (#35560)
* BottleCapGrammar

* broken
2023-12-11 14:57:13 -06:00
D3athrow-Issues
d51bde9baa [ci skip] Automatic changelog update. 2023-12-11 15:29:02 -05:00
DeityLink
0942117dcd Tempgun new feature (#35511) 2023-12-11 14:28:54 -06:00
D3athrow-Issues
2fa1ab4ed7 [ci skip] Automatic changelog update. 2023-12-11 15:28:44 -05:00
boy2mantwicethefam
b430af42d0 Optimizes tcomms a little (#35458)
* small optimization

* we leave this in

* Revert "we leave this in"

This reverts commit a21975371f.

* New way of doing this

* Static lists
2023-12-11 14:28:35 -06:00
D3athrow-Issues
c3ecd0c026 [ci skip] Automatic changelog update. 2023-12-11 15:28:16 -05:00
boy2mantwicethefam
03f60402c0 Update say.dm (#35485) 2023-12-11 14:28:09 -06:00
D3athrow-Issues
abc3b6e671 [ci skip] Automatic changelog update. 2023-12-11 15:27:14 -05:00
boy2mantwicethefam
343c596252 The vampire's "Rejuvenate" ability will, if the vampire is sufficiently powerful, also stop any bleeding. (#35491)
* vampire stuff

* Update rejuvenate.dm

* removes redundant check
2023-12-11 14:27:06 -06:00
D3athrow-Issues
4c9b7725cb [ci skip] Automatic changelog update. 2023-12-11 15:26:45 -05:00
jellyveggie2
f3c7d708c4 SMES now show exact charge and max capacity (#35556)
* Make SMES only display 100% when they actually are at 100%

* eww

* proper revert of "100% when 100%"
2023-12-11 14:26:38 -06:00
jellyveggie2
12cd662fc6 Allow for some wiggle room with orders (#35555) 2023-12-11 14:25:29 -06:00
D3athrow-Issues
d78048b20a [ci skip] Automatic changelog update. 2023-12-11 15:24:58 -05:00
DeityLink
14e0e5124c Adds sounds to the Electric Loom (#35561)
* adds sounds to the electric loom

* adjust volume and range
2023-12-11 14:24:51 -06:00
D3athrow-Issues
890cc8ccae [ci skip] Automatic changelog update. 2023-12-11 15:24:44 -05:00
DeityLink
1b23838ac7 Fixes the in-hand icons of composite uniforms (#35553) 2023-12-11 14:24:37 -06:00
D3athrow-Issues
6f450c2a21 [ci skip] Automatic changelog update. 2023-12-11 15:24:17 -05:00
DeityLink
2af8ecef94 The Paint & Linen Update [The Forgotten Splinter]: Floor Tiles, Plating, & Shuttles (featuring tile painter decals) (#35559)
* The Forgotten Splinter

* update
2023-12-11 14:24:09 -06:00
D3athrow-Issues
ddf92b515c [ci skip] Automatic changelog update. 2023-12-11 15:21:26 -05:00
DeityLink
9ba6e43b93 Art Vendor replacement from Art Storages (#35562) 2023-12-11 14:21:13 -06:00
DeityLink
30f9caeb59 The Paint & Linen Update [Splinter 6]: Flax, Linen, Weaving, Sewing, Dyeing (#35538)
* Soft Reset

* fixing typos and stuff

* 😌

* fix types here and there
2023-12-10 18:08:47 -06:00
DeityLink
0f9180bf19 The Paint & Linen Update [Splinter 4]: Painting Brush, Palette, Canvas, and Paintings changes (#35530)
* Soft Reset

* fix issues

* radium fluff

* :agony:
2023-12-10 17:53:03 -06:00
DeityLink
3ec956fbca The Paint & Linen Update [Splinter 3]: Mapping Changes (#35529)
* Soft Reset

* dme edit

* bigstacks of cloth

* fixing snaxi conflicts
2023-12-10 17:39:37 -06:00
D3athrow-Issues
df3c7d33af [ci skip] Automatic changelog update. 2023-12-10 18:29:45 -05:00
DeityLink
dd749c36c4 The Paint & Linen Update [ATOMIZED] (#35451)
* Soft Reset

* better nanopaint cost

* AHHHH
2023-12-10 17:29:37 -06:00
DeityLink
04eaaf7153 The Paint & Linen Update [Splinter 5]: Painting Floors, Walls, Paint Rollers, High Rollers (#35534)
* Soft Reset

* white define

* alpha define

* high roller starting mats, recyk, and melt temp

* open container check

* removed radium prank, moved to a special interaction with the painting brush

* fixing conflicts in items.dmi (removed coin icons moved to coins.dmi)
2023-12-10 17:04:17 -06:00
DeityLink
f90d45fb46 The Paint & Linen Update [Splinter 2]: Splashplosions (#35528)
* Soft Reset

* gotta set up the FLAXOIL define

* test_reach

* deprecated comment has left the building
2023-12-10 17:01:20 -06:00
DeityLink
00e584b333 The Paint & Linen Update [Splinter 1]: Table Shifting (#35527)
* Soft Reset

* Table Shift
2023-12-10 17:01:05 -06:00
D3athrow-Issues
396f605457 [ci skip] Automatic changelog update. 2023-12-09 18:22:40 -05:00
d3athrow
f83b70c536 Merge pull request #35420 from Mintgreen01/Bleeding-Edge
Pomf plushie fix
2023-12-09 18:22:32 -05:00
D3athrow-Issues
99257e2c81 [ci skip] Automatic changelog update. 2023-12-09 14:12:19 -05:00
DorainGrey
65182b19c1 Horizon & Snaxi fixes (#35547) 2023-12-09 13:12:10 -06:00
Mintgreen01
efc9a6c7de removed "<> 0" 2023-12-09 11:09:01 +00:00
D3athrow-Issues
dab5a4bce2 [ci skip] Automatic changelog update. 2023-12-09 04:27:51 -05:00
DeityLink
15121b534f Nuka Cola tweaks (#35531)
* nuka cola tweaks

* same credits as iron
2023-12-09 03:27:44 -06:00
D3athrow-Issues
abb49ed395 [ci skip] Automatic changelog update. 2023-12-09 04:27:40 -05:00
nervere
b4f4ee0448 Bonk! Adds sound effect when the rolling pin successfully knocks someone out + code improvements & balance (#35488)
* fix rolling pin knockout and add bonk sound effect

* code improvement and balance

* eye blur

* properly do attack animations on knockout proc

* briefcase knockouts adjusted too

* briefcase makes hit sound instead of bonk

* ensure hitsound for briefcase knockout

* change rolling pin hitsound to be more "fleshy"

* fix helmets protecting head

* helmet fix

* git sucks

---------

Co-authored-by: nervere <sage@lulz>
2023-12-09 03:27:27 -06:00
D3athrow-Issues
b718a7d1d0 [ci skip] Automatic changelog update. 2023-12-08 23:15:56 -05:00
DorainGrey
bf15a0383b Snaxi fixes I (#35542)
* Fixes Caps Hat

* Snaxi Fixes
2023-12-08 22:15:48 -06:00