cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-12 19:22:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

[MIRROR] Porting Fixes

Browse Source
This commit is contained in:
Chompstation Bot
2021-02-21 16:02:54 +00:00
parent b354763b37
commit f55f171cdf
3 changed files with 167 additions and 141 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
code/modules/admin/verbs/randomverbs.dm
View File

@@ -515,7 +515,25 @@ Traitors and the like can also be revived with the previous role mostly intact.
if(new_character.mind) if(new_character.mind)
new_character.mind.loaded_from_ckey = picked_ckey new_character.mind.loaded_from_ckey = picked_ckey
new_character.mind.loaded_from_slot = picked_slot new_character.mind.loaded_from_slot = picked_slot
<<<<<<< HEAD
//VOREStation Add End //VOREStation Add End
||||||| parent of 278c3eaa3f... Merge pull request #9761 from VOREStation/upstream-merge-7891
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)
//VOREStation Add End
=======
//VOREStation Add End
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)
>>>>>>> 278c3eaa3f... Merge pull request #9761 from VOREStation/upstream-merge-7891
//If desired, apply equipment. //If desired, apply equipment.
if(equipment) if(equipment)

8
code/modules/mining/ore.dm
View File

@@ -113,7 +113,15 @@
icon_state = "slag" icon_state = "slag"
material = null material = null
<<<<<<< HEAD
/obj/item/weapon/ore/New() /obj/item/weapon/ore/New()
||||||| parent of 278c3eaa3f... Merge pull request #9761 from VOREStation/upstream-merge-7891
/obj/item/weapon/ore/New()
..()
=======
/obj/item/weapon/ore/Initialize()
..()
>>>>>>> 278c3eaa3f... Merge pull request #9761 from VOREStation/upstream-merge-7891
randpixel_xy() randpixel_xy()
/obj/item/weapon/ore/attackby(obj/item/weapon/W as obj, mob/user as mob) /obj/item/weapon/ore/attackby(obj/item/weapon/W as obj, mob/user as mob)