cyberpresidentvanellope/S.P.L.U.R.T-Station-13
1
0
Fork 0
mirror of https://github.com/SPLURT-Station/S.P.L.U.R.T-Station-13.git synced 2026-01-06 07:03:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

Moderately unoriginal PR title about runtime errors.

Browse Source
This commit is contained in:
Ghommie
2020-03-26 23:22:51 +01:00
parent 613c66d88e
commit 3c42e9eefd
6 changed files with 19 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
code/modules/client/preferences.dm
View File

@@ -2131,6 +2131,8 @@ GLOBAL_LIST_EMPTY(preferences_datums)
toggles ^= MEMBER_PUBLIC
if("gender")
var/chosengender = input(user, "Select your character's gender.", "Gender Selection", gender) as null|anything in list(MALE,FEMALE,"nonbinary","object")
if(!chosengender)
return
switch(chosengender)
if("nonbinary")
chosengender = PLURAL

2
code/modules/mob/living/brain/brain_item.dm
View File

@@ -88,7 +88,7 @@
brainmob.stored_dna = new /datum/dna/stored(brainmob)
C.dna.copy_dna(brainmob.stored_dna)
if(HAS_TRAIT(L, TRAIT_NOCLONE))
brainmob.status_traits[TRAIT_NOCLONE] = L.status_traits[TRAIT_NOCLONE]
LAZYSET(brainmob.status_traits, TRAIT_NOCLONE, L.status_traits[TRAIT_NOCLONE])
var/obj/item/organ/zombie_infection/ZI = L.getorganslot(ORGAN_SLOT_ZOMBIE)
if(ZI)
brainmob.set_species(ZI.old_species) //For if the brain is cloned

2
code/modules/mob/living/carbon/carbon.dm
View File

@@ -283,6 +283,8 @@
/mob/living/carbon/resist_buckle()
. = FALSE
if(!buckled)
return
if(restrained())
// too soon.
if(last_special > world.time)

2
code/modules/mob/living/living.dm
View File

@@ -715,7 +715,7 @@
return TRUE
/mob/living/proc/resist_buckle()
buckled.user_unbuckle_mob(src,src)
buckled?.user_unbuckle_mob(src,src)
/mob/living/proc/resist_fire()
return

6
code/modules/projectiles/guns/energy.dm
View File

@@ -65,9 +65,9 @@
update_icon()
/obj/item/gun/energy/Destroy()
if(flags_1 & INITIALIZED_1)
QDEL_NULL(cell)
QDEL_LIST(ammo_type)
//no need to delete them, since contents are already deleted in atom/movable/Destroy().
cell = null
ammo_type = null
STOP_PROCESSING(SSobj, src)
return ..()

14
modular_citadel/code/datums/status_effects/chems.dm
View File

@@ -23,11 +23,10 @@
owner.remove_status_effect(src)
..()
/datum/status_effect/chem/SGDF/on_remove(mob/living/carbon/M)
/datum/status_effect/chem/SGDF/on_remove()
log_game("FERMICHEM: SGDF mind shift applied. [owner] is now playing as their clone and should not have memories after their clone split (look up SGDF status applied). ID: [owner.key]")
originalmind.transfer_to(fermi_Clone)
to_chat(owner, "<span class='warning'>Lucidity shoots to your previously blank mind as your mind suddenly finishes the cloning process. You marvel for a moment at yourself, as your mind subconciously recollects all your memories up until the point when you cloned yourself. Curiously, you find that you memories are blank after you ingested the synthetic serum, leaving you to wonder where the other you is.</span>")
to_chat(M, "<span class='warning'>Lucidity shoots to your previously blank mind as your mind suddenly finishes the cloning process. You marvel for a moment at yourself, as your mind subconciously recollects all your memories up until the point when you cloned yourself. Curiously, you find that you memories are blank after you ingested the synthetic serum, leaving you to wonder where the other you is.</span>")
fermi_Clone = null
return ..()
@@ -193,14 +192,13 @@
log_game("FERMICHEM: [M]'s possesser has been booted out into a astral ghost!")
originalmind.transfer_to(original)
/datum/status_effect/chem/astral_insurance/on_remove(mob/living/carbon/M) //God damnit get them home!
if(owner.mind == originalmind) //If they're home, HOORAY
return ..()
/datum/status_effect/chem/astral_insurance/on_remove() //God damnit get them home!
if(owner.mind != originalmind) //If they're home, HOORAY
if(owner.mind)
var/mob/living/simple_animal/astral/G = new(get_turf(M.loc))
var/mob/living/simple_animal/astral/G = new(get_turf(owner))
owner.mind.transfer_to(G)//Just in case someone else is inside of you, it makes them a ghost and should hopefully bring them home at the end.
to_chat(G, "<span class='warning'>[M]'s conciousness snaps back to them as their astrogen runs out, kicking your projected mind out!'</b></span>")
log_game("FERMICHEM: [M]'s possesser has been booted out into a astral ghost!")
to_chat(G, "<span class='warning'>[owner]'s conciousness snaps back to them as their astrogen runs out, kicking your projected mind out!'</b></span>")
log_game("FERMICHEM: [owner]'s possesser has been booted out into a astral ghost!")
originalmind.transfer_to(original)
return ..()