Porting Fixes (#7891)

* Porting Fixes

- Ores now properly initialize
- Spawned in characters now have languages set

* Update ore.dm

* More Hard Delete Fixes

* Fixes compile issue
This commit is contained in:
Novacat
2021-02-19 22:07:27 -09:00
committed by GitHub
parent 9d4a3ed422
commit e47f39ec24
4 changed files with 13 additions and 3 deletions
+6
View File
@@ -497,6 +497,12 @@ Traitors and the like can also be revived with the previous role mostly intact.
antag_data.add_antagonist(new_character.mind)
antag_data.place_mob(new_character)
for(var/lang in picked_client.prefs.alternate_languages)
var/datum/language/chosen_language = GLOB.all_languages[lang]
if(chosen_language)
if(is_lang_whitelisted(src,chosen_language) || (new_character.species && (chosen_language.name in new_character.species.secondary_langs)))
new_character.add_language(lang)
//If desired, apply equipment.
if(equipment)
if(charjob)
+3 -2
View File
@@ -148,7 +148,8 @@
icon_state = "slag"
material = null
/obj/item/weapon/ore/New()
/obj/item/weapon/ore/Initialize()
..()
randpixel_xy()
/obj/item/weapon/ore/attackby(obj/item/weapon/W as obj, mob/user as mob)
@@ -156,4 +157,4 @@
var/obj/item/device/core_sampler/C = W
C.sample_item(src, user)
else
return ..()
return ..()
@@ -57,7 +57,7 @@
return ..()
/mob/living/simple_mob/mechanical/mecha/Destroy()
qdel(sparks)
qdel_null(sparks)
return ..()
/mob/living/simple_mob/mechanical/mecha/death()