Commit Graph

437 Commits

Author SHA1 Message Date
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
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
Kharkov72
4e2d9a3bd0 I cannot let this go unadded 2021-02-21 00:53:05 -05:00
Chloe Carver-Brown
63063ecd9b It liiiiiives 2021-02-20 14:48:12 +00:00
Chloe Carver-Brown
a38a978f70 Revert "Poggers"
This reverts commit 389291b46a.
2021-02-19 23:35:57 +00:00
Chloe Carver-Brown
6d8d602907 Adding clustaur grenades 2021-02-19 23:21:12 +00:00
Chloe Carver-Brown
389291b46a Poggers 2021-02-19 22:19:12 +00:00
Chloe Carver-Brown
c1c9b3bba2 Poggers 2021-02-15 23:47:04 +00:00
Vladin
1bfe8bb816 love in the air
no not really thats actually nerve gas
2021-02-13 21:51:56 -05:00
DragonTrance
58b69503e3 #4 2021-02-11 20:02:40 -07:00
DragonTrance
75415bb7af you know what, dont even deconstruct them 2021-02-10 07:33:11 -07:00
DragonTrance
d09400af15 stop exploiting constructable showers 2021-02-10 07:23:31 -07:00
DragonTrance
ed135323dc #2 2021-02-10 07:18:26 -07:00
QuoteFox
22d0f71b6c Fixes empty tape recorders getting stuck on pocket and belt slots 2021-02-09 10:31:38 +00:00
DragonTrance
187471f0af #1 2021-02-08 19:15:44 -07:00
QuoteFox
b39881f441 vending fix, wallet fix
vending fix, wallet fix
2021-02-04 23:40:40 +00:00