Skip to content

Генокрад Fixes #27 #34

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Error777 wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Генокрад Fixes #27 #34

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c6063ed
Генокрад Fixes #27
Oct 21, 2017
d7d289c
Датчики Fixes #30
Oct 22, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions code/datums/repositories/crew.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
var/global/datum/repository/crew/crew_repository = new()
var/list/map_levels = list(3,4,6)
var/list/map_levels = list(1,2,3,4,5,6)

/datum/repository/crew
var/list/cache_data
Expand All @@ -24,7 +24,7 @@ var/list/map_levels = list(3,4,6)
var/tracked = scan()
for(var/obj/item/clothing/under/C in tracked)
var/turf/pos = get_turf(C)
if((C) && (C.has_sensor) && (pos) && (pos.z == z_level) && (C.sensor_mode != SUIT_SENSOR_OFF))
if(C.has_sensor && pos && pos.z == z_level && C.sensor_mode != SUIT_SENSOR_OFF)
if(istype(C.loc, /mob/living/carbon/human))
var/mob/living/carbon/human/H = C.loc
if(H.w_uniform != C)
Expand Down
3 changes: 2 additions & 1 deletion code/game/gamemodes/changeling/changeling_powers.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -421,7 +421,7 @@ var/global/list/possible_changeling_IDs = list("Alpha","Beta","Gamma","Delta","E

C.status_flags |= FAKEDEATH //play dead
C.update_canmove()
C.remove_changeling_powers()
C.verbs -= /mob/proc/changeling_fakedeath

C.emote("gasp")
C.tod = worldtime2text()
Expand Down Expand Up @@ -453,6 +453,7 @@ var/global/list/possible_changeling_IDs = list("Alpha","Beta","Gamma","Delta","E
// sending display messages
C << "<span class='notice'>We have regenerated.</span>"
C.verbs -= /mob/proc/changeling_revive
C.verbs += /mob/proc/changeling_fakedeath


//Boosts the range of your next sting attack by 1
Expand Down