Commit Graph
391 Commits
Author SHA1 Message Date
ToonClyde 59c1475118 a bit of detailing 2021-04-20 03:55:27 -07:00
Dahlular 6c72b0e0e6 Merge remote-tracking branch 'upstream/master' into cumcom 2021-04-18 23:17:45 -06:00
Archie 2f7f72ea0e Archie Fix Pack 1 2021-04-18 21:07:35 -03:00
DahlularandGitHub f2bd4ed664 Merge pull request #1070 from ArchieBeepBoop/drone
drone gaming
2021-04-17 22:49:44 -06:00
Archie fce68d94bf drone gaming 2021-04-18 01:45:22 -03:00
ToonClyde 39782e6172 added external lighting 2021-04-17 02:38:34 -07:00
ToonClyde c46cc725e2 fancied up the top left solar and added some Easter eggs 2021-04-16 09:42:14 -07:00
ToonClyde 7c6bfc0a74 I did something but I don't remember 2021-04-15 10:02:35 -07:00
Dahlular 428fced71d bruh moment 2021-04-15 08:40:41 -06:00
Chloe Carver-Brown f6683fbcd3 we're off to see the wizard 2021-04-15 15:12:13 +01:00
Dahlular 3ef196a2d3 adds funny ballooooonnsss 2021-04-15 06:30:34 -06:00
Chloe Carver-Brown 83cbca5f07 But if you close your eyes 2021-04-15 12:25:18 +01:00
Dahlular 7537d9b813 Player spawns 2021-04-15 05:14:10 -06:00
Dahlular 68b5609a10 Areas! 2021-04-15 04:54:20 -06:00
DahlularandGitHub 9ace823a70 Merge pull request #1063 from lyricalpaws/master
A bunch of shit and fuck (Actually useful)
2021-04-15 04:32:24 -06:00
Archie 36f265aea7 Nothing Here 2021-04-12 11:18:50 -03:00
Chloe Carver-Brown 5e5b43212e fuck shit piss 2021-04-08 01:36:09 +01:00
ToonClyde b2f56b4b0b Xenoarchaeology Access 2021-04-05 22:23:20 -07:00
ToonClyde 2d26cb3a91 did most of the cameras for rooms 2021-03-30 01:40:27 -07:00
ToonClyde 1934c2ea32 all the wiring and Disposal piping is done 2021-03-29 04:27:58 -07:00
QuoteFox 99f861a512 new plating and shelves 2021-03-28 16:48:02 +01:00
ToonClyde 47c13cd876 all the pipeing are done 2021-03-27 04:07:19 -07: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
ToonClyde e5eb6cdc6b redid medical a little and got directional arcade machines 2021-03-26 05:27:21 -07:00
ToonClyde 6e02198762 rotated doors and blast doors 2021-03-25 14:49:08 -07:00
QuoteFox 03e3d5abcc fixes 2021-03-25 15:06:40 +00:00
QuoteFox f2f4e771d9 fixes 2021-03-25 15:03:38 +00:00
QuoteFox afc61a2d57 more fixes 2021-03-25 14:42:16 +00:00
QuoteFox 29b3f0293e more fixes 2021-03-25 12:58:27 +00:00
QuoteFox 7e11e97ace flashy stuff 2021-03-25 12:48:46 +00:00
QuoteFox d22ef34523 fixes 2021-03-25 12:12:48 +00:00
QuoteFox a1644811ac Ported Map; Lambda Station 2021-03-25 12:06:32 +00:00
ToonClyde 5a0eb30c70 lighting is in 2021-03-25 01:24:58 -07:00
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
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
Chloe Carver-Brown 655afd0dfe minor change to psych office 2021-03-24 12:46:49 +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
Chloe Carver-Brown 0620b5c682 psych job! 2021-03-23 17:21:44 +00: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 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
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
ToonClyde e38b9e556b a few small tweaks 2021-03-20 05:50:25 -07:00