 Dahlular
|
400354cc6e
|
Merge remote-tracking branch 'upstream/master' into cumcom
|
2021-03-25 00:15:19 -06:00 |
|
|
ToonClyde
|
13eb70fdde
|
got this to work <3
|
2021-03-24 23:14:41 -07:00 |
|
|
QuoteFoxandGitHub
|
b949054b1f
|
Merge pull request #1048 from CapnMachaddish/anti-wazard-gear
Anti wazard gear
|
2021-03-24 22:08:03 +00:00 |
|
|
QuoteFoxandGitHub
|
c962b73e2f
|
Merge pull request #1050 from lyricalpaws/master
More changes to medical
|
2021-03-24 15:28:13 +00:00 |
|
|
Chloe Carver-Brown
|
9a4962c5e3
|
bonk
|
2021-03-24 14:27:09 +00:00 |
|
|
Dahlular
|
149ba24169
|
Merge branch 'master' into cumcom
|
2021-03-24 07:55:15 -06:00 |
|
|
ToonClyde
|
52441e9f33
|
I did work yes
|
2021-03-24 06:48:30 -07:00 |
|
|
QuoteFoxandGitHub
|
effd382a90
|
Merge pull request #1049 from lyricalpaws/master
Small changes to the psych office
|
2021-03-24 12:54:48 +00:00 |
|
|
Chloe Carver-Brown
|
655afd0dfe
|
minor change to psych office
|
2021-03-24 12:46:49 +00:00 |
|
|
ChloeandGitHub
|
5b7f9c4633
|
Merge pull request #11 from quotefox/master
update
|
2021-03-24 12:06:30 +00:00 |
|
|
QuoteFox
|
8e15edf08a
|
cigs no longer make a mountain of ash when put out.
|
2021-03-24 11:53:01 +00:00 |
|
|
QuoteFox
|
f0e7fa69b7
|
Fixed stat panel resetting theme on relog.
|
2021-03-24 10:43:29 +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
|
04339e805c
|
Revert "airlock cycling."
This reverts commit 1cebaa753e.
|
2021-03-23 18:55:55 +00:00 |
|
|
QuoteFox
|
e77f3ee585
|
Revert "slight tweak"
This reverts commit b56a7f817c.
|
2021-03-23 18:55:48 +00:00 |
|
|
QuoteFoxandGitHub
|
c4ced3d443
|
Merge pull request #1044 from Chemlight/Centcom-fixes
Update Centcom
|
2021-03-23 18:14:12 +00:00 |
|
|
QuoteFoxandGitHub
|
fa3e559b78
|
Merge pull request #1046 from lyricalpaws/master
Adds psychologist role, changes Box med a bit
|
2021-03-23 18:13:40 +00:00 |
|
|
QuoteFoxandGitHub
|
d320536b97
|
Merge pull request #1047 from CapnMachaddish/door-sounds-2.0
slight tweak
|
2021-03-23 17:53:43 +00:00 |
|
|
CapnMachaddish
|
b56a7f817c
|
slight tweak
|
2021-03-23 12:52:02 -05: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
|
1cebaa753e
|
airlock cycling.
|
2021-03-23 15:58:16 +00:00 |
|
|
QuoteFox
|
f2da13b759
|
Sounds, New Announcer, announce uses local reverb
|
2021-03-23 15:50:11 +00:00 |
|
|
QuoteFoxandGitHub
|
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 |
|
|
CapnMachaddish
|
956bc6cb8b
|
PAAARTAAAAY!
THROUGH THE FIRE AND THE FLAMES WE CARRY ON
|
2021-03-23 01:39:01 -05:00 |
|
|
ToonClyde
|
dc61f2c9d4
|
finish the turbine, Gateway, and Teleporter
|
2021-03-22 20:13:31 -07:00 |
|
|
Chemlight
|
edfe170e08
|
Update Centcom
Ended up fixing a missing floor tile and added a few weapon chargers along with other things at CC.
|
2021-03-22 16:52:40 -07:00 |
|
|
DahlularandGitHub
|
7b4e122ed5
|
Merge pull request #1043 from quotefox/revert-1041-revert-1039-fukin-vot
Revert "Revert "idk what to call this""
|
2021-03-22 11:25:50 -06:00 |
|
|
DahlularandGitHub
|
4b0c8a2d0e
|
Revert "Revert "idk what to call this""
|
2021-03-22 11:25:32 -06:00 |
|
|
DahlularandGitHub
|
4b7339086d
|
Merge pull request #1042 from quotefox/revert-1036-Centcom-but-with-more-room
Revert "Centcom patch"
|
2021-03-22 11:25:03 -06:00 |
|
|
DahlularandGitHub
|
48515f31d4
|
Revert "Centcom patch"
|
2021-03-22 11:24:19 -06:00 |
|
|
Dahlular
|
ea6beba104
|
Merge remote-tracking branch 'upstream/master'
|
2021-03-22 11:18:41 -06:00 |
|
|
DahlularandGitHub
|
fffc518893
|
Merge pull request #1041 from quotefox/revert-1039-fukin-vot
Revert "idk what to call this"
|
2021-03-22 11:15:47 -06:00 |
|
|
DahlularandGitHub
|
99b6c9ad0a
|
Revert "idk what to call this"
|
2021-03-22 11:15:31 -06:00 |
|
|
DahlularandGitHub
|
ce4a0f158e
|
Merge pull request #1039 from DragonTrance/fukin-vot
idk what to call this
|
2021-03-22 11:13:02 -06:00 |
|
|
QuoteFoxandGitHub
|
0f7d875949
|
Merge pull request #1040 from lukevale/master
Swimssuits, sweaters, and jackets! OH MY!
|
2021-03-22 16:02:35 +00:00 |
|
|
QuoteFoxandGitHub
|
5ed08c5b24
|
Merge pull request #1038 from ToonClyde/superheated-candle
stupid infinite candles superheating a room
|
2021-03-22 16:01:47 +00:00 |
|
|
QuoteFoxandGitHub
|
efc28da971
|
Merge pull request #1036 from Chemlight/Centcom-but-with-more-room
Centcom patch
|
2021-03-22 16:01:40 +00:00 |
|
|
ToonClyde
|
6cb0817896
|
Securities 90% done!!
|
2021-03-22 05:22:18 -07:00 |
|
|
lukevale
|
2039aa1f10
|
finishing touches to the new clothing
|
2021-03-21 18:51:57 -05: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 |
|