fix roundstart/rej cleanup
This commit is contained in:
LetterJay
+14
-13
@@ -63,8 +63,8 @@
|
||||
|
||||
var/mob/living/enslaved_to //If this mind's master is another mob (i.e. adamantine golems)
|
||||
|
||||
var/datum/language_holder
|
||||
|
||||
var/datum/language_holder/language_holder
|
||||
|
||||
/datum/mind/New(var/key)
|
||||
src.key = key
|
||||
soulOwner = src
|
||||
@@ -77,21 +77,22 @@
|
||||
antag_datums = null
|
||||
return ..()
|
||||
|
||||
/datum/mind/proc/get_language_holder()
|
||||
if(!language_holder)
|
||||
var/datum/language_holder/L = current.get_language_holder(shadow=FALSE)
|
||||
language_holder = L.copy(src)
|
||||
|
||||
return language_holder
|
||||
|
||||
/datum/mind/proc/get_language_holder()
|
||||
if(!language_holder)
|
||||
var/datum/language_holder/L = current.get_language_holder(shadow=FALSE)
|
||||
language_holder = L.copy(src)
|
||||
|
||||
return language_holder
|
||||
|
||||
/datum/mind/proc/transfer_to(mob/new_character, var/force_key_move = 0)
|
||||
if(current) // remove ourself from our old body's mind variable
|
||||
current.mind = null
|
||||
SStgui.on_transfer(current, new_character)
|
||||
|
||||
if(!language_holder)
|
||||
language_holder = new_character.language_holder.copy(src)
|
||||
|
||||
if(!language_holder)
|
||||
var/datum/language_holder/mob_holder = new_character.get_language_holder(shadow = FALSE)
|
||||
language_holder = mob_holder.copy(src)
|
||||
|
||||
if(key)
|
||||
if(new_character.key != key) //if we're transfering into a body with a key associated which is not ours
|
||||
new_character.ghostize(1) //we'll need to ghostize so that key isn't mobless.
|
||||
@@ -284,7 +285,7 @@
|
||||
creator.faction |= current.faction
|
||||
|
||||
if(creator.mind.special_role)
|
||||
message_admins("[ADMIN_LOOKUPFLW(current)] has been created by [ADMIN_LOOKUPFLW(creator)], an antagonist.")
|
||||
message_admins("[ADMIN_LOOKUPFLW(current)] has been created by [ADMIN_LOOKUPFLW(creator)], an antagonist.")
|
||||
to_chat(current, "<span class='userdanger'>Despite your creators current allegiances, your true master remains [creator.real_name]. If their loyalities change, so do yours. This will never change unless your creator's body is destroyed.</span>")
|
||||
|
||||
/datum/mind/proc/show_memory(mob/recipient, window=1)
|
||||
|
||||
@@ -1,20 +0,0 @@
|
||||
diff a/code/datums/mind.dm b/code/datums/mind.dm (rejected hunks)
|
||||
@@ -63,7 +63,7 @@
|
||||
|
||||
var/mob/living/enslaved_to //If this mind's master is another mob (i.e. adamantine golems)
|
||||
|
||||
- var/datum/language_holder
|
||||
+ var/datum/language_holder/language_holder
|
||||
|
||||
/datum/mind/New(var/key)
|
||||
src.key = key
|
||||
@@ -90,7 +90,8 @@
|
||||
SStgui.on_transfer(current, new_character)
|
||||
|
||||
if(!language_holder)
|
||||
- language_holder = new_character.language_holder.copy(src)
|
||||
+ var/datum/language_holder/mob_holder = new_character.get_language_holder(shadow = FALSE)
|
||||
+ language_holder = mob_holder.copy(src)
|
||||
|
||||
if(key)
|
||||
if(new_character.key != key) //if we're transfering into a body with a key associated which is not ours
|
||||
@@ -1,10 +0,0 @@
|
||||
diff a/code/game/atoms_movable.dm b/code/game/atoms_movable.dm (rejected hunks)
|
||||
@@ -571,7 +571,7 @@
|
||||
|
||||
|
||||
/* Language procs */
|
||||
-/atom/movable/proc/get_language_holder()
|
||||
+/atom/movable/proc/get_language_holder(shadow=TRUE)
|
||||
if(language_holder)
|
||||
return language_holder
|
||||
else
|
||||
@@ -1,17 +0,0 @@
|
||||
diff a/code/game/machinery/hologram.dm b/code/game/machinery/hologram.dm (rejected hunks)
|
||||
@@ -294,7 +294,7 @@ GLOBAL_LIST_EMPTY(holopads)
|
||||
Hologram.add_atom_colour("#77abff", FIXED_COLOUR_PRIORITY)
|
||||
Hologram.Impersonation = user
|
||||
|
||||
- Hologram.languages = user.languages
|
||||
+ Hologram.language_holder = user.get_language_holder()
|
||||
Hologram.mouse_opacity = 0//So you can't click on it.
|
||||
Hologram.layer = FLY_LAYER//Above all the other objects/mobs. Or the vast majority of them.
|
||||
Hologram.anchored = 1//So space wind cannot drag it.
|
||||
@@ -392,4 +392,4 @@ For the other part of the code, check silicon say.dm. Particularly robot talk.*/
|
||||
req_components = list(/obj/item/weapon/stock_parts/capacitor = 1)
|
||||
|
||||
#undef HOLOPAD_PASSIVE_POWER_USAGE
|
||||
-#undef HOLOGRAM_POWER_USAGE
|
||||
\ No newline at end of file
|
||||
+#undef HOLOGRAM_POWER_USAGE
|
||||
@@ -1,15 +0,0 @@
|
||||
diff a/code/modules/mob/dead/observer/observer.dm b/code/modules/mob/dead/observer/observer.dm (rejected hunks)
|
||||
@@ -117,10 +117,12 @@ GLOBAL_VAR_INIT(observer_default_invisibility, INVISIBILITY_OBSERVER)
|
||||
|
||||
animate(src, pixel_y = 2, time = 10, loop = -1)
|
||||
|
||||
- grant_all_languages()
|
||||
GLOB.dead_mob_list += src
|
||||
+
|
||||
..()
|
||||
|
||||
+ grant_all_languages()
|
||||
+
|
||||
/mob/dead/observer/narsie_act()
|
||||
var/old_color = color
|
||||
color = "#960000"
|
||||
@@ -1,12 +0,0 @@
|
||||
diff a/code/modules/mob/living/carbon/human/human.dm b/code/modules/mob/living/carbon/human/human.dm (rejected hunks)
|
||||
@@ -58,8 +58,9 @@
|
||||
if(!(NOBLOOD in dna.species.species_traits))
|
||||
internal_organs += new /obj/item/organ/heart
|
||||
|
||||
- internal_organs += new dna.species.mutanteyes()
|
||||
+ internal_organs += new dna.species.mutanteyes
|
||||
internal_organs += new dna.species.mutantears
|
||||
+ internal_organs += new dna.species.mutanttongue
|
||||
internal_organs += new /obj/item/organ/brain
|
||||
..()
|
||||
|
||||
@@ -1,18 +0,0 @@
|
||||
diff a/code/modules/mob/living/carbon/human/species.dm b/code/modules/mob/living/carbon/human/species.dm (rejected hunks)
|
||||
@@ -66,15 +66,10 @@
|
||||
//Flight and floating
|
||||
var/override_float = 0
|
||||
|
||||
-
|
||||
- //Eyes
|
||||
var/obj/item/organ/eyes/mutanteyes = /obj/item/organ/eyes
|
||||
-
|
||||
- //Ears
|
||||
var/obj/item/organ/ears/mutantears = /obj/item/organ/ears
|
||||
-
|
||||
- //Hands
|
||||
var/obj/item/mutanthands = null
|
||||
+ var/obj/item/organ/tongue/mutanttongue = /obj/item/organ/tongue
|
||||
|
||||
///////////
|
||||
// PROCS //
|
||||
@@ -1,10 +0,0 @@
|
||||
diff a/code/modules/mob/living/carbon/human/species_types/lizardpeople.dm b/code/modules/mob/living/carbon/human/species_types/lizardpeople.dm (rejected hunks)
|
||||
@@ -6,7 +6,7 @@
|
||||
default_color = "00FF00"
|
||||
species_traits = list(MUTCOLORS,EYECOLOR,LIPS)
|
||||
mutant_bodyparts = list("tail_lizard", "snout", "spines", "horns", "frills", "body_markings", "legs")
|
||||
- mutant_organs = list(/obj/item/organ/tongue/lizard)
|
||||
+ mutanttongue = /obj/item/organ/tongue/lizard
|
||||
coldmod = 1.5
|
||||
heatmod = 0.67
|
||||
default_features = list("mcolor" = "0F0", "tail" = "Smooth", "snout" = "Round", "horns" = "None", "frills" = "None", "spines" = "None", "body_markings" = "None", "legs" = "Normal Legs")
|
||||
Reference in New Issue
Block a user