Commit Graph

1997 Commits

Author SHA1 Message Date
QuoteFox 9172ee8bc8 Revert "gradient part 2, the fix"
This reverts commit a32444dae7.
2021-03-27 10:56:39 +00:00
QuoteFox a4826e6eab Revert "Merge remote-tracking branch 'upstream/master'"
This reverts commit f5cf7f6f5a, reversing
changes made to a32444dae7.
2021-03-27 10:56:34 +00:00
QuoteFox b81d6bccba Revert "Revert "Revert "Hair_gradients part one."""
This reverts commit c5d8bb5fb3.
2021-03-27 10:56:23 +00:00
QuoteFox 6365c7c895 Revert "the fixening or something"
This reverts commit bbd60b8c0f.
2021-03-27 10:56:20 +00:00
QuoteFox 64c8cc576f Revert "final touches."
This reverts commit 6c2ca26e86.
2021-03-27 10:56:18 +00:00
QuoteFox bcb174eafb Revert "Merge pull request #1057 from lukevale/master"
This reverts commit 8f5ad4e860, reversing
changes made to bcc80b9800.
2021-03-27 10:56:06 +00:00
QuoteFox 8f5ad4e860 Merge pull request #1057 from lukevale/master
A quick fix to saving. Should now save properly.
2021-03-26 13:41:32 +00:00
lukevale a0de61cd90 A quick fix to saving. Should now save properly. 2021-03-26 02:30:11 -05:00
QuoteFox bf7abb778d Revert "Revert "Merge pull request #1055 from DragonTrance/apparition-antagonist""
This reverts commit 04d01ed851.
2021-03-26 06:00:13 +00:00
QuoteFox 04d01ed851 Revert "Merge pull request #1055 from DragonTrance/apparition-antagonist"
This reverts commit 5488e82e13, reversing
changes made to fa04b528f9.
2021-03-26 05:59:30 +00:00
QuoteFox 5488e82e13 Merge pull request #1055 from DragonTrance/apparition-antagonist
Wendigo (Early/Testing Stages)
2021-03-26 05:44:39 +00:00
DragonTrance 1e3c4b91d6 wendigo antag (admemery atm) 2021-03-25 22:29:29 -07:00
QuoteFox e57ff2e49c Merge pull request #1054 from CapnMachaddish/Door-Sounds-2.1
New door sounds, take 2
2021-03-26 02:44:46 +00:00
CapnMachaddish 786b05579c Doors and corners, kid... doors and corners. 2021-03-25 20:00:23 -05:00
lukevale 6c2ca26e86 final touches. 2021-03-25 16:56:29 -05:00
lukevale bbd60b8c0f the fixening or something 2021-03-25 15:01:31 -05:00
lukevale c5d8bb5fb3 Revert "Revert "Hair_gradients part one.""
This reverts commit 90c1e4193e.
2021-03-25 14:59:57 -05:00
QuoteFox 90c1e4193e Revert "Hair_gradients part one."
This reverts commit 703ae30ec1.
2021-03-25 13:05:57 +00:00
QuoteFox a1644811ac Ported Map; Lambda Station 2021-03-25 12:06:32 +00:00
QuoteFox e698a8a30c Merge pull request #1051 from lukevale/master
Hair Gradients. The headache.
2021-03-25 10:58:54 +00:00
lukevale 703ae30ec1 Hair_gradients part one. 2021-03-25 04:58:38 -05:00
QuoteFox b949054b1f Merge pull request #1048 from CapnMachaddish/anti-wazard-gear
Anti wazard gear
2021-03-24 22:08:03 +00:00
QuoteFox 8e15edf08a cigs no longer make a mountain of ash when put out. 2021-03-24 11:53:01 +00:00
QuoteFox 41c03378fc revert reverb (broken)
revert reverb bro
2021-03-23 20:37:15 +00:00
CapnMachaddish 06a38d57a2 Now available from your local interdimensional dragon shopkeeper 2021-03-23 14:25:11 -05:00
CapnMachaddish 72a3bc12a6 gloves 2021-03-23 14:05:05 -05:00
QuoteFox 92f281373d Revert "Merge pull request #1045 from CapnMachaddish/door-sounds-2.0"
This reverts commit 43a0ce2b0a, reversing
changes made to 9594a65526.
2021-03-23 18:56:27 +00:00
QuoteFox 35d4666715 Revert "Sounds, New Announcer, announce uses local reverb"
This reverts commit f2da13b759.
2021-03-23 18:55:58 +00:00
QuoteFox fa3e559b78 Merge pull request #1046 from lyricalpaws/master
Adds psychologist role, changes Box med a bit
2021-03-23 18:13:40 +00:00
Chloe Carver-Brown 0620b5c682 psych job! 2021-03-23 17:21:44 +00:00
QuoteFox 38b5e5b0eb locker and jumpsuit equip sounds. 2021-03-23 16:27:18 +00:00
QuoteFox f2da13b759 Sounds, New Announcer, announce uses local reverb 2021-03-23 15:50:11 +00:00
QuoteFox 43a0ce2b0a Merge pull request #1045 from CapnMachaddish/door-sounds-2.0
Door sounds 2.0
2021-03-23 15:47:52 +00:00
CapnMachaddish efafab1b72 even more doors 2021-03-23 10:27:02 -05:00
CapnMachaddish b8b033ee5b EVEN MORE 2021-03-23 07:17:36 -05:00
CapnMachaddish b165c3c7a1 hehe 2021-03-23 05:41:05 -05:00
QuoteFox 9594a65526 areas now have reverbs 2021-03-23 10:03:03 +00:00
Dahlular 4b0c8a2d0e Revert "Revert "idk what to call this"" 2021-03-22 11:25:32 -06:00
Dahlular 99b6c9ad0a Revert "idk what to call this" 2021-03-22 11:15:31 -06:00
Dahlular ce4a0f158e Merge pull request #1039 from DragonTrance/fukin-vot
idk what to call this
2021-03-22 11:13:02 -06:00
QuoteFox 0f7d875949 Merge pull request #1040 from lukevale/master
Swimssuits, sweaters, and jackets! OH MY!
2021-03-22 16:02:35 +00:00
QuoteFox acc67680a2 Fix Formatting in Examine window 2021-03-21 06:51:00 +00:00
lukevale cf48916d8d final touches on the sweater. 2021-03-20 16:28:38 -05:00
DragonTrance f2c2359c1c idk what to call this 2021-03-20 14:14:22 -07:00
lukevale ea20010c14 Winter labcoat and virgin killer! 2021-03-20 15:17:03 -05:00
QuoteFox 0d487e3eb9 Proper fixes and returning to monkey. 2021-03-20 19:16:50 +00:00
QuoteFox 9cf0ca814b Revert "some fixes!"
This reverts commit 0c5effbc7b.
2021-03-20 19:01:30 +00:00
QuoteFox 5dbf439e0b Revert "lets not rip a hole in space time."
This reverts commit 9d16326f34.
2021-03-20 19:00:47 +00:00
QuoteFox a9054be26f Revert "return to monkey"
This reverts commit 007ea1f7de.
2021-03-20 19:00:36 +00:00
QuoteFox 007ea1f7de return to monkey 2021-03-20 18:51:08 +00:00