Skip to content
This repository has been archived by the owner on Mar 25, 2020. It is now read-only.

DREAM REWORK #2392

Closed
wants to merge 29 commits into from
Closed

DREAM REWORK #2392

Show file tree
Hide file tree
Changes from 16 commits
Commits
Show all changes
29 commits
Select commit Hold shift + click to select a range
6313143
Refactors dreaming
Time-Green Jul 16, 2017
f64ad2f
Fixes invisibility, fluff messages and clears out useless code
Time-Green Jul 16, 2017
590c43f
Fixes an inverted check
Time-Green Jul 17, 2017
90dc1df
Removes more checks and fixes brain surgery
Time-Green Jul 17, 2017
333b502
Adds ambience by kayozz and a new dream by kmc
Time-Green Jul 18, 2017
f60c38d
Adds more maps, features and fixes some more bugs
Time-Green Jul 19, 2017
24c07fd
Deletes an empty file I made on accident
Time-Green Jul 19, 2017
8512d44
Merge branch 'master' into Dream-rework
Time-Green Jul 29, 2017
ef82ae8
Removes conflict part 1
Time-Green Jul 29, 2017
aa666cb
Revert "Deletes an empty file I made on accident"
Time-Green Jul 29, 2017
4858f7e
Fixes more shit
Time-Green Jul 29, 2017
89661e9
Merge remote-tracking branch 'origin/Dream-rework' into Dream-rework
Time-Green Jul 29, 2017
1f0f985
Pastes in the master map
Time-Green Jul 29, 2017
93fa457
Fixes conflicts...
Time-Green Jul 29, 2017
37d351f
fixes the maps...
Time-Green Jul 29, 2017
e4ca798
Adds a fake ckey to the player for admin reasons, requested by slinky
Time-Green Jul 30, 2017
375121b
Removes debug messages. I thought I had them all...
Time-Green Jul 31, 2017
18676db
Merge branch 'master' into Dream-rework
Time-Green Aug 7, 2017
47bc5a6
Reverts the fake ckey
Time-Green Aug 15, 2017
3270155
Merge remote-tracking branch 'refs/remotes/yogstation13/master' into …
Time-Green Aug 21, 2017
d3af0e0
Merge remote-tracking branch 'refs/remotes/yogstation13/master' into …
Time-Green Aug 27, 2017
8d5c9ca
Fixes all instances off being DC'd
Time-Green Aug 27, 2017
ec1cecf
Orbiting the dream person teleports you to their real body
Time-Green Aug 27, 2017
2cac2be
Gives the empty bodies fake keys
Time-Green Aug 29, 2017
04964b4
Fixes a quick typo
Time-Green Aug 29, 2017
def340a
Fixes a quick typo 2.0
Time-Green Aug 29, 2017
3951f31
Fixes another typo and tests the failsafe
Time-Green Aug 29, 2017
fb5e660
Removes a debug message
Time-Green Aug 30, 2017
3b91249
Fixes blob. Woops
Time-Green Aug 30, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
1 change: 1 addition & 0 deletions _maps/__MAP_DEFINES.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,5 +10,6 @@
#define EMPTY_AREA_2 "Empty Area 2"
#define EMPTY_AREA_3 "Empty Area 3"
#define EMPTY_AREA_4 "Empty Area 4"
#define DREAMLAND "Dreamland"
#define AWAY_MISSION "Away Mission"
#define AWAY_MISSION_LIST list(AWAY_MISSION = SELFLOOPING)
Empty file added _maps/map_files/generic/z10.dm
View file
Open in desktop
Empty file.