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

Commit

Permalink
Merge pull request #2622 from Cruix/nodream
Browse files Browse the repository at this point in the history
Removes dreaming
  • Loading branch information
Cruix committed Oct 6, 2017
2 parents bc88bad + a69e5af commit 9050827
Show file tree
Hide file tree
Showing 9 changed files with 616 additions and 785 deletions.
1,300 changes: 613 additions & 687 deletions _maps/map_files/generic/z2.dmm

Large diffs are not rendered by default.

4 changes: 0 additions & 4 deletions code/_globalvars/lists/mapping.dm
Expand Up @@ -69,7 +69,3 @@ var/list/datum/map_template/maint_room_templates = list()

var/list/datum/map_template/shuttle_templates = list()
var/list/datum/map_template/shelter_templates = list()

//List of dream landmarks
var/list/dreamland = list()
var/list/legiondream = list()
2 changes: 0 additions & 2 deletions code/game/area/Space_Station_13_areas.dm
Expand Up @@ -68,8 +68,6 @@ NOTE: there are two lists of areas in the end of this file: centcom and station

var/sound_env = ROOM

var/dream_type //A special type of dream that occurs in the area. example: = "legion"

/*Adding a wizard area teleport list because motherfucking lag -- Urist*/
/*I am far too lazy to make it a proper list of areas so I'll just make it run the usual telepot routine at the start of the game*/
var/list/teleportlocs = list()
Expand Down
7 changes: 1 addition & 6 deletions code/game/atoms_movable.dm
Expand Up @@ -144,12 +144,7 @@
if(has_buckled_mobs())
unbuckle_all_mobs(force=1)
. = ..()
var/reset_perspective = TRUE
if(istype(src, /mob/living/carbon))
var/mob/living/carbon/C = src
if(C.dream.dreaming)
reset_perspective = FALSE //Don't want dreamers to get buggy
if(client && reset_perspective)
if(client)
reset_perspective(destination)
update_canmove() //if the mob was asleep inside a container and then got forceMoved out we need to make them fall.

Expand Down
2 changes: 1 addition & 1 deletion code/game/objects/effects/landmarks.dm
Expand Up @@ -303,4 +303,4 @@
world.log << "Ruin \"[template_name]\" placed at ([T.x], [T.y], [T.z])"
template.load(T, centered = FALSE)
template.loaded++
return TRUE
return TRUE
1 change: 0 additions & 1 deletion code/modules/mining/lavaland/lavaland_areas.dm
Expand Up @@ -4,7 +4,6 @@
icon_state = "mining"
has_gravity = 1
always_unpowered = TRUE
dream_type = "legion"

/area/lavaland/surface
name = "Lavaland"
Expand Down
5 changes: 1 addition & 4 deletions code/modules/mob/living/carbon/carbon.dm
@@ -1,6 +1,5 @@
/mob/living/carbon
blood_volume = BLOOD_VOLUME_NORMAL
var/datum/dream/dream = new()

/mob/living/carbon/New()
create_reagents(1000)
Expand Down Expand Up @@ -731,10 +730,8 @@
if(NOCRIT in status_flags)//no crit when you're stimmed
return
stat = UNCONSCIOUS
blind_eyes(1)
update_canmove()
if(!dream.Dream(src))
blind_eyes(1)

else if(health <= config.health_threshold_crit)
if(NOCRIT in status_flags)
return
Expand Down
79 changes: 0 additions & 79 deletions code/modules/mob/living/carbon/dream.dm

This file was deleted.

1 change: 0 additions & 1 deletion yogstation.dme
Expand Up @@ -1381,7 +1381,6 @@
#include "code\modules\mob\living\carbon\carbon_defines.dm"
#include "code\modules\mob\living\carbon\carbon_movement.dm"
#include "code\modules\mob\living\carbon\death.dm"
#include "code\modules\mob\living\carbon\dream.dm"
#include "code\modules\mob\living\carbon\emote.dm"
#include "code\modules\mob\living\carbon\examine.dm"
#include "code\modules\mob\living\carbon\inventory.dm"
Expand Down

0 comments on commit 9050827

Please sign in to comment.