cyberpresidentvanellope/vgstation13
1
0
Fork 0
mirror of https://github.com/vgstation-coders/vgstation13.git synced 2025-12-10 02:16:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'color_replace_2_electric_boogaloo' into Bleeding-Edge

Browse Source 
Conflicts:
	code/ATMOSPHERICS/pipe/pipe_dispenser.dm
	code/game/machinery/computer/HolodeckControl.dm
	code/game/machinery/embedded_controller/embedded_controller_base.dm
	code/modules/mining/money_bag.dm
	code/modules/mob/living/carbon/carbon.dm
	code/modules/mob/living/silicon/mommi/mommi.dm
	code/modules/mob/living/simple_animal/friendly/farm_animals.dm
	code/modules/research/destructive_analyzer.dm
	code/modules/research/rdconsole.dm
	code/modules/research/xenoarchaeology/machinery/analysis_base.dm
	code/modules/research/xenoarchaeology/machinery/artifact_harvester.dm
	code/modules/research/xenoarchaeology/tools/ano_device_battery.dm
This commit is contained in:
D3athrow
2015-04-12 16:40:59 -05:00
parent 9f2e2bb4e3
commit 01d2471fc9
534 changed files with 3273 additions and 3268 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
code/ZAS/Airflow.dm
View File

@@ -54,10 +54,10 @@ mob/proc/airflow_stun()
return 0
if(last_airflow_stun > world.time - zas_settings.Get(/datum/ZAS_Setting/airflow_stun_cooldown)) return 0
if(!(status_flags & CANSTUN) && !(status_flags & CANWEAKEN))
src << "\blue You stay upright as the air rushes past you."
src << "<span class='notice'>You stay upright as the air rushes past you.</span>"
return 0
if(weakened <= 0) src << "\red The sudden rush of air knocks you over!"
if(weakened <= 0) src << "<span class='warning'>The sudden rush of air knocks you over!</span>"
weakened = max(weakened,5)
last_airflow_stun = world.time
return
@@ -74,10 +74,10 @@ mob/living/carbon/human/airflow_stun()
if(shoes)
if(shoes.flags & NOSLIP) return 0
if(!(status_flags & CANSTUN) && !(status_flags & CANWEAKEN))
src << "\blue You stay upright as the air rushes past you."
src << "<span class='notice'>You stay upright as the air rushes past you.</span>"
return 0
if(weakened <= 0) src << "\red The sudden rush of air knocks you over!"
if(weakened <= 0) src << "<span class='warning'>The sudden rush of air knocks you over!</span>"
weakened = max(weakened,rand(1,5))
last_airflow_stun = world.time
return
@@ -374,7 +374,7 @@ atom/movable/proc/airflow_hit(atom/A)
mob/airflow_hit(atom/A)
if(!sound_override)
for(var/mob/M in hearers(src))
M.show_message("\red <B>\The [src] slams into \a [A]!</B>",1,"\red You hear a loud slam!",2)
M.show_message("<span class='warning'><B>\The [src] slams into \a [A]!</B></span>",1,"<span class='warning'>You hear a loud slam!</span>",2)
//playsound(get_turf(src), "smash.ogg", 25, 1, -1)
weakened = max(weakened, (istype(A,/obj/item) ? A:w_class : rand(1,5))) //Heheheh
. = ..()
@@ -382,7 +382,7 @@ mob/airflow_hit(atom/A)
obj/airflow_hit(atom/A)
if(!sound_override)
for(var/mob/M in hearers(src))
M.show_message("\red <B>\The [src] slams into \a [A]!</B>",1,"\red You hear a loud slam!",2)
M.show_message("<span class='warning'><B>\The [src] slams into \a [A]!</B></span>",1,"<span class='warning'>You hear a loud slam!</span>",2)
//playsound(get_turf(src), "smash.ogg", 25, 1, -1)
. = ..()
@@ -392,7 +392,7 @@ obj/item/airflow_hit(atom/A)
mob/living/carbon/human/airflow_hit(atom/A)
// for(var/mob/M in hearers(src))
// M.show_message("\red <B>[src] slams into [A]!</B>",1,"\red You hear a loud slam!",2)
// M.show_message("<span class='warning'><B>[src] slams into [A]!</B></span>",1,"<span class='warning'>You hear a loud slam!</span>",2)
//playsound(get_turf(src), "punch", 25, 1, -1)
if(prob(33))
loc:add_blood(src)