mirror of
https://github.com/ParadiseSS13/Paradise.git
synced 2026-08-23 03:57:13 +01:00
Porting much of Aryn's stuff
-Sounds -Detective Work -Hallucinations Tweaked server air alarm Tweaked gibs Working on de-derping surgery Ported some BS12 stuff (stunned radio and adminwho) Player's mind datum now holds their antagonist preferences.
This commit is contained in:
@@ -61,6 +61,7 @@
|
||||
/mob/living/carbon/human/dummy
|
||||
real_name = "Test Dummy"
|
||||
nodamage = 1
|
||||
universal_speak = 1
|
||||
|
||||
|
||||
|
||||
|
||||
@@ -253,7 +253,7 @@
|
||||
var/datum/gas_mixture/environment = loc.return_air()
|
||||
var/datum/air_group/breath
|
||||
// HACK NEED CHANGING LATER
|
||||
if(health < (config.health_threshold_dead + 50)) //PEOPLE ARE NOT DYING, DAMMIT
|
||||
if(health < config.health_threshold_dead)
|
||||
losebreath++
|
||||
|
||||
if(losebreath>0 && prob(90)) //Suffocating so do not take a breath
|
||||
@@ -630,7 +630,7 @@
|
||||
apply_damage(0.4*discomfort, BURN, "r_arm")
|
||||
|
||||
handle_chemicals_in_body()
|
||||
if(reagents) reagents.metabolize(src)
|
||||
if(reagents && stat != 2) reagents.metabolize(src)
|
||||
|
||||
if(mutantrace == "plant") //couldn't think of a better place to place it, since it handles nutrition -- Urist
|
||||
var/light_amount = 0 //how much light there is in the place, affects receiving nutrition and healing
|
||||
@@ -755,6 +755,7 @@
|
||||
lying = 1
|
||||
stat = 0
|
||||
if (paralysis > 0)
|
||||
handle_dreams()
|
||||
AdjustParalysis(-1)
|
||||
blinded = 1
|
||||
lying = 1
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
/mob/living/carbon/var/traumatic_shock = 0
|
||||
/mob/living/var/traumatic_shock = 0
|
||||
/mob/living/carbon/var/shock_stage = 0
|
||||
|
||||
// proc to find out in how much pain the mob is at the moment
|
||||
|
||||
@@ -136,7 +136,7 @@
|
||||
if( !message_mode && (disease_symptoms & DISEASE_WHISPER))
|
||||
message_mode = "whisper"
|
||||
|
||||
if(src.stunned > 0)
|
||||
if(src.stunned > 0 && (!(traumatic_shock > 61) && prob(50)))
|
||||
message_mode = "" //Stunned people shouldn't be able to physically turn on their radio/hold down the button to speak into it
|
||||
|
||||
|
||||
|
||||
@@ -793,19 +793,19 @@
|
||||
spawn()
|
||||
if(key)
|
||||
if(istype(src, /mob/living/silicon))
|
||||
robogibs(loc, viruses)
|
||||
robogibs(loc, viruses, name)
|
||||
else if (istype(src, /mob/living/carbon/alien))
|
||||
xgibs(loc, viruses)
|
||||
xgibs(loc, viruses, name)
|
||||
else
|
||||
gibs(loc, viruses)
|
||||
gibs(loc, viruses, name, dna)
|
||||
|
||||
else
|
||||
if(istype(src, /mob/living/silicon))
|
||||
robogibs(loc, viruses)
|
||||
else if(istype(src, /mob/living/carbon/alien))
|
||||
xgibs(loc, viruses)
|
||||
xgibs(loc, viruses, name)
|
||||
else
|
||||
gibs(loc, viruses)
|
||||
gibs(loc, viruses, name, dna)
|
||||
sleep(15)
|
||||
for(var/obj/item/I in src.contents)
|
||||
I.loc = get_turf(src)
|
||||
|
||||
@@ -258,7 +258,7 @@
|
||||
job_master.EquipRank(character, rank, 1)
|
||||
EquipCustomItems(character)
|
||||
character.loc = pick(latejoin)
|
||||
character.be_syndicate = src.preferences.be_special & BE_TRAITOR
|
||||
character.be_syndicate = src.preferences.be_special
|
||||
ticker.mode.latespawn(character)
|
||||
AnnounceArrival(character, rank)
|
||||
|
||||
|
||||
Reference in New Issue
Block a user