Commit Graph

451 Commits

Author SHA1 Message Date
ToonClyde
2e8480abc4 cheeseburger backpack time 2021-05-10 02:54:15 -07:00
DragonTrance
88d7fb3dca fixes borg pixel shift, and borg expander also gives client-side resize action 2021-05-09 14:04:26 -07:00
Chloe Carver-Brown
55098e9c65 Woe, qol be upon ye 2021-05-05 00:29:18 +01:00
Archie
f3a4c96da6 Removes some references and adds one. 2021-05-03 20:31:01 -03:00
Dahlular
90ba8f2b64 Map fixes, gravity fixes, many fixes 2021-04-29 21:21:52 -06:00
Dahlular
4150636fa4 Revert "Revert "Merge branch 'master' into cumcom""
This reverts commit c2cc5c49c6.
2021-04-29 17:46:09 -06:00
Dahlular
c2cc5c49c6 Revert "Merge branch 'master' into cumcom"
This reverts commit 05c4645c35, reversing
changes made to d3867f491b.
2021-04-29 17:44:13 -06:00
Dahlular
05c4645c35 Merge branch 'master' into cumcom 2021-04-29 17:43:57 -06:00
Dahlular
3cefcf6eb1 Merge remote-tracking branch 'upstream/master' 2021-04-29 17:24:55 -06:00
Dahlular
2723507a0f potential atmos fixes 2021-04-28 23:01:54 -06:00
Chloe Carver-Brown
310a58f27a ogh 2021-04-20 15:29:01 +01:00
Dahlular
50a7413928 Merge remote-tracking branch 'upstream/master' 2021-04-18 23:19:38 -06:00
Dahlular
6c72b0e0e6 Merge remote-tracking branch 'upstream/master' into cumcom 2021-04-18 23:17:45 -06:00
Archie
d89aec9ce1 Random Parallax 2021-04-19 02:08:21 -03:00
Dahlular
39d446817b Merge remote-tracking branch 'upstream/master' 2021-04-17 21:09:59 -06:00
Dahlular
677561e819 Merge remote-tracking branch 'upstream/master' 2021-04-17 21:05:19 -06:00
QuoteFox
fb21e779b1 Nail paint cosmetics 2021-04-17 22:41:02 +01:00
Chloe Carver-Brown
5e5b43212e fuck shit piss 2021-04-08 01:36:09 +01:00
QuoteFox
275438d526 reduce radio volume
reduce radio volume
2021-03-28 23:18:27 +01:00
QuoteFox
58b12a8147 Item sounds 2021-03-28 22:05:25 +01:00
QuoteFox
8cceffb594 radio in sounds. 2021-03-28 18:53:32 +01:00
QuoteFox
99f861a512 new plating and shelves 2021-03-28 16:48:02 +01: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
a1644811ac Ported Map; Lambda Station 2021-03-25 12:06:32 +00:00
Dahlular
400354cc6e Merge remote-tracking branch 'upstream/master' into cumcom 2021-03-25 00:15:19 -06:00
Dahlular
149ba24169 Merge branch 'master' into cumcom 2021-03-24 07:55:15 -06:00
QuoteFox
8e15edf08a cigs no longer make a mountain of ash when put out. 2021-03-24 11:53:01 +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
Dahlular
ea6beba104 Merge remote-tracking branch 'upstream/master' 2021-03-22 11:18:41 -06: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
9d16326f34 lets not rip a hole in space time. 2021-03-20 16:35:46 +00:00
QuoteFox
0c5effbc7b some fixes!
some fixes!
2021-03-20 16:32:29 +00:00
QuoteFox
706ee6d3eb Hyperstation RP beta 0.1 and alot of bug fixes. 2021-03-20 12:36:02 +00:00
Dahlular
a936acf6ce crystal fixes 2021-03-10 04:45:19 -07:00
Dahlular
1003b04929 medium crystals 2021-03-10 04:30:38 -07:00
Dahlular
79f00a10b8 random small crystals 2021-03-10 03:29:40 -07:00
Dahlular
c72cde0fab fixes 2021-03-08 12:31:19 -07:00
DragonTrance
a336b3086f trays hold more + donk pockets store correctly 2021-03-02 00:43:08 -07:00
QuoteFox
74fd8d8f13 Stat panel fixes (Not done) 2021-02-28 03:58:07 +00:00
QuoteFox
d4abf52004 clustaur nerf. 2021-02-26 21:26:34 +00:00
QuoteFox
233a357a5d matches now make a noise 2021-02-26 01:52:55 +00:00
DragonTrance
6aa9462551 better 2021-02-25 14:31:00 -07:00
DragonTrance
4de3075120 squashes defib runtime 2021-02-25 14:14:39 -07:00
QuoteFox
9dd61f3efb Pens now write on people, Harm intent to stab them like the old way.
Washable at showers.
2021-02-22 23:08:42 +00:00
QuoteFox
973e45e102 Merge pull request #983 from DragonTrance/plant-adding
Botany Changes
2021-02-21 23:08:24 +00:00
DragonTrance
3ebb7488de Merge branch 'master' into plant-adding 2021-02-21 12:06:48 -07:00
DragonTrance
24cb27b67c #5 2021-02-21 08:37:10 -07:00