cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-08-21 20:20:33 +01:00
Code Issues Packages Projects Releases Wiki Activity

[MIRROR] Fixes typo 'transfered', olive oil reaction repath [MDB IGNORE] (#23469)

Browse Source 
* Fixes typo 'transfered', olive oil reaction repath

* Modular

* Update condiment.dm

* Update recipes_guide.dm

* Update _cup.dm

---------

Co-authored-by: Bloop <13398309+vinylspiders@users.noreply.github.com>
This commit is contained in:
SkyratBot
2023-09-04 08:49:33 -04:00
committed by GitHub
co-authored by Bloop
parent 11133f4e51
commit 87bfa7a61a
78 changed files with 152 additions and 152 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/mob/living/brain/posibrain.dm
+9 -9
View File
@@ -124,20 +124,20 @@ GLOBAL_VAR(posibrain_notify_cooldown)
brainmob.set_suicide(FALSE)
transfer_personality(user)
/obj/item/mmi/posibrain/transfer_identity(mob/living/carbon/transfered_user)
name = "[initial(name)] ([transfered_user])"
brainmob.name = transfered_user.real_name
brainmob.real_name = transfered_user.real_name
if(transfered_user.has_dna())
/obj/item/mmi/posibrain/transfer_identity(mob/living/carbon/transferred_user)
name = "[initial(name)] ([transferred_user])"
brainmob.name = transferred_user.real_name
brainmob.real_name = transferred_user.real_name
if(transferred_user.has_dna())
if(!brainmob.stored_dna)
brainmob.stored_dna = new /datum/dna/stored(brainmob)
transfered_user.dna.copy_dna(brainmob.stored_dna)
brainmob.timeofdeath = transfered_user.timeofdeath
transferred_user.dna.copy_dna(brainmob.stored_dna)
brainmob.timeofdeath = transferred_user.timeofdeath
brainmob.set_stat(CONSCIOUS)
if(brainmob.mind)
brainmob.mind.set_assigned_role(SSjob.GetJobType(posibrain_job_path))
if(transfered_user.mind)
transfered_user.mind.transfer_to(brainmob)
if(transferred_user.mind)
transferred_user.mind.transfer_to(brainmob)
brainmob.mind.remove_all_antag_datums()
brainmob.mind.wipe_memory()
code/modules/mob/living/carbon/carbon.dm
+1 -1
View File
@@ -481,7 +481,7 @@
var/turf/floor = get_turf(src)
var/obj/effect/decal/cleanable/vomit/spew = new(floor, get_static_viruses())
bite.reagents.trans_to(spew, amount, transfered_by = src)
bite.reagents.trans_to(spew, amount, transferred_by = src)
/mob/living/carbon/proc/spew_organ(power = 5, amt = 1)
for(var/i in 1 to amt)
code/modules/mob/living/carbon/death.dm
+2 -2
View File
@@ -40,14 +40,14 @@
/mob/living/carbon/spill_organs(no_brain, no_organs, no_bodyparts)
var/atom/Tsec = drop_location()
if(!no_bodyparts)
if(no_organs)//so the organs don't get transfered inside the bodyparts we'll drop.
if(no_organs)//so the organs don't get transferred inside the bodyparts we'll drop.
for(var/organ in organs)
if(no_brain || !istype(organ, /obj/item/organ/internal/brain))
qdel(organ)
else //we're going to drop all bodyparts except chest, so the only organs that needs spilling are those inside it.
for(var/obj/item/organ/organ as anything in organs)
if(no_brain && istype(organ, /obj/item/organ/internal/brain))
qdel(organ) //so the brain isn't transfered to the head when the head drops.
qdel(organ) //so the brain isn't transferred to the head when the head drops.
continue
var/org_zone = check_zone(organ.zone) //both groin and chest organs.
if(org_zone == BODY_ZONE_CHEST)