Commit Graph

308 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
Archie
f3a4c96da6 Removes some references and adds one. 2021-05-03 20:31:01 -03:00
Chloe Carver-Brown
310a58f27a ogh 2021-04-20 15:29:01 +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
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
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
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
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
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
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
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
QuoteFox
a40e002595 loose ends.
more prices I missed
2021-02-04 14:20:17 +00:00
QuoteFox
c0de8ec3ac some prices and lights I forgot. 2021-02-04 13:10:16 +00:00
QuoteFox
5584bb9522 Economy part 2 - Vendors 2021-02-04 12:42:50 +00:00
QuoteFox
409a221c42 Merge pull request #940 from VladinXXV/typo-hell
Quality of Life +1
2021-01-29 21:21:54 +00:00
Vladin
17b20e3a3e Sthefo.... stepo..... steto.... ssetho.....
THE THING YOU LISTEN TO THE HEART WITH DAMNIT
2021-01-29 16:06:02 -05:00
QuoteFox
4980b0556d Merge pull request #936 from ArchieBeepBoop/solar
Modular Solar Panels + Solar Tracker Fix + Compile issue fix
2021-01-29 20:38:48 +00:00
QuoteFox
3d1aabd694 Merge pull request #937 from quotefox/economy
Hyper Economy part 1 - Money Movement.
2021-01-29 01:18:58 +00:00
QuoteFox
9366e720fa Merge pull request #935 from Kabramen/chairs
One step closer to become IKEA: More furniture to the new woodtypes, 3 new chair bounties + one stuff for loadout
2021-01-28 23:59:27 +00:00
Archie
d50b781203 SolarTest11 2021-01-28 20:22:08 -03:00
Kabra_men
0b1a40baee that's a lot of stuff heck 2021-01-28 18:28:48 -03:00
Vladin
479c003c97 Do not fuck the bird.
Kenk plush can no longer be sex'd, as per his request.
2021-01-26 23:43:51 -05:00
Kabra_men
41c87b5e85 more wood stuff 2021-01-25 17:37:06 -03:00