mirror of
https://github.com/SPLURT-Station/S.P.L.U.R.T-Station-13.git
synced 2025-12-10 09:54:52 +00:00
fixes
This commit is contained in:
@@ -591,9 +591,9 @@
|
|||||||
switch(child)
|
switch(child)
|
||||||
if(/datum)
|
if(/datum)
|
||||||
return null
|
return null
|
||||||
if(/obj || /mob)
|
if(/obj, /mob)
|
||||||
return /atom/movable
|
return /atom/movable
|
||||||
if(/area || /turf)
|
if(/area, /turf)
|
||||||
return /atom
|
return /atom
|
||||||
else
|
else
|
||||||
return /datum
|
return /datum
|
||||||
|
|||||||
@@ -224,6 +224,7 @@
|
|||||||
else
|
else
|
||||||
to_chat(owner, "<span class='userdanger'>You feel your heart lurching in your chest...</span>")
|
to_chat(owner, "<span class='userdanger'>You feel your heart lurching in your chest...</span>")
|
||||||
owner.adjustOxyLoss(8)
|
owner.adjustOxyLoss(8)
|
||||||
|
else
|
||||||
|
|
||||||
/datum/brain_trauma/severe/discoordination
|
/datum/brain_trauma/severe/discoordination
|
||||||
name = "Discoordination"
|
name = "Discoordination"
|
||||||
|
|||||||
@@ -30,7 +30,7 @@
|
|||||||
return
|
return
|
||||||
|
|
||||||
switch(stage)
|
switch(stage)
|
||||||
if(2 || 3) //Pretend to be a cold and give time to spread.
|
if(2, 3) //Pretend to be a cold and give time to spread.
|
||||||
if(prob(8))
|
if(prob(8))
|
||||||
affected_mob.emote("sneeze")
|
affected_mob.emote("sneeze")
|
||||||
if(prob(8))
|
if(prob(8))
|
||||||
|
|||||||
@@ -374,7 +374,7 @@ GLOBAL_LIST_EMPTY(allConsoles)
|
|||||||
radio_freq = FREQ_ENGINEERING
|
radio_freq = FREQ_ENGINEERING
|
||||||
if("security")
|
if("security")
|
||||||
radio_freq = FREQ_SECURITY
|
radio_freq = FREQ_SECURITY
|
||||||
if("cargobay" || "mining")
|
if("cargobay", "mining")
|
||||||
radio_freq = FREQ_SUPPLY
|
radio_freq = FREQ_SUPPLY
|
||||||
Radio.set_frequency(radio_freq)
|
Radio.set_frequency(radio_freq)
|
||||||
|
|
||||||
|
|||||||
@@ -70,9 +70,9 @@
|
|||||||
|
|
||||||
/obj/machinery/atmospherics/pipe/layer_manifold/SetInitDirections()
|
/obj/machinery/atmospherics/pipe/layer_manifold/SetInitDirections()
|
||||||
switch(dir)
|
switch(dir)
|
||||||
if(NORTH || SOUTH)
|
if(NORTH, SOUTH)
|
||||||
initialize_directions = NORTH|SOUTH
|
initialize_directions = NORTH|SOUTH
|
||||||
if(EAST || WEST)
|
if(EAST, WEST)
|
||||||
initialize_directions = EAST|WEST
|
initialize_directions = EAST|WEST
|
||||||
|
|
||||||
/obj/machinery/atmospherics/pipe/layer_manifold/isConnectable(obj/machinery/atmospherics/target, given_layer)
|
/obj/machinery/atmospherics/pipe/layer_manifold/isConnectable(obj/machinery/atmospherics/target, given_layer)
|
||||||
|
|||||||
@@ -30,3 +30,4 @@
|
|||||||
if(1 to 10)
|
if(1 to 10)
|
||||||
mutatepest(user)
|
mutatepest(user)
|
||||||
return
|
return
|
||||||
|
else
|
||||||
|
|||||||
@@ -144,6 +144,7 @@
|
|||||||
newletter = "nglu"
|
newletter = "nglu"
|
||||||
if(5)
|
if(5)
|
||||||
newletter = "glor"
|
newletter = "glor"
|
||||||
|
else
|
||||||
. += newletter
|
. += newletter
|
||||||
return sanitize(.)
|
return sanitize(.)
|
||||||
|
|
||||||
|
|||||||
@@ -347,10 +347,10 @@
|
|||||||
var/dir2 = 0
|
var/dir2 = 0
|
||||||
var/dir3 = 0
|
var/dir3 = 0
|
||||||
switch(direction)
|
switch(direction)
|
||||||
if(NORTH||SOUTH)
|
if(NORTH, SOUTH)
|
||||||
dir2 = 4
|
dir2 = 4
|
||||||
dir3 = 8
|
dir3 = 8
|
||||||
if(EAST||WEST)
|
if(EAST, WEST)
|
||||||
dir2 = 1
|
dir2 = 1
|
||||||
dir3 = 2
|
dir3 = 2
|
||||||
var/turf/T2 = T
|
var/turf/T2 = T
|
||||||
|
|||||||
@@ -145,6 +145,8 @@
|
|||||||
if(7)
|
if(7)
|
||||||
new /obj/item/clothing/glasses/sunglasses(src)
|
new /obj/item/clothing/glasses/sunglasses(src)
|
||||||
new /obj/item/clothing/mask/cigarette/rollie(src)
|
new /obj/item/clothing/mask/cigarette/rollie(src)
|
||||||
|
else
|
||||||
|
return
|
||||||
|
|
||||||
/obj/structure/closet/crate/grave/open(mob/living/user, obj/item/S)
|
/obj/structure/closet/crate/grave/open(mob/living/user, obj/item/S)
|
||||||
if(!opened)
|
if(!opened)
|
||||||
|
|||||||
@@ -41,13 +41,14 @@
|
|||||||
target.cure_all_traumas(TRAUMA_RESILIENCE_LOBOTOMY)
|
target.cure_all_traumas(TRAUMA_RESILIENCE_LOBOTOMY)
|
||||||
if(target.mind && target.mind.has_antag_datum(/datum/antagonist/brainwashed))
|
if(target.mind && target.mind.has_antag_datum(/datum/antagonist/brainwashed))
|
||||||
target.mind.remove_antag_datum(/datum/antagonist/brainwashed)
|
target.mind.remove_antag_datum(/datum/antagonist/brainwashed)
|
||||||
switch(rand(1,6))//Now let's see what hopefully-not-important part of the brain we cut off
|
if(prob(50))
|
||||||
if(1)
|
switch(rand(1,3))//Now let's see what hopefully-not-important part of the brain we cut off
|
||||||
target.gain_trauma_type(BRAIN_TRAUMA_MILD, TRAUMA_RESILIENCE_SURGERY)
|
if(1)
|
||||||
if(2)
|
target.gain_trauma_type(BRAIN_TRAUMA_MILD, TRAUMA_RESILIENCE_SURGERY)
|
||||||
target.gain_trauma_type(BRAIN_TRAUMA_SEVERE, TRAUMA_RESILIENCE_SURGERY)
|
if(2)
|
||||||
if(3)
|
target.gain_trauma_type(BRAIN_TRAUMA_SEVERE, TRAUMA_RESILIENCE_SURGERY)
|
||||||
target.gain_trauma_type(BRAIN_TRAUMA_SPECIAL, TRAUMA_RESILIENCE_SURGERY)
|
if(3)
|
||||||
|
target.gain_trauma_type(BRAIN_TRAUMA_SPECIAL, TRAUMA_RESILIENCE_SURGERY)
|
||||||
// you're cutting off a part of the brain.w
|
// you're cutting off a part of the brain.w
|
||||||
var/obj/item/organ/brain/B = target.getorganslot(ORGAN_SLOT_BRAIN)
|
var/obj/item/organ/brain/B = target.getorganslot(ORGAN_SLOT_BRAIN)
|
||||||
B.applyOrganDamage(50, 100)
|
B.applyOrganDamage(50, 100)
|
||||||
|
|||||||
@@ -469,6 +469,7 @@ GLOBAL_LIST_EMPTY(vending_products)
|
|||||||
freebie(user, 2)
|
freebie(user, 2)
|
||||||
if(16 to 25)
|
if(16 to 25)
|
||||||
freebie(user, 1)
|
freebie(user, 1)
|
||||||
|
if(26 to 75)
|
||||||
if(76 to 90)
|
if(76 to 90)
|
||||||
tilt(user)
|
tilt(user)
|
||||||
if(91 to 100)
|
if(91 to 100)
|
||||||
|
|||||||
@@ -630,19 +630,19 @@ GLOBAL_LIST_EMPTY(rain_sounds)
|
|||||||
playchime = 1
|
playchime = 1
|
||||||
|
|
||||||
switch(hour)
|
switch(hour)
|
||||||
if(1 || 2)
|
if(1, 2)
|
||||||
HRimgstate = "asshouroverlay-2" //Now it is ass, mostly because someones going to kill me for the other names.
|
HRimgstate = "asshouroverlay-2" //Now it is ass, mostly because someones going to kill me for the other names.
|
||||||
if(3)
|
if(3)
|
||||||
HRimgstate = "asshouroverlay-3"
|
HRimgstate = "asshouroverlay-3"
|
||||||
if(4 || 5)
|
if(4, 5)
|
||||||
HRimgstate = "asshouroverlay-4"
|
HRimgstate = "asshouroverlay-4"
|
||||||
if(6)
|
if(6)
|
||||||
HRimgstate = "asshouroverlay-6"
|
HRimgstate = "asshouroverlay-6"
|
||||||
if(7 || 8)
|
if(7, 8)
|
||||||
HRimgstate = "asshouroverlay-7"
|
HRimgstate = "asshouroverlay-7"
|
||||||
if(9)
|
if(9)
|
||||||
HRimgstate = "asshouroverlay-9"
|
HRimgstate = "asshouroverlay-9"
|
||||||
if(10 || 11)
|
if(10, 11)
|
||||||
HRimgstate = "asshouroverlay-10"
|
HRimgstate = "asshouroverlay-10"
|
||||||
else
|
else
|
||||||
HRimgstate = "asshouroverlay-0" //Station time wraps to 0, and so does our hours.
|
HRimgstate = "asshouroverlay-0" //Station time wraps to 0, and so does our hours.
|
||||||
|
|||||||
Reference in New Issue
Block a user